Commit c51c98d9 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/gui/file-new-dialog.c app/gui/resize-dialog.c

2002-02-07  Sven Neumann  <sven@gimp.org>

	* app/gui/file-new-dialog.c
	* app/gui/resize-dialog.c
	* app/tools/gimpbrightnesscontrasttool.c
	* app/tools/gimpcolorbalancetool.c
	* app/tools/gimpcroptool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpposterizetool.c
	* app/tools/gimpthresholdtool.c
	* app/tools/gimptransformtool.c: moved Cancel button to the left.

	* data/images/Makefile.am
	* data/images/tips_wilber.png: removed ...
	* data/images/wilber-tips.png: ... and readded under a new name.

	* app/gui/tips-dialog.c: changed accordingly.

	* data/images/wilber-wizard.png: new wilber for the user installation
	dialog.

	* app/gui/user-install-dialog.c: use the new wilber icon. We still
	need a good new eeek wilber.

	* themes/Default/gtkrc: don't change the default font size.
parent 758de05b
2002-02-07 Sven Neumann <sven@gimp.org>
* app/gui/file-new-dialog.c
* app/gui/resize-dialog.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcroptool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpposterizetool.c
* app/tools/gimpthresholdtool.c
* app/tools/gimptransformtool.c: moved Cancel button to the left.
* data/images/Makefile.am
* data/images/tips_wilber.png: removed ...
* data/images/wilber-tips.png: ... and readded under a new name.
* app/gui/tips-dialog.c: changed accordingly.
* data/images/wilber-wizard.png: new wilber for the user installation
dialog.
* app/gui/user-install-dialog.c: use the new wilber icon. We still
need a good new eeek wilber.
* themes/Default/gtkrc: don't change the default font size.
2002-02-06 Michael Natterer <mitch@gimp.org>
 
