From 7ebfbdb597dd274c389ab286910133656c4ba3ce Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Thu, 11 Mar 2010 16:55:27 +0000 Subject: [PATCH] remove amps from kguiitems in message boxes, let KDE handle shortcuts svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1102034 --- src/gui/applyprogressdialog.cpp | 2 +- src/gui/mainwindow.cpp | 10 +++++----- src/gui/partitionmanagerwidget.cpp | 4 ++-- src/gui/partpropsdialog.cpp | 8 ++++---- src/gui/treelog.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp index 5fa92ad..17d13a3 100644 --- a/src/gui/applyprogressdialog.cpp +++ b/src/gui/applyprogressdialog.cpp @@ -384,7 +384,7 @@ void ApplyProgressDialog::saveReport() if (fileName.isEmpty()) return; - if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file %1?", 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 %1?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue) { QFile file(fileName); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 2ae201e..0edef0a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -143,7 +143,7 @@ void MainWindow::closeEvent(QCloseEvent* event) i18ncp("@info", "Do you really want to quit the application?There is still an operation pending.", "Do you really want to quit the application?There are still %1 operations pending.", numPendingOperations()), i18nc("@title:window", "Discard Pending Operations and Quit?"), - KGuiItem(i18nc("@action:button", "&Quit %1", KGlobal::mainComponent().aboutData()->programName())), + KGuiItem(i18nc("@action:button", "Quit %1", KGlobal::mainComponent().aboutData()->programName())), KStandardGuiItem::cancel(), "reallyQuit") == KMessageBox::Cancel) { event->ignore(); @@ -618,7 +618,7 @@ void MainWindow::onRefreshDevices() "Do you really want to rescan the devices?" "This will also clear the list of pending operations."), i18nc("@title:window", "Really Rescan the Devices?"), - KGuiItem(i18nc("@action:button", "&Rescan Devices")), + KGuiItem(i18nc("@action:button", "Rescan Devices")), KStandardGuiItem::cancel(), "reallyRescanDevices") == KMessageBox::Continue) { scanDevices(); @@ -637,7 +637,7 @@ void MainWindow::onApplyAllOperations() "Do you really want to apply the pending operations listed below?" "This will permanently modify your disks."), opList, i18nc("@title:window", "Apply Pending Operations?"), - KGuiItem(i18nc("@action:button", "&Apply Pending Operations")), + KGuiItem(i18nc("@action:button", "Apply Pending Operations")), KStandardGuiItem::cancel()) == KMessageBox::Continue) { Log() << i18nc("@info/plain", "Applying operations..."); @@ -678,7 +678,7 @@ 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")), + KGuiItem(i18nc("@action:button", "Clear Pending Operations")), KStandardGuiItem::cancel(), "reallyClearPendingOperations") == KMessageBox::Continue) { Log() << i18nc("@info/plain", "Clearing the list of pending operations."); @@ -879,7 +879,7 @@ void MainWindow::onExportPartitionTable() if (fileName.isEmpty()) return; - if (QFile::exists(fileName) && KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file %1?", 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 %1?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "Overwrite File")), KStandardGuiItem::cancel()) != KMessageBox::Continue) return; QFile file(fileName); diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index fb22219..6fd3a6d 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -523,7 +523,7 @@ void PartitionManagerWidget::onDeletePartition(bool shred) "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")), + KGuiItem(i18nc("@action:button", "Delete It")), KStandardGuiItem::cancel(), "reallyDeleteClipboardPartition") == KMessageBox::Cancel) return; @@ -707,7 +707,7 @@ void PartitionManagerWidget::onBackupPartition() if (fileName.isEmpty()) return; - if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file %1?", 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 %1?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue) operationStack().push(new BackupOperation(*selectedDevice(), *selectedPartition(), fileName)); } diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index 4b0d77b..ce7124e 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -312,8 +312,8 @@ void PartPropsDialog::onFilesystemChanged(int) i18nc("@info", "You are about to lose all data on partition %1." "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 %1 will unrecoverably be lost.", partition().deviceNode()), i18nc("@title:window", "Really Recreate %1 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) + KGuiItem(i18nc("@action:button", "Change the File System")), + KGuiItem(i18nc("@action:button", "Do Not Change the File System")), "reallyChangeFileSystem") == KMessageBox::Continue) { setDirty(); updateHideAndShow(); @@ -334,8 +334,8 @@ void PartPropsDialog::onRecreate(int state) i18nc("@info", "You are about to lose all data on partition %1." "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 %1 will unrecoverably be lost.", partition().deviceNode()), i18nc("@title:window", "Really Recreate File System on %1?", partition().deviceNode()), - KGuiItem(i18nc("@action:button", "&Recreate the File System")), - KGuiItem(i18nc("@action:button", "&Do Not Recreate the File System")), "reallyRecreateFileSystem") == KMessageBox::Continue)) + KGuiItem(i18nc("@action:button", "Recreate the File System")), + KGuiItem(i18nc("@action:button", "Do Not Recreate the File System")), "reallyRecreateFileSystem") == KMessageBox::Continue)) { setDirty(); setWarnFileSystemChange(); diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index cdefb67..8141104 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -124,7 +124,7 @@ void TreeLog::onSaveLog() { QFile file(fileName); - if (QFile::exists(fileName) && KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file %1?", 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 %1?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "Overwrite File")), KStandardGuiItem::cancel()) != KMessageBox::Continue) return; if (!file.open(QFile::WriteOnly | QFile::Truncate))