SVN commit 963130 by mfuchs: Use warnings for some dialogs instead of questions and use more KStandardGuiItems. M +2 -2 conf/transfersgroupwidget.cpp M +3 -3 core/kget.cpp M +4 -4 mainwindow.cpp --- trunk/KDE/kdenetwork/kget/conf/transfersgroupwidget.cpp #963129:963130 @@ -122,10 +122,10 @@ { QString firstGroup = dataModel->data(indexList.first(), Qt::DisplayRole).toString(); - if(KMessageBox::questionYesNo(this, + if(KMessageBox::warningYesNo(this, i18np("Are you sure that you want to remove the group named %1?", "Are you sure that you want to remove all selected groups?", firstGroup, indexList.count()), i18np("Remove group", "Remove groups", indexList.count()), - KGuiItem(i18n("&Remove"), KIcon("edit-delete")), KStandardGuiItem::cancel()) == KMessageBox::Yes) + KStandardGuiItem::remove(), KStandardGuiItem::cancel()) == KMessageBox::Yes) { foreach(const QModelIndex &index, indexList) { --- trunk/KDE/kdenetwork/kget/core/kget.cpp #963129:963130 @@ -893,10 +893,10 @@ { if(KIO::NetAccess::exists(destUrl, KIO::NetAccess::DestinationSide, 0)) { - if (KMessageBox::warningYesNoCancel(0, + if (KMessageBox::warningYesNo(0, i18n("Destination file \n%1\nalready exists.\n" - "Do you want to overwrite it?", destUrl.prettyUrl())) - == KMessageBox::Yes) + "Do you want to overwrite it?", destUrl.prettyUrl()), i18n("Overwrite destination"), + KStandardGuiItem::overwrite(), KStandardGuiItem::cancel()) == KMessageBox::Yes) { safeDeleteFile( destUrl ); return true; --- trunk/KDE/kdenetwork/kget/mainwindow.cpp #963129:963130 @@ -440,11 +440,11 @@ void MainWindow::slotQuit() { if (KGet::schedulerRunning()) { - if (KMessageBox::warningYesNoCancel(this, + if (KMessageBox::warningYesNo(this, i18n("Some transfers are still running.\n" "Are you sure you want to close KGet?"), i18n("Confirm Quit"), - KStandardGuiItem::yes(), KStandardGuiItem::no(), KStandardGuiItem::cancel(), + KStandardGuiItem::quit(), KStandardGuiItem::cancel(), "ExitWithActiveTransfers") != KMessageBox::Yes) return; @@ -566,11 +566,11 @@ foreach (TransferHandler * it, KGet::selectedTransfers()) { if (it->status() != Job::Finished) { - if (KMessageBox::questionYesNo(this, + if (KMessageBox::warningYesNo(this, i18np("Are you sure you want to delete the selected transfer?", "Are you sure you want to delete the selected transfers?", KGet::selectedTransfers().count()), i18n("Confirm transfer delete"), - KGuiItem(i18n("&Delete"), KIcon("edit-delete")), KStandardGuiItem::cancel()) == KMessageBox::No) + KStandardGuiItem::remove(), KStandardGuiItem::cancel()) == KMessageBox::No) { return; }