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

themes/Default/images/Makefile.am 

2001-11-28  Michael Natterer  <mitch@gimp.org>

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-wilber-16x16.png
	* themes/Default/images/stock-wilber-32x32.png
	* themes/Default/images/stock-wilber-48x48.png
	* themes/Default/images/stock-wilber-64x64.png: new files.

	* themes/Default/Makefile.am: create gimp-wilber-pixbufs.h

	* libgimpwidgets/gimpdialog.[ch]: removed gimp_dialog_set_icon().

	* libgimpwidgets/gimpwidgets.[ch]: added gimp_widgets_init() which
	calls gimp_stock_init() and calls gtk_window_set_default_icon_list()
	with the above set of inlined pixbufs.

	* libgimp/gimpui.c
	* app/gui/gui.c: call gimp_widgets_init().

	* app/display/gimpdisplayshell.c: removed the fallback icon stuff.

	* app/gui/splash.c
	* app/gui/user-install-dialog.c
	* app/widgets/gimpdock.c
	* app/widgets/gimpitemfactory.c
	* libgimpwidgets/gimphelpui.c
	* plug-ins/imagemap/imap_default_dialog.c
	* plug-ins/imagemap/imap_file.c: don't call gimp_dialog_set_icon().

	* plug-ins/common/uniteditor.c: wanted to start hacking here...
	Nothing really changed.
This commit is contained in:
Michael Natterer 2001-11-28 01:14:06 +00:00 committed by Michael Natterer
parent ae06cd2dda
commit e9c3bb45a2
25 changed files with 109 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ChangeLog
View File

@ -1,3 +1,35 @@
2001-11-28 Michael Natterer <mitch@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-wilber-16x16.png
* themes/Default/images/stock-wilber-32x32.png
* themes/Default/images/stock-wilber-48x48.png
* themes/Default/images/stock-wilber-64x64.png: new files.
* themes/Default/Makefile.am: create gimp-wilber-pixbufs.h
* libgimpwidgets/gimpdialog.[ch]: removed gimp_dialog_set_icon().
* libgimpwidgets/gimpwidgets.[ch]: added gimp_widgets_init() which
calls gimp_stock_init() and calls gtk_window_set_default_icon_list()
with the above set of inlined pixbufs.
* libgimp/gimpui.c
* app/gui/gui.c: call gimp_widgets_init().
* app/display/gimpdisplayshell.c: removed the fallback icon stuff.
* app/gui/splash.c
* app/gui/user-install-dialog.c
* app/widgets/gimpdock.c
* app/widgets/gimpitemfactory.c
* libgimpwidgets/gimphelpui.c
* plug-ins/imagemap/imap_default_dialog.c
* plug-ins/imagemap/imap_file.c: don't call gimp_dialog_set_icon().
* plug-ins/common/uniteditor.c: wanted to start hacking here...
Nothing really changed.
2001-11-28 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpbutton.c

2
app/dialogs/user-install-dialog.c
View File

@ -537,8 +537,6 @@ user_install_dialog_create (Gimp *gimp)
NULL);
gimp_dialog_set_icon (GTK_WINDOW (dialog));
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 8);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);

27
app/display/gimpdisplayshell-draw.c
View File

@ -72,8 +72,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/wilber.xpm"
#define MAX_TITLE_BUF 256
@ -2125,13 +2123,11 @@ gimp_display_shell_draw_cursor (GimpDisplayShell *shell)
static void
gimp_display_shell_update_icon (GimpDisplayShell *shell)
{
static GdkPixmap *wilber_pixmap = NULL;
static GdkBitmap *wilber_mask = NULL;
GtkStyle *style;
GdkGC *icongc, *iconmaskgc;
GdkColormap *colormap;
GdkColor black, white;
gboolean success;
GtkStyle *style;
GdkGC *icongc, *iconmaskgc;
GdkColormap *colormap;
GdkColor black, white;
gboolean success;
TempBuf *icondata;
guchar *data;
@ -2171,15 +2167,6 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
style = gtk_widget_get_style (GTK_WIDGET (shell));
if (! wilber_pixmap)
{
wilber_pixmap =
gdk_pixmap_create_from_xpm_d (GTK_WIDGET (shell)->window,
&wilber_mask,
&style->bg[GTK_STATE_NORMAL],
wilber_xpm);
}
factor = ((gfloat) gimp_image_get_height (shell->gdisp->gimage)) /
gimp_image_get_width (shell->gdisp->gimage);
@ -2265,9 +2252,7 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
}
else
{
g_printerr ("gimp_display_shell_update_icon: falling back to default\n");
gdk_window_set_icon (GTK_WIDGET (shell)->window,
NULL, wilber_pixmap, wilber_mask);
g_printerr ("%s: falling back to default", G_STRLOC);
}
shell->icon_needs_update = FALSE;

