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

[Thibault Normand]

SVN commit 634146 by tnormand:

# UI Improvements

 M  +1 -1      umbrello/object_factory.cpp  
 M  +7 -0      umbrello/uml.cpp  
 M  +5 -0      umbrello/uml.h  
 M  +1 -0      umbrello/umlview.cpp  
 M  +2 -5      umbrello/widget_factory.cpp  
 M  +14 -13    uml.kdevelop  


--- branches/work/isi-umbrello/umbrello/umbrello/object_factory.cpp #634145:634146
@@ -117,8 +117,8 @@
     }
     o->setUMLPackage(parentPkg);
     parentPkg->addObject(o);
+
     UMLApp::app()->executeCommand(new Uml::cmdCreateUMLObject(o));
-
     kapp->processEvents();
     return o;
 }
--- branches/work/isi-umbrello/umbrello/umbrello/uml.cpp #634145:634146
@@ -580,6 +580,13 @@
     m_pQUndoView->setCleanIcon(KIcon("filesave"));
     m_pQUndoView->setStack(m_pUndoStack);
     
+    // Create the property viewer
+    m_propertyDock = new QDockWidget(i18n("Properties"), this);
+    addDockWidget(Qt::LeftDockWidgetArea, m_propertyDock);
+    
+    tabifyDockWidget(m_documentationDock, m_cmdHistoryDock);
+    tabifyDockWidget(m_cmdHistoryDock, m_propertyDock);
+    
     QByteArray dockConfig;
     m_config->readEntry("DockConfig", dockConfig);
     restoreState(dockConfig); //reposition all the DockWindows to their saved positions
--- branches/work/isi-umbrello/umbrello/umbrello/uml.h #634145:634146
@@ -959,6 +959,11 @@
     QDockWidget* m_cmdHistoryDock;
 
     /**
+     * Contains the property browser widget
+    */
+    QDockWidget* m_propertyDock;
+    
+    /**
      * Documentation window.
      */
     DocWindow* m_pDocWindow;
--- branches/work/isi-umbrello/umbrello/umbrello/umlview.cpp #634145:634146
@@ -460,6 +460,7 @@
 
     if (newWidget == NULL)
         return;
+    
     newWidget->setVisible( true );
     newWidget->setActivated();
     newWidget->setFont( getFont() );
--- branches/work/isi-umbrello/umbrello/umbrello/widget_factory.cpp #634145:634146
@@ -65,7 +65,6 @@
     int y = pos.y();
     Uml::Diagram_Type diagramType = view->getType();
     Uml::Object_Type type = o->getBaseType();
-    UMLDoc *doc = UMLApp::app()->getDocument();
     UMLWidget *newWidget = NULL;
     switch (type) {
     case Uml::ot_Actor:
@@ -143,8 +142,6 @@
     if (newWidget) {
         newWidget->setX( pos.x() );
         newWidget->setY( y );
-
-    	UMLApp::app()->executeCommand(new Uml::cmdCreateWidget(view, newWidget));
     }
 
     return newWidget;
@@ -257,9 +254,9 @@
                 kWarning() << "Trying to create an unknown widget:" << tag << endl;
             }
         }
-        return widget;
+        
     }
-
+    return widget;
 }
 }   // end namespace Widget_Factory
 
--- branches/work/isi-umbrello/umbrello/uml.kdevelop #634145:634146
@@ -12,9 +12,9 @@
     <projectname>uml</projectname>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <version></version>
-    <description></description>
-    <defaultencoding></defaultencoding>
+    <version/>
+    <description/>
+    <defaultencoding/>
     <versioncontrol>kdevsubversion</versioncontrol>
   </general>
   <kdevautoproject>
@@ -29,7 +29,7 @@
       <abortonerror>true</abortonerror>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <envvars>
         <envvar value="1" name="WANT_AUTOCONF_2_5" />
         <envvar value="1" name="WANT_AUTOMAKE_1_6" />
@@ -48,8 +48,8 @@
     </configurations>
     <run>
       <mainprogram>/home/kde-devel/svn/isi-umbrello/umbrello</mainprogram>
-      <programargs></programargs>
-      <globaldebugarguments></globaldebugarguments>
+      <programargs/>
+      <globaldebugarguments/>
       <globalcwd>/home/kde-devel/svn/isi-umbrello/umbrello</globalcwd>
       <useglobalprogram>false</useglobalprogram>
       <terminal>false</terminal>
@@ -72,6 +72,7 @@
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>false</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
     </tree>
   </kdevfileview>
   <kdevdoctreeview>
@@ -86,10 +87,10 @@
   <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -139,7 +140,7 @@
       <includePaths>.;</includePaths>
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
@@ -160,7 +161,7 @@
   </cppsupportpart>
   <kdevfilecreate>
     <filetypes>
-      <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+      <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
@@ -170,7 +171,7 @@
     </useglobaltypes>
   </kdevfilecreate>
   <ctagspart>
-    <customArguments></customArguments>
+    <customArguments/>
     <customTagfilePath>/home/kde-devel/svn/isi-umbrello/umbrello/tags</customTagfilePath>
     <activeTagsFiles/>
   </ctagspart>