shrinked most icons to their minimum size

--Sven
This commit is contained in:
Sven Neumann
1999-10-27 00:09:39 +00:00
parent a74d52fbbf
commit e547526eba
20 changed files with 235 additions and 314 deletions

View File

@ -1,3 +1,10 @@
Wed Oct 27 02:03:47 MEST 1999 Sven Neumann <sven@gimp.org>
* app/info_window.c
* app/ops_buttons.c: cosmetic changes
* pixmaps/*.xpm: cropped most of the icons to their minimum size
1999-10-26 Michael Natterer <mitch@gimp.org>
Put the active tool, brush, pattern and gradient to the context

View File

@ -179,42 +179,42 @@ info_window_image_preview_book (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table2);
gtk_container_add (GTK_CONTAINER (alignment), frame);
labelAvalue = gtk_label_new ("N/A");
labelAvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelAvalue);
gtk_table_attach (GTK_TABLE (table2), labelAvalue, 1, 2, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelBvalue = gtk_label_new ("N/A");
labelBvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelBvalue);
gtk_table_attach (GTK_TABLE (table2), labelBvalue, 1, 2, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelGvalue = gtk_label_new ("N/A");
labelGvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelGvalue);
gtk_table_attach (GTK_TABLE (table2), labelGvalue, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelRvalue = gtk_label_new ("N/A");
labelRvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelRvalue);
gtk_table_attach (GTK_TABLE (table2), labelRvalue, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelA = gtk_label_new ("A:");
labelA = gtk_label_new (_("A:"));
gtk_widget_show (labelA);
gtk_table_attach (GTK_TABLE (table2), labelA, 0, 1, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelB = gtk_label_new ("B:");
labelB = gtk_label_new (_("B:"));
gtk_widget_show (labelB);
gtk_table_attach (GTK_TABLE (table2), labelB, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelG = gtk_label_new ("G:");
labelG = gtk_label_new (_("G:"));
gtk_widget_show (labelG);
gtk_table_attach (GTK_TABLE (table2), labelG, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelR = gtk_label_new ("R:");
labelR = gtk_label_new (_("R:"));
gtk_widget_show (labelR);
gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
@ -227,7 +227,6 @@ info_window_image_preview_book (InfoDialog *info_win)
dropper_xpm);
pixmapwid = gtk_pixmap_new (pixmap, mask);
gtk_misc_set_alignment (GTK_MISC (pixmapwid), 0.2, 0.2);
gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (pixmapwid);
@ -417,7 +416,7 @@ info_window_update (InfoDialog *info_win,
unit_factor = gimp_unit_get_factor (gdisp->gimage->unit);
unit_digits = gimp_unit_get_digits (gdisp->gimage->unit);
g_snprintf (format_buf, sizeof (format_buf),
"%%d x %%d pixels (%%.%df x %%.%df %s)",
_("%%d x %%d pixels (%%.%df x %%.%df %s)"),
unit_digits + 1, unit_digits + 1,
gimp_unit_get_symbol (gdisp->gimage->unit));
g_snprintf (iwd->dimensions_str, MAX_BUF, format_buf,

View File

@ -179,42 +179,42 @@ info_window_image_preview_book (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table2);
gtk_container_add (GTK_CONTAINER (alignment), frame);
labelAvalue = gtk_label_new ("N/A");
labelAvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelAvalue);
gtk_table_attach (GTK_TABLE (table2), labelAvalue, 1, 2, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelBvalue = gtk_label_new ("N/A");
labelBvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelBvalue);
gtk_table_attach (GTK_TABLE (table2), labelBvalue, 1, 2, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelGvalue = gtk_label_new ("N/A");
labelGvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelGvalue);
gtk_table_attach (GTK_TABLE (table2), labelGvalue, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelRvalue = gtk_label_new ("N/A");
labelRvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelRvalue);
gtk_table_attach (GTK_TABLE (table2), labelRvalue, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelA = gtk_label_new ("A:");
labelA = gtk_label_new (_("A:"));
gtk_widget_show (labelA);
gtk_table_attach (GTK_TABLE (table2), labelA, 0, 1, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelB = gtk_label_new ("B:");
labelB = gtk_label_new (_("B:"));
gtk_widget_show (labelB);
gtk_table_attach (GTK_TABLE (table2), labelB, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelG = gtk_label_new ("G:");
labelG = gtk_label_new (_("G:"));
gtk_widget_show (labelG);
gtk_table_attach (GTK_TABLE (table2), labelG, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelR = gtk_label_new ("R:");
labelR = gtk_label_new (_("R:"));
gtk_widget_show (labelR);
gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
@ -227,7 +227,6 @@ info_window_image_preview_book (InfoDialog *info_win)
dropper_xpm);
pixmapwid = gtk_pixmap_new (pixmap, mask);
gtk_misc_set_alignment (GTK_MISC (pixmapwid), 0.2, 0.2);
gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (pixmapwid);
@ -417,7 +416,7 @@ info_window_update (InfoDialog *info_win,
unit_factor = gimp_unit_get_factor (gdisp->gimage->unit);
unit_digits = gimp_unit_get_digits (gdisp->gimage->unit);
g_snprintf (format_buf, sizeof (format_buf),
"%%d x %%d pixels (%%.%df x %%.%df %s)",
_("%%d x %%d pixels (%%.%df x %%.%df %s)"),
unit_digits + 1, unit_digits + 1,
gimp_unit_get_symbol (gdisp->gimage->unit));
g_snprintf (iwd->dimensions_str, MAX_BUF, format_buf,

View File

@ -179,42 +179,42 @@ info_window_image_preview_book (InfoDialog *info_win)
gtk_container_add (GTK_CONTAINER (frame), table2);
gtk_container_add (GTK_CONTAINER (alignment), frame);
labelAvalue = gtk_label_new ("N/A");
labelAvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelAvalue);
gtk_table_attach (GTK_TABLE (table2), labelAvalue, 1, 2, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelBvalue = gtk_label_new ("N/A");
labelBvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelBvalue);
gtk_table_attach (GTK_TABLE (table2), labelBvalue, 1, 2, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelGvalue = gtk_label_new ("N/A");
labelGvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelGvalue);
gtk_table_attach (GTK_TABLE (table2), labelGvalue, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelRvalue = gtk_label_new ("N/A");
labelRvalue = gtk_label_new (_("N/A"));
gtk_widget_show (labelRvalue);
gtk_table_attach (GTK_TABLE (table2), labelRvalue, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelA = gtk_label_new ("A:");
labelA = gtk_label_new (_("A:"));
gtk_widget_show (labelA);
gtk_table_attach (GTK_TABLE (table2), labelA, 0, 1, 4, 5,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelB = gtk_label_new ("B:");
labelB = gtk_label_new (_("B:"));
gtk_widget_show (labelB);
gtk_table_attach (GTK_TABLE (table2), labelB, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelG = gtk_label_new ("G:");
labelG = gtk_label_new (_("G:"));
gtk_widget_show (labelG);
gtk_table_attach (GTK_TABLE (table2), labelG, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
labelR = gtk_label_new ("R:");
labelR = gtk_label_new (_("R:"));
gtk_widget_show (labelR);
gtk_table_attach (GTK_TABLE (table2), labelR, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
@ -227,7 +227,6 @@ info_window_image_preview_book (InfoDialog *info_win)
dropper_xpm);
pixmapwid = gtk_pixmap_new (pixmap, mask);
gtk_misc_set_alignment (GTK_MISC (pixmapwid), 0.2, 0.2);
gtk_table_attach (GTK_TABLE (table2), pixmapwid, 0, 2, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (pixmapwid);
@ -417,7 +416,7 @@ info_window_update (InfoDialog *info_win,
unit_factor = gimp_unit_get_factor (gdisp->gimage->unit);
unit_digits = gimp_unit_get_digits (gdisp->gimage->unit);
g_snprintf (format_buf, sizeof (format_buf),
"%%d x %%d pixels (%%.%df x %%.%df %s)",
_("%%d x %%d pixels (%%.%df x %%.%df %s)"),
unit_digits + 1, unit_digits + 1,
gimp_unit_get_symbol (gdisp->gimage->unit));
g_snprintf (iwd->dimensions_str, MAX_BUF, format_buf,

View File

@ -36,39 +36,24 @@ ops_button_box_new (GtkWidget *parent,
{
GtkWidget *button;
GtkWidget *button_box;
GtkWidget *box;
GtkWidget *pixmapwid;
GtkWidget *pixmap_widget;
GdkPixmap *pixmap;
GdkBitmap *mask;
GtkStyle *style;
GSList *group = NULL;
GSList *box_list = NULL;
GSList *list;
gint max_width = 0;
gint width;
gint height;
gtk_widget_realize (parent);
style = gtk_widget_get_style (parent);
button_box = gtk_hbox_new (FALSE, 1);
button_box = gtk_hbox_new (TRUE, 1);
while (ops_button->xpm_data)
{
box = gtk_hbox_new (FALSE, 0);
gtk_container_set_border_width (GTK_CONTAINER (box), 0);
pixmap = gdk_pixmap_create_from_xpm_d (parent->window,
&mask,
&style->bg[GTK_STATE_NORMAL],
ops_button->xpm_data);
gdk_window_get_size (pixmap, &width, &height);
max_width = MAX (max_width, width);
pixmapwid = gtk_pixmap_new (pixmap, mask);
gtk_box_pack_start (GTK_BOX (box), pixmapwid, TRUE, TRUE, 1);
gtk_widget_show (pixmapwid);
box_list = g_slist_prepend (box_list, box);
pixmap_widget = gtk_pixmap_new (pixmap, mask);
switch (ops_type)
{
@ -87,7 +72,7 @@ ops_button_box_new (GtkWidget *parent,
break;
}
gtk_container_add (GTK_CONTAINER (button), box);
gtk_container_add (GTK_CONTAINER (button), pixmap_widget);
if (ops_button->ext_callbacks == NULL)
{
@ -108,6 +93,7 @@ ops_button_box_new (GtkWidget *parent,
gtk_box_pack_start (GTK_BOX(button_box), button, TRUE, TRUE, 0);
gtk_widget_show (pixmap_widget);
gtk_widget_show (button);
ops_button->widget = button;
@ -116,13 +102,6 @@ ops_button_box_new (GtkWidget *parent,
ops_button++;
}
for (list = box_list; list; list = list->next)
{
gtk_widget_set_usize (GTK_WIDGET (list->data), max_width, -1);
gtk_widget_show (GTK_WIDGET (list->data));
}
g_slist_free (box_list);
return (button_box);
}

View File

@ -1,11 +1,9 @@
/* XPM */
static char * anchor_xpm[] = {
"16 16 3 1",
"15 14 3 1",
" c None",
". c #000000",
"+ c #7F7F7F",
" ",
" ",
" .. ",
" ...... ",
" ....++ ",

View File

@ -1,28 +1,28 @@
/* XPM */
static char * delete_xpm[] = {
"16 16 9 1",
"13 16 9 1",
" c None",
". c #0B0B0D",
"+ c #EBEBE9",
"@ c #B8B8B9",
"# c #9E9E9D",
"$ c #656566",
"% c #3E3E3D",
"& c #2F2F2D",
"* c #242424",
"$ c #3E3E3D",
"% c #2F2F2D",
"& c #242424",
"* c #656566",
" ... ",
" .++@. ",
" ........... ",
".+++++++@@##.",
".............",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+&+*+.@. ",
" .+%+%+%+&#. ",
" .######$$%. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+%+&+.@. ",
" .+$+$+$+%#. ",
" .######**$. ",
" ......... "};

View File

@ -1,28 +1,24 @@
/* XPM */
static char * dropper_xpm[] = {
"22 22 3 1",
"17 17 4 1",
" c None",
". c #FFFFFF",
"+ c #000000",
" ",
" ",
" ",
". c #000000",
"+ c #929292",
"@ c #FFFFFF",
" ... ",
" ..... ",
" .+.... ",
" .++++.... ",
" .+++.++. ",
" ...+..+. ",
" .+...+. ",
" ..++..+. ",
" . .++..+. ",
" .++..+. ",
" .++..+. ",
" .++..+. ",
" .++..+. ",
" .++..+. ",
" .++..+. ",
" .++.+. ",
" .++++. ",
" ... ",
" . "};
" .....+",
" ........+",
" ......++",
" +@...+++ ",
" +@@@..+ ",
" +@@@.+.+ ",
" +@@@.++ + ",
" +@@@.++ ",
" +@@@.++ ",
" +@@@.++ ",
" +@@@.++ ",
" +@@.++ ",
"+@..++ ",
" .+++ ",
" + "};

