Renamed from set_menu_sensitivity. Also sensitize the toolbar widgets.

1999-09-23  Federico Mena Quintero  <federico@redhat.com>

	* window.c (set_menu_tb_sensitivity): Renamed from
	set_menu_sensitivity.  Also sensitize the toolbar widgets.
	(WindowPrivate): Added a field to keep the zoom toolbar items.
	(window_destroy): Free said array.

	* tb-image.c (tb_image_new): Also return an array with the widgets
	for the zoom buttons.

	* stock.c (stock_init): New function to initialize the stock
	pixmaps.

	* tb-image.c (toolbar): Use the stock pixmaps.

	* main.c (main): Initialize the stock pixmaps.

	* Makefile.am (SUBDIRS): Process the stock directory.
This commit is contained in:
Federico Mena Quintero 1999-09-23 04:43:44 +00:00 committed by Arturo Espinosa
parent 3910cc3228
commit f876eba7c3
16 changed files with 951 additions and 9 deletions

View file

@ -1,3 +1,7 @@
1999-09-23 Federico Mena Quintero <federico@redhat.com>
* configure.in: Output the src/stock/Makefile as well.
1999-09-15 Federico Mena Quintero <federico@redhat.com>
* Started the ChangeLog.

View file

@ -38,4 +38,5 @@ intl/Makefile
macros/Makefile
po/Makefile.in
src/Makefile
src/stock/Makefile
])

View file

@ -1,3 +1,22 @@
1999-09-23 Federico Mena Quintero <federico@redhat.com>
* window.c (set_menu_tb_sensitivity): Renamed from
set_menu_sensitivity. Also sensitize the toolbar widgets.
(WindowPrivate): Added a field to keep the zoom toolbar items.
(window_destroy): Free said array.
* tb-image.c (tb_image_new): Also return an array with the widgets
for the zoom buttons.
* stock.c (stock_init): New function to initialize the stock
pixmaps.
* tb-image.c (toolbar): Use the stock pixmaps.
* main.c (main): Initialize the stock pixmaps.
* Makefile.am (SUBDIRS): Process the stock directory.
1999-09-22 Federico Mena Quintero <federico@redhat.com>
* main.c (main): Use gtk_widget_show_now(). This will be better

View file

@ -1,3 +1,5 @@
SUBDIRS = stock
INCLUDES = \
-I$(includedir) \
$(EXTRA_GNOME_CFLAGS) \
@ -16,6 +18,8 @@ eog_SOURCES = \
main.c \
render.c \
render.h \
stock.c \
stock.h \
tb-image.c \
tb-image.h \
ui-image.c \

View file

@ -21,6 +21,7 @@
#include <config.h>
#include <gnome.h>
#include "stock.h"
#include "util.h"
#include "window.h"
@ -39,6 +40,8 @@ main (int argc, char **argv)
gnome_init_with_popt_table (PACKAGE, VERSION, argc, argv, NULL, 0, &ctx);
gdk_rgb_init ();
stock_init ();
args = poptGetArgs (ctx);
opened = FALSE;

68
src/stock.c Normal file
View file

@ -0,0 +1,68 @@
/* Eye of Gnome image viewer - stock icons
*
* Copyright (C) 1999 The Free Software Foundation
*
* Author: Federico Mena-Quintero <federico@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <gnome.h>
#include "stock.h"
#include "stock/stock-zoom-1.xpm"
#include "stock/stock-zoom-fit.xpm"
#include "stock/stock-zoom-in.xpm"
#include "stock/stock-zoom-out.xpm"
/**
* stock_init:
* @void:
*
* Initializes the stock icons by registering them against gnome-stock.
**/
void
stock_init (void)
{
static GnomeStockPixmapEntry entries[4];
entries[0].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA;
entries[0].data.width = 24;
entries[0].data.height = 24;
entries[0].data.xpm_data = stock_zoom_1_xpm;
entries[1].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA;
entries[1].data.width = 24;
entries[1].data.height = 24;
entries[1].data.xpm_data = stock_zoom_fit_xpm;
entries[2].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA;
entries[2].data.width = 24;
entries[2].data.height = 24;
entries[2].data.xpm_data = stock_zoom_in_xpm;
entries[3].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA;
entries[3].data.width = 24;
entries[3].data.height = 24;
entries[3].data.xpm_data = stock_zoom_out_xpm;
gnome_stock_pixmap_register (STOCK_ZOOM_1, GNOME_STOCK_PIXMAP_REGULAR, &entries[0]);
gnome_stock_pixmap_register (STOCK_ZOOM_FIT, GNOME_STOCK_PIXMAP_REGULAR, &entries[1]);
gnome_stock_pixmap_register (STOCK_ZOOM_IN, GNOME_STOCK_PIXMAP_REGULAR, &entries[2]);
gnome_stock_pixmap_register (STOCK_ZOOM_OUT, GNOME_STOCK_PIXMAP_REGULAR, &entries[3]);
}

