app/gui/preferences-dialog.c Added Window Manager tab exposing the window

2003-11-20 Henrik Brix Andersen <brix@gimp.org>

* app/gui/preferences-dialog.c
* app/widgets/gimphelp-ids.h: Added Window Manager tab exposing
the window manager hint settings to the user, moved the
activate-on-focus setting to this tab as well.

* themes/Default/images/preferences/window-manager.png
* themes/Default/images/preferences/Makefile.am: added empty
placeholder for Window Manager preferences icon.

ChangeLog

@@ -1,3 +1,14 @@
+2003-11-20  Henrik Brix Andersen  <brix@gimp.org>
+
+	* app/gui/preferences-dialog.c
+	* app/widgets/gimphelp-ids.h: Added Window Manager tab exposing
+	the window manager hint settings to the user, moved the
+	activate-on-focus setting to this tab as well.
+
+	* themes/Default/images/preferences/window-manager.png
+	* themes/Default/images/preferences/Makefile.am: added empty
+	placeholder for Window Manager preferences icon.
+
 2003-11-20  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimpdock.c: reverted a small part of my last commit.

app/dialogs/preferences-dialog.c

@@ -1428,10 +1428,6 @@ prefs_dialog_new (Gimp       *gimp,
                          _("Marching _Ants Speed:"),
                          GTK_TABLE (table), 0);
 
-  prefs_check_button_add (object, "activate-on-focus",
-                          _("Activate the Focused Image"),
-                          GTK_BOX (vbox2));
-
   /*  Zoom & Resize Behavior  */
   vbox2 = prefs_frame_new (_("Zoom & Resize Behavior"),
                            GTK_CONTAINER (vbox), FALSE);
@@ -1782,6 +1778,41 @@ prefs_dialog_new (Gimp       *gimp,
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
 
+  /********************/
+  /*  Window Manager  */
+  /********************/
+  vbox = prefs_notebook_append_page (gimp,
+                                     GTK_NOTEBOOK (notebook),
+				     _("Window Manager"),
+                                     "window-manager.png",
+				     GTK_TREE_STORE (tree),
+				     _("Window Manager"),
+				     GIMP_HELP_PREFS_WINDOW_MANAGER,
+				     NULL,
+				     &top_iter,
+				     page_index++);
+
+  vbox2 = prefs_frame_new (_("Decorations"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE);
+
+  prefs_enum_option_menu_add (object, "toolbox-window-type", 0, 0,
+                              _("Window Type Hint for the _Toolbox:"),
+                              GTK_TABLE (table), 0);
+
+  prefs_enum_option_menu_add (object, "dock-window-type", 0, 0,
+                              _("Window Type Hint for the _Docks:"),
+                              GTK_TABLE (table), 1);
+
+  vbox2 = prefs_frame_new (_("Focus"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "activate-on-focus",
+                          _("Activate the _Focused Image"),
+                          GTK_BOX (vbox2));
+
+
   /*****************/
   /*  Environment  */
   /*****************/

app/gui/preferences-dialog.c

@@ -1428,10 +1428,6 @@ prefs_dialog_new (Gimp       *gimp,
                          _("Marching _Ants Speed:"),
                          GTK_TABLE (table), 0);
 
-  prefs_check_button_add (object, "activate-on-focus",
-                          _("Activate the Focused Image"),
-                          GTK_BOX (vbox2));
-
   /*  Zoom & Resize Behavior  */
   vbox2 = prefs_frame_new (_("Zoom & Resize Behavior"),
                            GTK_CONTAINER (vbox), FALSE);
@@ -1782,6 +1778,41 @@ prefs_dialog_new (Gimp       *gimp,
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
 
+  /********************/
+  /*  Window Manager  */
+  /********************/
+  vbox = prefs_notebook_append_page (gimp,
+                                     GTK_NOTEBOOK (notebook),
+				     _("Window Manager"),
+                                     "window-manager.png",
+				     GTK_TREE_STORE (tree),
+				     _("Window Manager"),
+				     GIMP_HELP_PREFS_WINDOW_MANAGER,
+				     NULL,
+				     &top_iter,
+				     page_index++);
+
+  vbox2 = prefs_frame_new (_("Decorations"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2), FALSE);
+
+  prefs_enum_option_menu_add (object, "toolbox-window-type", 0, 0,
+                              _("Window Type Hint for the _Toolbox:"),
+                              GTK_TABLE (table), 0);
+
+  prefs_enum_option_menu_add (object, "dock-window-type", 0, 0,
+                              _("Window Type Hint for the _Docks:"),
+                              GTK_TABLE (table), 1);
+
+  vbox2 = prefs_frame_new (_("Focus"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "activate-on-focus",
+                          _("Activate the _Focused Image"),
+                          GTK_BOX (vbox2));
+
+
   /*****************/
   /*  Environment  */
   /*****************/

app/widgets/gimphelp-ids.h

@@ -363,6 +363,7 @@
 #define GIMP_HELP_PREFS_IMAGE_WINDOW_TITLE        "gimp-prefs-image-window-title"
 #define GIMP_HELP_PREFS_DISPLAY                   "gimp-prefs-display"
 #define GIMP_HELP_PREFS_MONITOR                   "gimp-prefs-monitor"
+#define GIMP_HELP_PREFS_WINDOW_MANAGER            "gimp-prefs-window-manager"
 #define GIMP_HELP_PREFS_ENVIRONMENT               "gimp-prefs-environment"
 #define GIMP_HELP_PREFS_SESSION                   "gimp-prefs-session"
 #define GIMP_HELP_PREFS_FOLDERS                   "gimp-prefs-folders"

themes/Default/images/preferences/Makefile.am

@@ -27,7 +27,8 @@ PREFS_IMAGES = \
 	monitor.png			\
 	new-image.png			\
 	session.png			\
-	tool-options.png
+	tool-options.png		\
+	window-manager.png
 
 themedata_DATA = $(PREFS_IMAGES)