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

[tfry at users.sourceforge.net]

Revision: 3474
          http://rkward.svn.sourceforge.net/rkward/?rev=3474&view=rev
Author:   tfry
Date:     2011-03-12 14:28:26 +0000 (Sat, 12 Mar 2011)

Log Message:
-----------
Add icon for slots pseudo-object

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/core/rkmodificationtracker.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/s4_slots.png

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-03-12 11:09:51 UTC (rev 3473)
+++ trunk/rkward/ChangeLog	2011-03-12 14:28:26 UTC (rev 3474)
@@ -1,4 +1,4 @@
-- Support S4 slots in object name completion and workspace browser		TODO: more testing, better icon
+- Support S4 slots in object name completion and workspace browser		TODO: more testing
 - More correct handling of quotes in object name completion
 - Support plot history for ggplot2 plots
 - Be less pro-active about fetching structure information on R objects in the workspace		TODO: verify that this fixes our issues with rXML

Modified: trunk/rkward/rkward/core/rkmodificationtracker.cpp
===================================================================
--- trunk/rkward/rkward/core/rkmodificationtracker.cpp	2011-03-12 11:09:51 UTC (rev 3473)
+++ trunk/rkward/rkward/core/rkmodificationtracker.cpp	2011-03-12 14:28:26 UTC (rev 3474)
@@ -313,8 +313,7 @@
 			if (object->isVariable ()) return RObject::typeToText (object->getDataType ());
 			return QVariant ();
 		}
-		if (col == ClassColumn) return object->makeClassString ("; ");
-		RK_ASSERT (false);
+		if ((col == ClassColumn) && (!object->isPseudoObject ())) return object->makeClassString ("; ");
 	} else if (role == Qt::FontRole) {
 		if (col == NameColumn && object->isPseudoObject ()) {
 			QFont font;

Modified: trunk/rkward/rkward/icons/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/icons/CMakeLists.txt	2011-03-12 11:09:51 UTC (rev 3473)
+++ trunk/rkward/rkward/icons/CMakeLists.txt	2011-03-12 14:28:26 UTC (rev 3474)
@@ -13,6 +13,7 @@
 	run_line.png
 	run_selection.png
 	run_all.png
+	s4_slots.png
 	paste_inside_selection.png
 	paste_inside_table.png
 	DESTINATION ${DATA_INSTALL_DIR}/rkward/icons)

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


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

Modified: trunk/rkward/rkward/misc/rkstandardicons.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.cpp	2011-03-12 11:09:51 UTC (rev 3473)
+++ trunk/rkward/rkward/misc/rkstandardicons.cpp	2011-03-12 14:28:26 UTC (rev 3474)
@@ -2,7 +2,7 @@
                           rkstandardicons  -  description
                              -------------------
     begin                : Wed Oct 24 2007
-    copyright            : (C) 2007, 2009, 2010 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009, 2010, 2011 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -89,7 +89,7 @@
 	icons[ObjectDataLogical] = QIcon (rkward_icon_base + "data-logical.png");
 	icons[ObjectDataUnknown] = KIcon ("unknown");
 	icons[ObjectDataOther] = icons[ActionDeleteRow];
-	icons[ObjectObjectList] = KIcon ("view-list-tree");
+	icons[ObjectPseudo] = QIcon (rkward_icon_base + "s4_slots.png");
 
 	// windows
 	icons[WindowDataFrameEditor] = icons[ObjectDataFrame];
@@ -100,7 +100,7 @@
 	icons[WindowObject] = KIcon ("zoom-original");
 	icons[WindowConsole] = KIcon ("utilities-terminal");
 	icons[WindowCommandLog] = KIcon ("format-justify-left");
-	icons[WindowWorkspaceBrowser] = icons[ObjectObjectList];
+	icons[WindowWorkspaceBrowser] = KIcon ("view-list-tree");
 	icons[WindowSearchHelp] = KIcon ("help-contents");
 	icons[WindowPendingJobs] = KIcon ("system-run");
 	icons[WindowFileBrowser] = KIcon ("folder");
@@ -135,12 +135,12 @@
 				return icons[ObjectDataOther];
 		}
 	}
+	if (object->isSlotsPseudoObject ()) return icons[ObjectPseudo];
 	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];
 
 	return QIcon ();
 }

Modified: trunk/rkward/rkward/misc/rkstandardicons.h
===================================================================
--- trunk/rkward/rkward/misc/rkstandardicons.h	2011-03-12 11:09:51 UTC (rev 3473)
+++ trunk/rkward/rkward/misc/rkstandardicons.h	2011-03-12 14:28:26 UTC (rev 3474)
@@ -2,7 +2,7 @@
                           rkstandardicons  -  description
                              -------------------
     begin                : Wed Oct 24 2007
-    copyright            : (C) 2007, 2009, 2010 by Thomas Friedrichsmeier
+    copyright            : (C) 2007, 2009, 2010, 2011 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -86,7 +86,7 @@
 		ObjectDataLogical,
 		ObjectDataUnknown,
 		ObjectDataOther,
-		ObjectObjectList,
+		ObjectPseudo,
 
 		WindowDataFrameEditor,
 		WindowCommandEditor,


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