GNOME.org
 

[gimp] Get rid of toolbox-window-hint, use dock-window-hint instead

commit e1faf82e7d9a9dd31c5e7e88abc45c92b3cc603b
Author: Martin Nordholts <martinn src gnome org>
Date:   Wed Sep 9 23:34:18 2009 +0200

    Get rid of toolbox-window-hint, use dock-window-hint instead
    
    Since the toolbox no longer is the main window with a menu, use the
    same hint for the toolbox (which actually is a dock) as for the other
    docks.

 app/config/gimpguiconfig.c       |   23 +++++++++--------------
 app/config/gimpguiconfig.h       |    1 -
 app/config/gimprc-blurbs.h       |    9 +++------
 app/dialogs/preferences-dialog.c |    8 ++------
 app/widgets/gimptoolbox.c        |    2 +-
 docs/gimprc.5.in                 |   13 +++----------
 etc/gimprc                       |   12 +++---------
 7 files changed, 21 insertions(+), 47 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 39a8a1f..65f565b 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -79,7 +79,6 @@ enum
   PROP_WEB_BROWSER,
   PROP_USER_MANUAL_ONLINE,
   PROP_USER_MANUAL_ONLINE_URI,
-  PROP_TOOLBOX_WINDOW_HINT,
   PROP_DOCK_WINDOW_HINT,
   PROP_CURSOR_FORMAT,
 
@@ -88,6 +87,7 @@ enum
   PROP_MENU_MNEMONICS,
   PROP_SHOW_TOOL_TIPS,
   PROP_SHOW_TIPS,
+  PROP_TOOLBOX_WINDOW_HINT,
   PROP_TRANSIENT_DOCKS
 };
 
@@ -245,13 +245,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                    USER_MANUAL_ONLINE_URI_BLURB,
                                    DEFAULT_USER_MANUAL_ONLINE_URI,
                                    GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_TOOLBOX_WINDOW_HINT,
-                                 "toolbox-window-hint",
-                                 TOOLBOX_WINDOW_HINT_BLURB,
-                                 GIMP_TYPE_WINDOW_HINT,
-                                 GIMP_WINDOW_HINT_UTILITY,
-                                 GIMP_PARAM_STATIC_STRINGS |
-                                 GIMP_CONFIG_PARAM_RESTART);
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_DOCK_WINDOW_HINT,
                                  "dock-window-hint",
                                  DOCK_WINDOW_HINT_BLURB,
@@ -287,6 +280,12 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS |
                                     GIMP_CONFIG_PARAM_IGNORE);
+  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_TOOLBOX_WINDOW_HINT,
+                                 "toolbox-window-hint", NULL,
+                                 GIMP_TYPE_WINDOW_HINT,
+                                 GIMP_WINDOW_HINT_UTILITY,
+                                 GIMP_PARAM_STATIC_STRINGS |
+                                 GIMP_CONFIG_PARAM_IGNORE);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TRANSIENT_DOCKS,
                                     "transient-docks", NULL,
                                     FALSE,
