[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 1020923 by fischer:

Fixing tab name updating when renamed.

 M  +4 -5      dialogs/umlviewdialog.cpp  
 M  +2 -1      uml.h  
 M  +10 -5     umldoc.cpp  
 M  +1 -1      umldoc.h  
 M  +1 -2      umlscene.cpp  


--- branches/work/soc-umbrello/umbrello/dialogs/umlviewdialog.cpp #1020922:1020923
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2008                                               *
+ *   copyright (C) 2002-2009                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -205,9 +205,9 @@
  */
 void UMLViewDialog::checkName()
 {
-    QString name = m_diagramProperties->ui_diagramName-> text();
-    UMLDoc * pDoc = UMLApp::app()-> getDocument();
-    UMLScene * pScene = pDoc -> findView( m_pScene -> getType(), name )->umlScene();
+    QString name = m_diagramProperties->ui_diagramName->text();
+    UMLDoc * pDoc = UMLApp::app()->getDocument();
+    UMLScene * pScene = pDoc->findView( m_pScene->getType(), name )->umlScene();
     if ( name.length() == 0 ) {
         KMessageBox::sorry(this, i18n("The name you have entered is invalid."),
                            i18n("Invalid Name"), false);
@@ -221,7 +221,6 @@
         return;
     }
     m_pScene->setName( name );
-    // [PORT]
     pDoc->signalDiagramRenamed(m_pScene->activeView());
 }
 
--- branches/work/soc-umbrello/umbrello/uml.h #1020922:1020923
@@ -79,7 +79,7 @@
 {
     Q_OBJECT
 public:
-    UMLApp(QWidget* parent=0);
+    UMLApp(QWidget* parent = 0);
     ~UMLApp();
 
     static UMLApp* app();
@@ -340,6 +340,7 @@
     QDockWidget* m_documentationDock;  ///< Contains the documentation DocWindow widget.
     QDockWidget* m_cmdHistoryDock;     ///< Contains the undo/redo viewer widget.
     QDockWidget* m_propertyDock;       ///< Contains the property browser widget.
+
     DocWindow*   m_pDocWindow;         ///< Documentation window.
     QUndoView*   m_pQUndoView;         ///< Undo / Redo Viewer
     RefactoringAssistant* m_refactoringAssist;  ///< Refactoring assistant.
--- branches/work/soc-umbrello/umbrello/umldoc.cpp #1020922:1020923
@@ -2724,13 +2724,18 @@
 /**
  * Signal a view/diagram has been renamed.
  */
-void UMLDoc::signalDiagramRenamed(UMLView* pView )
+void UMLDoc::signalDiagramRenamed(UMLView* view)
 {
-    Settings::OptionState optionState = Settings::getOptionState();
-    if (optionState.generalState.tabdiagrams) {
-        UMLApp::app()->tabWidget()->setTabText( UMLApp::app()->tabWidget()->indexOf(pView), pView->umlScene()->getName() );
+    if (view) {
+        Settings::OptionState optionState = Settings::getOptionState();
+        if (optionState.generalState.tabdiagrams) {
+            UMLApp::app()->tabWidget()->setTabText( UMLApp::app()->tabWidget()->indexOf(view), view->umlScene()->getName() );
+        }
+        emit sigDiagramRenamed( view->umlScene()->getID() );
     }
-    emit sigDiagramRenamed( pView->umlScene()->getID() );
+    else {
+      uError() << "Cannot signal diagram renamed - view is null!";
+    }
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/umldoc.h #1020922:1020923
@@ -146,7 +146,7 @@
     void loadExtensionsFromXMI(QDomNode & node);
     bool loadDiagramsFromXMI(QDomNode & node);
 
-    void signalDiagramRenamed(UMLView * pView);
+    void signalDiagramRenamed(UMLView * view);
     void signalUMLObjectCreated(UMLObject * o);
 
     UMLFolder * getDatatypeFolder() const;
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1020922:1020923
@@ -3047,8 +3047,7 @@
                                              getName(), &ok, UMLApp::app());
         if (ok) {
             setName(name);
-            // [PORT]
-            // m_pDoc->signalDiagramRenamed(this);
+            m_pDoc->signalDiagramRenamed(activeView());
         }
     }
         break;