[rkward-cvs] SF.net SVN: rkward:[4067] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 4067
          http://rkward.svn.sourceforge.net/rkward/?rev=4067&view=rev
Author:   tfry
Date:     2011-12-02 19:10:17 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Use a more standard ordering of entries in the "Settings" menu. Hopefully this will also fix the Settings menu issue on MacOS (but I have not tested that, yet).

Modified Paths:
--------------
    trunk/rkward/rkward/rkward.cpp
    trunk/rkward/rkward/rkwardui.rc
    trunk/rkward/rkward/windows/rktoplevelwindowgui.rc

Modified: trunk/rkward/rkward/rkward.cpp
===================================================================
--- trunk/rkward/rkward/rkward.cpp	2011-12-02 16:39:00 UTC (rev 4066)
+++ trunk/rkward/rkward/rkward.cpp	2011-12-02 19:10:17 UTC (rev 4067)
@@ -418,11 +418,11 @@
 
 	// These two currently do the same thing
 	action = actionCollection ()->addAction ("load_unload_libs", this, SLOT (slotFileLoadLibs()));
-	action->setText (i18n ("Load / Unload Packages"));
+	action->setText (i18n ("Manage installed R packages..."));
 	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionConfigurePackages));
 
 	action = actionCollection ()->addAction ("configure_packages", this, SLOT (slotFileLoadLibs()));
-	action->setText (i18n ("Configure Packages"));
+	action->setText (i18n ("Configure Packages..."));
 	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionConfigurePackages));
 
 	setStandardToolBarMenuEnabled (true);
@@ -441,8 +441,8 @@
 	window_detach->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionDetachWindow));
 	window_detach->setText (i18n ("Detach"));
 
-	configure = actionCollection ()->addAction ("configure", this, SLOT (slotConfigure()));
-	configure->setText (i18n ("Configure RKWard"));
+	configure = actionCollection ()->addAction ("options_configure", this, SLOT (slotConfigure()));
+	configure->setText (i18n ("Configure RKWard..."));
 
 	edit_menu_dummy = actionCollection ()->addAction ("edit_menu_dummy", this);
 	edit_menu_dummy->setText (i18n ("[No actions available for current view]"));

Modified: trunk/rkward/rkward/rkwardui.rc
===================================================================
--- trunk/rkward/rkward/rkwardui.rc	2011-12-02 16:39:00 UTC (rev 4066)
+++ trunk/rkward/rkward/rkwardui.rc	2011-12-02 19:10:17 UTC (rev 4067)
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward_main" version="562">
+<kpartgui name="rkward_main" version="570">
 <MenuBar>
 	<!-- The Main Window ui.rc is the only one, where merging happens, reliably. That is, why we need to define
 	     a lot of merge points, here, which can then be used be mdi windows and their children.
@@ -78,8 +78,9 @@
 	</Menu>
 	
 	<Menu name="settings"><text>&Settings</text>
-		<Action name="configure_packages"/>
-		<Action name="configure"/>
+		<DefineGroup name="configure_merge_group" append="configure_merge"/>
+		<Separator append="configure_merge"/>
+		<Action name="configure_packages" append="configure_merge"/>
 	</Menu>
 
 	<Menu name="help"><text>&Help</text>

Modified: trunk/rkward/rkward/windows/rktoplevelwindowgui.rc
===================================================================
--- trunk/rkward/rkward/windows/rktoplevelwindowgui.rc	2011-12-02 16:39:00 UTC (rev 4066)
+++ trunk/rkward/rkward/windows/rktoplevelwindowgui.rc	2011-12-02 19:10:17 UTC (rev 4067)
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward_toplevel" version="580">
+<kpartgui name="rkward_toplevel" version="581">
 	<MenuBar>
 		<Merge/>
 		<Menu name="window"><text>&Window</text>
@@ -24,8 +24,8 @@
 			<Merge/>
 		</Menu>
 		<Menu name="settings"><text>&Settings</text>
-			<Action name="options_configure_keybinding"/>
-			<Action name="options_configure_toolbars"/>
+			<Action name="options_configure_keybinding" group="configure_merge_group"/>
+			<Action name="options_configure_toolbars" group="configure_merge_group"/>
 		</Menu>
 		<Menu name="help"><text>&Help</text>
 			<Action name="rkward_help" group="prehelp_actions_merge"/>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.