39
src/stock.h Normal file
View file

@ -0,0 +1,39 @@
/* Eye of Gnome image viewer - stock icons
*
* Copyright (C) 1999 The Free Software Foundation
*
* Author: Federico Mena-Quintero <federico@gimp.org>
*
* 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef STOCK_H
#define STOCK_H
/* Stock names */
#define STOCK_ZOOM_1 "EOG_stock_zoom_1"
#define STOCK_ZOOM_FIT "EOG_stock_zoom_fit"
#define STOCK_ZOOM_IN "EOG_stock_zoom_in"
#define STOCK_ZOOM_OUT "EOG_stock_zoom_out"
void stock_init (void);
#endif

2
src/stock/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in

5
src/stock/Makefile.am Normal file
View file

@ -0,0 +1,5 @@
EXTRA_DIST = \
stock-zoom-1.xpm \
stock-zoom-fit.xpm \
stock-zoom-in.xpm \
stock-zoom-out.xpm

184
src/stock/stock-zoom-1.xpm Normal file
View file

@ -0,0 +1,184 @@
/* XPM */
static char * stock_zoom_1_xpm[] = {
"24 24 157 2",
" c None",
". c #000000",
"+ c #30302D",
"@ c #7E7E75",
"# c #B3B3A5",
"$ c #CFCFBE",
"% c #D2D2C1",
"& c #BABAAA",
"* c #848479",
"= c #31312D",
"- c #87877F",
"; c #D7D7CC",
"> c #DADACD",
", c #DADACC",
"' c #DADACB",
") c #DCDCCC",
"! c #DFDFCF",
"~ c #DEDECD",
"{ c #D9D9C8",
"] c #7E7E73",
"^ c #A6A69D",
"/ c #E2E2D9",
"( c #E9E9E2",
"_ c #EAEAE2",
": c #E6E6DB",
"< c #E3E3D5",
"[ c #E3E3D3",
"} c #DFDFCE",
"| c #D9D9C7",
"1 c #D4D4C3",
"2 c #929285",
"3 c #86867E",
"4 c #E0E0D8",
"5 c #F0F0EB",
"6 c #F8F8F5",
"7 c #F7F7F3",
"8 c #F0F0E9",
"9 c #EAEADF",
"0 c #E2E2D4",
"a c #DADACA",
"b c #D3D3C2",
"c c #CECEBD",
"d c #C9C9B8",
"e c #C4C4B4",
"f c #717168",
"g c #30302C",
"h c #D6D6CA",
"i c #E7E7DF",
"j c #F6F6F3",
"k c #FEFEFD",
"l c #FCFCFA",
"m c #F5F5EF",
"n c #DFDFD0",
"o c #D6D6C6",
"p c #C4C4B3",
"q c #BFBFAE",
"r c #B9B9AA",
"s c #282824",
"t c #D9D9CC",
"u c #E6E6DD",
"v c #F3F3EE",
"w c #E4E4D9",
"x c #D9D9CA",
"y c #D0D0C0",
"z c #C8C8B9",
"A c #B9B9A9",
"B c #B4B4A4",
"C c #68685F",
"D c #B3B3A6",
"E c #E4E4D8",
"F c #E7E7DC",
"G c #CACABA",
"H c #B3B3A4",
"I c #AEAE9F",
"J c #909083",
"K c #D1D1C0",
"L c #DBDBCC",
"M c #C3C3B3",
"N c #A9A99A",
"O c #A1A192",
"P c #D5D5C3",
"Q c #E2E2D1",
"R c #D0D0C1",
"S c #C3C3B2",
"T c #BDBDAC",
"U c #B7B7A8",
"V c #A8A899",
"W c #A3A395",
"X c #9B9B8D",
"Y c #BDBDAE",
"Z c #DBDBCA",
"` c #C8C8B8",
" . c #B7B7A7",
".. c #B2B2A2",
"+. c #A3A394",
"@. c #9E9E8F",
"#. c #828275",
"$. c #DADAC8",
"%. c #D5D5C4",
"&. c #D0D0BF",
"*. c #C1C1B0",
"=. c #B1B1A2",
"-. c #ACAC9D",
";. c #9D9D8F",
">. c #98988A",
",. c #57574F",
"'. c #CACAB9",
"). c #BBBBAB",
"!. c #B6B6A6",
"~. c #B1B1A1",
"{. c #A7A798",
"]. c #989889",
"^. c #1F1F1C",
"/. c #7B7B71",
"(. c #C5C5B4",
"_. c #C0C0AF",
":. c #BABAAB",
"<. c #B5B5A6",
"[. c #B0B0A1",
"}. c #ABAB9C",
"|. c #A6A697",
"1. c #A1A193",
"2. c #9C9C8E",
"3. c #979789",
"4. c #929284",
"5. c #53534B",
"6. c #8D8D82",
"7. c #BFBFAF",
"8. c #B5B5A5",
"9. c #B0B0A0",
"0. c #9C9C8D",
"a. c #969689",
"b. c #919184",
"c. c #65655C",
"d. c #6E6E65",
"e. c #B4B4A5",
"f. c #AFAFA0",
"g. c #AAAA9B",
"h. c #A5A596",
"i. c #A0A092",
"j. c #969688",
"k. c #919183",
"l. c #241D14",
"m. c #211100",
"n. c #262623",
"o. c #8C8C80",
"p. c #9D9D8E",
"q. c #7F7F74",
"r. c #55554E",
"s. c #E9D1B8",
"t. c #A6825C",
"u. c #582D00",
"v. c #0B0600",
"w. c #160B00",
"x. c #4D2800",
"y. c #371C00",
"z. c #372B1F",
" . . . . . . ",
" . . . . . . . . . . ",
" . . + @ # $ % & * = . . ",
" . . - ; > , ' ) ! ~ { ] . . ",
" . . ^ / ( _ : < [ } | 1 $ 2 . . ",
" . . 3 4 5 6 7 8 9 0 a b c d e f . . ",
" . g h i j k l m 9 n o $ d p q r s . ",
". . @ t u v . . 8 w x y z . . A B C . . ",
". . D , E . . . F . . G . . . H I J . . ",
". . K L 0 . . . > . . M . . . I N O . . ",
". . P } Q ! . . R G S T U . . V W X . . ",
". . Y } Z o . . ` . . .... . +.@.#.. . ",
". . * $.%.&.. . *.. . =.-.. . ;.>.,.. . ",
" . g 1 $ '.. . ).!.~.-.{.. . ].2 ^.. ",
" . . /.'.(._.:.<.[.}.|.1.2.3.4.5.. . ",
" . . 6.7.& 8.9.}.|.O 0.a.b.c.. . . ",
" . . d.e.f.g.h.i.X j.k.5.. . l.m.. ",
" . . n.c.o.p.].q.r.^.. . l.s.t.u.v. ",
" . . . . . . . . . . . w.t.s.t.u.v. ",
" . . . . . . . x.t.s.t.u.. ",
" v.u.t.s.t.y.. ",
" v.u.t.s.t.. ",
" v.x.t.s.. ",
" . w.z.. "};

