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

[kapatp at users.sourceforge.net]

Revision: 2971
          http://rkward.svn.sourceforge.net/rkward/?rev=2971&view=rev
Author:   kapatp
Date:     2010-08-27 22:47:54 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
Add some more icons to the device toolbar.

Modified Paths:
--------------
    trunk/rkward/rkward/misc/rkstandardicons.cpp
    trunk/rkward/rkward/misc/rkstandardicons.h
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
    trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
    trunk/rkward/rkward/windows/rkwindowcatcher.cpp

Modified: trunk/rkward/rkward/misc/rkstandardicons.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.cpp	2010-08-27 21:05:32 UTC (rev 2970)
+++ trunk/rkward/rkward/misc/rkstandardicons.cpp	2010-08-27 22:47:54 UTC (rev 2971)
@@ -62,8 +62,10 @@
 	icons[ActionMoveUp] = KIcon ("go-up");
 	icons[ActionMoveDown] = KIcon ("go-down");
 
+	icons[ActionFlagGreen] = KIcon ("flag-green.png");
 	icons[ActionSnapshot] = KIcon ("list-add.png");
 	icons[ActionRemovePlot] = KIcon ("list-remove.png");
+	icons[ActionWindowDuplicate] = KIcon ("window-duplicate.png");
 
 	icons[ActionClear] = KIcon ("edit-clear.png");
 

Modified: trunk/rkward/rkward/misc/rkstandardicons.h
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.h	2010-08-27 21:05:32 UTC (rev 2970)
+++ trunk/rkward/rkward/misc/rkstandardicons.h	2010-08-27 22:47:54 UTC (rev 2971)
@@ -62,8 +62,10 @@
 		ActionMoveUp,
 		ActionMoveDown,
 
+		ActionFlagGreen,
 		ActionSnapshot,
 		ActionRemovePlot,
+		ActionWindowDuplicate,
 
 		ActionClear,
 

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-08-27 21:05:32 UTC (rev 2970)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public_graphics.R	2010-08-27 22:47:54 UTC (rev 2971)
@@ -216,6 +216,7 @@
 			push.pop.and.record (which.pop = 1, deviceId = NULL, newplot = TRUE)
 		}
 		
+		.set.gType.newplot ("")
 		dev.set (cur.deviceId)
 	}
 	recordUnsaved <- function (deviceId = dev.cur ())
@@ -308,7 +309,6 @@
 			}
 			message (status.display, "\n") # add to a new status bar?
 			histPositions [[deviceId]] <<- n
-			.set.gType.newplot (gType [[n]])
 			.rk.graph.history.gui () # (deviceId)
 		}
 		else message("replay: 'n' not in valid range: ", n)

Modified: trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc
===================================================================
--- trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc	2010-08-27 21:05:32 UTC (rev 2970)
+++ trunk/rkward/rkward/windows/rkcatchedx11windowpart.rc	2010-08-27 22:47:54 UTC (rev 2971)
@@ -35,6 +35,11 @@
 		<Merge/>
 	</MenuBar>
 	<ToolBar name="mdiToolBar">
+		<Action name="device_activate"/>
+		<Action name="device_duplicate"/>
+		<Separator/>
+		<Action name="device_copy_to_output"/>
+		<Separator/>
 		<Action name="plot_first"/>
 		<Action name="plot_prev"/>
 		<Action name="plot_next"/>

Modified: trunk/rkward/rkward/windows/rkwindowcatcher.cpp
===================================================================
--- trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-08-27 21:05:32 UTC (rev 2970)
+++ trunk/rkward/rkward/windows/rkwindowcatcher.cpp	2010-08-27 22:47:54 UTC (rev 2971)
@@ -537,13 +537,16 @@
 
 	action = actionCollection ()->addAction ("device_activate", window, SLOT (activateDevice()));
 	action->setText (i18n ("Make active"));
+	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionFlagGreen));
 	action = actionCollection ()->addAction ("device_copy_to_output", window, SLOT (copyDeviceToOutput()));
 	action->setText (i18n ("Copy to output"));
+	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::WindowOutput));
 	action = actionCollection ()->addAction (KStandardAction::Print, "device_print", window, SLOT (printDevice()));
 	action = actionCollection ()->addAction ("device_copy_to_r_object", window, SLOT (copyDeviceToRObject()));
 	action->setText (i18n ("Store as R object..."));
 	action = actionCollection ()->addAction ("device_duplicate", window, SLOT (duplicateDevice()));
 	action->setText (i18n ("Duplicate"));
+	action->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionWindowDuplicate));
 
 	// initialize context for plugins
 	RKContextMap *context = RKComponentMap::getContext ("x11");


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