[Marble-commits] branches/KDE/4.6/kdeedu/marble/src

[Dennis Nienhüser]

SVN commit 1209051 by nienhueser:

Remove the Cancel button in the yes/no question.
BUG: 261125
Backport of commit 1209050.

 M  +2 -2      QtMainWindow.cpp  
 M  +1 -1      marble_part.cpp  


--- branches/KDE/4.6/kdeedu/marble/src/QtMainWindow.cpp #1209050:1209051
@@ -516,8 +516,8 @@
 {
     QString const title = tr( "Marble" );
     QString const text = tr( "Are you sure you want to delete all bookmarks?" );
-    QMessageBox::StandardButtons const buttons = QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel;
-    if ( QMessageBox::question( m_controlView->marbleWidget(), title, text, buttons, QMessageBox::Cancel ) == QMessageBox::Yes ) {
+    QMessageBox::StandardButtons const buttons = QMessageBox::Yes | QMessageBox::No;
+    if ( QMessageBox::question( m_controlView->marbleWidget(), title, text, buttons, QMessageBox::No ) == QMessageBox::Yes ) {
         m_controlView->marbleWidget()->removeAllBookmarks();
     }
 }
--- branches/KDE/4.6/kdeedu/marble/src/marble_part.cpp #1209050:1209051
@@ -1561,7 +1561,7 @@
 {
     QString const title = i18nc( "Application name", "Marble" );
     QString const text = i18n( "Are you sure you want to delete all bookmarks?" );
-    if ( KMessageBox::questionYesNoCancel( widget(), text, title ) == KMessageBox::Yes ) {
+    if ( KMessageBox::questionYesNo( widget(), text, title ) == KMessageBox::Yes ) {
         m_controlView->marbleWidget()->removeAllBookmarks();
     }
 }