View file

@ -0,0 +1,181 @@
/* XPM */
static char * stock_zoom_fit_xpm[] = {
"24 24 154 2",
" c None",
". c #000000",
"+ c #30302D",
"@ c #7E7E75",
"# c #B3B3A5",
"$ c #CFCFBE",
"% c #D2D2C1",
"& c #BABAAA",
"* c #848479",
"= c #31312D",
"- c #87877F",
"; c #D7D7CC",
"> c #DADACD",
", c #DADACC",
"' c #DADACB",
") c #DCDCCC",
"! c #DFDFCF",
"~ c #DEDECD",
"{ c #D9D9C8",
"] c #7E7E73",
"^ c #A6A69D",
"/ c #E2E2D9",
"( c #E9E9E2",
"_ c #EAEAE2",
": c #E6E6DB",
"< c #E3E3D5",
"[ c #E3E3D3",
"} c #DFDFCE",
"| c #D9D9C7",
"1 c #D4D4C3",
"2 c #929285",
"3 c #86867E",
"4 c #E0E0D8",
"5 c #EAEADF",
"6 c #E2E2D4",
"7 c #C4C4B4",
"8 c #717168",
"9 c #30302C",
"0 c #D6D6CA",
"a c #E7E7DF",
"b c #DFDFD0",
"c c #BFBFAE",
"d c #B9B9AA",
"e c #282824",
"f c #D9D9CC",
"g c #E6E6DD",
"h c #F9F9F5",
"i c #F0F0E9",
"j c #E4E4D9",
"k c #D9D9CA",
"l c #D0D0C0",
"m c #C8C8B9",
"n c #B9B9A9",
"o c #B4B4A4",
"p c #68685F",
"q c #B3B3A6",
"r c #E4E4D8",
"s c #EFEFE6",
"t c #E7E7DC",
"u c #DCDCCF",
"v c #D2D2C3",
"w c #CACABA",
"x c #C3C3B3",
"y c #B3B3A4",
"z c #AEAE9F",
"A c #909083",
"B c #D1D1C0",
"C c #DBDBCC",
"D c #E8E8DB",
"E c #E6E6DA",
"F c #E2E2D5",
"G c #CACABB",
"H c #BDBDAD",
"I c #B8B8A8",
"J c #B3B3A3",
"K c #A9A99A",
"L c #A1A192",
"M c #D5D5C3",
"N c #E2E2D1",
"O c #DBDBCB",
"P c #D6D6C7",
"Q c #D0D0C1",
"R c #C3C3B2",
"S c #BDBDAC",
"T c #B7B7A8",
"U c #B2B2A3",
"V c #ADAD9E",
"W c #A8A899",
"X c #A3A395",
"Y c #9B9B8D",
"Z c #BDBDAE",
"` c #DBDBCA",
" . c #CDCDBD",
".. c #C8C8B8",
"+. c #C1C1B2",
"@. c #BCBCAC",
"#. c #B7B7A7",
"$. c #B2B2A2",
"%. c #A3A394",
"&. c #9E9E8F",
"*. c #828275",
"=. c #DADAC8",
"-. c #D5D5C4",
";. c #C6C6B5",
">. c #C1C1B0",
",. c #BBBBAC",
"'. c #B6B6A7",
"). c #B1B1A2",
"!. c #ACAC9D",
"~. c #9D9D8F",
"{. c #98988A",
"]. c #57574F",
"^. c #B6B6A6",
"/. c #B1B1A1",
"(. c #989889",
"_. c #1F1F1C",
":. c #7B7B71",
"<. c #CACAB9",
"[. c #B0B0A1",
"}. c #ABAB9C",
"|. c #929284",
"1. c #53534B",
"2. c #8D8D82",
"3. c #BFBFAF",
"4. c #B5B5A5",
"5. c #B0B0A0",
"6. c #A6A697",
"7. c #9C9C8D",
"8. c #969689",
"9. c #919184",
"0. c #65655C",
"a. c #6E6E65",
"b. c #B4B4A5",
"c. c #AFAFA0",
"d. c #AAAA9B",
"e. c #A5A596",
"f. c #A0A092",
"g. c #969688",
"h. c #919183",
"i. c #241D14",
"j. c #211100",
"k. c #262623",
"l. c #8C8C80",
"m. c #9D9D8E",
"n. c #7F7F74",
"o. c #55554E",
"p. c #E9D1B8",
"q. c #A6825C",
"r. c #582D00",
"s. c #0B0600",
"t. c #160B00",
"u. c #4D2800",
"v. c #371C00",
"w. c #372B1F",
" . . . . . . ",
" . . . . . . . . . . ",
" . . + @ # $ % & * = . . ",
" . . - ; > , ' ) ! ~ { ] . . ",
" . . ^ / ( _ : < [ } | 1 $ 2 . . ",
" . . 3 4 . . . . 5 6 . . . . 7 8 . . ",
" . 9 0 a . . . . 5 b . . . . c d e . ",
". . @ f g . . h i j k l m . . n o p . . ",
". . q , r . . s t u v w x . . y z A . . ",
". . B C 6 D E F > v G x H I J z K L . . ",
". . M } N ! O P Q w R S T U V W X Y . . ",
". . Z } ` . . ...+.@.#.$.. . %.&.*.. . ",
". . * =.-.. . ;.>.,.'.).!.. . ~.{.].. . ",
" . 9 1 $ . . . . ^./.. . . . (.2 _.. ",
" . . :.<.. . . . [.}.. . . . |.1.. . ",
" . . 2.3.& 4.5.}.6.L 7.8.9.0.. . . ",
" . . a.b.c.d.e.f.Y g.h.1.. . i.j.. ",
" . . k.0.l.m.(.n.o._.. . i.p.q.r.s. ",
" . . . . . . . . . . . t.q.p.q.r.s. ",
" . . . . . . . u.q.p.q.r.. ",
" s.r.q.p.q.v.. ",
" s.r.q.p.q.. ",
" s.u.q.p.. ",
" . t.w.. "};

