]> git.sur5r.net Git - glabels/commitdiff
projects / glabels / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 67b655a)
2004-01-03 Jim Evins <evins@snaught.com>
authorJim Evins <evins@snaught.com>
Sun, 4 Jan 2004 04:18:02 +0000 (04:18 +0000)
committerJim Evins <evins@snaught.com>
Sun, 4 Jan 2004 04:18:02 +0000 (04:18 +0000)
* AUTHORS:
Added acknowledgement of contributions by Wayne Schuller.

* src/commands.c: (gl_cmd_file_print):
Create extra reference to print dialog, so that it can be properly re-used.

* src/mygal/mygal-combo-box.h:
* src/mygal/mygal-combo-box.c:
(mygal_combo_box_popup_hide_unconditional),
(mygal_combo_box_popup_display), (mygal_combo_box_set_display),
(gtk_combo_set_tearoff_state), (mygal_combo_box_construct),
(mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title),
(mygal_combo_box_set_tearable):
Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to
complete the rename of this widget to prevent namespace collisions
with Gtk+-2.3.

* src/prefs-dialog.glade:
Fixed alignment of Fill/Color widgets.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@402 f5e0f49d-192f-0410-a22d-a8d8700d0965

glabels2/AUTHORS patch | blob | history
glabels2/ChangeLog patch | blob | history
glabels2/src/commands.c patch | blob | history
glabels2/src/mygal/mygal-combo-box.c patch | blob | history
glabels2/src/mygal/mygal-combo-box.h patch | blob | history
glabels2/src/prefs-dialog.glade patch | blob | history

diff --git a/glabels2/AUTHORS b/glabels2/AUTHORS
index 7fd7952a6089aa89c6ee198b92117eb34f940d55..04470697cac21e4f6ad84f3001ea0185cc64718e 100644 (file)
--- a/glabels2/AUTHORS
+++ b/glabels2/AUTHORS
@@ -21,8 +21,8 @@ canvas item:
        Raph Levien <raph@acm.org>,
        Lauris Kaplinski <lauris@helixcode.com>
 
-Glabels includes modified versions of several widgets from the GAL library.  These are
-copyright:
+Glabels includes modified versions of several widgets from the GAL library.
+These are copyright:
 
        * Copyright 2000, 2001, Ximian, Inc.
        * Copyright 2000, Michael Levy
@@ -34,6 +34,7 @@ Glabels includes gnome-recent objects.  The author:
 
 Glabels includes contributions from:
        Emmanuel Pacaud <emmanuel.pacaud@univ-poitiers.fr>
+       Wayne Schuller <k_wayne@linuxpower.org>
        Akkana <akkana@shallowsky.com>
        nestor di <nestordi@usuarios.retecal.es>  --  excellent splash screen
                                                       that first appeared in
diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index d40fddd9e0478c3a3ea27ea3c826af263602713f..6c57d4a3e92fe2d4b4aae6e6bd54b2b26ab9bd1b 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,25 @@
+2004-01-03  Jim Evins  <evins@snaught.com>
+
+       * AUTHORS:
+               Added acknowledgement of contributions by Wayne Schuller.
+       
+       * src/commands.c: (gl_cmd_file_print):
+               Create extra reference to print dialog, so that it can be properly re-used.
+       
+       * src/mygal/mygal-combo-box.h:
+       * src/mygal/mygal-combo-box.c:
+       (mygal_combo_box_popup_hide_unconditional),
+       (mygal_combo_box_popup_display), (mygal_combo_box_set_display),
+       (gtk_combo_set_tearoff_state), (mygal_combo_box_construct),
+       (mygal_combo_box_set_arrow_relief), (mygal_combo_box_set_title),
+       (mygal_combo_box_set_tearable):
+               Changed all occurances of GTK_IS_COMBO_BOX to MYGAL_IS_COMBO_BOX, to
+               complete the rename of this widget to prevent namespace collisions
+               with Gtk+-2.3.
+       
+       * src/prefs-dialog.glade:
+               Fixed alignment of Fill/Color widgets.
+
 2004-01-03  Jim Evins  <evins@snaught.com>
 
        * data/avery-iso-templates.xml:
diff --git a/glabels2/src/commands.c b/glabels2/src/commands.c
index caf4d2fb58d0ac721457550585003101a8c391dd..b6a706ff87163999a19728b45112b8e2619fd4da 100644 (file)
--- a/glabels2/src/commands.c
+++ b/glabels2/src/commands.c
@@ -163,8 +163,9 @@ gl_cmd_file_print (BonoboUIComponent *uic,
        } else {
 
                GL_VIEW(window->view)->print_dialog =
-                       gl_print_dialog_new (GL_VIEW(window->view)->label,
-                                            BONOBO_WINDOW(window));
+                       g_object_ref (
+                               gl_print_dialog_new (GL_VIEW(window->view)->label,
+                                                    BONOBO_WINDOW(window)) );
 
                gtk_widget_show (GL_VIEW(window->view)->print_dialog);
        }
