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

[tfry at users.sourceforge.net]

Revision: 2443
          http://rkward.svn.sourceforge.net/rkward/?rev=2443&view=rev
Author:   tfry
Date:     2009-04-06 19:27:33 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------
Add missing icons in data.frame editor

Modified Paths:
--------------
    trunk/rkward/rkward/dataeditor/rkeditordataframepart.cpp
    trunk/rkward/rkward/icons/CMakeLists.txt
    trunk/rkward/rkward/misc/rkstandardicons.cpp
    trunk/rkward/rkward/misc/rkstandardicons.h

Added Paths:
-----------
    trunk/rkward/rkward/icons/paste_inside_selection.png
    trunk/rkward/rkward/icons/paste_inside_table.png

Modified: trunk/rkward/rkward/dataeditor/rkeditordataframepart.cpp
===================================================================
--- trunk/rkward/rkward/dataeditor/rkeditordataframepart.cpp	2009-04-06 12:22:57 UTC (rev 2442)
+++ trunk/rkward/rkward/dataeditor/rkeditordataframepart.cpp	2009-04-06 19:27:33 UTC (rev 2443)
@@ -2,7 +2,7 @@
                           rkeditordataframepart  -  description
                              -------------------
     begin                : Wed Sep 14 2005
-    copyright            : (C) 2005, 2006, 2007 by Thomas Friedrichsmeier
+    copyright            : (C) 2005, 2006, 2007, 2009 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -24,6 +24,7 @@
 #include <klocale.h>
 
 #include "rkeditordataframe.h"
+#include "../misc/rkstandardicons.h"
 #include "../rkward.h"
 #include "../debug.h"
 
@@ -54,13 +55,13 @@
 	editor->editActions ()->addAction (editPaste);
 
 	editPasteToTable = actionCollection ()->addAction ("paste_to_table", this, SLOT(slotEditPasteToTable()));
-	editPasteToTable->setText (i18n("Paste inside Table"));
-	editPasteToTable->setIcon (KIcon ("frame_spreadsheet"));
+	editPasteToTable->setText (i18n("Paste inside table"));
+	editPasteToTable->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionPasteInsideTable));
 	editor->editActions ()->addAction (editPasteToTable);
 
 	editPasteToSelection = actionCollection ()->addAction ("paste_to_selection", this, SLOT(slotEditPasteToSelection()));
-	editPasteToSelection->setText (i18n("Paste inside Selection"));
-	editPasteToSelection->setIcon (KIcon ("frame-edit"));
+	editPasteToSelection->setText (i18n("Paste inside selection"));
+	editPasteToSelection->setIcon (RKStandardIcons::getIcon (RKStandardIcons::ActionPasteInsideSelection));
 	editor->editActions ()->addAction (editPasteToSelection);
 
 	editCut->setStatusTip (i18n("Cuts the selected section and puts it to the clipboard"));

Modified: trunk/rkward/rkward/icons/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/icons/CMakeLists.txt	2009-04-06 12:22:57 UTC (rev 2442)
+++ trunk/rkward/rkward/icons/CMakeLists.txt	2009-04-06 19:27:33 UTC (rev 2443)
@@ -13,4 +13,6 @@
 	run_line.png
 	run_selection.png
 	run_all.png
+	paste_inside_selection.png
+	paste_inside_table.png
 	DESTINATION ${DATA_INSTALL_DIR}/rkward/icons)

Added: trunk/rkward/rkward/icons/paste_inside_selection.png
===================================================================
(Binary files differ)


Property changes on: trunk/rkward/rkward/icons/paste_inside_selection.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/rkward/rkward/icons/paste_inside_table.png
===================================================================
(Binary files differ)


Property changes on: trunk/rkward/rkward/icons/paste_inside_table.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/rkward/rkward/misc/rkstandardicons.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.cpp	2009-04-06 12:22:57 UTC (rev 2442)
+++ trunk/rkward/rkward/misc/rkstandardicons.cpp	2009-04-06 19:27:33 UTC (rev 2443)
@@ -2,7 +2,7 @@
                           rkstandardicons  -  description
                              -------------------
     begin                : Wed Oct 24 2007
-    copyright            : (C) 2007 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -46,6 +46,8 @@
 	icons[ActionInsertRow] = KIcon ("edit-add");
 	icons[ActionDeleteVar] = icons[ActionDeleteRow];
 	icons[ActionInsertVar] = icons[ActionInsertRow];
+	icons[ActionPasteInsideTable] = QIcon (rkward_icon_base + "paste_inside_table.png");
+	icons[ActionPasteInsideSelection] = QIcon (rkward_icon_base + "paste_inside_selection.png");
 
 	icons[ActionAddRight] = KIcon ("arrow-right");
 	icons[ActionRemoveLeft] = KIcon ("arrow-left");

Modified: trunk/rkward/rkward/misc/rkstandardicons.h
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.h	2009-04-06 12:22:57 UTC (rev 2442)
+++ trunk/rkward/rkward/misc/rkstandardicons.h	2009-04-06 19:27:33 UTC (rev 2443)
@@ -2,7 +2,7 @@
                           rkstandardicons  -  description
                              -------------------
     begin                : Wed Oct 24 2007
-    copyright            : (C) 2007 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -46,6 +46,8 @@
 		ActionInsertRow,
 		ActionDeleteVar,
 		ActionInsertVar,
+		ActionPasteInsideTable,
+		ActionPasteInsideSelection,
 
 		ActionAddRight,
 		ActionRemoveLeft,


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