27
app/display/gimpdisplayshell.c
View File

@ -72,8 +72,6 @@
#include "libgimp/gimpintl.h"
#include "pixmaps/wilber.xpm"
#define MAX_TITLE_BUF 256
@ -2125,13 +2123,11 @@ gimp_display_shell_draw_cursor (GimpDisplayShell *shell)
static void
gimp_display_shell_update_icon (GimpDisplayShell *shell)
{
static GdkPixmap *wilber_pixmap = NULL;
static GdkBitmap *wilber_mask = NULL;
GtkStyle *style;
GdkGC *icongc, *iconmaskgc;
GdkColormap *colormap;
GdkColor black, white;
gboolean success;
GtkStyle *style;
GdkGC *icongc, *iconmaskgc;
GdkColormap *colormap;
GdkColor black, white;
gboolean success;
TempBuf *icondata;
guchar *data;
@ -2171,15 +2167,6 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
style = gtk_widget_get_style (GTK_WIDGET (shell));
if (! wilber_pixmap)
{
wilber_pixmap =
gdk_pixmap_create_from_xpm_d (GTK_WIDGET (shell)->window,
&wilber_mask,
&style->bg[GTK_STATE_NORMAL],
wilber_xpm);
}
factor = ((gfloat) gimp_image_get_height (shell->gdisp->gimage)) /
gimp_image_get_width (shell->gdisp->gimage);
@ -2265,9 +2252,7 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
}
else
{
g_printerr ("gimp_display_shell_update_icon: falling back to default\n");
gdk_window_set_icon (GTK_WIDGET (shell)->window,
NULL, wilber_pixmap, wilber_mask);
g_printerr ("%s: falling back to default", G_STRLOC);
}
shell->icon_needs_update = FALSE;

4
app/gui/gui.c
View File

@ -137,6 +137,8 @@ gui_libs_init (gint *argc,
display_env = g_strconcat ("DISPLAY=", gdk_get_display (), NULL);
putenv (display_env);
#endif
gimp_widgets_init ();
}
void
@ -147,8 +149,6 @@ gui_themes_init (Gimp *gimp)
g_return_if_fail (GIMP_IS_GIMP (gimp));
gimp_stock_init ();
themes_hash = g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,

3
app/gui/splash.c
View File

@ -27,7 +27,6 @@
#include "splash.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimpintl.h"
@ -57,8 +56,6 @@ splash_create (gboolean show_image)
gtk_window_set_position (GTK_WINDOW (win_initstatus), GTK_WIN_POS_CENTER);
gtk_window_set_policy (GTK_WINDOW (win_initstatus), FALSE, FALSE, FALSE);
gimp_dialog_set_icon (GTK_WINDOW (win_initstatus));
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_add (GTK_CONTAINER (win_initstatus), vbox);
gtk_widget_show (vbox);

2
app/gui/user-install-dialog.c
View File

@ -537,8 +537,6 @@ user_install_dialog_create (Gimp *gimp)
NULL);
gimp_dialog_set_icon (GTK_WINDOW (dialog));
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 8);
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);

1
app/widgets/gimpdock.c
View File

@ -140,7 +140,6 @@ gimp_dock_init (GimpDock *dock)
gtk_window_set_title (GTK_WINDOW (dock), "Gimp");
gtk_window_set_wmclass (GTK_WINDOW (dock), "dock", "Gimp");
gtk_window_set_policy (GTK_WINDOW (dock), FALSE, TRUE, TRUE);
gimp_dialog_set_icon (GTK_WINDOW (dock));
gtk_widget_set_usize (GTK_WIDGET (dock), GIMP_DOCK_MINIMAL_WIDTH, -1);

2
app/widgets/gimpitemfactory.c
View File

@ -620,8 +620,6 @@ gimp_item_factory_tearoff_callback (GtkWidget *widget,
#endif
g_object_set_data (G_OBJECT (widget), "tearoff-menu-toplevel",
toplevel);
gimp_dialog_set_icon (GTK_WINDOW (toplevel));
}
}
else

2
libgimp/gimpui.c
View File

@ -76,7 +76,7 @@ gimp_ui_init (const gchar *prog_name,
if (preview)
gtk_preview_set_gamma (gimp_gamma ());
gimp_stock_init ();
gimp_widgets_init ();
initialized = TRUE;
}

61
libgimpwidgets/gimpdialog.c
View File