190
src/stock/stock-zoom-in.xpm Normal file
View file

@ -0,0 +1,190 @@
/* XPM */
static char * stock_zoom_in_xpm[] = {
"24 24 163 2",
" c None",
". c #000000",
"+ c #30302D",
"@ c #7E7E75",
"# c #B3B3A5",
"$ c #CFCFBE",
"% c #D2D2C1",
"& c #BABAAA",
"* c #848479",
"= c #31312D",
"- c #87877F",
"; c #D7D7CC",
"> c #DADACD",
", c #DADACC",
"' c #DADACB",
") c #DCDCCC",
"! c #DFDFCF",
"~ c #DEDECD",
"{ c #D9D9C8",
"] c #7E7E73",
"^ c #A6A69D",
"/ c #E2E2D9",
"( c #E9E9E2",
"_ c #EAEAE2",
": c #E6E6DB",
"< c #E3E3D5",
"[ c #E3E3D3",
"} c #DFDFCE",
"| c #D9D9C7",
"1 c #D4D4C3",
"2 c #929285",
"3 c #86867E",
"4 c #E0E0D8",
"5 c #F0F0EB",
"6 c #F8F8F5",
"7 c #F7F7F3",
"8 c #F0F0E9",
"9 c #DADACA",
"0 c #D3D3C2",
"a c #CECEBD",
"b c #C9C9B8",
"c c #C4C4B4",
"d c #717168",
"e c #30302C",
"f c #D6D6CA",
"g c #E7E7DF",
"h c #F6F6F3",
"i c #FEFEFD",
"j c #FCFCFA",
"k c #F5F5EF",
"l c #D6D6C6",
"m c #C4C4B3",
"n c #BFBFAE",
"o c #B9B9AA",
"p c #282824",
"q c #D9D9CC",
"r c #E6E6DD",
"s c #F3F3EE",
"t c #FAFAF7",
"u c #F9F9F5",
"v c #D0D0C0",
"w c #C8C8B9",
"x c #C3C3B3",
"y c #BEBEAE",
"z c #B9B9A9",
"A c #B4B4A4",
"B c #68685F",
"C c #B3B3A6",
"D c #E4E4D8",
"E c #EDEDE4",
"F c #F2F2EA",
"G c #EFEFE6",
"H c #E7E7DC",
"I c #CACABA",
"J c #BEBEAD",
"K c #B8B8A9",
"L c #B3B3A4",
"M c #AEAE9F",
"N c #909083",
"O c #D1D1C0",
"P c #DBDBCC",
"Q c #E2E2D4",
"R c #A9A99A",
"S c #A1A192",
"T c #D5D5C3",
"U c #E2E2D1",
"V c #A8A899",
"W c #A3A395",
"X c #9B9B8D",
"Y c #BDBDAE",
"Z c #DBDBCA",
"` c #D2D2C2",
" . c #CDCDBD",
".. c #C8C8B8",
"+. c #B7B7A7",
"@. c #B2B2A2",
"#. c #ADAD9E",
"$. c #A3A394",
"%. c #9E9E8F",
"&. c #828275",
"*. c #DADAC8",
"=. c #D5D5C4",
"-. c #D0D0BF",
";. c #CBCBBA",
">. c #C6C6B5",
",. c #C1C1B0",
"'. c #B1B1A2",
"). c #ACAC9D",
"!. c #A7A798",
"~. c #A2A294",
"{. c #9D9D8F",
"]. c #98988A",
"^. c #57574F",
"/. c #CACAB9",
"(. c #C5C5B5",
"_. c #C0C0B0",
":. c #BBBBAB",
"<. c #A2A293",
"[. c #9D9D8E",
"}. c #989889",
"|. c #1F1F1C",
"1. c #7B7B71",
"2. c #C5C5B4",
"3. c #C0C0AF",
"4. c #BABAAB",
"5. c #B5B5A6",
"6. c #A6A697",
"7. c #A1A193",
"8. c #9C9C8E",
"9. c #979789",
"0. c #929284",
"a. c #53534B",
"b. c #8D8D82",
"c. c #BFBFAF",
"d. c #B5B5A5",
"e. c #B0B0A0",
"f. c #ABAB9C",
"g. c #9C9C8D",
"h. c #969689",
"i. c #919184",
"j. c #65655C",
"k. c #6E6E65",
"l. c #B4B4A5",
"m. c #AFAFA0",
"n. c #AAAA9B",
"o. c #A5A596",
"p. c #A0A092",
"q. c #969688",
"r. c #919183",
"s. c #241D14",
"t. c #211100",
"u. c #262623",
"v. c #8C8C80",
"w. c #7F7F74",
"x. c #55554E",
"y. c #E9D1B8",
"z. c #A6825C",
"A. c #582D00",
"B. c #0B0600",
"C. c #160B00",
"D. c #4D2800",
"E. c #371C00",
"F. c #372B1F",
" . . . . . . ",
" . . . . . . . . . . ",
" . . + @ # $ % & * = . . ",
" . . - ; > , ' ) ! ~ { ] . . ",
" . . ^ / ( _ : < [ } | 1 $ 2 . . ",
" . . 3 4 5 6 7 8 . . 9 0 a b c d . . ",
" . e f g h i j k . . l $ b m n o p . ",
". . @ q r s t u 8 . . v w x y z A B . . ",
". . C , D E F G H . . I x J K L M N . . ",
". . O P Q . . . . . . . . . . M R S . . ",
". . T } U . . . . . . . . . . V W X . . ",
". . Y } Z l ` .... . +.@.#.V $.%.&.. . ",
". . * *.=.-.;.>.,.. . '.).!.~.{.].^.. . ",
" . e 1 $ /.(._.:.. . ).!.<.[.}.2 |.. ",
" . . 1./.2.3.4.5.. . 6.7.8.9.0.a.. . ",
" . . b.c.& d.e.f.6.S g.h.i.j.. . . ",
" . . k.l.m.n.o.p.X q.r.a.. . s.t.. ",
" . . u.j.v.[.}.w.x.|.. . s.y.z.A.B. ",
" . . . . . . . . . . . C.z.y.z.A.B. ",
" . . . . . . . D.z.y.z.A.. ",
" B.A.z.y.z.E.. ",
" B.A.z.y.z.. ",
" B.D.z.y.. ",
" . C.F.. "};

