[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

correctly remove configure from toolbar to follow interface guidelines
and also an old entry for show documentation window from the settings
menu.


  M +0 -4      umbrelloui.rc   1.15
  M +1 -1      uml.cpp   1.74


--- kdesdk/umbrello/umbrello/uml.cpp  #1.73:1.74
@@ -165,5 +165,5 @@ void UMLApp::initActions() {
                     SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes");
 
-        preferences = KStdAction::preferences(this,  SLOT( slotPrefs() ), actionCollection(), "umbrello_configure");
+        preferences = KStdAction::preferences(this,  SLOT( slotPrefs() ), actionCollection());
 
         genWizard = new KAction(i18n("&Code Generation Wizard..."),0,this,SLOT(generationWizard()),

--- kdesdk/umbrello/umbrello/umbrelloui.rc  #1.14:1.15
@@ -32,7 +32,4 @@
   </Menu>
 
-  <Menu name="settings"><text>&Settings</text>
-    <Action name="Show_Documentation"/>
-  </Menu>
   <Menu name="code"><text>&Code</text>
     <Action name="import_class"/>
@@ -50,5 +47,4 @@
   <Action name="popup_zoom"/>
   <Action name="zoom100"/>
-  <Action name="umbrello_configure"/>
 </ToolBar>
 </kpartgui>