[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Ralf Habacker]

SVN commit 1325057 by habacker:

fixed todo: move showPropDialog to class UMLView

 M  +1 -1      uml.cpp  
 M  +2 -2      umllistview.cpp  
 M  +2 -19     umlscene.cpp  
 M  +0 -2      umlscene.h  
 M  +17 -0     umlview.cpp  
 M  +2 -0      umlview.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #1325056:1325057
@@ -2371,7 +2371,7 @@
  */
 void UMLApp::slotCurrentViewProperties()
 {
-    currentView()->umlScene()->showPropDialog();
+    currentView()->showPropDialog();
 }
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1325056:1325057
@@ -614,7 +614,7 @@
             UMLView * pView = m_doc->findView(currItem->ID());
             if (pView) {
                 pView->umlScene()->updateDocumentation(false);
-                pView->umlScene()->showPropDialog();
+                pView->showPropDialog();
                 pView->umlScene()->showDocumentation(true);
             }
             return;
@@ -1408,7 +1408,7 @@
         UMLView * pView = m_doc->findView(item->ID());
         if (pView) {
             pView->umlScene()->updateDocumentation(false);
-            pView->umlScene()->showPropDialog();
+            pView->showPropDialog();
             pView->umlScene()->showDocumentation(true);
         }
         return;
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1325056:1325057
@@ -62,7 +62,6 @@
 #include "umlobjectlist.h"
 #include "umlrole.h"
 #include "umlview.h"
-#include "umlviewdialog.h"
 #include "umlviewimageexporter.h"
 #include "umlwidget.h"
 #include "uniqueid.h"
@@ -81,7 +80,6 @@
 
 // include files for Qt
 #include <QPainter>
-#include <QPointer>
 #include <QString>
 #include <QStringList>
 #include <QPainter>
@@ -877,7 +875,7 @@
     }
     else {
         // show properties dialog of the scene
-        if (showPropDialog() == true) {
+        if (m_view->showPropDialog() == true) {
             m_doc->setModified();
         }
         ome->accept();
@@ -3374,7 +3372,7 @@
         break;
 
     case ListPopupMenu::mt_Properties:
-        if (showPropDialog() == true)
+        if (m_view->showPropDialog() == true)
             m_doc->setModified();
         break;
 
@@ -3456,21 +3454,6 @@
 }
 
 /**
- * Shows the properties dialog for the view.
- * FIXME belongs to UMLView
- */
-bool UMLScene::showPropDialog()
-{
-    bool success = false;
-    QPointer<UMLViewDialog> dlg = new UMLViewDialog(activeView(), this);
-    if (dlg->exec() == QDialog::Accepted) {
-        success = true;
-    }
-    delete dlg;
-    return success;
-}
-
-/**
  * Returns the font to use
  */
 QFont UMLScene::font() const
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1325056:1325057
@@ -271,8 +271,6 @@
 
     void updateContainment(UMLCanvasObject *self);
 
-    bool showPropDialog();
-
     void setClassWidgetOptions(ClassOptionsPage * page);
 
     void checkSelections();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #1325056:1325057
@@ -20,8 +20,11 @@
 #include "umldoc.h"
 #include "umldragdata.h"
 #include "umlscene.h"
+#include "umlviewdialog.h"
 #include "umlwidget.h"
 
+#include <QPointer>
+
 DEBUG_REGISTER(UMLView)
 
 /**
@@ -93,6 +96,20 @@
     return (int)(matrix().m11()*100.0);
 }
 
+/**
+ * Shows the properties dialog for the view.
+ */
+bool UMLView::showPropDialog()
+{
+    bool success = false;
+    QPointer<UMLViewDialog> dlg = new UMLViewDialog(this, umlScene());
+    if (dlg->exec() == QDialog::Accepted) {
+        success = true;
+    }
+    delete dlg;
+    return success;
+}
+
 void UMLView::zoomIn()
 {
     QMatrix wm = matrix();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.h #1325056:1325057
@@ -42,6 +42,8 @@
     void setZoom(int zoom);
     int currentZoom();
 
+    bool showPropDialog();
+
 public slots:
     void zoomIn();
     void zoomOut();