View file

@ -0,0 +1,203 @@
/* XPM */
static char * stock_zoom_out_xpm[] = {
"24 24 176 2",
" c None",
". c #000000",
"+ c #30302D",
"@ c #7E7E75",
"# c #B3B3A5",
"$ c #CFCFBE",
"% c #D2D2C1",
"& c #BABAAA",
"* c #848479",
"= c #31312D",
"- c #87877F",
"; c #D7D7CC",
"> c #DADACD",
", c #DADACC",
"' c #DADACB",
") c #DCDCCC",
"! c #DFDFCF",
"~ c #DEDECD",
"{ c #D9D9C8",
"] c #7E7E73",
"^ c #A6A69D",
"/ c #E2E2D9",
"( c #E9E9E2",
"_ c #EAEAE2",
": c #E6E6DB",
"< c #E3E3D5",
"[ c #E3E3D3",
"} c #DFDFCE",
"| c #D9D9C7",
"1 c #D4D4C3",
"2 c #929285",
"3 c #86867E",
"4 c #E0E0D8",
"5 c #F0F0EB",
"6 c #F8F8F5",
"7 c #F7F7F3",
"8 c #F0F0E9",
"9 c #EAEADF",
"0 c #E2E2D4",
"a c #DADACA",
"b c #D3D3C2",
"c c #CECEBD",
"d c #C9C9B8",
"e c #C4C4B4",
"f c #717168",
"g c #30302C",
"h c #D6D6CA",
"i c #E7E7DF",
"j c #F6F6F3",
"k c #FEFEFD",
"l c #FCFCFA",
"m c #F5F5EF",
"n c #DFDFD0",
"o c #D6D6C6",
"p c #C4C4B3",
"q c #BFBFAE",
"r c #B9B9AA",
"s c #282824",
"t c #D9D9CC",
"u c #E6E6DD",
"v c #F3F3EE",
"w c #FAFAF7",
"x c #F9F9F5",
"y c #E4E4D9",
"z c #D9D9CA",
"A c #D0D0C0",
"B c #C8C8B9",
"C c #C3C3B3",
"D c #BEBEAE",
"E c #B9B9A9",
"F c #B4B4A4",
"G c #68685F",
"H c #B3B3A6",
"I c #E4E4D8",
"J c #EDEDE4",
"K c #F2F2EA",
"L c #EFEFE6",
"M c #E7E7DC",
"N c #DCDCCF",
"O c #D2D2C3",
"P c #CACABA",
"Q c #BEBEAD",
"R c #B8B8A9",
"S c #B3B3A4",
"T c #AEAE9F",
"U c #909083",
"V c #D1D1C0",
"W c #DBDBCC",
"X c #A9A99A",
"Y c #A1A192",
"Z c #D5D5C3",
"` c #E2E2D1",
" . c #A8A899",
".. c #A3A395",
"+. c #9B9B8D",
"@. c #BDBDAE",
"#. c #DBDBCA",
"$. c #D2D2C2",
"%. c #CDCDBD",
"&. c #C8C8B8",
"*. c #C1C1B2",
"=. c #BCBCAC",
"-. c #B7B7A7",
";. c #B2B2A2",
">. c #ADAD9E",
",. c #A3A394",
"'. c #9E9E8F",
"). c #828275",
"!. c #DADAC8",
"~. c #D5D5C4",
"{. c #D0D0BF",
"]. c #CBCBBA",
"^. c #C6C6B5",
"/. c #C1C1B0",
"(. c #BBBBAC",
"_. c #B6B6A7",
":. c #B1B1A2",
"<. c #ACAC9D",
"[. c #A7A798",
"}. c #A2A294",
"|. c #9D9D8F",
"1. c #98988A",
"2. c #57574F",
"3. c #CACAB9",
"4. c #C5C5B5",
"5. c #C0C0B0",
"6. c #BBBBAB",
"7. c #B6B6A6",
"8. c #B1B1A1",
"9. c #A2A293",
"0. c #9D9D8E",
"a. c #989889",
"b. c #1F1F1C",
"c. c #7B7B71",
"d. c #C5C5B4",
"e. c #C0C0AF",
"f. c #BABAAB",
"g. c #B5B5A6",
"h. c #B0B0A1",
"i. c #ABAB9C",
"j. c #A6A697",
"k. c #A1A193",
"l. c #9C9C8E",
"m. c #979789",
"n. c #929284",
"o. c #53534B",
"p. c #8D8D82",
"q. c #BFBFAF",
"r. c #B5B5A5",
"s. c #B0B0A0",
"t. c #9C9C8D",
"u. c #969689",
"v. c #919184",
"w. c #65655C",
"x. c #6E6E65",
"y. c #B4B4A5",
"z. c #AFAFA0",
"A. c #AAAA9B",
"B. c #A5A596",
"C. c #A0A092",
"D. c #969688",
"E. c #919183",
"F. c #241D14",
"G. c #211100",
"H. c #262623",
"I. c #8C8C80",
"J. c #7F7F74",
"K. c #55554E",
"L. c #E9D1B8",
"M. c #A6825C",
"N. c #582D00",
"O. c #0B0600",
"P. c #160B00",
"Q. c #4D2800",
"R. c #371C00",
"S. c #372B1F",
" . . . . . . ",
" . . . . . . . . . . ",
" . . + @ # $ % & * = . . ",
" . . - ; > , ' ) ! ~ { ] . . ",
" . . ^ / ( _ : < [ } | 1 $ 2 . . ",
" . . 3 4 5 6 7 8 9 0 a b c d e f . . ",
" . g h i j k l m 9 n o $ d p q r s . ",
". . @ t u v w x 8 y z A B C D E F G . . ",
". . H , I J K L M N O P C Q R S T U . . ",
". . V W 0 . . . . . . . . . . T X Y . . ",
". . Z } ` . . . . . . . . . . ...+.. . ",
". . @.} #.o $.%.&.*.=.-.;.>. .,.'.).. . ",
". . * !.~.{.].^./.(._.:.<.[.}.|.1.2.. . ",
" . g 1 $ 3.4.5.6.7.8.<.[.9.0.a.2 b.. ",
" . . c.3.d.e.f.g.h.i.j.k.l.m.n.o.. . ",
" . . p.q.& r.s.i.j.Y t.u.v.w.. . . ",
" . . x.y.z.A.B.C.+.D.E.o.. . F.G.. ",
" . . H.w.I.0.a.J.K.b.. . F.L.M.N.O. ",
" . . . . . . . . . . . P.M.L.M.N.O. ",
" . . . . . . . Q.M.L.M.N.. ",
" O.N.M.L.M.R.. ",
" O.N.M.L.M.. ",
" O.Q.M.L.. ",
" . P.S.. "};

