[Pspp-cvs] pspp/src/ui/gui ChangeLog automake.mk psppire.c...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/07/15 03:29:03

Modified files:
        src/ui/gui     : ChangeLog automake.mk psppire.c psppire.glade 

Log message:
        Added toolbar icons.  Hopefully somebody will contribute some better 
ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- ChangeLog   4 Jul 2006 01:24:59 -0000       1.21
+++ ChangeLog   15 Jul 2006 03:29:03 -0000      1.22
@@ -1,3 +1,8 @@
+Sat Jul 15 11:27:15 WST 2006 John Darrington <address@hidden>
+
+   * psppire.c psppire.glade automake.mk icons/* : Added toolbar icons where 
+       there's no suitable gtk stock icon.
+
 Tue Jul  4 09:08:38 WST 2006 John Darrington <address@hidden>
        
    * psppire.c: Fixed --help and --version options.

Index: automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- automake.mk 24 Jun 2006 09:08:50 -0000      1.10
+++ automake.mk 15 Jul 2006 03:29:03 -0000      1.11
@@ -22,7 +22,13 @@
 dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/psppire.glade \
        $(top_srcdir)/src/ui/gui/psppicon.png \
-       $(top_srcdir)/src/ui/gui/pspplogo.png
+       $(top_srcdir)/src/ui/gui/pspplogo.png \
+       $(top_srcdir)/src/ui/gui/icons/value-labels.png \
+       $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
+       $(top_srcdir)/src/ui/gui/icons/insert-case.png \
+       $(top_srcdir)/src/ui/gui/icons/split-file.png \
+       $(top_srcdir)/src/ui/gui/icons/select-cases.png \
+       $(top_srcdir)/src/ui/gui/icons/weight-cases.png
 
 
 src_ui_gui_psppire_SOURCES = \

Index: psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- psppire.c   4 Jul 2006 01:24:59 -0000       1.15
+++ psppire.c   15 Jul 2006 03:29:03 -0000      1.16
@@ -71,6 +71,8 @@
 
 PsppireVarStore *var_store = 0;
 
+void create_icon_factory (void);
+
 int 
 main(int argc, char *argv[]) 
 {
@@ -106,7 +108,6 @@
       return 0;
     }
 
-
   glade_init();
 
 
@@ -127,6 +128,8 @@
 
   data_store = psppire_data_store_new(the_dictionary);
 
+  create_icon_factory();
+
   /* load the interface */
   xml = glade_xml_new(PKGDATADIR "/psppire.glade", NULL, NULL);
 
@@ -218,3 +221,50 @@
 }
 
 
+
+void 
+create_icon_factory (void)
+{
+  GtkIconFactory *factory = gtk_icon_factory_new();
+
+  GtkIconSet *icon_set;
+  
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
+
+  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
+  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+  g_object_unref (pixbuf);
+  gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
+
+  gtk_icon_factory_add_default (factory);
+}

Index: psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- psppire.glade       24 Jun 2006 09:08:50 -0000      1.5
+++ psppire.glade       15 Jul 2006 03:29:03 -0000      1.6
@@ -547,6 +547,7 @@
                <widget class="GtkToolButton" id="variables">
                  <property name="visible">True</property>
                  <property name="tooltip" 
translatable="yes">Variables</property>
+                 <property name="stock_id">pspp-goto-variable</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -604,6 +605,7 @@
                <widget class="GtkToolButton" id="insert_case">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Insert 
Case</property>
+                 <property name="stock_id">pspp-insert-case</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -620,6 +622,7 @@
                <widget class="GtkToolButton" id="insert_variable">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Insert 
Variable</property>
+                 <property name="stock_id">pspp-insert-variable</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -649,6 +652,7 @@
                <widget class="GtkToolButton" id="toolbutton8">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Split 
File</property>
+                 <property name="stock_id">pspp-split-file</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -665,6 +669,7 @@
                <widget class="GtkToolButton" id="toolbutton9">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Weight 
Cases</property>
+                 <property name="stock_id">pspp-weight-cases</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -681,6 +686,7 @@
                <widget class="GtkToolButton" id="toolbutton10">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Select 
Cases</property>
+                 <property name="stock_id">pspp-select-cases</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
@@ -710,6 +716,7 @@
                <widget class="GtkToggleToolButton" 
id="togglebutton-value-labels">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Value 
Labels</property>
+                 <property name="stock_id">pspp-value-labels</property>
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>