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

app/gui/preferences-dialog.c app/widgets/widgets-enums.[ch] added new 

2004-05-04  Sven Neumann  <sven@gimp.org>

	* app/gui/preferences-dialog.c
	* app/widgets/widgets-enums.[ch]
	* app/widgets/gimpwidgets-utils.c (gimp_window_set_hint): added
	new window hint "keep-above" to force toolbox and/or dock windows
	to be kept above (if the WM supports this hint). Fixes bug .
This commit is contained in:
Sven Neumann 2004-05-04 13:31:57 +00:00 committed by Sven Neumann
parent 29e4cf347b
commit 2c2f46aeca
6 changed files with 23 additions and 9 deletions

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-05-04 Sven Neumann <sven@gimp.org>
* app/gui/preferences-dialog.c
* app/widgets/widgets-enums.[ch]
* app/widgets/gimpwidgets-utils.c (gimp_window_set_hint): added
new window hint "keep-above" to force toolbox and/or dock windows
to be kept above (if the WM supports this hint). Fixes bug #131672.
2004-05-04 Michael Natterer <mitch@gimp.org> 2004-05-04 Michael Natterer <mitch@gimp.org>
Fix bug #141719: Fix bug #141719:

6
app/dialogs/preferences-dialog.c
View File

@ -1820,17 +1820,17 @@ prefs_dialog_new (Gimp *gimp,
&top_iter, &top_iter,
page_index++); page_index++);
vbox2 = prefs_frame_new (_("Window Type Hints"), vbox2 = prefs_frame_new (_("Window Manager Hints"),
GTK_CONTAINER (vbox), FALSE); GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE); table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_combo_box_add (object, "toolbox-window-hint", 0, 0, prefs_enum_combo_box_add (object, "toolbox-window-hint", 0, 0,
_("Window Type Hint for the _Toolbox:"), _("Hint for the _Toolbox:"),
GTK_TABLE (table), 0); GTK_TABLE (table), 0);
prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0, prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
_("Window Type Hint for the _Docks:"), _("Hint for the _Docks:"),
GTK_TABLE (table), 1); GTK_TABLE (table), 1);
vbox2 = prefs_frame_new (_("Focus"), vbox2 = prefs_frame_new (_("Focus"),

6
app/gui/preferences-dialog.c
View File

@ -1820,17 +1820,17 @@ prefs_dialog_new (Gimp *gimp,
&top_iter, &top_iter,
page_index++); page_index++);
vbox2 = prefs_frame_new (_("Window Type Hints"), vbox2 = prefs_frame_new (_("Window Manager Hints"),
GTK_CONTAINER (vbox), FALSE); GTK_CONTAINER (vbox), FALSE);
table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE); table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE);
prefs_enum_combo_box_add (object, "toolbox-window-hint", 0, 0, prefs_enum_combo_box_add (object, "toolbox-window-hint", 0, 0,
_("Window Type Hint for the _Toolbox:"), _("Hint for the _Toolbox:"),
GTK_TABLE (table), 0); GTK_TABLE (table), 0);
prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0, prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
_("Window Type Hint for the _Docks:"), _("Hint for the _Docks:"),
GTK_TABLE (table), 1); GTK_TABLE (table), 1);
vbox2 = prefs_frame_new (_("Focus"), vbox2 = prefs_frame_new (_("Focus"),

4
app/widgets/gimpwidgets-utils.c
View File

@ -749,5 +749,9 @@ gimp_window_set_hint (GtkWindow *window,
case GIMP_WINDOW_HINT_UTILITY: case GIMP_WINDOW_HINT_UTILITY:
gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_UTILITY); gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_UTILITY);
break; break;
case GIMP_WINDOW_HINT_KEEP_ABOVE:
gtk_window_set_keep_above (window, TRUE);
break;
} }
} }

1
app/widgets/widgets-enums.c
View File

@ -135,6 +135,7 @@ static const GEnumValue gimp_window_hint_enum_values[] =
{ {
{ GIMP_WINDOW_HINT_NORMAL, N_("Normal Window"), "normal" }, { GIMP_WINDOW_HINT_NORMAL, N_("Normal Window"), "normal" },
{ GIMP_WINDOW_HINT_UTILITY, N_("Utility Window"), "utility" }, { GIMP_WINDOW_HINT_UTILITY, N_("Utility Window"), "utility" },
{ GIMP_WINDOW_HINT_KEEP_ABOVE, N_("Keep Above"), "keep-above" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };

5
app/widgets/widgets-enums.h
View File

@ -105,8 +105,9 @@ GType gimp_window_hint_get_type (void) G_GNUC_CONST;
typedef enum typedef enum
{ {
GIMP_WINDOW_HINT_NORMAL, /*< desc="Normal Window" >*/ GIMP_WINDOW_HINT_NORMAL, /*< desc="Normal Window" >*/
GIMP_WINDOW_HINT_UTILITY, /*< desc="Utility Window" >*/ GIMP_WINDOW_HINT_UTILITY, /*< desc="Utility Window" >*/
GIMP_WINDOW_HINT_KEEP_ABOVE /*< desc="Keep Above" >*/
} GimpWindowHint; } GimpWindowHint;