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

[Andi Fischer]

SVN commit 1111014 by fischer:

Patch from Eike Lange applied.

 M  +2 -3      controller/notewidgetcontroller.cpp  
 M  +1 -16     widgets/notewidget.cpp  
 M  +2 -2      widgets/notewidget.h  


--- branches/work/soc-umbrello/umbrello/controller/notewidgetcontroller.cpp #1111013:1111014
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2006-2009                                               *
+ *   copyright (C) 2006-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -36,14 +36,13 @@
 /**
  * Overridden from UMLWidgetController.
  * Handles a mouse move event.
- * Executes base code and then sets the geometry of the editor.
+ * Executes base code.
  *
  * @param me The QGraphicsSceneMouseEvent event.
  */
 void NoteWidgetController::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
 {
     UMLWidgetController::mouseMoveEvent(me);
-    //m_noteWidget->setEditorGeometry();
 }
 
 /**
--- branches/work/soc-umbrello/umbrello/widgets/notewidget.cpp #1111013:1111014
@@ -4,7 +4,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2009                                               *
+ *   copyright (C) 2002-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -103,14 +103,6 @@
     }
 
     QString linkText("Diagram: " + view->umlScene()->name());
-// #if defined (NOTEWIDGET_EMBED_EDITOR)
-//     m_pEditor->setUnderline(true);
-//     m_pEditor->insert(linkText);
-//     m_pEditor->setUnderline(false);
-// #else
-//     setDoc(linkText);
-//     update();
-// #endif
     m_diagramLink = sceneID;
 }
 
@@ -274,12 +266,6 @@
     }
     ListPopupMenu::Menu_Type sel = menu->getMenuType(action);
     switch(sel) {
-        ///OBSOLETE - remove ListPopupMenu::mt_Link_Docs
-        // case ListPopupMenu::mt_Link_Docs:
-        //      umlScene()->updateNoteWidgets();
-        //      doc->setModified(true);
-        //      break;
-
     case ListPopupMenu::mt_Rename:
         umlScene()->updateDocumentation( false );
         dlg = new NoteDialog( umlScene()->activeView(), this );
@@ -290,7 +276,6 @@
         }
         delete dlg;
         break;
-
     default:
         UMLWidget::slotMenuSelection(action);
         break;
--- branches/work/soc-umbrello/umbrello/widgets/notewidget.h #1111013:1111014
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2002-2006                                               *
+ *   copyright (C) 2002-2010                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
 
@@ -77,6 +76,7 @@
     enum {
         GroupIndex
     };
+
     enum {
         DiagramLinkItemIndex,
         NoteTypeItemIndex,