diff --git a/glabels2/src/mygal/mygal-combo-box.c b/glabels2/src/mygal/mygal-combo-box.c
index daa6466b638fe983f2a1a3c132930a1b591d138d..e476618da2ecee434591ab5ed6cc13c4b144a85c 100644 (file)
--- a/glabels2/src/mygal/mygal-combo-box.c
+++ b/glabels2/src/mygal/mygal-combo-box.c
@@ -207,7 +207,7 @@ mygal_combo_box_popup_hide_unconditional (MygalComboBox *combo_box)
        gboolean popup_info_destroyed = FALSE;
 
        g_return_if_fail (combo_box != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box));
 
        gtk_widget_hide (combo_box->priv->toplevel);
        gtk_widget_hide (combo_box->priv->popup);
@@ -287,7 +287,7 @@ mygal_combo_box_popup_display (MygalComboBox *combo_box)
        int x, y;
 
        g_return_if_fail (combo_box != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box));
        
        /*
         * If we have no widget to display on the popdown,
@@ -471,7 +471,7 @@ void
 mygal_combo_box_set_display (MygalComboBox *combo_box, GtkWidget *display_widget)
 {
        g_return_if_fail (combo_box != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box));
        g_return_if_fail (display_widget != NULL);
        g_return_if_fail (GTK_IS_WIDGET (display_widget));
 
@@ -573,7 +573,7 @@ gtk_combo_set_tearoff_state (MygalComboBox *combo,
                             gboolean  torn_off)
 {
        g_return_if_fail (combo != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo));
        
        if (combo->priv->torn_off != torn_off) {
                combo->priv->torn_off = torn_off;
@@ -717,7 +717,7 @@ mygal_combo_box_construct (MygalComboBox *combo_box, GtkWidget *display_widget,
        GtkWidget *vbox;
 
        g_return_if_fail (combo_box != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo_box));
        g_return_if_fail (display_widget  != NULL);
        g_return_if_fail (GTK_IS_WIDGET (display_widget));
 
@@ -768,7 +768,7 @@ void
 mygal_combo_box_set_arrow_relief (MygalComboBox *cc, GtkReliefStyle relief)
 {
        g_return_if_fail (cc != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (cc));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (cc));
 
        gtk_button_set_relief (GTK_BUTTON (cc->priv->arrow_button), relief);
 }
@@ -792,7 +792,7 @@ mygal_combo_box_set_title (MygalComboBox *combo,
                         const gchar *title)
 {
        g_return_if_fail (combo != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo));
        
        g_object_set_data_full (G_OBJECT (combo), "gtk-combo-title",
                                g_strdup (title), (GDestroyNotify) g_free);
@@ -826,7 +826,7 @@ void
 mygal_combo_box_set_tearable (MygalComboBox *combo, gboolean tearable)
 {
        g_return_if_fail (combo != NULL);
-       g_return_if_fail (GTK_IS_COMBO_BOX (combo));
+       g_return_if_fail (MYGAL_IS_COMBO_BOX (combo));
 
        if (tearable){
                gtk_widget_show (combo->priv->tearable);
diff --git a/glabels2/src/mygal/mygal-combo-box.h b/glabels2/src/mygal/mygal-combo-box.h
index 25a8df1499c1cceb83144f4d72d02b374d1862d5..e1785f2d6687edc080f4809d5ec8cc3a7f25df2d 100644 (file)
--- a/glabels2/src/mygal/mygal-combo-box.h
+++ b/glabels2/src/mygal/mygal-combo-box.h
@@ -36,7 +36,7 @@ extern "C" {
 #define MYGAL_COMBO_BOX_TYPE          (mygal_combo_box_get_type())
 #define MYGAL_COMBO_BOX(obj)         G_TYPE_CHECK_INSTANCE_CAST (obj, mygal_combo_box_get_type (), MygalComboBox)
 #define MYGAL_COMBO_BOX_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, mygal_combo_box_get_type (), MygalComboBoxClass)
-#define GTK_IS_COMBO_BOX(obj)         G_TYPE_CHECK_INSTANCE_TYPE (obj, mygal_combo_box_get_type ())
+#define MYGAL_IS_COMBO_BOX(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, mygal_combo_box_get_type ())
 
 typedef struct _MygalComboBox       MygalComboBox;
 typedef struct _MygalComboBoxPrivate MygalComboBoxPrivate;
diff --git a/glabels2/src/prefs-dialog.glade b/glabels2/src/prefs-dialog.glade
index 10d32ea755b210444771469d98a5f1cb29842751..5b7abf9f772b8215762b925f3af7e309b707cd6b 100644 (file)
--- a/glabels2/src/prefs-dialog.glade
+++ b/glabels2/src/prefs-dialog.glade
@@ -1091,80 +1091,66 @@
                      </child>
 
                      <child>
-                       <widget class="GtkVBox" id="vbox7">
-                         <property name="border_width">6</property>
+                       <widget class="GtkTable" id="table4">
                          <property name="visible">True</property>
+                         <property name="n_rows">1</property>
+                         <property name="n_columns">2</property>
                          <property name="homogeneous">False</property>
-                         <property name="spacing">12</property>
+                         <property name="row_spacing">12</property>
+                         <property name="column_spacing">12</property>
 
                          <child>
-                           <widget class="GtkTable" id="table3">
+                           <widget class="GtkLabel" id="label20">
+                             <property name="width_request">90</property>
                              <property name="visible">True</property>
-                             <property name="n_rows">1</property>
-                             <property name="n_columns">2</property>
-                             <property name="homogeneous">False</property>
-                             <property name="row_spacing">0</property>
-                             <property name="column_spacing">0</property>
+                             <property name="label" translatable="yes">Color:</property>
+                             <property name="use_underline">False</property>
+                             <property name="use_markup">False</property>
+                             <property name="justify">GTK_JUSTIFY_LEFT</property>
+                             <property name="wrap">False</property>
+                             <property name="selectable">False</property>
+                             <property name="xalign">0</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xpad">0</property>
+                             <property name="ypad">0</property>
+                           </widget>
+                           <packing>
+                             <property name="left_attach">0</property>
+                             <property name="right_attach">1</property>
+                             <property name="top_attach">0</property>
+                             <property name="bottom_attach">1</property>
+                             <property name="x_options">fill</property>
+                             <property name="y_options"></property>
+                           </packing>
+                         </child>
 
-                             <child>
-                               <widget class="GtkLabel" id="label20">
-                                 <property name="width_request">90</property>
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Color:</property>
-                                 <property name="use_underline">False</property>
-                                 <property name="use_markup">False</property>
-                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">0</property>
-                                 <property name="ypad">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="left_attach">0</property>
-                                 <property name="right_attach">1</property>
-                                 <property name="top_attach">0</property>
-                                 <property name="bottom_attach">1</property>
-                                 <property name="x_options">fill</property>
-                                 <property name="y_options"></property>
-                               </packing>
-                             </child>
+                         <child>
+                           <widget class="GtkHBox" id="hbox11">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">12</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox11">
+                               <widget class="Custom" id="fill_color_combo">
                                  <property name="visible">True</property>
-                                 <property name="homogeneous">False</property>
-                                 <property name="spacing">12</property>
-
-                                 <child>
-                                   <widget class="Custom" id="fill_color_combo">
-                                     <property name="visible">True</property>
-                                     <property name="creation_function">gl_object_editor_construct_color_combo</property>
-                                     <property name="int1">0</property>
-                                     <property name="int2">0</property>
-                                     <property name="last_modification_time">Sun, 23 Nov 2003 15:43:12 GMT</property>
-                                   </widget>
-                                   <packing>
-                                     <property name="padding">0</property>
-                                     <property name="expand">False</property>
-                                     <property name="fill">False</property>
-                                   </packing>
-                                 </child>
+                                 <property name="creation_function">gl_object_editor_construct_color_combo</property>
+                                 <property name="int1">0</property>
+                                 <property name="int2">0</property>
+                                 <property name="last_modification_time">Sun, 23 Nov 2003 15:43:12 GMT</property>
                                </widget>
                                <packing>
-                                 <property name="left_attach">1</property>
-                                 <property name="right_attach">2</property>
-                                 <property name="top_attach">0</property>
-                                 <property name="bottom_attach">1</property>
-                                 <property name="y_options">fill</property>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
                                </packing>
                              </child>
                            </widget>
                            <packing>
-                             <property name="padding">0</property>
-                             <property name="expand">True</property>
-                             <property name="fill">True</property>
+                             <property name="left_attach">1</property>
+                             <property name="right_attach">2</property>
+                             <property name="top_attach">0</property>
+                             <property name="bottom_attach">1</property>
+                             <property name="y_options">fill</property>
                            </packing>
                          </child>
                        </widget>
gLabels Debian packaging