[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Stephan Binner <binner () kde ! org>
Date:       2005-02-16 12:52:31
Message-ID: 20050216125231.F0CA41BE59 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Fix Settings/ menu orders


  M +11 -13    kopeteui.rc   1.44
  M +1 -1      chatwindow/kopetechatwindow.rc   1.21


--- kdenetwork/kopete/kopete/kopeteui.rc  #1.43:1.44
@@ -33,17 +33,15 @@
                 <Menu name="settings">
                         <text>&amp;Settings</text>
-                        <Action name="settings_showmenubar" />
-                        <Merge name="StandardToolBarMenuHandler" />
-                        <Action name="settings_showstatusbar" />
-                        <Separator lineSeparator="true" />
-                        <Action name="settings_show_offliners" />
-                        <Action name="settings_show_empty_groups" />
-                        <Separator lineSeparator="true" />
-                        <Action name="settings_keys" />
-                        <Action name="settings_global" />
-                        <Action name="settings_notifications" />
-                        <Action name="settings_toolbars" />
-                        <Action name="settings_plugins"/>
-                        <Action name="settings_prefs" />
+                        <Action name="settings_showmenubar" append="show_merge"/>
+                        <Merge name="StandardToolBarMenuHandler" append="show_merge"/>
+                        <Action name="settings_showstatusbar" append="show_merge"/>
+                        <Action name="settings_show_offliners" append="show_merge"/>
+                        <Action name="settings_show_empty_groups" append="show_merge"/>
+                        <Action name="settings_plugins" append="configure_merge"/>
+                        <Action name="settings_notifications" append="configure_merge"/>
+                        <Action name="settings_global" append="configure_merge"/>
+                        <Action name="settings_keys" append="configure_merge"/>
+                        <Action name="settings_toolbars" append="configure_merge"/>
+                        <Action name="settings_prefs" append="configure_merge"/>
                 </Menu>
         </MenuBar>

--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.rc  #1.20:1.21
@@ -39,5 +39,5 @@
                         </Menu>
                         <Action append="show_merge" name="options_styles"/>
-                        <Action name="settings_prefs" />
+                        <Action append="configure_merge" name="settings_prefs" />
                 </Menu>
                 <Merge/>


[prev in list] [next in list] [prev in thread] [next in thread]