View file

@ -22,6 +22,7 @@
#include <config.h>
#include <gnome.h>
#include "commands.h"
#include "stock.h"
#include "tb-image.h"
@ -34,10 +35,15 @@ static GnomeUIInfo toolbar[] = {
GNOMEUIINFO_ITEM_STOCK (N_("Close"), N_("Close the current window"),
cmd_cb_window_close, GNOME_STOCK_PIXMAP_CLOSE),
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_ITEM_NONE (N_("In"), NULL, cmd_cb_zoom_in),
GNOMEUIINFO_ITEM_NONE (N_("Out"), NULL, cmd_cb_zoom_out),
GNOMEUIINFO_ITEM_NONE (N_("1:1"), NULL, cmd_cb_zoom_1),
GNOMEUIINFO_ITEM_NONE (N_("Fit"), NULL, cmd_cb_zoom_fit),
/* Index of the first zoom item and number of zoom items */
#define ZOOM_INDEX 3
#define ZOOM_ITEMS 4
GNOMEUIINFO_ITEM_STOCK (N_("In"), NULL, cmd_cb_zoom_in, STOCK_ZOOM_IN),
GNOMEUIINFO_ITEM_STOCK (N_("Out"), NULL, cmd_cb_zoom_out, STOCK_ZOOM_OUT),
GNOMEUIINFO_ITEM_STOCK (N_("1:1"), NULL, cmd_cb_zoom_1, STOCK_ZOOM_1),
GNOMEUIINFO_ITEM_STOCK (N_("Fit"), NULL, cmd_cb_zoom_fit, STOCK_ZOOM_FIT),
GNOMEUIINFO_END
};
@ -46,15 +52,23 @@ static GnomeUIInfo toolbar[] = {
/**
* tb_image_new:
* @window: An image window.
* @zoom_items: A NULL-terminated array of widgets for the zoom buttons is
* returned here.
*
* Creates a toolbar suitable for image windows.
*
* Return value: A newly-created toolbar.
**/
GtkWidget *
tb_image_new (Window *window)
tb_image_new (Window *window, GtkWidget ***zoom_items)
{
GtkWidget *tb;
GtkWidget **items;
int i;
g_return_val_if_fail (window != NULL, NULL);
g_return_val_if_fail (IS_WINDOW (window), NULL);
g_return_val_if_fail (zoom_items != NULL, NULL);
tb = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
gnome_app_fill_toolbar_with_data (GTK_TOOLBAR (tb),
@ -62,5 +76,13 @@ tb_image_new (Window *window)
GNOME_APP (window)->accel_group,
window);
items = g_new (GtkWidget *, ZOOM_ITEMS + 1);
*zoom_items = items;
for (i = 0; i < ZOOM_ITEMS; i++)
items[i] = toolbar[ZOOM_INDEX + i].widget;
items[i] = NULL;
return tb;
}

View file

@ -27,7 +27,7 @@
GtkWidget *tb_image_new (Window *window);
GtkWidget *tb_image_new (Window *window, GtkWidget ***zoom_items);

View file

@ -58,6 +58,9 @@ typedef struct {
/* View menu */
GtkWidget *view_menu;
/* Zoom toolbar items */
GtkWidget **zoom_tb_items;
} WindowPrivate;
@ -158,9 +161,18 @@ confirm_save (Window *window, gboolean ask_exit)
/* Setting the mode of a window */
static void
sensitize_zoom_items (GtkWidget **widgets, gboolean sensitive)
{
g_assert (widgets != NULL);
for (; *widgets != NULL; widgets++)
gtk_widget_set_sensitive (*widgets, sensitive);
}
/* Sets the sensitivity of menu items according to the mode */
static void
set_menu_sensitivity (Window *window)
set_menu_tb_sensitivity (Window *window)
{
WindowPrivate *priv;
@ -169,14 +181,17 @@ set_menu_sensitivity (Window *window)
switch (priv->mode) {
case WINDOW_MODE_NONE:
gtk_widget_set_sensitive (priv->view_menu, FALSE);
sensitize_zoom_items (priv->zoom_tb_items, FALSE);
break;
case WINDOW_MODE_IMAGE:
gtk_widget_set_sensitive (priv->view_menu, TRUE);
sensitize_zoom_items (priv->zoom_tb_items, TRUE);
break;
case WINDOW_MODE_COLLECTION:
gtk_widget_set_sensitive (priv->view_menu, FALSE);
sensitize_zoom_items (priv->zoom_tb_items, FALSE);
/* FIXME: finish this */
break;
@ -225,7 +240,7 @@ set_mode (Window *window, WindowMode mode)
g_assert_not_reached ();
}
set_menu_sensitivity (window);
set_menu_tb_sensitivity (window);
}
@ -488,6 +503,8 @@ window_destroy (GtkObject *object)
if (priv->file_sel)
gtk_widget_destroy (priv->file_sel);
g_free (priv->zoom_tb_items);
g_free (priv);
window_list = g_list_remove (window_list, window);
@ -548,7 +565,7 @@ window_construct (Window *window)
priv->view_menu = main_menu[1].widget;
tb = tb_image_new (window);
tb = tb_image_new (window, &priv->zoom_tb_items);
gnome_app_set_toolbar (GNOME_APP (window), GTK_TOOLBAR (tb));
gtk_window_set_default_size (GTK_WINDOW (window),