[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

Fix the preferences call to configure umbrello to be one of the standard KActions..this allows us to easily add it to the toolbar which is now done


  M +2 -2      umbrelloui.rc   1.11
  M +1 -2      uml.cpp   1.58


--- kdesdk/umbrello/umbrello/uml.cpp  #1.57:1.58
@@ -199,6 +199,5 @@ void UMLApp::initActions() {
                                   actionCollection(),"class_wizard");
 
-        preferences = new KAction(i18n("&Configure Umbrello..."), SmallIconSet("configure"), 0,
-                                  this, SLOT( slotPrefs() ), actionCollection(), "Configure_UML");
+        preferences = KStdAction::preferences(this,  SLOT( slotPrefs() ), actionCollection(), "umbrello_configure");
 
         genWizard = new KAction(i18n("&Code Generation Wizard..."),0,this,SLOT(generationWizard()),

--- kdesdk/umbrello/umbrello/umbrelloui.rc  #1.10:1.11
@@ -34,5 +34,5 @@
   <Menu name="settings"><text>&Settings</text>
     <Action name="Show_Documentation"/>
-    <Action name="Configure_UML"/>
+    <Action name="umbrello_configure"/>
   </Menu>
   <Menu name="code"><text>&Code</text>
@@ -50,5 +50,5 @@
   <Action name="umbrello_zoom_in"/>
   <Action name="umbrello_zoom_out"/>
-  <Action name="Configure_UML" icon="configure.png"/>
+  <Action name="umbrello_configure"/>
 </ToolBar>
 </kpartgui>