[rkward-cvs] SF.net SVN: rkward: [2257] branches/KDE4_port/rkward

[tfry at users.sourceforge.net]

Revision: 2257
          http://rkward.svn.sourceforge.net/rkward/?rev=2257&view=rev
Author:   tfry
Date:     2007-11-20 04:57:00 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
Add simple icon for matrix

Modified Paths:
--------------
    branches/KDE4_port/rkward/dataeditor/rkeditordataframe.h
    branches/KDE4_port/rkward/icons/CMakeLists.txt
    branches/KDE4_port/rkward/misc/rkstandardicons.cpp
    branches/KDE4_port/rkward/misc/rkstandardicons.h

Added Paths:
-----------
    branches/KDE4_port/rkward/icons/matrix.png

Modified: branches/KDE4_port/rkward/dataeditor/rkeditordataframe.h
===================================================================
--- branches/KDE4_port/rkward/dataeditor/rkeditordataframe.h	2007-11-20 12:44:00 UTC (rev 2256)
+++ branches/KDE4_port/rkward/dataeditor/rkeditordataframe.h	2007-11-20 12:57:00 UTC (rev 2257)
@@ -44,9 +44,6 @@
 	~RKEditorDataFrame ();
 
 	void flushChanges ();
-	
-	//void objectDeleted (RObject *object);
-	//void objectMetaModified (RObject *object);
 
 /** Tells the editor to restore the given object in the R-workspace from its copy of the data */
 	void restoreObject (RObject *object);

Modified: branches/KDE4_port/rkward/icons/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/icons/CMakeLists.txt	2007-11-20 12:44:00 UTC (rev 2256)
+++ branches/KDE4_port/rkward/icons/CMakeLists.txt	2007-11-20 12:57:00 UTC (rev 2257)
@@ -4,6 +4,7 @@
 	rkward_logo.png
 	function.png
 	list.png
+	matrix.png
 	data-numeric.png
 	data-factor.png
 	data-logical.png

Added: branches/KDE4_port/rkward/icons/matrix.png
===================================================================
(Binary files differ)


Property changes on: branches/KDE4_port/rkward/icons/matrix.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/KDE4_port/rkward/misc/rkstandardicons.cpp
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-20 12:44:00 UTC (rev 2256)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-20 12:57:00 UTC (rev 2257)
@@ -60,6 +60,7 @@
 	icons[ObjectFunction] = QIcon (rkward_icon_base + "function.png");
 	icons[ObjectEnvironment] = KIcon ("konqueror");
 	icons[ObjectPackageEnvironment] = KIcon ("ark");
+	icons[ObjectMatrix] = QIcon (rkward_icon_base + "matrix.png");
 	icons[ObjectDataFrame] = KIcon ("table");
 	icons[ObjectDataNumeric] = QIcon (rkward_icon_base + "data-numeric.png");
 	icons[ObjectDataFactor] = QIcon (rkward_icon_base + "data-factor.png");
@@ -109,6 +110,7 @@
 	}
 	if (object->isType (RObject::List)) return icons[ObjectList];
 	if (object->isType (RObject::Function)) return icons[ObjectFunction];
+	if (object->isType (RObject::Matrix)) return icons[ObjectMatrix];
 	if (object->isType (RObject::PackageEnv)) return icons[ObjectPackageEnvironment];
 	if (object->isType (RObject::Environment)) return icons[ObjectEnvironment];
 	if (object == RObjectList::getObjectList ()) return icons[ObjectObjectList];

Modified: branches/KDE4_port/rkward/misc/rkstandardicons.h
===================================================================
--- branches/KDE4_port/rkward/misc/rkstandardicons.h	2007-11-20 12:44:00 UTC (rev 2256)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.h	2007-11-20 12:57:00 UTC (rev 2257)
@@ -57,6 +57,7 @@
 		ObjectFunction,
 		ObjectEnvironment,
 		ObjectPackageEnvironment,
+		ObjectMatrix,
 		ObjectDataFrame,
 		ObjectDataNumeric,
 		ObjectDataFactor,


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