andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Fix text capitalization according to 

http://techbase.kde.org/Projects/Usability/HIG/Capitalization

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=902032
This commit is contained in:
Volker Lanz 2008-12-27 12:01:29 +00:00
parent b97e5225be
commit a7a090381f
6 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/gui/mainwindow.cpp
View File

@ -133,7 +133,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
if (KMessageBox::warningContinueCancel(this,
i18ncp("@info", "<para>Do you really want to quit the application?</para><para>There is still an operation pending.</para>",
"<para>Do you really want to quit the application?</para><para>There are still %1 operations pending.</para>", operationStack().size()),
i18nc("@title:window", "Discard pending operations and quit?"),
i18nc("@title:window", "Discard Pending Operations and Quit?"),
KGuiItem(i18nc("@action:button", "&Quit <application>%1</application>", KGlobal::mainComponent().aboutData()->programName())),
KStandardGuiItem::cancel(), "reallyQuit") == KMessageBox::Cancel)
{
@ -208,7 +208,7 @@ void MainWindow::setupActions()
KAction* createNewPartitionTable = actionCollection()->addAction("createNewPartitionTable", this, SLOT(onCreateNewPartitionTable()));
createNewPartitionTable->setEnabled(false);
createNewPartitionTable->setText(i18nc("@action:inmenu", "Create New Partition Table"));
createNewPartitionTable->setToolTip(i18nc("@info:tooltip", "Create New Partition Table"));
createNewPartitionTable->setToolTip(i18nc("@info:tooltip", "Create new partition table"));
createNewPartitionTable->setStatusTip(i18nc("@info:status", "Create a new and empty partition table on a device."));
createNewPartitionTable->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_N);
createNewPartitionTable->setIcon(BarIcon("edit-clear"));
@ -677,12 +677,12 @@ void MainWindow::onMountPartition()
if (p && p->canMount())
{
if (!p->mount(report))
KMessageBox::detailedSorry(this, i18nc("@info", "The file system on partition <filename>%1</filename> could not be mounted.", p->deviceNode()), QString("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could not mount file system."));
KMessageBox::detailedSorry(this, i18nc("@info", "The file system on partition <filename>%1</filename> could not be mounted.", p->deviceNode()), QString("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could Not Mount File System."));
}
else if (p && p->canUnmount())
{
if (!p->unmount(report))
KMessageBox::detailedSorry(this, i18nc("@info", "The file system on partition <filename>%1</filename> could not be unmounted.", p->deviceNode()), QString("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could not unmount file system."));
KMessageBox::detailedSorry(this, i18nc("@info", "The file system on partition <filename>%1</filename> could not be unmounted.", p->deviceNode()), QString("<pre>%1</pre>").arg(report.toText()), i18nc("@title:window", "Could Not Unmount File System."));
}
if (p->roles().has(PartitionRole::Logical))
@ -722,7 +722,7 @@ static bool checkTooManyPartitions(QWidget* parent, const Device& d, const Parti
KMessageBox::sorry(parent, i18nc("@info",
"<para>There are already %1 primary partitions on this device. This is the maximum number its partition table can handle.</para>"
"<para>You cannot create, paste or restore a primary partition on it before you delete an existing one.</para>",
d.partitionTable().numPrimaries()), i18nc("@title:window", "Too many primary partitions."));
d.partitionTable().numPrimaries()), i18nc("@title:window", "Too Many Primary Partitions."));
return true;
}
@ -786,7 +786,7 @@ void MainWindow::onDeletePartition()
"<para>The partition <filename>%1</filename> cannot currently be deleted because one or more partitions with higher logical numbers are still mounted.</para>"
"<para>Please unmount all partitions with higher logical numbers than %2 first.</para>",
selectedPartition()->deviceNode(), selectedPartition()->number()),
i18nc("@title:window", "Cannot delete partition."));
i18nc("@title:window", "Cannot Delete Partition."));
return;
}
@ -798,8 +798,8 @@ void MainWindow::onDeletePartition()
i18nc("@info",
"Do you really want to delete the partition that is currently in the clipboard? "
"It will no longer be available for pasting after it has been deleted."),
i18nc("@title:window", "Really delete partition in the clipboard?"),
KGuiItem(i18nc("@action:button", "&Delete it")),
i18nc("@title:window", "Really Delete Partition in the Clipboard?"),
KGuiItem(i18nc("@action:button", "&Delete It")),
KStandardGuiItem::cancel(), "reallyDeleteClipboardPartition") == KMessageBox::Cancel)
return;
@ -935,13 +935,13 @@ bool MainWindow::showInsertDialog(Partition& insertPartition, qint64 sourceLengt
if (overwrite)
KMessageBox::error(this, i18nc("@info",
"<para>The selected partition is not large enough to hold the source partition or the backup file.</para>"
"<para>Pick another target or resize this partition so it is as large as the source.</para>"), i18nc("@title:window", "Target not large enough"));
"<para>Pick another target or resize this partition so it is as large as the source.</para>"), i18nc("@title:window", "Target Not Large Enough"));
else
KMessageBox::sorry(this, i18nc("@info",
"<para>It is not possible to create the target partition large enough to hold the source.</para>"
"<para>This may happen if not all partitions on a device start and end on cylinder boundaries "
"or when copying a primary partition into an extended partition.</para>"),
i18nc("@title:window", "Cannot create target partition."));
i18nc("@title:window", "Cannot Create Target Partition."));
return false;
}
@ -963,8 +963,8 @@ void MainWindow::onCreateNewPartitionTable()
"<para>Do you really want to create a new partition table on the following device?</para>"
"<para><list><item><filename>%1</filename> (%2)</item></list></para>"
"<para><warning>This will destroy all data on the device.</warning></para>", selectedDevice()->deviceNode(), selectedDevice()->name()),
i18nc("@title:window", "Destroy all data on device?"),
KGuiItem(i18nc("@action:button", "&Create new partition table")),
i18nc("@title:window", "Destroy All Data on Device?"),
KGuiItem(i18nc("@action:button", "&Create New Partition Table")),
KStandardGuiItem::cancel()) == KMessageBox::Continue)
{
operationStack().push(new CreatePartitionTableOperation(*selectedDevice()));
@ -983,8 +983,8 @@ void MainWindow::onRefreshDevices()
i18nc("@info",
"<para>Do you really want to rescan the devices?</para>"
"<para><warning>This will also clear the list of pending operations.</warning></para>"),
i18nc("@title:window", "Really rescan the devices?"),
KGuiItem(i18nc("@action:button", "&Rescan devices")),
i18nc("@title:window", "Really Rescan the Devices?"),
KGuiItem(i18nc("@action:button", "&Rescan Devices")),
KStandardGuiItem::cancel(), "reallyRescanDevices") == KMessageBox::Continue)
{
scanDevices();
@ -1007,8 +1007,8 @@ void MainWindow::onClearAllOperations()
{
if (KMessageBox::warningContinueCancel(this,
i18nc("@info", "Do you really want to clear the list of pending operations?"),
i18nc("@title:window", "Clear pending operations?"),
KGuiItem(i18nc("@action:button", "&Clear pending operations")),
i18nc("@title:window", "Clear Pending Operations?"),
KGuiItem(i18nc("@action:button", "&Clear Pending Operations")),
KStandardGuiItem::cancel(), "reallyClearPendingOperations") == KMessageBox::Continue)
{
log() << i18nc("@info/plain", "Clearing the list of pending operations.");
@ -1033,8 +1033,8 @@ void MainWindow::onApplyAllOperations()
i18nc("@info",
"<para>Do you really want to apply the pending operations listed below?</para>"
"<para><warning>This will permanently modify your disks.</warning></para>"),
opList, i18nc("@title:window", "Apply pending operations?"),
KGuiItem(i18nc("@action:button", "&Apply pending operations")),
opList, i18nc("@title:window", "Apply Pending Operations?"),
KGuiItem(i18nc("@action:button", "&Apply Pending Operations")),
KStandardGuiItem::cancel()) == KMessageBox::Continue)
{
log() << i18nc("@info/plain", "Applying operations...");
@ -1093,7 +1093,7 @@ void MainWindow::onBackupPartition()
if (fileName.isEmpty())
return;
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite existing file?"), KGuiItem(i18nc("@action:button", "&Overwrite file")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "&Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
{
operationStack().push(new BackupOperation(*selectedDevice(), *selectedPartition(), fileName));
updatePartitions();
@ -1125,7 +1125,7 @@ void MainWindow::onRestorePartition()
if (restorePartition->length() > selectedPartition()->length())
{
KMessageBox::error(this, i18nc("@info", "The file system in the image file <filename>%1</filename> is too large to be restored to the selected partition.", fileName), i18nc("@title:window", "Not enough space to restore file system."));
KMessageBox::error(this, i18nc("@info", "The file system in the image file <filename>%1</filename> is too large to be restored to the selected partition.", fileName), i18nc("@title:window", "Not Enough Space to Restore File System."));
delete restorePartition;
return;
}

2
src/gui/mainwindowbase.ui
View File

@ -67,7 +67,7 @@
</column>
<column>
<property name="text" >
<string comment="@label">Mount point</string>
<string comment="@label">Mount Point</string>
</property>
</column>
<column>

6
src/gui/partitionmanagerui.rc
View File

@ -2,14 +2,14 @@
<gui name="KDE Partition Manager" version="4">
<ToolBar name="editToolBar">
<text context="@title:menu turn on and off edit toolbar">Edit toolbar</text>
<text context="@title:menu turn on and off edit toolbar">Edit Toolbar</text>
<Action name="applyAllOperations"/>
<Action name="undoOperation"/>
<Action name="clearAllOperations"/>
</ToolBar>
<ToolBar name="partitionToolBar">
<text context="@title:menu">Partition toolbar</text>
<text context="@title:menu">Partition Toolbar</text>
<Action name="newPartition"/>
<Action name="resizePartition"/>
<Action name="copyPartition"/>
@ -20,7 +20,7 @@
</ToolBar>
<ToolBar name="deviceToolBar">
<text context="@title:menu">Device toolbar</text>
<text context="@title:menu">Device Toolbar</text>
<Action name="createNewPartitionTable"/>
</ToolBar>

44
src/gui/partpropsdialog.cpp
View File

@ -93,7 +93,7 @@ void PartPropsDialog::setupDialog()
setDefaultButton(KDialog::Cancel);
enableButtonOk(false);
button(KDialog::Cancel)->setFocus();
dialogWidget().partResizerWidget().setReadOnly(true);
dialogWidget().partResizerWidget().init(device(), partition(), 0, 0);
@ -101,7 +101,7 @@ void PartPropsDialog::setupDialog()
dialogWidget().mountPoint().setText(mp);
dialogWidget().role().setText(partition().roles().toString());
QString statusText = i18nc("@label partition state", "idle");
if (partition().isMounted())
{
@ -112,7 +112,7 @@ void PartPropsDialog::setupDialog()
else
statusText = i18nc("@label partition state", "mounted");
}
dialogWidget().status().setText(statusText);
setupFileSystemComboBox();
@ -132,7 +132,7 @@ void PartPropsDialog::setupDialog()
dialogWidget().firstSector().setText(KGlobal::locale()->formatNumber(partition().firstSector(), 0));
dialogWidget().lastSector().setText(KGlobal::locale()->formatNumber(partition().lastSector(), 0));
dialogWidget().numSectors().setText(KGlobal::locale()->formatNumber(partition().length(), 0));
setupFlagsList();
updateHideAndShow();
@ -164,7 +164,7 @@ void PartPropsDialog::updateHideAndShow()
{
// create a temporary fs just to check if the currently selected type supports setting a label
const FileSystem* fs = FileSystemFactory::create(newFileSystemType(), -1, -1, -1, "");
if (fs == NULL || fs->supportSetLabel() == FileSystem::SupportNone)
{
dialogWidget().label().setReadOnly(true);
@ -182,7 +182,7 @@ void PartPropsDialog::updateHideAndShow()
dialogWidget().label().setReadOnly(isReadOnly());
dialogWidget().noSetLabel().setVisible(false);
}
delete fs;
// when do we show available and used capacity?
@ -191,15 +191,15 @@ void PartPropsDialog::updateHideAndShow()
!partition().roles().has(PartitionRole::Extended) && // neither for extended
!partition().roles().has(PartitionRole::Unallocated) && // or for unallocated
newFileSystemType() != FileSystem::Unformatted; // and not for unformatted file systems
dialogWidget().showAvailable(showAvailableAndUsed);
dialogWidget().showUsed(showAvailableAndUsed);
// when do we show the file system combo box?
const bool showFileSystem =
!partition().roles().has(PartitionRole::Extended) && // not for extended, they have no file system
!partition().roles().has(PartitionRole::Unallocated); // and not for unallocated: no choice there
dialogWidget().showFileSystem(showFileSystem);
// when do we show the recreate file system check box?
@ -210,12 +210,12 @@ void PartPropsDialog::updateHideAndShow()
partition().state() != Partition::StateNew; // or new partitions
dialogWidget().showCheckRecreate(showCheckRecreate);
// when do we show the list of partition flags?
const bool showListFlags =
partition().state() != Partition::StateNew && // not for new partitions
!partition().roles().has(PartitionRole::Unallocated); // and not for unallocated space
dialogWidget().showListFlags(showListFlags);
dialogWidget().checkRecreate().setEnabled(!isReadOnly());
@ -250,19 +250,19 @@ void PartPropsDialog::setupFileSystemComboBox()
dialogWidget().fileSystem().clear();
QString selected;
QStringList fsNames;
foreach(const FileSystem* fs, FileSystemFactory::map().values())
if (fs->supportCreate() != FileSystem::SupportNone && partition().capacity() >= fs->minCapacity() && partition().capacity() <= fs->maxCapacity())
{
QString name = fs->name();
if (partition().fileSystem().type() == fs->type())
selected = name;
// If the partition isn't extended, skip the extended FS
if (fs->type() == FileSystem::Extended && !partition().roles().has(PartitionRole::Extended))
continue;
// The user cannot change the filesystem back to "unformatted" once a filesystem has been created.
if (fs->type() == FileSystem::Unformatted)
{
@ -290,10 +290,10 @@ void PartPropsDialog::onFilesystemChanged(int)
if (partition().state() == Partition::StateNew || warnFileSystemChange() || KMessageBox::warningContinueCancel(this,
i18nc("@info", "<para><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></para>"
"<para>Changing the file system on a partition already on disk will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</para>", partition().deviceNode()),
i18nc("@title:window", "Really recreate <filename>%1</filename> with file system %2?", partition().deviceNode(), dialogWidget().fileSystem().currentText()),
KGuiItem(i18nc("@action:button", "&Change the file system")),
KGuiItem(i18nc("@action:button", "&Do not change the file system")), "reallyChangeFileSystem") == KMessageBox::Continue)
{
i18nc("@title:window", "Really Recreate <filename>%1</filename> with File System %2?", partition().deviceNode(), dialogWidget().fileSystem().currentText()),
KGuiItem(i18nc("@action:button", "&Change the File System")),
KGuiItem(i18nc("@action:button", "&Do Not Change the File System")), "reallyChangeFileSystem") == KMessageBox::Continue)
{
setDirty();
updateHideAndShow();
setWarnFileSystemChange();
@ -311,9 +311,9 @@ void PartPropsDialog::onRecreate(int state)
if (state == Qt::Checked && (warnFileSystemChange() || KMessageBox::warningContinueCancel(this,
i18nc("@info", "<para><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></para>"
"<para>Recreating a file system will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</para>", partition().deviceNode()),
i18nc("@title:window", "Really recreate file system on <filename>%1</filename>?", partition().deviceNode()),
KGuiItem(i18nc("@action:button", "&Recreate the file system")),
KGuiItem(i18nc("@action:button", "&Do not recreate the file system")), "reallyRecreateFileSystem") == KMessageBox::Continue))
i18nc("@title:window", "Really Recreate File System on <filename>%1</filename>?", partition().deviceNode()),
KGuiItem(i18nc("@action:button", "&Recreate the File System")),
KGuiItem(i18nc("@action:button", "&Do Not Recreate the File System")), "reallyRecreateFileSystem") == KMessageBox::Continue))
{
setDirty();
setWarnFileSystemChange();

36
src/gui/progressdialog.cpp
View File

@ -70,7 +70,7 @@ ProgressDialog::ProgressDialog(QWidget* parent, OperationRunner& orunner) :
setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Details);
dialogWidget().treeTasks().setColumnWidth(0, width() * 0.8);
setupConnections();
restoreDialogSize(KConfigGroup(KGlobal::config(), "progressDialog"));
@ -118,11 +118,11 @@ void ProgressDialog::show()
timer().start(1000);
time().start();
setLastReportUpdate(0);
onSecondElapsed(); // resets the total time output label
KDialog::show();
}
@ -130,7 +130,7 @@ void ProgressDialog::resetReport()
{
delete m_Report;
m_Report = new Report(NULL);
detailsWidget().editReport().clear();
detailsWidget().editReport().setCursorWidth(0);
detailsWidget().buttonSave().setEnabled(false);
@ -153,7 +153,7 @@ void ProgressDialog::slotButtonClicked(int button)
updateReport(true);
return;
}
if (button == KDialog::Cancel && operationRunner().isRunning())
{
// only cancel once
@ -174,7 +174,7 @@ void ProgressDialog::slotButtonClicked(int button)
KApplication::restoreOverrideCursor();
if (KMessageBox::questionYesNo(this, i18nc("@info", "Do you really want to cancel?"), i18nc("@title:window", "Cancel Running Operations"), KGuiItem(i18nc("@action:button", "Yes, cancel operations")), KStandardGuiItem::no()) == KMessageBox::Yes)
if (KMessageBox::questionYesNo(this, i18nc("@info", "Do you really want to cancel?"), i18nc("@title:window", "Cancel Running Operations"), KGuiItem(i18nc("@action:button", "Yes, Cancel Operations")), KStandardGuiItem::no()) == KMessageBox::Yes)
// in the meantime while we were showing the messagebox, the runner might have finished.
if (operationRunner().isRunning())
operationRunner().cancel();
@ -278,7 +278,7 @@ void ProgressDialog::onJobFinished(Job* job, Operation* op)
const int current = dialogWidget().progressTotal().value();
dialogWidget().progressTotal().setValue(current + 1);
setParentTitle(op->description());
updateReport(true);
}
@ -292,7 +292,7 @@ void ProgressDialog::onOpFinished(int num, Operation* op)
}
setCurrentOpItem(NULL);
setStatus(op->description());
dialogWidget().progressSub().setValue(op->totalProgress());
@ -324,7 +324,7 @@ void ProgressDialog::addTaskOutput(int num, const Operation& op)
item->setIcon(0, op.statusIcon());
item->setText(0, opDesc(num, op));
item->setText(1, QTime(0, 0).toString(timeFormat()));
QFont f;
f.setWeight(QFont::Bold);
item->setFont(0, f);
@ -349,7 +349,7 @@ void ProgressDialog::onSecondElapsed()
QTime t = QTime::fromString(currentOpItem()->text(1), timeFormat()).addSecs(1);
currentOpItem()->setText(1, t.toString(timeFormat()));;
}
const QTime outputTime = QTime(0, 0).addMSecs(time().elapsed());
dialogWidget().totalTime().setText(i18nc("@info:progress", "Total Time: %1", outputTime.toString(timeFormat())));
}
@ -381,11 +381,11 @@ void ProgressDialog::saveReport()
if (fileName.isEmpty())
return;
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite existing file?"), KGuiItem(i18nc("@action:button", "&Overwrite file")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "&Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
{
QFile file(fileName);
if (file.open(QIODevice::WriteOnly | QIODevice::Truncate))
{
file.write(Report::htmlHeader().toUtf8());
@ -395,7 +395,7 @@ void ProgressDialog::saveReport()
file.close();
}
else
KMessageBox::sorry(this, i18nc("@info", "Could not open file <filename>%1</filename> for writing.", fileName), i18nc("@title:window", "Could not save report."));
KMessageBox::sorry(this, i18nc("@info", "Could not open file <filename>%1</filename> for writing.", fileName), i18nc("@title:window", "Could Not Save Report."));
}
}
@ -407,7 +407,7 @@ void ProgressDialog::browserReport()
// the file as the logged in user, not as the user running our application.
file.setFileTemplate("/tmp/" + KGlobal::mainComponent().aboutData()->appName() + "-XXXXXX.html");
file.setAutoRemove(false);
if (file.open())
{
file.write(Report::htmlHeader().toUtf8());
@ -418,8 +418,8 @@ void ProgressDialog::browserReport()
file.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ReadGroup | QFile::ReadOther);
if (!KRun::runUrl(file.fileName(), "text/html", this, true))
KMessageBox::sorry(this, i18nc("@info", "The configured external browser could not be run. Please check your settings."), i18nc("@title:window", "Could not launch browser."));
KMessageBox::sorry(this, i18nc("@info", "The configured external browser could not be run. Please check your settings."), i18nc("@title:window", "Could Not Launch Browser."));
}
else
KMessageBox::sorry(this, i18nc("@info", "Could not create temporary file <filename>%1</filename> for writing.", file.fileName()), i18nc("@title:window", "Could not launch browser."));
KMessageBox::sorry(this, i18nc("@info", "Could not create temporary file <filename>%1</filename> for writing.", file.fileName()), i18nc("@title:window", "Could Not Launch Browser."));
}

6
src/main.cpp
View File

@ -46,8 +46,8 @@ static bool checkPermissions()
"You will, however, <emphasis>not</emphasis> be allowed to apply operations.</para>"
"<para>Do you want to continue running <application>%1</application>?</para>",
KGlobal::mainComponent().aboutData()->programName()),
i18nc("@title:window", "No administrative privileges"),
KGuiItem(i18nc("@action:button", "Run without administrative privileges")),
i18nc("@title:window", "No Administrative Privileges"),
KGuiItem(i18nc("@action:button", "Run Without Administrative Privileges")),
KStandardGuiItem::cancel(),
"runWithoutRootPrivileges") == KMessageBox::Continue;
@ -75,7 +75,7 @@ int main(int argc, char* argv[])
);
about.addAuthor(ki18nc("@info:credit", "Volker Lanz"), KLocalizedString(), "vl@fidra.de");
about.setHomepage("http://www.partitionmanager.org");
KCmdLineArgs::init(argc, argv, &about);
// workaround for https://bugs.launchpad.net/kdesudo/+bug/272427