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

[tfry at users.sourceforge.net]

Revision: 2255
          http://rkward.svn.sourceforge.net/rkward/?rev=2255&view=rev
Author:   tfry
Date:     2007-11-19 16:13:41 -0800 (Mon, 19 Nov 2007)

Log Message:
-----------
Add icons for factor, numeric, logical data. These are not terribly good, though...

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

Added Paths:
-----------
    branches/KDE4_port/rkward/icons/data-factor.png
    branches/KDE4_port/rkward/icons/data-logical.png
    branches/KDE4_port/rkward/icons/data-numeric.png

Modified: branches/KDE4_port/rkward/core/rkmodificationtracker.cpp
===================================================================
--- branches/KDE4_port/rkward/core/rkmodificationtracker.cpp	2007-11-19 23:47:49 UTC (rev 2254)
+++ branches/KDE4_port/rkward/core/rkmodificationtracker.cpp	2007-11-20 00:13:41 UTC (rev 2255)
@@ -2,7 +2,7 @@
                           rkmodificationtracker  -  description
                              -------------------
     begin                : Tue Aug 31 2004
-    copyright            : (C) 2004 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -407,5 +407,3 @@
 	RKGlobals::tracker ()->removeObjectListener (object, this);
 	--num_watched_objects;
 }
-
-#include "rkmodificationtracker.moc"

Modified: branches/KDE4_port/rkward/core/rkmodificationtracker.h
===================================================================
--- branches/KDE4_port/rkward/core/rkmodificationtracker.h	2007-11-19 23:47:49 UTC (rev 2254)
+++ branches/KDE4_port/rkward/core/rkmodificationtracker.h	2007-11-20 00:13:41 UTC (rev 2255)
@@ -2,7 +2,7 @@
                           rkmodificationtracker  -  description
                              -------------------
     begin                : Tue Aug 31 2004
-    copyright            : (C) 2004 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2007 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 

Modified: branches/KDE4_port/rkward/icons/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/icons/CMakeLists.txt	2007-11-19 23:47:49 UTC (rev 2254)
+++ branches/KDE4_port/rkward/icons/CMakeLists.txt	2007-11-20 00:13:41 UTC (rev 2255)
@@ -1,16 +1,15 @@
 ADD_SUBDIRECTORY(app-icon)
 
-########### install files ###############
-
-INSTALL(FILES   rkward_logo.png function.png list.png window_back.png window_forward.png run_line.png run_selection.png run_all.png DESTINATION ${DATA_INSTALL_DIR}/rkward/icons)
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#KDE_ICON = rkward
-#iconsdir = $(kde_datadir)/rkward/icons
-#
-#icons_DATA = rkward_logo.png function.png list.png window_back.png window_forward.png run_line.png run_selection.png run_all.png
-#
+INSTALL(FILES
+	rkward_logo.png
+	function.png
+	list.png
+	data-numeric.png
+	data-factor.png
+	data-logical.png
+	window_back.png
+	window_forward.png
+	run_line.png
+	run_selection.png
+	run_all.png
+	DESTINATION ${DATA_INSTALL_DIR}/rkward/icons)

Added: branches/KDE4_port/rkward/icons/data-factor.png
===================================================================
(Binary files differ)


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

Added: branches/KDE4_port/rkward/icons/data-logical.png
===================================================================
(Binary files differ)


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

Added: branches/KDE4_port/rkward/icons/data-numeric.png
===================================================================
(Binary files differ)


Property changes on: branches/KDE4_port/rkward/icons/data-numeric.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-19 23:47:49 UTC (rev 2254)
+++ branches/KDE4_port/rkward/misc/rkstandardicons.cpp	2007-11-20 00:13:41 UTC (rev 2255)
@@ -58,15 +58,13 @@
 	// objects
 	icons[ObjectList] = QIcon (rkward_icon_base + "list.png");
 	icons[ObjectFunction] = QIcon (rkward_icon_base + "function.png");
-#warning KDE 4: some of these icons have been renamed
 	icons[ObjectEnvironment] = KIcon ("konqueror");
 	icons[ObjectPackageEnvironment] = KIcon ("ark");
 	icons[ObjectDataFrame] = KIcon ("table");
-	icons[ObjectDataNumeric] = KIcon ("math_paren");	// TODO: needs to be replaced
-	icons[ObjectDataFactor] = KIcon ("math_onetwomatrix");	// TODO: needs to be replaced
+	icons[ObjectDataNumeric] = QIcon (rkward_icon_base + "data-numeric.png");
+	icons[ObjectDataFactor] = QIcon (rkward_icon_base + "data-factor.png");
 	icons[ObjectDataCharacter] = KIcon ("text");
-#warning TODO icon for logical
-	icons[ObjectDataLogical] = QIcon ();
+	icons[ObjectDataLogical] = QIcon (rkward_icon_base + "data-logical.png");
 	icons[ObjectDataUnknown] = KIcon ("unknown");
 	icons[ObjectDataOther] = icons[ActionDeleteRow];
 	icons[ObjectObjectList] = KIcon ("view-tree");


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