@ -31,8 +31,6 @@
#include "gimpdialog.h"
#include "gimphelpui.h"
#include "pixmaps/wilber.xpm"
typedef void (* GimpDialogCancelCallback) (GtkWidget *widget,
gpointer data);
@ -41,8 +39,6 @@ typedef void (* GimpDialogCancelCallback) (GtkWidget *widget,
static void gimp_dialog_class_init (GimpDialogClass *klass);
static void gimp_dialog_init (GimpDialog *dialog);
static void gimp_dialog_realize (GtkWidget *widget);
static void gimp_dialog_real_realize (GtkWidget *widget);
static gboolean gimp_dialog_delete_event (GtkWidget *widget,
GdkEventAny *event);
@ -81,15 +77,12 @@ gimp_dialog_get_type (void)
static void
gimp_dialog_class_init (GimpDialogClass *klass)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
object_class = G_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
widget_class->realize = gimp_dialog_realize;
widget_class->delete_event = gimp_dialog_delete_event;
}
@ -98,35 +91,6 @@ gimp_dialog_init (GimpDialog *dialog)
{
}
static void
gimp_dialog_realize (GtkWidget *widget)
{
if (GTK_WIDGET_CLASS (parent_class)->realize)
GTK_WIDGET_CLASS (parent_class)->realize (widget);
gimp_dialog_real_realize (widget);
}
static void
gimp_dialog_real_realize (GtkWidget *widget)
{
static GdkPixmap *wilber_pixmap = NULL;
static GdkBitmap *wilber_mask = NULL;
GtkStyle *style;
style = gtk_widget_get_style (widget);
if (wilber_pixmap == NULL)
wilber_pixmap =
gdk_pixmap_create_from_xpm_d (widget->window,
&wilber_mask,
&style->bg[GTK_STATE_NORMAL],
wilber_xpm);
gdk_window_set_icon (widget->window, NULL,
wilber_pixmap, wilber_mask);
}
static gboolean
gimp_dialog_delete_event (GtkWidget *widget,
GdkEventAny *event)
@ -426,28 +390,3 @@ gimp_dialog_create_action_areav (GimpDialog *dialog,
label = va_arg (args, gchar *);
}
}
/**
* gimp_dialog_set_icon:
* @dialog: The #GtkWindow you want to set the pixmap icon for.
*
* This function sets the WM pixmap icon for the dialog which will appear
* e.g. in GNOME's or KDE's window list.
*
* Note that this function is automatically called by
* gimp_help_connect() which in turn is called by gimp_dialog_newv(),
* so you only have to call it for #GtkWindow's which have no help
* page (like tear-off menus).
**/
void
gimp_dialog_set_icon (GtkWindow *dialog)
{
g_return_if_fail (GTK_IS_WINDOW (dialog));
if (GTK_WIDGET_REALIZED (GTK_WIDGET (dialog)))
gimp_dialog_real_realize (GTK_WIDGET (dialog));
else
g_signal_connect (G_OBJECT (dialog), "realize",
G_CALLBACK (gimp_dialog_real_realize),
NULL);
}

2
libgimpwidgets/gimpdialog.h
View File

