dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pixmaps/Makefile.am pixmaps/zoom_in.xpm removed. 

2002-01-02  Michael Natterer  <mitch@gimp.org>

	* pixmaps/Makefile.am
	* pixmaps/zoom_in.xpm
	* pixmaps/zoom_out.xpm: removed.

	* app/nav_window.c
	* plug-ins/Lighting/lighting_ui.c
	* plug-ins/MapObject/mapobject_ui.c: use GTK_STOCK_ZOOM_[IN|OUT]
	instead.
This commit is contained in:
Michael Natterer 2002-01-02 17:20:50 +00:00 committed by Michael Natterer
parent ac94892dc2
commit 5e3d59841d
9 changed files with 75 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-01-02 Michael Natterer <mitch@gimp.org>
* pixmaps/Makefile.am
* pixmaps/zoom_in.xpm
* pixmaps/zoom_out.xpm: removed.
* app/nav_window.c
* plug-ins/Lighting/lighting_ui.c
* plug-ins/MapObject/mapobject_ui.c: use GTK_STOCK_ZOOM_[IN|OUT]
instead.
2002-01-02 Michael Natterer <mitch@gimp.org>
* plug-ins/pagecurl/pagecurl.c: compile with GTK_DISABLE_DEPRECATED.

16
app/display/gimpnavigationeditor.c
View File

@ -52,9 +52,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \
@ -1583,6 +1580,7 @@ nav_create_button_area (NavigationDialog *nav_dialog)
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *button;
GtkWidget *image;
GtkWidget *hscale;
gchar scale_str[MAX_SCALE_BUF];
@ -1592,11 +1590,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomout),
nav_dialog);
@ -1610,11 +1612,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (hbox), nav_dialog->zoom_label, TRUE, TRUE, 0);
gtk_widget_show (nav_dialog->zoom_label);
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomin),
nav_dialog);

16
app/display/gimpnavigationview.c
View File

@ -52,9 +52,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \
@ -1583,6 +1580,7 @@ nav_create_button_area (NavigationDialog *nav_dialog)
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *button;
GtkWidget *image;
GtkWidget *hscale;
gchar scale_str[MAX_SCALE_BUF];
@ -1592,11 +1590,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomout),
nav_dialog);
@ -1610,11 +1612,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (hbox), nav_dialog->zoom_label, TRUE, TRUE, 0);
gtk_widget_show (nav_dialog->zoom_label);
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomin),
nav_dialog);

16
app/nav_window.c
View File

@ -52,9 +52,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \
@ -1583,6 +1580,7 @@ nav_create_button_area (NavigationDialog *nav_dialog)
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *button;
GtkWidget *image;
GtkWidget *hscale;
gchar scale_str[MAX_SCALE_BUF];
@ -1592,11 +1590,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomout),
nav_dialog);
@ -1610,11 +1612,15 @@ nav_create_button_area (NavigationDialog *nav_dialog)
gtk_box_pack_start (GTK_BOX (hbox), nav_dialog->zoom_label, TRUE, TRUE, 0);
gtk_widget_show (nav_dialog->zoom_label);
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
button = gtk_button_new ();
GTK_WIDGET_UNSET_FLAGS (button, GTK_RECEIVES_DEFAULT);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (navwindow_zoomin),
nav_dialog);

2
pixmaps/Makefile.am
View File

@ -10,8 +10,6 @@ EXTRA_DIST = @STRIP_BEGIN@ \
raise.xpm \
topath.xpm \
toselection.xpm \
zoom_in.xpm \
zoom_out.xpm \
\
default.xpm \
eek.xpm \

30
pixmaps/zoom_in.xpm
View File

@ -1,30 +0,0 @@
/* XPM */
static char * zoom_in_xpm[] = {
"18 18 9 1",
" c None",
". c #020204",
"+ c #B5B5B6",
"@ c #D0D0D1",
"# c #9A9A98",
"$ c #E8E8E9",
"% c #8F8F91",
"& c #6E6E6E",
"* c #5A5A5C",
" ... ",
" ..+@+.. ",
" .#@$$$@#. ",
" .%$$$.#$+&. ",
" .@$$$.#$@#. ",
" .+$$$$.+$$#&.",
" .@$.......@&.",
" .+$##+.&%&@*.",
" .@$$$.&#$&. ",
" .#+@@.&$%*. ",
" ..%#+#@%*. ",
" .#...&&*.. ",
" ..#. ... ",
" .$.. ",
" .$... ",
".$... ",
".#.. ",
" .. "};

30
pixmaps/zoom_out.xpm
View File

@ -1,30 +0,0 @@
/* XPM */
static char * zoom_out_xpm[] = {
"18 18 9 1",
" c None",
". c #020204",
"+ c #B5B5B6",
"@ c #D0D0D1",
"# c #9A9A98",
"$ c #E8E8E9",
"% c #8F8F91",
"& c #6E6E6E",
"* c #5A5A5C",
" ... ",
" ..+@+.. ",
" .#@$$$@#. ",
" .%$$$$$$+&. ",
" .@$$$$$$@#. ",
" .+$$$$$$$@#&.",
" .@$.......+&.",
" .+$@####%&+*.",
" .@$$$@+#$&. ",
" .#+@@+#$%*. ",
" ..%#+#@%*. ",
" .#...&&*.. ",
" ..#. ... ",
" .$.. ",
" .$... ",
".$... ",
".#.. ",
" .. "};

31
plug-ins/Lighting/lighting_ui.c
View File

@ -43,10 +43,6 @@
#include "high1.xpm"
#include "high2.xpm"
/*
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
*/
extern LightingValues mapvals;
@ -1127,6 +1123,9 @@ main_dialog (GimpDrawable *drawable)
GtkWidget *hbox;
GtkWidget *frame;
GtkWidget *button;
/*
GtkWidget *image;
*/
gimp_ui_init ("Lighting", FALSE);
@ -1202,23 +1201,33 @@ main_dialog (GimpDrawable *drawable)
gimp_help_set_help_data (button, _("Recompute preview image"), NULL);
/*
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
button = gtk_button_new ();
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (zoomout_callback),
NULL);
gtk_widget_show (button);
gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL);
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (zoomin_callback),
G_CALLBACK (zoomout_callback),
NULL);
button = gtk_button_new ();
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gimp_help_set_help_data (button, _("Zoom in (make image bigger)"), NULL);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (zoomin_callback),
NULL);
*/
create_main_notebook (main_hbox);

16
plug-ins/MapObject/mapobject_ui.c
View File

@ -29,9 +29,6 @@
#include "high1.xpm"
#include "high2.xpm"
#include "pixmaps/zoom_in.xpm"
#include "pixmaps/zoom_out.xpm"
GckVisualInfo *visinfo = NULL;
GdkGC *gc = NULL;
@ -1407,6 +1404,7 @@ main_dialog (GimpDrawable *drawable)
GtkWidget *hbox;
GtkWidget *frame;
GtkWidget *button;
GtkWidget *image;
GtkWidget *toggle;
gimp_ui_init ("MapObject", FALSE);
@ -1481,20 +1479,28 @@ main_dialog (GimpDrawable *drawable)
gimp_help_set_help_data (button, _("Recompute preview image"), NULL);
button = gimp_pixmap_button_new (zoom_out_xpm, NULL);
button = gtk_button_new ();
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (zoomout_callback),
NULL);
gimp_help_set_help_data (button, _("Zoom out (make image smaller)"), NULL);
button = gimp_pixmap_button_new (zoom_in_xpm, NULL);
button = gtk_button_new ();
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (zoomin_callback),
NULL);