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

[tfry at users.sourceforge.net]

Revision: 1127
          http://svn.sourceforge.net/rkward/?rev=1127&view=rev
Author:   tfry
Date:     2007-01-11 16:09:30 -0800 (Thu, 11 Jan 2007)

Log Message:
-----------
More icons, and more actions added to menus/toolbars, that were only at one place, before

Modified Paths:
--------------
    trunk/rkward/rkward/rkconsolepart.rc
    trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
    trunk/rkward/rkward/windows/rkcommandlogpart.rc
    trunk/rkward/rkward/windows/rkhtmlwindow.cpp

Modified: trunk/rkward/rkward/rkconsolepart.rc
===================================================================
--- trunk/rkward/rkward/rkconsolepart.rc	2007-01-11 21:26:39 UTC (rev 1126)
+++ trunk/rkward/rkward/rkconsolepart.rc	2007-01-12 00:09:30 UTC (rev 1127)
@@ -1,17 +1,28 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.2">
+<kpartgui name="rkward" version="0.4.5">
 	<MenuBar>
+		<Menu name="edit">
+			<Action name="rkconsole_copy"></Action>
+			<Action name="rkconsole_copy_literal"></Action>
+			<Action name="rkconsole_paste"></Action>
+			<Separator/>
+			<Action name="rkconsole_clear"></Action>
+		</Menu>
 		<Menu name="run"><text>&Run</text>
 			<Merge/>
 			<Separator/>
 			<Action name="run_selection"/>
 			<Action name="interrupt"/>
 		</Menu>
+		<Menu name="settings">
+			<Action name="rkconsole_configure"></Action>
+		</Menu>
 		<Menu name="help"><text>&Help</text>
 			<Action name="function_reference"></Action>
 		</Menu>
 	</MenuBar>
 	<ToolBar fullWidth="true" name="runToolBar">
+		<Action name="run_selection"/>
 		<Action name="interrupt"/>
 		<Separator/>
 		<Merge/>

Modified: trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp	2007-01-11 21:26:39 UTC (rev 1126)
+++ trunk/rkward/rkward/windows/rkcommandeditorwindowpart.cpp	2007-01-12 00:09:30 UTC (rev 1127)
@@ -50,11 +50,9 @@
 void RKCommandEditorWindowPart::initializeActions () {
 	RK_TRACE (COMMANDEDITOR);
 
-	runAll = new KAction (i18n ("Run all"), KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
-	runAll->setIcon("player_fwd");
-	runSelection = new KAction (i18n ("Run selection"), KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
-	runSelection->setIcon("player_play");
-	runLine = new KAction (i18n ("Run current line"), KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
+	runAll = new KAction (i18n ("Run all"), "player_fwd", KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
+	runSelection = new KAction (i18n ("Run selection"), "player_play", KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
+	runLine = new KAction (i18n ("Run current line"), "player_end", KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
 
 	helpFunction = new KAction (i18n ("&Function reference"), KShortcut ("F2"), this, SLOT (slotFunctionReference ()), actionCollection (), "function_reference");
 }

Modified: trunk/rkward/rkward/windows/rkcommandlogpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcommandlogpart.rc	2007-01-11 21:26:39 UTC (rev 1126)
+++ trunk/rkward/rkward/windows/rkcommandlogpart.rc	2007-01-12 00:09:30 UTC (rev 1127)
@@ -1,5 +1,18 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.2">
+<kpartgui name="rkward" version="0.4.5">
+	<Menubar>
+		<Menu name="edit">
+			<Action name="log_select_all"/>
+			<Action name="log_copy"/>
+			<Action name="log_clear"/>
+		</Menu>
+		<Menu name="run">
+			<Action name="log_run_selection"/>
+		</Menu>
+		<Menu name="settings">
+			<Action name="log_configure"/>
+		</Menu>
+	</Menubar>
 	<Menu name="rkcommandlog_context_menu">
 		<Action name="log_copy"/>
 		<Action name="log_run_selection"/>
@@ -10,4 +23,7 @@
 		<Separator/>
 		<Action name="log_configure"/>
 	</Menu>
+	<ToolBar fullWidth="true" name="runToolBar">
+		<Action name="log_run_selection"/>
+	</ToolBar>
 </kpartgui>

Modified: trunk/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2007-01-11 21:26:39 UTC (rev 1126)
+++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2007-01-12 00:09:30 UTC (rev 1127)
@@ -212,7 +212,7 @@
 	setIcon (SmallIcon ("text_block"));
 	setCaption (i18n ("Output"));
 
-	outputFlush = new KAction (i18n ("&Flush Output"), "editclear", 0, this, SLOT (flushOutput ()), actionCollection (), "output_flush");
+	outputFlush = new KAction (i18n ("&Flush Output"), "editdelete", 0, this, SLOT (flushOutput ()), actionCollection (), "output_flush");
 	outputRefresh = new KAction (i18n ("&Refresh Output"), "reload", 0, this, SLOT (refreshOutput ()), actionCollection (), "output_refresh");
 	print = KStdAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_output");
 	print->setText (i18n ("Print Output"));


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