[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2010-12-05 22:01:44
Message-ID: 20101205220144.3FC98AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1203997 by gateau:

Use a warning dialog with an appropriate button text instead of yes/no

 M  +4 -2      actionmanager.cpp  
 M  +5 -9      calendarview.cpp  
 M  +3 -2      filtereditdialog.cpp  
 M  +4 -3      korgac/alarmdockwindow.cpp  


--- trunk/KDE/kdepim/korganizer/actionmanager.cpp #1203996:1203997
@@ -1205,10 +1205,12 @@
   }
 
   if ( QFileInfo( settings->outputFile() ).exists() ) {
-    if( KMessageBox::questionYesNo(
+    if( KMessageBox::warningContinueCancel(
           dialogParent(),
           i18n( "Do you want to overwrite file \"%1\"?",
-                settings->outputFile() ) ) == KMessageBox::No ) {
+                settings->outputFile() ),
+          QString(),
+          KStandardGuiItem::overwrite() ) == KMessageBox::Cancel ) {
       return;
     }
   }
--- trunk/KDE/kdepim/korganizer/calendarview.cpp #1203996:1203997
@@ -865,15 +865,12 @@
 
 int CalendarView::msgItemDelete( const Akonadi::Item &item )
 {
-  return KMessageBox::questionYesNo(
+  return KMessageBox::warningContinueCancel(
     this,
     i18nc( "@info",
            "Do you really want to permanently remove the item \"%1\"?", \
CalendarSupport::incidence( item )->summary() ),  i18nc( "@title:window", "Delete \
                Item?" ),
-    KStandardGuiItem::yes(),
-    KStandardGuiItem::no(),
-    QString(),
-    KMessageBox::Notify );
+    KStandardGuiItem::del());
 }
 
 void CalendarView::edit_cut()
@@ -2535,7 +2532,7 @@
   if ( mCalendar->findChildren( todoItem ).isEmpty() ) {
     bool doDelete = true;
     if ( !force && KOPrefs::instance()->mConfirm ) {
-      doDelete = ( msgItemDelete( todoItem ) == KMessageBox::Yes );
+      doDelete = ( msgItemDelete( todoItem ) == KMessageBox::Continue );
     }
     if ( doDelete && mChanger->isNotDeleted( todoItem.id() ) ) {
       mChanger->deleteIncidence( todoItem, 0, this );
@@ -2663,8 +2660,7 @@
             itemFuture,
             KGuiItem( i18n( "Delete &All" ) ) );
         } else {
-          km = ( msgItemDelete( item ) == KMessageBox::Yes ?
-                 KMessageBox::Continue : KMessageBox::Cancel );
+          km = msgItemDelete( item );
         }
       }
     }
@@ -2691,7 +2687,7 @@
   } else {
     bool doDelete = true;
     if ( !force && KOPrefs::instance()->mConfirm ) {
-      doDelete = ( msgItemDelete( item ) == KMessageBox::Yes );
+      doDelete = ( msgItemDelete( item ) == KMessageBox::Continue );
     }
     if ( doDelete ) {
       mChanger->deleteIncidence( item, 0, this );
--- trunk/KDE/kdepim/korganizer/filtereditdialog.cpp #1203996:1203997
@@ -244,11 +244,12 @@
     return;
   }
 
-  if ( KMessageBox::questionYesNo(
+  if ( KMessageBox::warningContinueCancel(
          this,
          i18nc( "@info",
                 "Do you really want to permanently remove the filter \"%1\"?", \
                mCurrent->name() ),
-         i18nc( "@title:window", "Delete Filter?" ) ) != KMessageBox::Yes ) {
+         i18nc( "@title:window", "Delete Filter?" ),
+         KStandardGuiItem::del() ) == KMessageBox::Cancel ) {
     return;
   }
 
--- trunk/KDE/kdepim/korganizer/korgac/alarmdockwindow.cpp #1203996:1203997
@@ -167,14 +167,15 @@
 void AlarmDockWindow::slotQuit()
 {
   if ( mAutostartSet == true ) {
-    int result = KMessageBox::questionYesNo(
+    int result = KMessageBox::warningContinueCancel(
       associatedWidget(),
       i18nc( "@info",
              "Do you want to quit the KOrganizer reminder daemon?<nl/>"
              "<note> you will not get calendar reminders unless the daemon is \
                running.</note>" ),
-      i18nc( "@title:window", "Close KOrganizer Reminder Daemon" ) );
+      i18nc( "@title:window", "Close KOrganizer Reminder Daemon" ),
+      KStandardGuiItem::quit() );
 
-    if ( result == KMessageBox::Yes ) {
+    if ( result == KMessageBox::Continue ) {
       emit quitSignal();
     }
   } else {


[prev in list] [next in list] [prev in thread] [next in thread]