@@ -414,9 +413,6 @@ gimp_gui_config_set_property (GObject      *object,
       g_free (gui_config->user_manual_online_uri);
       gui_config->user_manual_online_uri = g_value_dup_string (value);
       break;
-    case PROP_TOOLBOX_WINDOW_HINT:
-      gui_config->toolbox_window_hint = g_value_get_enum (value);
-      break;
     case PROP_DOCK_WINDOW_HINT:
       gui_config->dock_window_hint = g_value_get_enum (value);
       break;
@@ -428,6 +424,7 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_MENU_MNEMONICS:
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
+    case PROP_TOOLBOX_WINDOW_HINT:
     case PROP_TRANSIENT_DOCKS:
     case PROP_WEB_BROWSER:
       /* ignored */
@@ -530,9 +527,6 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_USER_MANUAL_ONLINE_URI:
       g_value_set_string (value, gui_config->user_manual_online_uri);
       break;
-    case PROP_TOOLBOX_WINDOW_HINT:
-      g_value_set_enum (value, gui_config->toolbox_window_hint);
-      break;
     case PROP_DOCK_WINDOW_HINT:
       g_value_set_enum (value, gui_config->dock_window_hint);
       break;
@@ -544,6 +538,7 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_MENU_MNEMONICS:
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
+    case PROP_TOOLBOX_WINDOW_HINT:
     case PROP_TRANSIENT_DOCKS:
     case PROP_WEB_BROWSER:
       /* ignored */
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 6a96c79..d020333 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -67,7 +67,6 @@ struct _GimpGuiConfig
   gchar               *web_browser;
   gboolean             user_manual_online;
   gchar               *user_manual_online_uri;
-  GimpWindowHint       toolbox_window_hint;
   GimpWindowHint       dock_window_hint;
   GimpCursorFormat     cursor_format;
 
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index 26f014f..774fe0b 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -101,8 +101,9 @@ N_("Tools such as fuzzy-select and bucket fill find regions based on a " \
 "Sets the default settings used when an image is viewed in fullscreen mode."
 
 #define DOCK_WINDOW_HINT_BLURB \
-N_("The window type hint that is set on dock windows. This may affect " \
-   "the way your window manager decorates and handles dock windows.")
+N_("The window type hint that is set on dock windows and the toolbox " \
+   "window. This may affect the way your window manager decorates and " \
+   "handles these windows.")
 
 #define ENVIRON_PATH_BLURB \
 "Sets the environ search path."
@@ -404,10 +405,6 @@ N_("Show the currently active image in the toolbox.")
 #define TOOLBOX_WILBER_BLURB \
 "Show the GIMP mascot at the top of the toolbox."
 
-#define TOOLBOX_WINDOW_HINT_BLURB \
-N_("The window type hint that is set on the toolbox. This may affect " \
-   "how your window manager decorates and handles the toolbox window.")
-
 #define TRANSPARENCY_TYPE_BLURB \
 N_("Sets the manner in which transparency is displayed in images.")
 
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index d9d4377..8e83e8a 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -2629,14 +2629,10 @@ prefs_dialog_new (Gimp       *gimp,
   vbox2 = prefs_frame_new (_("Window Manager Hints"),
                            GTK_CONTAINER (vbox), FALSE);
 
-  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
-
-  prefs_enum_combo_box_add (object, "toolbox-window-hint", 0, 0,
-                            _("Hint for the _toolbox:"),
-                            GTK_TABLE (table), 0, size_group);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
 
   prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
-                            _("Hint for other _docks:"),
+                            _("Hint for _docks and toolbox:"),
                             GTK_TABLE (table), 1, size_group);
 
   vbox2 = prefs_frame_new (_("Focus"),
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index c7a02fc..422294f 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -199,7 +199,7 @@ gimp_toolbox_constructor (GType                  type,
   context = gimp_dock_get_context (GIMP_DOCK (toolbox));
   config  = GIMP_GUI_CONFIG (context->gimp->config);
 
-  gimp_window_set_hint (GTK_WINDOW (toolbox), config->toolbox_window_hint);
+  gimp_window_set_hint (GTK_WINDOW (toolbox), config->dock_window_hint);
 
   main_vbox = gimp_dock_get_main_vbox (GIMP_DOCK (toolbox));
 
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index 18bebed..22538e2 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -824,18 +824,11 @@ The location of the online user manual. This is used if 'user-manual-online'
 is enabled.  This is a string value.
 
 .TP
-(toolbox-window-hint utility)
-
-The window type hint that is set on the toolbox. This may affect how your
-window manager decorates and handles the toolbox window.  Possible values are
-normal, utility and keep-above.
-
-.TP
 (dock-window-hint utility)
 
-The window type hint that is set on dock windows. This may affect the way your
-window manager decorates and handles dock windows.  Possible values are
-normal, utility and keep-above.
+The window type hint that is set on dock windows and the toolbox window. This
+may affect the way your window manager decorates and handles these windows. 
+Possible values are normal, utility and keep-above.
 
 .TP
 (cursor-format pixbuf)
diff --git a/etc/gimprc b/etc/gimprc
index decfdea..ee3bd15 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -650,15 +650,9 @@
 # 
 # (user-manual-online-uri "http://docs.gimp.org/2.7";)
 
-# The window type hint that is set on the toolbox. This may affect how your
-# window manager decorates and handles the toolbox window.  Possible values
-# are normal, utility and keep-above.
-# 
-# (toolbox-window-hint utility)
-
-# The window type hint that is set on dock windows. This may affect the way
-# your window manager decorates and handles dock windows.  Possible values
-# are normal, utility and keep-above.
+# The window type hint that is set on dock windows and the toolbox window.
+# This may affect the way your window manager decorates and handles these
+# windows.  Possible values are normal, utility and keep-above.
 # 
 # (dock-window-hint utility)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]