* app/core/gimpobject.c: made the gimp_object_get_memsize()
......
......@@ -323,12 +323,12 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
......
......@@ -431,12 +431,12 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
......
......@@ -333,12 +333,12 @@ threshold_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, threshold_cancel_callback,
td, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
......
......@@ -117,12 +117,12 @@ file_new_dialog_create (Gimp *gimp,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
......@@ -318,8 +318,12 @@ file_new_dialog_create (Gimp *gimp,
gtk_table_attach_defaults (GTK_TABLE (info->resolution_se), spinbutton,
1, 2, 0, 1);
gtk_widget_show (spinbutton);
gtk_table_attach (GTK_TABLE (table), info->resolution_se, 1, 2, 5, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
abox = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), abox, 1, 2, 5, 7);
gtk_widget_show (abox);
gtk_container_add (GTK_CONTAINER (abox), info->resolution_se);
gtk_widget_show (info->resolution_se);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (info->resolution_se),
......
......@@ -206,15 +206,15 @@ resize_widget_new (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL,
cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
NULL, FALSE, TRUE,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
......
......@@ -124,7 +124,7 @@ tips_dialog_create (void)
gtk_widget_show (vbox2);
filename = g_build_filename (gimp_data_directory(),
"images", "tips_wilber.png", NULL);
"images", "wilber-tips.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
......
......@@ -55,10 +55,8 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/eek.xpm"
#include "pixmaps/folder.xpm"
#include "pixmaps/new.xpm"
#include "pixmaps/wilber.xpm"
#ifndef G_OS_WIN32
......@@ -76,7 +74,6 @@
#define NUM_PAGES 6
#define EEK_PAGE (NUM_PAGES - 1)
#define WILBER_WIDTH 62
#define PAGE_STYLE(widget) gtk_widget_modify_style (widget, page_style)
#define TITLE_STYLE(widget) gtk_widget_modify_style (widget, title_style)
......@@ -100,7 +97,7 @@ static GtkWidget *user_install_dialog = NULL;
static GtkWidget *notebook = NULL;
static GtkWidget *title_pixmap = NULL;
static GtkWidget *title_image = NULL;
static GtkWidget *title_label = NULL;
static GtkWidget *footer_label = NULL;
......@@ -307,12 +304,21 @@ user_install_notebook_set_page (GtkNotebook *notebook,
gtk_label_set_text (GTK_LABEL (title_label), title);
gtk_label_set_text (GTK_LABEL (footer_label), footer);
if (index == EEK_PAGE)
if (index == EEK_PAGE && title_image)
{
gtk_widget_set_size_request (title_pixmap,
title_pixmap->allocation.width,
title_pixmap->allocation.height);
gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm);
GdkPixbuf *wilber;
gchar *filename;
filename = g_build_filename (gimp_data_directory(),
"images", "wilber-eek.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (wilber)
{
gtk_image_set_from_pixbuf (GTK_IMAGE (title_image), wilber);
g_object_unref (wilber);
}
}
gtk_notebook_set_current_page (notebook, index);
......@@ -526,8 +532,9 @@ user_install_dialog_create (Gimp *gimp)
GtkWidget *darea;
GtkWidget *page;
GtkWidget *sep;
GtkWidget *eek_box;
GdkPixbuf *wilber;
gchar *filename;
dialog = user_install_dialog =
gimp_dialog_new (_("GIMP User Installation"), "user_installation",
......@@ -578,16 +585,13 @@ user_install_dialog_create (Gimp *gimp)
GTK_RC_BG |
GTK_RC_TEXT);
pango_font_description_free (page_style->font_desc);
page_style->font_desc = pango_font_description_from_string ("sans 12");
/* B/Colored Style for the page title */
title_style = gtk_rc_style_copy (page_style);
title_style->bg[GTK_STATE_NORMAL] = title_color;
pango_font_description_free (title_style->font_desc);
title_style->font_desc = pango_font_description_from_string ("sans bold 24");
title_style->font_desc = pango_font_description_from_string ("sans 20");
TITLE_STYLE (dialog);
......@@ -603,7 +607,6 @@ user_install_dialog_create (Gimp *gimp)
ebox = gtk_event_box_new ();
TITLE_STYLE (ebox);
gtk_widget_set_events (ebox, GDK_EXPOSURE_MASK);
gtk_widget_set_size_request (ebox, WILBER_WIDTH + 16, -1);
gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0);
gtk_widget_show (ebox);
......@@ -612,9 +615,19 @@ user_install_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (ebox), hbox);
gtk_widget_show (hbox);
title_pixmap = gimp_pixmap_new (wilber_xpm);
gtk_box_pack_start (GTK_BOX (hbox), title_pixmap, FALSE, FALSE, 8);
gtk_widget_show (title_pixmap);
filename = g_build_filename (gimp_data_directory(),
"images", "wilber-wizard.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (wilber)
{
title_image = gtk_image_new_from_pixbuf (wilber);
g_object_unref (wilber);
gtk_box_pack_start (GTK_BOX (hbox), title_image, FALSE, FALSE, 8);
gtk_widget_show (title_image);
}
title_label = gtk_label_new (NULL);
TITLE_STYLE (title_label);
......
......@@ -117,12 +117,12 @@ file_new_dialog_create (Gimp *gimp,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, file_new_cancel_callback,
info, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, file_new_reset_callback,
info, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, file_new_ok_callback,
info, NULL, NULL, TRUE, FALSE,
......@@ -318,8 +318,12 @@ file_new_dialog_create (Gimp *gimp,
gtk_table_attach_defaults (GTK_TABLE (info->resolution_se), spinbutton,
1, 2, 0, 1);
gtk_widget_show (spinbutton);
gtk_table_attach (GTK_TABLE (table), info->resolution_se, 1, 2, 5, 7,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
abox = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_table_attach_defaults (GTK_TABLE (table), abox, 1, 2, 5, 7);
gtk_widget_show (abox);
gtk_container_add (GTK_CONTAINER (abox), info->resolution_se);
gtk_widget_show (info->resolution_se);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (info->resolution_se),
......
......@@ -206,15 +206,15 @@ resize_widget_new (GimpImage *gimage,
GTK_WIN_POS_MOUSE,
FALSE, FALSE, TRUE,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL,
cancel_cb ? cancel_cb : G_CALLBACK (gtk_widget_destroy),
cancel_cb ? user_data : NULL,
cancel_cb ? NULL : (gpointer) 1,
NULL, FALSE, TRUE,
GIMP_STOCK_RESET, reset_callback,
resize, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, ok_cb,
user_data, NULL, NULL, TRUE, FALSE,
......
......@@ -124,7 +124,7 @@ tips_dialog_create (void)
gtk_widget_show (vbox2);
filename = g_build_filename (gimp_data_directory(),
"images", "tips_wilber.png", NULL);
"images", "wilber-tips.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
......
......@@ -55,10 +55,8 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/eek.xpm"
#include "pixmaps/folder.xpm"
#include "pixmaps/new.xpm"
#include "pixmaps/wilber.xpm"
#ifndef G_OS_WIN32
......@@ -76,7 +74,6 @@
#define NUM_PAGES 6
#define EEK_PAGE (NUM_PAGES - 1)
#define WILBER_WIDTH 62
#define PAGE_STYLE(widget) gtk_widget_modify_style (widget, page_style)
#define TITLE_STYLE(widget) gtk_widget_modify_style (widget, title_style)
......@@ -100,7 +97,7 @@ static GtkWidget *user_install_dialog = NULL;
static GtkWidget *notebook = NULL;
static GtkWidget *title_pixmap = NULL;
static GtkWidget *title_image = NULL;
static GtkWidget *title_label = NULL;
static GtkWidget *footer_label = NULL;
......@@ -307,12 +304,21 @@ user_install_notebook_set_page (GtkNotebook *notebook,
gtk_label_set_text (GTK_LABEL (title_label), title);
gtk_label_set_text (GTK_LABEL (footer_label), footer);
if (index == EEK_PAGE)
if (index == EEK_PAGE && title_image)
{
gtk_widget_set_size_request (title_pixmap,
title_pixmap->allocation.width,
title_pixmap->allocation.height);
gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm);
GdkPixbuf *wilber;
gchar *filename;
filename = g_build_filename (gimp_data_directory(),
"images", "wilber-eek.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (wilber)
{
gtk_image_set_from_pixbuf (GTK_IMAGE (title_image), wilber);
g_object_unref (wilber);
}
}
gtk_notebook_set_current_page (notebook, index);
......@@ -526,8 +532,9 @@ user_install_dialog_create (Gimp *gimp)
GtkWidget *darea;
GtkWidget *page;
GtkWidget *sep;
GtkWidget *eek_box;
GdkPixbuf *wilber;
gchar *filename;
dialog = user_install_dialog =
gimp_dialog_new (_("GIMP User Installation"), "user_installation",
......@@ -578,16 +585,13 @@ user_install_dialog_create (Gimp *gimp)
GTK_RC_BG |
GTK_RC_TEXT);
pango_font_description_free (page_style->font_desc);
page_style->font_desc = pango_font_description_from_string ("sans 12");
/* B/Colored Style for the page title */
title_style = gtk_rc_style_copy (page_style);
title_style->bg[GTK_STATE_NORMAL] = title_color;
pango_font_description_free (title_style->font_desc);
title_style->font_desc = pango_font_description_from_string ("sans bold 24");
title_style->font_desc = pango_font_description_from_string ("sans 20");
TITLE_STYLE (dialog);
......@@ -603,7 +607,6 @@ user_install_dialog_create (Gimp *gimp)
ebox = gtk_event_box_new ();
TITLE_STYLE (ebox);
gtk_widget_set_events (ebox, GDK_EXPOSURE_MASK);
gtk_widget_set_size_request (ebox, WILBER_WIDTH + 16, -1);
gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0);
gtk_widget_show (ebox);
......@@ -612,9 +615,19 @@ user_install_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (ebox), hbox);
gtk_widget_show (hbox);
title_pixmap = gimp_pixmap_new (wilber_xpm);
gtk_box_pack_start (GTK_BOX (hbox), title_pixmap, FALSE, FALSE, 8);
gtk_widget_show (title_pixmap);
filename = g_build_filename (gimp_data_directory(),
"images", "wilber-wizard.png", NULL);
wilber = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
if (wilber)
{
title_image = gtk_image_new_from_pixbuf (wilber);
g_object_unref (wilber);
gtk_box_pack_start (GTK_BOX (hbox), title_image, FALSE, FALSE, 8);
gtk_widget_show (title_image);
}
title_label = gtk_label_new (NULL);
TITLE_STYLE (title_label);
......
......@@ -263,12 +263,12 @@ brightness_contrast_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, brightness_contrast_reset_callback,
bcd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, brightness_contrast_cancel_callback,
bcd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, brightness_contrast_reset_callback,
bcd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, brightness_contrast_ok_callback,
bcd, NULL, NULL, TRUE, FALSE,
......
......@@ -323,12 +323,12 @@ color_balance_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, color_balance_cancel_callback,
cbd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, color_balance_reset_callback,
cbd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, color_balance_ok_callback,
cbd, NULL, NULL, TRUE, FALSE,
......
......@@ -960,13 +960,15 @@ crop_info_create (GimpTool *tool)
/* create the action area */
gimp_dialog_create_action_area (GIMP_DIALOG (crop_info->shell),
_("Crop"), crop_crop_callback,
NULL, NULL, NULL, TRUE, FALSE,
_("Resize"), crop_resize_callback,
NULL, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CLOSE, crop_close_callback,
NULL, NULL, NULL, FALSE, FALSE,
_("Resize"), crop_resize_callback,
NULL, NULL, NULL, FALSE, FALSE,
_("Crop"), crop_crop_callback,
NULL, NULL, NULL, TRUE, FALSE,
NULL);
/* add the information fields */
......
......@@ -431,12 +431,12 @@ hue_saturation_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_CANCEL, hue_saturation_cancel_callback,
hsd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, hue_saturation_reset_callback,
hsd, NULL, NULL, FALSE, FALSE,
GTK_STOCK_OK, hue_saturation_ok_callback,
hsd, NULL, NULL, TRUE, FALSE,
......
......@@ -244,12 +244,12 @@ posterize_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, posterize_reset_callback,
pd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, posterize_cancel_callback,
pd, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, posterize_reset_callback,
pd, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, posterize_ok_callback,
pd, NULL, NULL, TRUE, FALSE,
......
......@@ -333,12 +333,12 @@ threshold_dialog_new (void)
GTK_WIN_POS_NONE,
FALSE, TRUE, FALSE,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_CANCEL, threshold_cancel_callback,
td, NULL, NULL, FALSE, TRUE,
GIMP_STOCK_RESET, threshold_reset_callback,
td, NULL, NULL, TRUE, FALSE,
GTK_STOCK_OK, threshold_ok_callback,
td, NULL, NULL, TRUE, FALSE,
......
......@@ -959,12 +959,12 @@ gimp_transform_tool_info_dialog_connect (GimpTransformTool *tr_tool,
{
gimp_dialog_create_action_area (GIMP_DIALOG (tr_tool->info_dialog->shell),
ok_button, transform_ok_callback,
tr_tool, NULL, NULL, TRUE, FALSE,
GIMP_STOCK_RESET, transform_reset_callback,
tr_tool, NULL, NULL, FALSE, FALSE,
ok_button, transform_ok_callback,
tr_tool, NULL, NULL, TRUE, FALSE,
NULL);
}
}
......
......@@ -3,9 +3,10 @@
imagedatadir = $(gimpdatadir)/images
imagedata_DATA = \
gimp_logo.png \
gimp_splash.gif \
gimp_splash.png \
tips_wilber.png
gimp_logo.png \
gimp_splash.gif \
gimp_splash.png \
wilber-tips.png \
wilber-wizard.png
EXTRA_DIST = $(imagedata_DATA)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment