[Uml-devel] kdesdk/umbrello/umbrello

[Stephan Binner]

CVS commit by binner: 

Time to bring warningContinueCancel to this version :-)


  M +1 -1      umldoc.cpp   1.158
  M +5 -6      umlview.cpp   1.150


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.157:1.158
@@ -1333,5 +1333,5 @@ void UMLDoc::removeDiagram(int id) {
                 return;
         }
-        if (KMessageBox::warningYesNo(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram")) == KMessageBox::Yes) {
+        if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) {
                 removeView(umlview);
                 emit sigDiagramRemoved(id);

--- kdesdk/umbrello/umbrello/umlview.cpp  #1.149:1.150
@@ -1377,8 +1377,7 @@ void UMLView::exportImage() {
                 if (info.exists())
                 {
-                        int want_save = KMessageBox::questionYesNo(0, i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_ImageURL.fileName()),
-                                                                i18n("File Already Exists"),
-                                                                KStdGuiItem::yes(), KStdGuiItem::no());
-                        if (want_save == KMessageBox::No)
+                        int want_save = KMessageBox::warningContinueCancel(0, i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_ImageURL.fileName()),
+                                                                i18n("File Already Exists"), i18n("&Overwrite"));
+                        if (want_save == KMessageBox::Cancel)
                                 // another possibility would be to show the save dlg again
                                 return;
@@ -2781,7 +2780,7 @@ bool UMLView::checkUniqueSelection()
 
 void UMLView::clearDiagram() {
-        if( KMessageBox::Yes == KMessageBox::warningYesNo( this, i18n("You are about to delete "
+        if( KMessageBox::Continue == KMessageBox::warningContinueCancel( this, i18n("You are about to delete "
                                                                        "the entire diagram.\nAre you sure?"),
-                                                            i18n("Delete Diagram?") ) ) {
+                                                            i18n("Delete Diagram?"),KGuiItem( i18n("&Delete"), "editdelete") ) ) {
                 removeAllWidgets();
         }