No Subject
OK to commit?
Havoc
Index: libgnomeprintui/gpaui/add-printer-dialog.c
===================================================================
RCS file: /cvs/gnome/libgnomeprintui/libgnomeprintui/gpaui/add-printer-dialog.c,v
retrieving revision 1.5
diff -u -p -u -r1.5 add-printer-dialog.c
--- libgnomeprintui/gpaui/add-printer-dialog.c 2001/07/31 17:43:00 1.5
+++ libgnomeprintui/gpaui/add-printer-dialog.c 2001/10/28 23:24:05
@@ -23,8 +23,6 @@
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
#include <libgpa/gpa-printer.h>
#include "add-printer-dialog.h"
@@ -49,7 +47,7 @@ gpa_add_printer_widget_new (GPANode *nod
gpa = gpa_widget_new (GPA_TYPE_WIDGET, node);
- vb = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+ vb = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (gpa), vb);
gtk_widget_show (vb);
@@ -63,12 +61,12 @@ gpa_add_printer_widget_new (GPANode *nod
l = gtk_label_new (_("Manufacturer"));
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (t), l, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), l, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show (l);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (t), sw, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), sw, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (sw);
cl = gtk_clist_new (1);
@@ -82,12 +80,12 @@ gpa_add_printer_widget_new (GPANode *nod
l = gtk_label_new (_("Model"));
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (t), l, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), l, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show (l);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (t), sw, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), sw, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (sw);
cl = gtk_clist_new (1);
@@ -99,17 +97,17 @@ gpa_add_printer_widget_new (GPANode *nod
gtk_signal_connect (GTK_OBJECT (cl), "unselect_row", GTK_SIGNAL_FUNC (gpa_apw_unselect_model), gpa);
gtk_object_set_data (GTK_OBJECT (gpa), "model_list", cl);
- hb = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
- gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, GNOME_PAD_SMALL);
+ hb = gtk_hbox_new (FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 2);
gtk_widget_show (hb);
l = gtk_label_new (_("Name"));
gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5);
- gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 2);
gtk_widget_show (l);
e = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 2);
gtk_widget_show (e);
gtk_object_set_data (GTK_OBJECT (gpa), "name_entry", e);
@@ -265,7 +263,7 @@ gpa_add_printer_dialog_new (GPANode *nod
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
c = ((GtkDialog *) dialog)->vbox;
- gtk_container_set_border_width (GTK_CONTAINER (c), GNOME_PAD_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER (c), 2);
gpa = gpa_add_printer_widget_new (node);
gtk_box_pack_start (GTK_BOX (c), GTK_WIDGET (gpa), TRUE, TRUE, 4);
@@ -274,14 +272,14 @@ gpa_add_printer_dialog_new (GPANode *nod
c = ((GtkDialog *) dialog)->action_area;
b = gtk_button_new_with_label (_("From PPD..."));
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_widget_show (b);
- b = gnome_stock_button (GNOME_STOCK_BUTTON_OK);
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ b = gtk_button_new_stock (GTK_STOCK_OK);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (gpa_apd_ok_clicked), dialog);
gtk_widget_show (b);
- b = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL);
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ b = gtk_button_new_stock (GTK_STOCK_CANCEL);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (gpa_apd_cancel_clicked), dialog);
gtk_widget_show (b);
Index: libgnomeprintui/gpaui/config-dialog.c
===================================================================
RCS file: /cvs/gnome/libgnomeprintui/libgnomeprintui/gpaui/config-dialog.c,v
retrieving revision 1.1
diff -u -p -u -r1.1 config-dialog.c
--- libgnomeprintui/gpaui/config-dialog.c 2001/03/24 12:10:52 1.1
+++ libgnomeprintui/gpaui/config-dialog.c 2001/10/28 23:24:05
@@ -24,8 +24,6 @@
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "add-printer-dialog.h"
static void gpa_apw_select_vendor (GtkCList *clist, gint row, gint column, GdkEvent *event, GPAWidget *gpaw);
@@ -49,7 +47,7 @@ gpa_config_widget_new (GPANode *node)
gpa = gpa_widget_new (node);
- vb = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+ vb = gtk_vbox_new (FALSE, 2);
gtk_container_add (GTK_CONTAINER (gpa), vb);
gtk_widget_show (vb);
@@ -63,12 +61,12 @@ gpa_config_widget_new (GPANode *node)
l = gtk_label_new (_("Manufacturer"));
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (t), l, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), l, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show (l);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (t), sw, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), sw, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (sw);
cl = gtk_clist_new (1);
@@ -82,12 +80,12 @@ gpa_config_widget_new (GPANode *node)
l = gtk_label_new (_("Model"));
gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (t), l, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), l, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 2, 2);
gtk_widget_show (l);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy ((GtkScrolledWindow *) sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (t), sw, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, GNOME_PAD_SMALL, GNOME_PAD_SMALL);
+ gtk_table_attach (GTK_TABLE (t), sw, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
gtk_widget_show (sw);
cl = gtk_clist_new (1);
@@ -99,17 +97,17 @@ gpa_config_widget_new (GPANode *node)
gtk_signal_connect (GTK_OBJECT (cl), "unselect_row", GTK_SIGNAL_FUNC (gpa_apw_unselect_model), gpa);
gtk_object_set_data (GTK_OBJECT (gpa), "model_list", cl);
- hb = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
- gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, GNOME_PAD_SMALL);
+ hb = gtk_hbox_new (FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 2);
gtk_widget_show (hb);
l = gtk_label_new (_("Name"));
gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5);
- gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (hb), l, FALSE, FALSE, 2);
gtk_widget_show (l);
e = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (hb), e, TRUE, TRUE, 2);
gtk_widget_show (e);
gtk_object_set_data (GTK_OBJECT (gpa), "name_entry", e);
@@ -265,7 +263,7 @@ gpa_add_printer_dialog_new (GPANode *nod
gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
c = ((GtkDialog *) dialog)->vbox;
- gtk_container_set_border_width (GTK_CONTAINER (c), GNOME_PAD_SMALL);
+ gtk_container_set_border_width (GTK_CONTAINER (c), 2);
gpa = gpa_add_printer_widget_new (node);
gtk_box_pack_start (GTK_BOX (c), GTK_WIDGET (gpa), TRUE, TRUE, 4);
@@ -274,14 +272,14 @@ gpa_add_printer_dialog_new (GPANode *nod
c = ((GtkDialog *) dialog)->action_area;
b = gtk_button_new_with_label (_("From PPD..."));
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_widget_show (b);
- b = gnome_stock_button (GNOME_STOCK_BUTTON_OK);
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ b = gtk_button_new_stock (GTK_STOCK_OK);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (gpa_apd_ok_clicked), dialog);
gtk_widget_show (b);
- b = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL);
- gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, GNOME_PAD_SMALL);
+ b = gtk_button_new_stock (GTK_STOCK_CANCEL);
+ gtk_box_pack_start (GTK_BOX (c), b, FALSE, TRUE, 2);
gtk_signal_connect (GTK_OBJECT (b), "clicked", GTK_SIGNAL_FUNC (gpa_apd_cancel_clicked), dialog);
gtk_widget_show (b);
Index: libgnomeprintui/gpaui/media-orientation.c
===================================================================
RCS file: /cvs/gnome/libgnomeprintui/libgnomeprintui/gpaui/media-orientation.c,v
retrieving revision 1.2
diff -u -p -u -r1.2 media-orientation.c
--- libgnomeprintui/gpaui/media-orientation.c 2001/08/24 16:52:01 1.2
+++ libgnomeprintui/gpaui/media-orientation.c 2001/10/28 23:24:05
@@ -18,7 +18,6 @@
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkvbox.h>
#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-uidefs.h>
#include "media-orientation.h"
static void gpa_mow_changed (GtkWidget *w, GPAMediaOrientationWidget *mow);
@@ -51,21 +50,21 @@ gpa_media_orientation_widget_construct (
gpa_widget_construct (GPA_WIDGET (mow), node);
- vb = gtk_vbox_new (TRUE, GNOME_PAD_SMALL);
+ vb = gtk_vbox_new (TRUE, 2);
gtk_container_add (GTK_CONTAINER (mow), vb);
b = gtk_radio_button_new_with_label (NULL, _("Portrait"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (b));
- gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, 2);
gtk_object_set_data (GTK_OBJECT (mow), "portrait", b);
gtk_signal_connect (GTK_OBJECT (b), "toggled", GTK_SIGNAL_FUNC (gpa_mow_changed), mow);
b = gtk_radio_button_new_with_label (group, _("Landscape"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (b));
- gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, 2);
gtk_object_set_data (GTK_OBJECT (mow), "landscape", b);
gtk_signal_connect (GTK_OBJECT (b), "toggled", GTK_SIGNAL_FUNC (gpa_mow_changed), mow);
b = gtk_check_button_new_with_label (_("Rotate 180"));
- gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, GNOME_PAD_SMALL);
+ gtk_box_pack_start (GTK_BOX (vb), b, TRUE, FALSE, 2);
gtk_object_set_data (GTK_OBJECT (mow), "rotate", b);
gtk_signal_connect (GTK_OBJECT (b), "toggled", GTK_SIGNAL_FUNC (gpa_mow_changed), mow);
gtk_widget_show_all (vb);
[
Date Prev][Date Next] [
Thread Prev][Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