View File

@ -1,6 +1,6 @@
/* XPM */
static char * lower_xpm[] = {
"16 16 24 1",
"13 13 24 1",
" c None",
". c #000000",
"+ c #999999",
@ -25,8 +25,6 @@ static char * lower_xpm[] = {
"/ c #5D5D5D",
"( c #636363",
"_ c #6B6B6B",
" ",
" ",
" ........... ",
".+@@@@@@@@+#.",
" .@$$$$$$$%. ",
@ -39,5 +37,4 @@ static char * lower_xpm[] = {
" .+(#. ",
" ._. ",
" .#. ",
" . ",
" "};
" . "};

View File

@ -1,6 +1,6 @@
/* XPM */
static char * new_xpm[] = {
"16 16 37 1",
"12 14 37 1",
" c None",
". c #000000",
"+ c #F0F0F0",
@ -38,7 +38,6 @@ static char * new_xpm[] = {
"6 c #CDCDCD",
"7 c #C7C7C7",
"8 c #BDBDBD",
" ",
" ........",
" ..+@@@@#.",
" .@.$@@@@%.",
@ -52,5 +51,4 @@ static char * new_xpm[] = {
".@1](<2[#3%.",
".@<,'45678%.",
".#%%%%%%%%%.",
" ............ ",
" "};
"............"};

View File

@ -1,6 +1,6 @@
/* XPM */
static char * no_xpm[] = {
"18 18 8 1",
"13 14 8 1",
" c None",
". c #000000",
"+ c #C46D74",
@ -9,8 +9,6 @@ static char * no_xpm[] = {
"$ c #BD5A62",
"% c #7B2D34",
"& c #8C343C",
" ",
" ",
" .. . ",
" .+@. .#.",
" .##. .$#.",
@ -24,6 +22,4 @@ static char * no_xpm[] = {
".+#&. .@#. ",
".#&. .#@. ",
" .. .@#. ",
" .. ",
" ",
" "};
" .. "};

View File

@ -1,14 +1,12 @@
/* XPM */
static char * penadd_xpm[] = {
"25 24 5 1",
"25 20 5 1",
" c None",
". c #949194",
"+ c #000000",
"@ c #FFFFFF",
"# c #DEDADE",
" ",
" ",
" ",
" . ",
" + ",
" +. ",
@ -27,6 +25,4 @@ static char * penadd_xpm[] = {
" +.+++. +++++ ",
" +.+++. +... ",
" +.+++. +. ",
" ..... . ",
" ",
" "};
" ..... . "};

View File

@ -1,14 +1,12 @@
/* XPM */
static char * pendel_xpm[] = {
"25 24 5 1",
"25 20 5 1",
" c None",
". c #949194",
"+ c #000000",
"@ c #FFFFFF",
"# c #DEDADE",
" ",
" ",
" ",
" . ",
" + ",
" +. ",
@ -27,6 +25,4 @@ static char * pendel_xpm[] = {
" +.+++. +++++ ",
" +.+++. ..... ",
" +.+++. ",
" ..... ",
" ",
" "};
" ..... "};

View File

@ -1,13 +1,11 @@
/* XPM */
static char * penedit_xpm[] = {
"25 24 5 1",
"25 20 5 1",
" c None",
". c #000000",
"+ c #949194",
"@ c #FFFFFF",
"# c #DEDADE",
" ",
" ",
" ... . ",
" ........ ... ",
" .. ... .. .. ",
@ -27,6 +25,4 @@ static char * penedit_xpm[] = {
" .+...+ ",
" .+...+ ",
" .+...+ ",
" +++++ ",
" ",
" "};
" +++++ "};

View File

@ -1,14 +1,12 @@
/* XPM */
static char * pennorm_xpm[] = {
"25 24 5 1",
"25 20 5 1",
" c None",
". c #949194",
"+ c #000000",
"@ c #FFFFFF",
"# c #DEDADE",
" ",
" ",
" ",
" . ",
" + ",
" +. ",
@ -27,6 +25,4 @@ static char * pennorm_xpm[] = {
" +.+++. ",
" +.+++. ",
" +.+++. ",
" ..... ",
" ",
" "};
" ..... "};

View File

@ -1,6 +1,6 @@
/* XPM */
static char * raise_xpm[] = {
"16 16 11 1",
"13 13 11 1",
" c None",
". c #000000",
"+ c #CCCCCC",
@ -12,7 +12,6 @@ static char * raise_xpm[] = {
"* c #AEAEAE",
"= c #B3B3B3",
"- c #333333",
" ",
" . ",
" .+. ",
" .@. ",
@ -25,6 +24,4 @@ static char * raise_xpm[] = {
" .+@%+%+%&#. ",
" .@%=%=%=%%. ",
".+%########-.",
" ........... ",
" ",
" "};
" ........... "};

View File

@ -1,14 +1,10 @@
/* XPM */
static char * topath_xpm[] = {
"24 24 4 1",
"19 17 4 1",
" c None",
". c #020204",
"+ c #E8E8E9",
"@ c #B5B5B6",
" ",
" ",
" ",
" ",
".. ... ..",
"...................",
".. +++...+++ ..",
@ -25,7 +21,4 @@ static char * topath_xpm[] = {
" .@ @ @ @ @. ",
".. +++...+++ ..",
"...................",
" .. ... .. ",
" ",
" ",
" "};
".. ... .."};

View File

@ -1,15 +1,10 @@
/* XPM */
static char * toselection_xpm[] = {
"24 24 4 1",
"15 15 4 1",
" c None",
". c #020204",
"+ c #E8E8E9",
"@ c #B5B5B6",
" ",
" ",
" ",
" ",
" ",
" ... ",
" +++@ @+++ ",
" .@ @ @ @ @. ",
@ -24,8 +19,4 @@ static char * toselection_xpm[] = {
" .@ @ @ @ @ @. ",
" .@ @ @ @ @. ",
" +++@ @+++ ",
" ... ",
" ",
" ",
" ",
" "};
" ... "};

View File

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

View File

@ -1,6 +1,6 @@
/* XPM */
static char * zoom_out_xpm[] = {
"24 24 9 1",
"18 18 9 1",
" c None",
". c #020204",
"+ c #B5B5B6",
@ -10,8 +10,6 @@ static char * zoom_out_xpm[] = {
"% c #8F8F91",
"& c #6E6E6E",
"* c #5A5A5C",
" ",
" ",
" ... ",
" ..+@+.. ",
" .#@$$$@#. ",
@ -29,8 +27,4 @@ static char * zoom_out_xpm[] = {
" .$... ",
".$... ",
".#.. ",
" .. ",
" ",
" ",
" ",
" "};
" .. "};