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

Ralf Habacker ralf.habacker at gmail.com
Tue Dec 13 15:21:28 UTC 2011


SVN commit 1268562 by habacker:

unified method names for showing a property dialog

 M  +1 -1      dialogs/codeeditor.cpp  
 M  +2 -2      umllistview.cpp  
 M  +1 -1      umlobject.cpp  
 M  +1 -1      umlobject.h  
 M  +2 -2      widgets/activitywidget.cpp  
 M  +4 -4      widgets/activitywidget.h  
 M  +2 -2      widgets/floatingtextwidget.cpp  
 M  +1 -1      widgets/floatingtextwidget.h  
 M  +2 -2      widgets/objectnodewidget.cpp  
 M  +1 -1      widgets/objectnodewidget.h  
 M  +2 -2      widgets/objectwidget.cpp  
 M  +1 -1      widgets/objectwidget.h  
 M  +1 -1      widgets/signalwidget.cpp  
 M  +1 -1      widgets/signalwidget.h  
 M  +2 -2      widgets/statewidget.cpp  
 M  +1 -1      widgets/statewidget.h  
 M  +3 -3      widgets/umlwidget.cpp  
 M  +1 -1      widgets/umlwidget.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp #1268561:1268562
@@ -176,7 +176,7 @@
                     delete dlg;
                 }
                 else if ( (dynamic_cast<UMLClassifier*>(obj)) ) {
-                    if (obj->showProperties()) {
+                    if (obj->showPropertiesDialog()) {
                         rebuildView(para);
                     }
                 }
--- trunk/KDE/kdesdk/umbrello/umbrello/umllistview.cpp #1268561:1268562
@@ -546,7 +546,7 @@
         umlType = object->baseType();
 
         if (Model_Utils::typeIsCanvasWidget(lvt)) {
-            object->showProperties(ClassPropDlg::page_gen);
+            object->showPropertiesDialog(ClassPropDlg::page_gen);
         } else if (umlType == UMLObject::ot_EnumLiteral) {
             // Show the Enum Literal Dialog
             UMLEnumLiteral* selectedEnumLiteral = static_cast<UMLEnumLiteral*>(object);
@@ -1334,7 +1334,7 @@
     }
 
     if (object)
-        object->showProperties(page);
+        object->showPropertiesDialog(page);
     item->cancelRename(0);  //double click can cause it to go into rename mode.
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #1268561:1268562
@@ -116,7 +116,7 @@
  * @param assoc   Whether to show association page.
  * @return        True if we modified the object.
  */
-bool UMLObject::showProperties(int page, bool assoc)
+bool UMLObject::showPropertiesDialog(int page, bool assoc)
 {
     Q_UNUSED(page);
     DocWindow *docwindow = UMLApp::app()->docWindow();
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.h #1268561:1268562
@@ -128,7 +128,7 @@
 
     void setInPaste(bool bInPaste = true);
 
-    virtual bool showProperties(int page = 0, bool assoc = false);
+    virtual bool showPropertiesDialog(int page = 0, bool assoc = false);
 
     virtual bool resolveRef();
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1268561:1268562
@@ -143,7 +143,7 @@
 /**
  * Show a properties dialog for an ActivityWidget.
  */
-void ActivityWidget::showProperties()
+void ActivityWidget::showPropertiesDialog()
 {
     DocWindow *docwindow = UMLApp::app()->docWindow();
     docwindow->updateDocumentation(false);
@@ -376,7 +376,7 @@
         break;
 
     case ListPopupMenu::mt_Properties:
-        showProperties();
+        showPropertiesDialog();
         break;
 
     default:
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.h #1268561:1268562
@@ -64,12 +64,12 @@
     QString postconditionText();
     void setPostconditionText(const QString&);
 
-    void showProperties();
+    virtual void showPropertiesDialog();
 
-    void draw(QPainter & p, int offsetX, int offsetY);
+    virtual void draw(QPainter & p, int offsetX, int offsetY);
 
-    bool loadFromXMI( QDomElement & qElement );
-    void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
+    virtual bool loadFromXMI( QDomElement & qElement );
+    virtual void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
 
     void constrain(int& width, int& height);
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.cpp #1268561:1268562
@@ -128,7 +128,7 @@
     ListPopupMenu::MenuType sel = m_pMenu->getMenuType(action);
     switch(sel) {
     case ListPopupMenu::mt_Properties:
-        showProperties();
+        showPropertiesDialog();
         break;
 
     case ListPopupMenu::mt_Delete:
@@ -549,7 +549,7 @@
  * for the floating text widget, the rename dialog for floating text or
  * the options dialog for the link widget are shown.
  */
-void FloatingTextWidget::showProperties()
+void FloatingTextWidget::showPropertiesDialog()
 {
     if (m_textRole == Uml::TextRole::Coll_Message || m_textRole == Uml::TextRole::Coll_Message_Self ||
             m_textRole == Uml::TextRole::Seq_Message || m_textRole == Uml::TextRole::Seq_Message_Self) {
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.h #1268561:1268562
@@ -103,7 +103,7 @@
     void changeName(const QString& newText);
 
     void showOperationDialog();
-    void showProperties();
+    void showPropertiesDialog();
 
     void saveToXMI( QDomDocument & qDoc, QDomElement & qElement );
     bool loadFromXMI( QDomElement & qElement );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1268561:1268562
@@ -203,7 +203,7 @@
         break;
 
     case ListPopupMenu::mt_Properties:
-        showProperties();
+        showPropertiesDialog();
         break;
 
     default:
@@ -211,7 +211,7 @@
     }
 }
 
-void ObjectNodeWidget::showProperties()
+void ObjectNodeWidget::showPropertiesDialog()
 {
     DocWindow *docwindow = UMLApp::app()->docWindow();
     docwindow->updateDocumentation(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.h #1268561:1268562
@@ -89,7 +89,7 @@
      * Show a properties dialog for an ObjectNodeWidget.
      *
      */
-    virtual void showProperties();
+    virtual void showPropertiesDialog();
 
 
     /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1268561:1268562
@@ -108,7 +108,7 @@
             break;
         }
     case ListPopupMenu::mt_Properties:
-        showProperties();
+        showPropertiesDialog();
         updateComponentSize();
         moveEvent( 0 );
         update();
@@ -221,7 +221,7 @@
     }
 }
 
-void ObjectWidget::showProperties()
+void ObjectWidget::showPropertiesDialog()
 {
     DocWindow *docwindow = UMLApp::app()->docWindow();
     docwindow->updateDocumentation(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.h #1268561:1268562
@@ -142,7 +142,7 @@
     /**
      * Show a properties dialog for an ObjectWidget.
      */
-    void showProperties();
+    void showPropertiesDialog();
 
     /**
      * Returns whether to draw as an Actor or not.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.cpp #1268561:1268562
@@ -223,7 +223,7 @@
     }
 }
 
-void SignalWidget::showProperties()
+void SignalWidget::showPropertiesDialog()
 {
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.h #1268561:1268562
@@ -88,7 +88,7 @@
      * Show a properties dialog for a SignalWidget.
      *
      */
-    virtual void  showProperties();
+    virtual void  showPropertiesDialog();
 
 
     /**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1268561:1268562
@@ -178,7 +178,7 @@
         break;
 
     case ListPopupMenu::mt_Properties:
-        showProperties();
+        showPropertiesDialog();
         break;
 
     case ListPopupMenu::mt_New_Activity:
@@ -227,7 +227,7 @@
     return true;
 }
 
-void StateWidget::showProperties()
+void StateWidget::showPropertiesDialog()
 {
     DocWindow *docwindow = UMLApp::app()->docWindow();
     docwindow->updateDocumentation(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.h #1268561:1268562
@@ -116,7 +116,7 @@
     /**
      * Show a properties dialog for a StateWidget.
      */
-    void showProperties();
+    void showPropertiesDialog();
 
     /**
      * Returns true if the given toolbar button represents a State.
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1268561:1268562
@@ -291,11 +291,11 @@
                 wt == WidgetBase::wt_Node || wt == WidgetBase::wt_Enum || wt == WidgetBase::wt_Entity ||
                 (wt == WidgetBase::wt_Class && m_pView->type() == Uml::DiagramType::Class)) {
             UMLApp::app()->beginMacro(i18n("Change Properties"));
-            showProperties();
+            showPropertiesDialog();
             UMLApp::app()->endMacro();
         } else if (wt == wt_Object) {
             UMLApp::app()->beginMacro(i18n("Change Properties"));
-            m_pObject->showProperties();
+            m_pObject->showPropertiesDialog();
             UMLApp::app()->endMacro();
         } else {
             uWarning() << "making properties dialog for unknown widget type";
@@ -641,7 +641,7 @@
     }
 }
 
-void UMLWidget::showProperties()
+void UMLWidget::showPropertiesDialog()
 {
     // will already be selected so make sure docWindow updates the doc
     // back it the widget
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1268561:1268562
@@ -424,7 +424,7 @@
     /**
      * Show a properties dialog for a UMLWidget.
      */
-    virtual void showProperties();
+    virtual void showPropertiesDialog();
 
     /**
      * Returns true if the Activate method has been called for this instance




More information about the umbrello-devel mailing list