@ -103,8 +103,6 @@ void gimp_dialog_create_action_area (GimpDialog *dialog,
void gimp_dialog_create_action_areav (GimpDialog *dialog,
va_list args);
void gimp_dialog_set_icon (GtkWindow *dialog);
G_END_DECLS

10
libgimpwidgets/gimphelpui.c
View File

@ -128,10 +128,6 @@ gimp_help_disable_tooltips (void)
* Note that this function is automatically called by all libgimp dialog
* constructors. You only have to call it for windows/dialogs you created
* "manually".
*
* For convenience, gimp_help_connect_help_accel() calls
* gimp_dialog_set_icon() if the passed widget is a #GtkWindow, so you
* don't have to worry about this.
**/
void
gimp_help_connect (GtkWidget *widget,
@ -141,12 +137,6 @@ gimp_help_connect (GtkWidget *widget,
if (! help_func)
return;
/* for convenience we set the wm icon here because
* this function is called for almost all gimp windows
*/
if (GTK_IS_WINDOW (widget))
gimp_dialog_set_icon (GTK_WINDOW (widget));
/* set up the help signals and tips query widget
*/
if (! tips_query)

32
libgimpwidgets/gimpwidgets.c
View File

@ -38,9 +38,41 @@
#include "gimpunitmenu.h"
#include "gimpwidgets.h"
#include "themes/Default/gimp-wilber-pixbufs.h"
#include "libgimp/libgimp-intl.h"
void
gimp_widgets_init (void)
{
GdkPixbuf *pixbuf;
GList *icon_list = NULL;
gint i;
const guint8 *inline_pixbufs[] =
{
stock_wilber_64_64,
stock_wilber_48_48,
stock_wilber_32_32,
stock_wilber_16_16
};
gimp_stock_init ();
for (i = 0; i < G_N_ELEMENTS (inline_pixbufs); i++)
{
pixbuf = gdk_pixbuf_new_from_inline (-1, inline_pixbufs[i], FALSE, NULL);
icon_list = g_list_prepend (icon_list, pixbuf);
}
gtk_window_set_default_icon_list (icon_list);
g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
g_list_free (icon_list);
}
/*
* Widget Constructors
*/

4
libgimpwidgets/gimpwidgets.h
View File

@ -46,6 +46,10 @@ G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
void gimp_widgets_init (void);
/*
* Widget Constructors
*/

4
plug-ins/common/uniteditor.c
View File

@ -64,7 +64,6 @@ query (void)
{
{ GIMP_PDB_INT32, "run_mode", "Interactive" }
};
static gint nargs = sizeof (args) / sizeof (args[0]);
gimp_install_procedure ("extension_gimp_unit_editor",
"The GIMP unit editor (runs in interactive mode only)",
@ -75,7 +74,7 @@ query (void)
N_("<Toolbox>/Xtns/Unit Editor..."),
"",
GIMP_EXTENSION,
nargs, 0,
G_N_ELEMENTS (args), 0,
args, NULL);
}
@ -93,6 +92,7 @@ run (gchar *name,
*nreturn_vals = 1;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_CALLING_ERROR;

1
plug-ins/imagemap/imap_default_dialog.c
View File

@ -102,7 +102,6 @@ make_default_dialog(const gchar *title)
data->cancel_cb = NULL;
data->dialog = dialog = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(dialog), title);
gimp_dialog_set_icon (GTK_WINDOW(dialog));
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
GTK_SIGNAL_FUNC(dialog_destroy), (gpointer) data);

2
plug-ins/imagemap/imap_file.c
View File

@ -60,7 +60,6 @@ do_file_open_dialog(void)
static GtkWidget *dialog;
if (!dialog) {
dialog = gtk_file_selection_new(_("Load Imagemap"));
gimp_dialog_set_icon (GTK_WINDOW (dialog));
gtk_signal_connect_object(
GTK_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button),
"clicked", GTK_SIGNAL_FUNC(gtk_widget_hide), GTK_OBJECT(dialog));
@ -121,7 +120,6 @@ do_file_save_as_dialog(void)
static GtkWidget *dialog;
if (!dialog) {
dialog = gtk_file_selection_new(_("Save Imagemap"));
gimp_dialog_set_icon (GTK_WINDOW (dialog));
gtk_signal_connect_object(
GTK_OBJECT(GTK_FILE_SELECTION(dialog)->cancel_button),
"clicked", GTK_SIGNAL_FUNC(gtk_widget_hide), GTK_OBJECT(dialog));

1
themes/Default/.cvsignore
View File

@ -3,3 +3,4 @@ Makefile.in
.xvpics
.thumbnails
gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h

16
themes/Default/Makefile.am
View File

@ -137,8 +137,22 @@ STOCK_TOOL_VARIABLES = @STRIP_BEGIN@ \
$(srcdir)/images/tools/stock-tool-button-zoom.png \
@STRIP_END@
noinst_DATA = gimp-stock-pixbufs.h
WILBER_VARIABLES = @STRIP_BEGIN@ \
stock_wilber_16_16 \
$(srcdir)/images/stock-wilber-16x16.png \
stock_wilber_32_32 \
$(srcdir)/images/stock-wilber-32x32.png \
stock_wilber_48_48 \
$(srcdir)/images/stock-wilber-48x48.png \
stock_wilber_64_64 \
$(srcdir)/images/stock-wilber-64x64.png \
@STRIP_END@
noinst_DATA = gimp-stock-pixbufs.h gimp-wilber-pixbufs.h
CLEANFILES += $(noinst_DATA)
gimp-stock-pixbufs.h: $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES)
gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h: $(WILBER_IMAGES)
gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) >$(srcdir)/gimp-wilber-pixbufs.h

9
themes/Default/images/Makefile.am
View File

@ -30,6 +30,13 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
stock-menu-qmask-on.png \
@STRIP_END@
WILBER_IMAGES = = @STRIP_BEGIN@ \
stock-wilber-16x16.png \
stock-wilber-32x32.png \
stock-wilber-48x48.png \
stock-wilber-64x64.png \
@STRIP_END@
themedata_DATA = $(STOCK_IMAGES)
EXTRA_DIST = $(themedata_DATA)
EXTRA_DIST = $(themedata_DATA) $(WILBER_IMAGES)

BIN
themes/Default/images/stock-wilber-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

BIN
themes/Default/images/stock-wilber-32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
themes/Default/images/stock-wilber-48x48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
themes/Default/images/stock-wilber-64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB