[Pspp-cvs] pspp glade.patch src/ui/gui/about.c src/ui/gui/...

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   06/12/30 23:30:32

Modified files:
        .              : glade.patch 
        src/ui/gui     : about.c psppire.glade 

Log message:
        Updated the about box to work properly with Gtk+2.10

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/glade.patch?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/about.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.glade?cvsroot=pspp&r1=1.11&r2=1.12

Patches:
Index: glade.patch
===================================================================
RCS file: /sources/pspp/pspp/glade.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- glade.patch 23 Dec 2006 09:03:44 -0000      1.1
+++ glade.patch 30 Dec 2006 23:30:32 -0000      1.2
@@ -1,10 +1,10 @@
-This patch mitigates a bug in glade-2, which silently deletes stock_ids, which 
it
-thinks are not valid.   You may have to apply this patch after editing 
data-editor.glade
-with glade-2
-==============
---- src/ui/gui/data-editor.glade,old   2006-12-23 17:30:32.000000000 +0900
-+++ src/ui/gui/data-editor.glade       2006-12-23 17:30:36.000000000 +0900
-@@ -619,6 +619,7 @@
+This patch mitigates a bug in glade-2, which silently deletes stock_ids, which 
+it thinks are not valid.   You may have to apply this patch after editing 
+data-editor.glade with glade-2.  Glade-3 is another story and might give 
+problems of its own.
+--- src/ui/gui/data-editor.glade,old   2006-12-31 07:29:39.000000000 +0900
++++ src/ui/gui/data-editor.glade       2006-12-31 07:30:04.000000000 +0900
+@@ -653,6 +653,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" 
translatable="yes">Variables</property>
@@ -12,7 +12,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -678,6 +679,7 @@
+@@ -712,6 +713,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Insert 
Case</property>
@@ -20,7 +20,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -696,6 +698,7 @@
+@@ -730,6 +732,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Insert 
Variable</property>
@@ -28,7 +28,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -726,6 +729,7 @@
+@@ -760,6 +763,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Split 
File</property>
@@ -36,7 +36,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -743,6 +747,7 @@
+@@ -777,6 +781,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Weight 
Cases</property>
@@ -44,7 +44,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -760,6 +765,7 @@
+@@ -794,6 +799,7 @@
                  <property name="visible">True</property>
                  <property name="sensitive">False</property>
                  <property name="tooltip" translatable="yes">Select 
Cases</property>
@@ -52,7 +52,7 @@
                  <property name="label" translatable="yes"></property>
                  <property name="use_underline">True</property>
                  <property name="visible_horizontal">True</property>
-@@ -789,6 +795,7 @@
+@@ -823,6 +829,7 @@
                <widget class="GtkToggleToolButton" 
id="togglebutton-value-labels">
                  <property name="visible">True</property>
                  <property name="tooltip" translatable="yes">Value 
Labels</property>

Index: src/ui/gui/about.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/about.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/about.c  24 Dec 2006 23:08:25 -0000      1.3
+++ src/ui/gui/about.c  30 Dec 2006 23:30:32 -0000      1.4
@@ -21,6 +21,11 @@
   gtk_window_set_icon_from_file (GTK_WINDOW (about),
                                 PKGDATADIR "/psppicon.png", 0);
 
+  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
+                               "http://www.gnu.org/software/pspp";);
+
+  gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about),
+                               bare_version);
 
   gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about),
                                (const gchar **) authors);
@@ -32,6 +37,8 @@
   gtk_window_set_keep_above (GTK_WINDOW (about), TRUE);
 
 
-  gtk_widget_show (about);
+  gtk_dialog_run (about);
+
+  gtk_widget_hide (about);
 }
 

Index: src/ui/gui/psppire.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.glade,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/ui/gui/psppire.glade    23 Dec 2006 09:03:45 -0000      1.11
+++ src/ui/gui/psppire.glade    30 Dec 2006 23:30:32 -0000      1.12
@@ -7,7 +7,7 @@
   <property name="destroy_with_parent">False</property>
   <property name="name">PSPPire</property>
   <property name="copyright">Free Software Foundation</property>
-  <property name="comments" translatable="yes">This is pre-alpha software.  It 
probably will not work.</property>
+  <property name="comments" translatable="yes">This is pre-alpha software.  
Use at your own risk.</property>
   <property name="license" translatable="yes">    This program is free 
software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -24,8 +24,6 @@
     02110-1301, USA.
 </property>
   <property name="wrap_license">False</property>
-  <property name="website">http://www.gnu.org/software/pspp</property>
-  <property name="authors">John Darrington</property>
   <property name="artists">Patrick Brunier</property>
   <property name="translator_credits"></property>
   <property name="logo">pspplogo.png</property>