[gimp] app: reorder the prefs categories tree, and rename some pages



commit 2e43824062f68c6e027d4b55374c963da3e4750f
Author: Michael Natterer <mitch gimp org>
Date:   Sat Dec 12 22:52:53 2015 +0100

    app: reorder the prefs categories tree, and rename some pages

 app/dialogs/preferences-dialog.c | 1134 +++++++++++++++++++-------------------
 1 files changed, 567 insertions(+), 567 deletions(-)
---
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 8b37976..000ec5f 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1354,16 +1354,16 @@ prefs_dialog_new (Gimp       *gimp,
   g_object_set_data (G_OBJECT (dialog), "prefs-box", prefs_box);
 
 
-  /*****************/
-  /*  Environment  */
-  /*****************/
+  /**********************/
+  /*  System Resources  */
+  /**********************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
                                   "gimp-prefs-environment",
                                   GTK_ICON_SIZE_DIALOG,
-                                  _("Environment"),
+                                  _("System Resources"),
                                   "gimp-prefs-environment",
                                   GTK_ICON_SIZE_BUTTON,
-                                  _("Environment"),
+                                  _("System Resources"),
                                   GIMP_HELP_PREFS_ENVIRONMENT,
                                   NULL,
                                   &top_iter);
@@ -1430,6 +1430,361 @@ prefs_dialog_new (Gimp       *gimp,
                           GTK_BOX (vbox2));
 
 
+  /**********************/
+  /*  Color Management  */
+  /**********************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-color-management",
+                                  GTK_ICON_SIZE_DIALOG,
+                                  _("Color Management"),
+                                  "gimp-prefs-color-management",
+                                  GTK_ICON_SIZE_BUTTON,
+                                  _("Color Management"),
+                                  GIMP_HELP_PREFS_COLOR_MANAGEMENT,
+                                  NULL,
+                                  &top_iter);
+
+  table = prefs_table_new (10, GTK_CONTAINER (vbox));
+
+  {
+    static const struct
+    {
+      const gchar *label;
+      const gchar *fs_label;
+      const gchar *property_name;
+    }
+    profiles[] =
+    {
+      { N_("Preferred _RGB profile:"),
+        N_("Select RGB Color Profile"),     "rgb-profile"     },
+      { N_("_CMYK profile:"),
+        N_("Select CMYK Color Profile"),    "cmyk-profile"    },
+      { N_("_Monitor profile:"),
+        N_("Select Monitor Color Profile"), "display-profile" },
+      { N_("_Print simulation profile:"),
+        N_("Select Printer Color Profile"), "printer-profile" }
+    };
+
+    GObject      *color_config;
+    GtkListStore *store;
+    gchar        *filename;
+    gint          row = 0;
+
+    g_object_get (object, "color-management", &color_config, NULL);
+
+    prefs_enum_combo_box_add (color_config, "mode", 0, 0,
+                              _("_Mode of operation:"),
+                              GTK_TABLE (table), row++, NULL);
+    gtk_table_set_row_spacing (GTK_TABLE (table), row - 1, 12);
+
+    filename = gimp_personal_rc_file ("profilerc");
+    store = gimp_color_profile_store_new (filename);
+    g_free (filename);
+
+    gimp_color_profile_store_add_file (GIMP_COLOR_PROFILE_STORE (store),
+                                       NULL, NULL);
+
+    for (i = 0; i < G_N_ELEMENTS (profiles); i++)
+      {
+        button = prefs_profile_combo_box_new (color_config,
+                                              store,
+                                              gettext (profiles[i].fs_label),
+                                              profiles[i].property_name);
+
+        gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
+                                   gettext (profiles[i].label), 0.0, 0.5,
+                                   button, 1, FALSE);
+
+
+        if (i == 2) /* display profile */
+          {
+            gtk_table_set_row_spacing (GTK_TABLE (table), row - 2, 12);
+
+            button =
+              gimp_prop_check_button_new (color_config,
+                                          "display-profile-from-gdk",
+                                          _("_Try to use the system monitor "
+                                            "profile"));
+
+            gtk_table_attach_defaults (GTK_TABLE (table),
+                                       button, 1, 2, row, row + 1);
+            gtk_widget_show (button);
+            row++;
+
+            prefs_enum_combo_box_add (color_config,
+                                      "display-rendering-intent", 0, 0,
+                                      _("_Display rendering intent:"),
+                                      GTK_TABLE (table), row++, NULL);
+
+            button =
+              gimp_prop_check_button_new (color_config,
+                                          "display-use-black-point-compensation",
+                                          _("Use _black point compensation for "
+                                            "the display"));
+
+            gtk_table_attach_defaults (GTK_TABLE (table),
+                                       button, 1, 2, row, row + 1);
+            gtk_widget_show (button);
+            gtk_table_set_row_spacing (GTK_TABLE (table), row, 12);
+            row++;
+          }
+
+        if (i == 3) /* printer profile */
+          {
+            prefs_enum_combo_box_add (color_config,
+                                      "simulation-rendering-intent", 0, 0,
+                                      _("_Softproof rendering intent:"),
+                                      GTK_TABLE (table), row++, NULL);
+
+            button =
+              gimp_prop_check_button_new (color_config,
+                                          "simulation-use-black-point-compensation",
+                                          _("Use black _point compensation "
+                                            "for softproofing"));
+
+            gtk_table_attach_defaults (GTK_TABLE (table),
+                                       button, 1, 2, row, row + 1);
+            gtk_widget_show (button);
+            row++;
+          }
+      }
+
+    g_object_unref (store);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
+    gtk_widget_show (hbox);
+    row++;
+
+    button = gimp_prop_check_button_new (color_config, "simulation-gamut-check",
+                                         _("Mark out of gamut colors"));
+    gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+    gtk_widget_show (button);
+
+    button = gimp_prop_color_button_new (color_config, "out-of-gamut-color",
+                                         _("Select Warning Color"),
+                                         COLOR_BUTTON_WIDTH,
+                                         COLOR_BUTTON_HEIGHT,
+                                         GIMP_COLOR_AREA_FLAT);
+    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+    gtk_widget_show (button);
+
+    gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
+                                  gimp_get_user_context (gimp));
+
+    gtk_table_set_row_spacing (GTK_TABLE (table), row - 1, 12);
+
+    button = prefs_enum_combo_box_add (object, "color-profile-policy", 0, 0,
+                                       _("File Open behaviour:"),
+                                       GTK_TABLE (table), row++, NULL);
+
+    g_object_unref (color_config);
+  }
+
+
+  /****************/
+  /*  Playground  */
+  /****************/
+  if (gimp->show_playground)
+    {
+      vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                      "gimp-prefs-playground",
+                                      GTK_ICON_SIZE_DIALOG,
+                                      _("Experimental Playground"),
+                                      "gimp-prefs-playground",
+                                      GTK_ICON_SIZE_BUTTON,
+                                      _("Playground"),
+                                      GIMP_HELP_PREFS_DIALOG,
+                                      NULL,
+                                      &top_iter);
+
+      vbox2 = prefs_frame_new (_("Insane Options"),
+                               GTK_CONTAINER (vbox), TRUE);
+
+      button = prefs_check_button_add (object, "playground-npd-tool",
+                                       _("_N-Point Deformation tool"),
+                                       GTK_BOX (vbox2));
+      button = prefs_check_button_add (object, "playground-handle-transform-tool",
+                                       _("_Handle Transform tool"),
+                                       GTK_BOX (vbox2));
+#ifdef HAVE_LIBMYPAINT
+      button = prefs_check_button_add (object, "playground-mybrush-tool",
+                                       _("_MyPaint Brush tool"),
+                                       GTK_BOX (vbox2));
+#endif
+
+      button = prefs_check_button_add (object, "playground-seamless-clone-tool",
+                                       _("_Seamless Clone tool"),
+                                       GTK_BOX (vbox2));
+    }
+
+
+  /******************/
+  /*  Tool Options  */
+  /******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-tool-options",
+                                  GTK_ICON_SIZE_DIALOG,
+                                  C_("preferences", "Tool Options"),
+                                  "gimp-prefs-tool-options",
+                                  GTK_ICON_SIZE_BUTTON,
+                                  C_("preferences", "Tool Options"),
+                                  GIMP_HELP_PREFS_TOOL_OPTIONS,
+                                  NULL,
+                                  &top_iter);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  General  */
+  vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add (object, "save-tool-options",
+                          _("_Save tool options on exit"),
+                          GTK_BOX (vbox2));
+
+  button = prefs_button_add ("document-save",
+                             _("Save Tool Options _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_tool_options_save_callback),
+                    gimp);
+
+  button2 = prefs_button_add (GIMP_STOCK_RESET,
+                              _("_Reset Saved Tool Options to "
+                                "Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_tool_options_clear_callback),
+                    gimp);
+
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+
+  /*  Snapping Distance  */
+  vbox2 = prefs_frame_new (_("Guide & Grid Snapping"),
+                           GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_spin_button_add (object, "snap-distance", 1.0, 5.0, 0,
+                         _("_Snap distance:"),
+                         GTK_TABLE (table), 0, size_group);
+
+  /*  Scaling  */
+  vbox2 = prefs_frame_new (_("Scaling"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+
+  prefs_enum_combo_box_add (object, "interpolation-type", 0, 0,
+                            _("Default _interpolation:"),
+                            GTK_TABLE (table), 0, size_group);
+
+  g_object_unref (size_group);
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Global Brush, Pattern, ...  */
+  vbox2 = prefs_frame_new (_("Paint Options Shared Between Tools"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "global-brush",
+                                    _("_Brush"),    GIMP_STOCK_BRUSH,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-dynamics",
+                                    _("_Dynamics"), GIMP_STOCK_DYNAMICS,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-pattern",
+                                    _("_Pattern"),  GIMP_STOCK_PATTERN,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "global-gradient",
+                                    _("_Gradient"), GIMP_STOCK_GRADIENT,
+                                    GTK_BOX (vbox2), size_group);
+
+  /*  Move Tool */
+  vbox2 = prefs_frame_new (_("Move Tool"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "move-tool-changes-active",
+                                    _("Set layer or path as active"),
+                                    GIMP_STOCK_TOOL_MOVE,
+                                    GTK_BOX (vbox2), size_group);
+
+  g_object_unref (size_group);
+  size_group = NULL;
+
+
+  /*******************/
+  /*  Default Image  */
+  /*******************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-new-image",
+                                  GTK_ICON_SIZE_DIALOG,
+                                  _("Default New Image"),
+                                  "gimp-prefs-new-image",
+                                  GTK_ICON_SIZE_BUTTON,
+                                  _("Default Image"),
+                                  GIMP_HELP_PREFS_NEW_IMAGE,
+                                  NULL,
+                                  &top_iter);
+
+  table = prefs_table_new (1, GTK_CONTAINER (vbox));
+
+  {
+    GtkWidget *combo;
+
+    combo = gimp_container_combo_box_new (gimp->templates,
+                                          gimp_get_user_context (gimp),
+                                          16, 0);
+    gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
+                               _("_Template:"),  0.0, 0.5,
+                               combo, 1, FALSE);
+
+    gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);
+
+    g_signal_connect (combo, "select-item",
+                      G_CALLBACK (prefs_template_select_callback),
+                      core_config->default_image);
+  }
+
+  editor = gimp_template_editor_new (core_config->default_image, gimp, FALSE);
+  gimp_template_editor_show_advanced (GIMP_TEMPLATE_EDITOR (editor), TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), editor, FALSE, FALSE, 0);
+  gtk_widget_show (editor);
+
+  /*  Quick Mask Color */
+  vbox2 = prefs_frame_new (_("Quick Mask"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+  button = gimp_prop_color_button_new (object, "quick-mask-color",
+                                       _("Set the default Quick Mask color"),
+                                       COLOR_BUTTON_WIDTH,
+                                       COLOR_BUTTON_HEIGHT,
+                                       GIMP_COLOR_AREA_SMALL_CHECKS);
+  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
+                                gimp_get_user_context (gimp));
+  prefs_widget_add_aligned (button, _("Quick Mask color:"),
+                            GTK_TABLE (table), 0, TRUE, NULL);
+
+
+
+  /**********************************/
+  /*  Default Image / Default Grid  */
+  /**********************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-default-grid",
+                                  GTK_ICON_SIZE_DIALOG,
+                                  _("Default Image Grid"),
+                                  "gimp-prefs-default-grid",
+                                  GTK_ICON_SIZE_BUTTON,
+                                  _("Default Grid"),
+                                  GIMP_HELP_PREFS_DEFAULT_GRID,
+                                  &top_iter,
+                                  &child_iter);
+
+  /*  Grid  */
+  editor = gimp_grid_editor_new (core_config->default_grid,
+                                 gimp_get_user_context (gimp),
+                                 gimp_template_get_resolution_x (core_config->default_image),
+                                 gimp_template_get_resolution_y (core_config->default_image));
+  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
+  gtk_widget_show (editor);
+
+
   /***************/
   /*  Interface  */
   /***************/
@@ -1512,46 +1867,9 @@ prefs_dialog_new (Gimp       *gimp,
                     gimp);
 
 
-  /****************/
-  /*  Playground  */
-  /****************/
-  if (gimp->show_playground)
-    {
-      vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                      "gimp-prefs-playground",
-                                      GTK_ICON_SIZE_DIALOG,
-                                      _("Experimental Playground"),
-                                      "gimp-prefs-playground",
-                                      GTK_ICON_SIZE_BUTTON,
-                                      _("Playground"),
-                                      GIMP_HELP_PREFS_DIALOG,
-                                      NULL,
-                                      &top_iter);
-
-      vbox2 = prefs_frame_new (_("Insane Options"),
-                               GTK_CONTAINER (vbox), TRUE);
-
-      button = prefs_check_button_add (object, "playground-npd-tool",
-                                       _("_N-Point Deformation tool"),
-                                       GTK_BOX (vbox2));
-      button = prefs_check_button_add (object, "playground-handle-transform-tool",
-                                       _("_Handle Transform tool"),
-                                       GTK_BOX (vbox2));
-#ifdef HAVE_LIBMYPAINT
-      button = prefs_check_button_add (object, "playground-mybrush-tool",
-                                       _("_MyPaint Brush tool"),
-                                       GTK_BOX (vbox2));
-#endif
-
-      button = prefs_check_button_add (object, "playground-seamless-clone-tool",
-                                       _("_Seamless Clone tool"),
-                                       GTK_BOX (vbox2));
-    }
-
-
-  /***********/
-  /*  Theme  */
-  /***********/
+  /***********************/
+  /*  Interface / Theme  */
+  /***********************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
                                   "gimp-prefs-theme",
                                   GTK_ICON_SIZE_DIALOG,
@@ -1560,8 +1878,8 @@ prefs_dialog_new (Gimp       *gimp,
                                   GTK_ICON_SIZE_BUTTON,
                                   _("Theme"),
                                   GIMP_HELP_PREFS_THEME,
-                                  NULL,
-                                  &top_iter);
+                                  &top_iter,
+                                  &child_iter);
 
   vbox2 = prefs_frame_new (_("Select Theme"), GTK_CONTAINER (vbox), TRUE);
 
@@ -1652,9 +1970,9 @@ prefs_dialog_new (Gimp       *gimp,
                     gimp);
 
 
-  /****************/
-  /*  Icon Theme  */
-  /****************/
+  /****************************/
+  /*  Interface / Icon Theme  */
+  /****************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
                                   "gimp-prefs-icon-theme",
                                   GTK_ICON_SIZE_DIALOG,
@@ -1663,8 +1981,8 @@ prefs_dialog_new (Gimp       *gimp,
                                   GTK_ICON_SIZE_BUTTON,
                                   _("Icon Theme"),
                                   GIMP_HELP_PREFS_ICON_THEME,
-                                  NULL,
-                                  &top_iter);
+                                  &top_iter,
+                                  &child_iter);
 
   vbox2 = prefs_frame_new (_("Select an Icon Theme"), GTK_CONTAINER (vbox), TRUE);
 
@@ -1744,9 +2062,56 @@ prefs_dialog_new (Gimp       *gimp,
   }
 
 
-  /*****************/
-  /*  Help System  */
-  /*****************/
+  /*************************/
+  /*  Interface / Toolbox  */
+  /*************************/
+  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
+                                  "gimp-prefs-toolbox",
+                                  GTK_ICON_SIZE_DIALOG,
+                                  _("Toolbox"),
+                                  "gimp-prefs-toolbox",
+                                  GTK_ICON_SIZE_BUTTON,
+                                  _("Toolbox"),
+                                  GIMP_HELP_PREFS_TOOLBOX,
+                                  &top_iter,
+                                  &child_iter);
+
+  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  /*  Appearance  */
+  vbox2 = prefs_frame_new (_("Appearance"),
+                           GTK_CONTAINER (vbox), FALSE);
+
+  prefs_check_button_add_with_icon (object, "toolbox-color-area",
+                                    _("Show _foreground & background color"),
+                                    GIMP_STOCK_DEFAULT_COLORS,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "toolbox-foo-area",
+                                    _("Show active _brush, pattern & gradient"),
+                                    GIMP_STOCK_BRUSH,
+                                    GTK_BOX (vbox2), size_group);
+  prefs_check_button_add_with_icon (object, "toolbox-image-area",
+                                    _("Show active _image"),
+                                    GIMP_STOCK_IMAGE,
+                                    GTK_BOX (vbox2), size_group);
+
+  g_object_unref (size_group);
+  size_group = NULL;
+
+  /* Tool Editor */
+  vbox2 = prefs_frame_new (_("Tools configuration"),
+                           GTK_CONTAINER (vbox), TRUE);
+  tool_editor = gimp_tool_editor_new (gimp->tool_info_list, gimp->user_context,
+                                      gimp_tools_get_default_order (gimp),
+                                      GIMP_VIEW_SIZE_SMALL, 1);
+
+  gtk_box_pack_start (GTK_BOX (vbox2), tool_editor, TRUE, TRUE, 0);
+  gtk_widget_show (tool_editor);
+
+
+  /*****************************/
+  /*  Interface / Help System  */
+  /*****************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
                                   "gimp-prefs-help-system",
                                   GTK_ICON_SIZE_DIALOG,
@@ -1755,8 +2120,8 @@ prefs_dialog_new (Gimp       *gimp,
                                   GTK_ICON_SIZE_BUTTON,
                                   _("Help System"),
                                   GIMP_HELP_PREFS_HELP,
-                                  NULL,
-                                  &top_iter);
+                                  &top_iter,
+                                  &child_iter);
 
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -1846,217 +2211,189 @@ prefs_dialog_new (Gimp       *gimp,
   size_group = NULL;
 
 
-  /******************/
-  /*  Tool Options  */
-  /******************/
+  /*************************/
+  /*  Interface / Display  */
+  /*************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-tool-options",
+                                  "gimp-prefs-display",
                                   GTK_ICON_SIZE_DIALOG,
-                                  C_("preferences", "Tool Options"),
-                                  "gimp-prefs-tool-options",
+                                  _("Display"),
+                                  "gimp-prefs-display",
                                   GTK_ICON_SIZE_BUTTON,
-                                  C_("preferences", "Tool Options"),
-                                  GIMP_HELP_PREFS_TOOL_OPTIONS,
-                                  NULL,
-                                  &top_iter);
+                                  _("Display"),
+                                  GIMP_HELP_PREFS_DISPLAY,
+                                  &top_iter,
+                                  &child_iter);
 
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
-  /*  General  */
-  vbox2 = prefs_frame_new (_("General"), GTK_CONTAINER (vbox), FALSE);
+  /*  Transparency  */
+  vbox2 = prefs_frame_new (_("Transparency"), GTK_CONTAINER (vbox), FALSE);
+  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
 
-  prefs_check_button_add (object, "save-tool-options",
-                          _("_Save tool options on exit"),
-                          GTK_BOX (vbox2));
+  prefs_enum_combo_box_add (object, "transparency-type", 0, 0,
+                            _("_Check style:"),
+                            GTK_TABLE (table), 0, size_group);
+  prefs_enum_combo_box_add (object, "transparency-size", 0, 0,
+                            _("Check _size:"),
+                            GTK_TABLE (table), 1, size_group);
 
-  button = prefs_button_add ("document-save",
-                             _("Save Tool Options _Now"),
-                             GTK_BOX (vbox2));
-  g_signal_connect (button, "clicked",
-                    G_CALLBACK (prefs_tool_options_save_callback),
-                    gimp);
+  vbox2 = prefs_frame_new (_("Monitor Resolution"),
+                           GTK_CONTAINER (vbox), FALSE);
 
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
-                              _("_Reset Saved Tool Options to "
-                                "Default Values"),
-                              GTK_BOX (vbox2));
-  g_signal_connect (button2, "clicked",
-                    G_CALLBACK (prefs_tool_options_clear_callback),
-                    gimp);
+  {
+    gchar *pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
 
-  g_object_set_data (G_OBJECT (button), "clear-button", button2);
+    entry = gimp_prop_coordinates_new (object,
+                                       "monitor-xresolution",
+                                       "monitor-yresolution",
+                                       NULL,
+                                       pixels_per_unit,
+                                       GIMP_SIZE_ENTRY_UPDATE_RESOLUTION,
+                                       0.0, 0.0,
+                                       TRUE);
 
-  /*  Snapping Distance  */
-  vbox2 = prefs_frame_new (_("Guide & Grid Snapping"),
-                           GTK_CONTAINER (vbox), FALSE);
-  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+    g_free (pixels_per_unit);
+  }
 
-  prefs_spin_button_add (object, "snap-distance", 1.0, 5.0, 0,
-                         _("_Snap distance:"),
-                         GTK_TABLE (table), 0, size_group);
+  gtk_table_set_col_spacings (GTK_TABLE (entry), 2);
+  gtk_table_set_row_spacings (GTK_TABLE (entry), 2);
 
-  /*  Scaling  */
-  vbox2 = prefs_frame_new (_("Scaling"), GTK_CONTAINER (vbox), FALSE);
-  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("Horizontal"), 0, 1, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("Vertical"), 0, 2, 0.0);
+  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
+                                _("ppi"), 1, 4, 0.0);
 
-  prefs_enum_combo_box_add (object, "interpolation-type", 0, 0,
-                            _("Default _interpolation:"),
-                            GTK_TABLE (table), 0, size_group);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-  g_object_unref (size_group);
-  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 24);
+  gtk_widget_show (entry);
+  gtk_widget_set_sensitive (entry, ! display_config->monitor_res_from_gdk);
 
-  /*  Global Brush, Pattern, ...  */
-  vbox2 = prefs_frame_new (_("Paint Options Shared Between Tools"),
-                           GTK_CONTAINER (vbox), FALSE);
+  group = NULL;
 
-  prefs_check_button_add_with_icon (object, "global-brush",
-                                    _("_Brush"),    GIMP_STOCK_BRUSH,
-                                    GTK_BOX (vbox2), size_group);
-  prefs_check_button_add_with_icon (object, "global-dynamics",
-                                    _("_Dynamics"), GIMP_STOCK_DYNAMICS,
-                                    GTK_BOX (vbox2), size_group);
-  prefs_check_button_add_with_icon (object, "global-pattern",
-                                    _("_Pattern"),  GIMP_STOCK_PATTERN,
-                                    GTK_BOX (vbox2), size_group);
-  prefs_check_button_add_with_icon (object, "global-gradient",
-                                    _("_Gradient"), GIMP_STOCK_GRADIENT,
-                                    GTK_BOX (vbox2), size_group);
+  {
+    gdouble  xres, yres;
+    gchar   *str;
 
-  /*  Move Tool */
-  vbox2 = prefs_frame_new (_("Move Tool"),
-                           GTK_CONTAINER (vbox), FALSE);
+    gimp_get_monitor_resolution (gdk_screen_get_default (), /* FIXME monitor */
+                                 0, /* FIXME monitor */
+                                 &xres, &yres);
 
-  prefs_check_button_add_with_icon (object, "move-tool-changes-active",
-                                    _("Set layer or path as active"),
-                                    GIMP_STOCK_TOOL_MOVE,
-                                    GTK_BOX (vbox2), size_group);
+    str = g_strdup_printf (_("_Detect automatically (currently %d × %d ppi)"),
+                           ROUND (xres), ROUND (yres));
 
-  g_object_unref (size_group);
-  size_group = NULL;
+    button = gtk_radio_button_new_with_mnemonic (group, str);
 
+    g_free (str);
+  }
 
-  /*************/
-  /*  Toolbox  */
-  /*************/
-  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-toolbox",
-                                  GTK_ICON_SIZE_DIALOG,
-                                  _("Toolbox"),
-                                  "gimp-prefs-toolbox",
-                                  GTK_ICON_SIZE_BUTTON,
-                                  _("Toolbox"),
-                                  GIMP_HELP_PREFS_TOOLBOX,
-                                  NULL,
-                                  &top_iter);
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
 
-  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+  g_object_set_data (G_OBJECT (button), "monitor_resolution_sizeentry", entry);
 
-  /*  Appearance  */
-  vbox2 = prefs_frame_new (_("Appearance"),
-                           GTK_CONTAINER (vbox), FALSE);
+  g_signal_connect (button, "toggled",
+                    G_CALLBACK (prefs_resolution_source_callback),
+                    config);
 
-  prefs_check_button_add_with_icon (object, "toolbox-color-area",
-                                    _("Show _foreground & background color"),
-                                    GIMP_STOCK_DEFAULT_COLORS,
-                                    GTK_BOX (vbox2), size_group);
-  prefs_check_button_add_with_icon (object, "toolbox-foo-area",
-                                    _("Show active _brush, pattern & gradient"),
-                                    GIMP_STOCK_BRUSH,
-                                    GTK_BOX (vbox2), size_group);
-  prefs_check_button_add_with_icon (object, "toolbox-image-area",
-                                    _("Show active _image"),
-                                    GIMP_STOCK_IMAGE,
-                                    GTK_BOX (vbox2), size_group);
+  button = gtk_radio_button_new_with_mnemonic (group, _("_Enter manually"));
+  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
 
-  g_object_unref (size_group);
-  size_group = NULL;
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
 
-  /* Tool Editor */
-  vbox2 = prefs_frame_new (_("Tools configuration"),
-                           GTK_CONTAINER (vbox), TRUE);
-  tool_editor = gimp_tool_editor_new (gimp->tool_info_list, gimp->user_context,
-                                      gimp_tools_get_default_order (gimp),
-                                      GIMP_VIEW_SIZE_SMALL, 1);
+  if (! display_config->monitor_res_from_gdk)
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
-  gtk_box_pack_start (GTK_BOX (vbox2), tool_editor, TRUE, TRUE, 0);
-  gtk_widget_show (tool_editor);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
 
+  calibrate_button = gtk_button_new_with_mnemonic (_("C_alibrate..."));
+  label = gtk_bin_get_child (GTK_BIN (calibrate_button));
+  gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), calibrate_button, FALSE, FALSE, 0);
+  gtk_widget_show (calibrate_button);
+  gtk_widget_set_sensitive (calibrate_button,
+                            ! display_config->monitor_res_from_gdk);
 
-  /***********************/
-  /*  Default New Image  */
-  /***********************/
+  g_object_bind_property (button, "active",
+                          entry,  "sensitive",
+                          G_BINDING_SYNC_CREATE);
+  g_object_bind_property (button,           "active",
+                          calibrate_button, "sensitive",
+                          G_BINDING_SYNC_CREATE);
+
+  g_signal_connect (calibrate_button, "clicked",
+                    G_CALLBACK (prefs_resolution_calibrate_callback),
+                    entry);
+
+  g_object_unref (size_group);
+  size_group = NULL;
+
+
+  /***********************************/
+  /*  Interface / Window Management  */
+  /***********************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-new-image",
+                                  "gimp-prefs-window-management",
                                   GTK_ICON_SIZE_DIALOG,
-                                  _("Default New Image"),
-                                  "gimp-prefs-new-image",
+                                  _("Window Management"),
+                                  "gimp-prefs-window-management",
                                   GTK_ICON_SIZE_BUTTON,
-                                  _("Default Image"),
-                                  GIMP_HELP_PREFS_NEW_IMAGE,
-                                  NULL,
-                                  &top_iter);
-
-  table = prefs_table_new (1, GTK_CONTAINER (vbox));
+                                  _("Window Management"),
+                                  GIMP_HELP_PREFS_WINDOW_MANAGEMENT,
+                                  &top_iter,
+                                  &child_iter);
 
-  {
-    GtkWidget *combo;
+  vbox2 = prefs_frame_new (_("Window Manager Hints"),
+                           GTK_CONTAINER (vbox), FALSE);
 
-    combo = gimp_container_combo_box_new (gimp->templates,
-                                          gimp_get_user_context (gimp),
-                                          16, 0);
-    gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
-                               _("_Template:"),  0.0, 0.5,
-                               combo, 1, FALSE);
+  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
 
-    gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);
+  prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
+                            _("Hint for _docks and toolbox:"),
+                            GTK_TABLE (table), 1, size_group);
 
-    g_signal_connect (combo, "select-item",
-                      G_CALLBACK (prefs_template_select_callback),
-                      core_config->default_image);
-  }
+  vbox2 = prefs_frame_new (_("Focus"),
+                           GTK_CONTAINER (vbox), FALSE);
 
-  editor = gimp_template_editor_new (core_config->default_image, gimp, FALSE);
-  gimp_template_editor_show_advanced (GIMP_TEMPLATE_EDITOR (editor), TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), editor, FALSE, FALSE, 0);
-  gtk_widget_show (editor);
+  prefs_check_button_add (object, "activate-on-focus",
+                          _("Activate the _focused image"),
+                          GTK_BOX (vbox2));
 
-  /*  Quick Mask Color */
-  vbox2 = prefs_frame_new (_("Quick Mask"), GTK_CONTAINER (vbox), FALSE);
-  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
-  button = gimp_prop_color_button_new (object, "quick-mask-color",
-                                       _("Set the default Quick Mask color"),
-                                       COLOR_BUTTON_WIDTH,
-                                       COLOR_BUTTON_HEIGHT,
-                                       GIMP_COLOR_AREA_SMALL_CHECKS);
-  gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
-                                gimp_get_user_context (gimp));
-  prefs_widget_add_aligned (button, _("Quick Mask color:"),
-                            GTK_TABLE (table), 0, TRUE, NULL);
+  /* Window Positions */
+  vbox2 = prefs_frame_new (_("Window Positions"), GTK_CONTAINER (vbox), FALSE);
 
+  prefs_check_button_add (object, "save-session-info",
+                          _("_Save window positions on exit"),
+                          GTK_BOX (vbox2));
+  prefs_check_button_add (object, "restore-monitor",
+                          _("Open windows on the same _monitor they were open before"),
+                          GTK_BOX (vbox2));
 
+  button = prefs_button_add ("document-save",
+                             _("Save Window Positions _Now"),
+                             GTK_BOX (vbox2));
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (prefs_session_save_callback),
+                    gimp);
 
-  /******************/
-  /*  Default Grid  */
-  /******************/
-  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-default-grid",
-                                  GTK_ICON_SIZE_DIALOG,
-                                  _("Default Image Grid"),
-                                  "gimp-prefs-default-grid",
-                                  GTK_ICON_SIZE_BUTTON,
-                                  _("Default Grid"),
-                                  GIMP_HELP_PREFS_DEFAULT_GRID,
-                                  NULL,
-                                  &top_iter);
+  button2 = prefs_button_add (GIMP_STOCK_RESET,
+                              _("_Reset Saved Window Positions to "
+                                "Default Values"),
+                              GTK_BOX (vbox2));
+  g_signal_connect (button2, "clicked",
+                    G_CALLBACK (prefs_session_clear_callback),
+                    gimp);
 
-  /*  Grid  */
-  editor = gimp_grid_editor_new (core_config->default_grid,
-                                 gimp_get_user_context (gimp),
-                                 gimp_template_get_resolution_x (core_config->default_image),
-                                 gimp_template_get_resolution_y (core_config->default_image));
-  gtk_box_pack_start (GTK_BOX (vbox), editor, TRUE, TRUE, 0);
-  gtk_widget_show (editor);
+  g_object_set_data (G_OBJECT (button), "clear-button", button2);
 
 
   /*******************/
@@ -2292,16 +2629,16 @@ prefs_dialog_new (Gimp       *gimp,
       }
   }
 
-  /********************************/
-  /*  Image Windows / Behavior  */
-  /********************************/
+  /******************************/
+  /*  Image Windows / Snapping  */
+  /******************************/
   vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
                                   "gimp-prefs-tool-options",
                                   GTK_ICON_SIZE_DIALOG,
-                                  _("Image Window Drawing Behavior"),
+                                  _("Image Window Snapping Behavior"),
                                   "gimp-prefs-tool-options",
                                   GTK_ICON_SIZE_BUTTON,
-                                  _("Behavior"),
+                                  _("Snapping"),
                                   GIMP_HELP_PREFS_IMAGE_WINDOW_APPEARANCE,
                                   &top_iter,
                                   &child_iter);
@@ -2316,285 +2653,6 @@ prefs_dialog_new (Gimp       *gimp,
                                    GTK_CONTAINER (vbox));
 
 
-  /*************/
-  /*  Display  */
-  /*************/
-  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-display",
-                                  GTK_ICON_SIZE_DIALOG,
-                                  _("Display"),
-                                  "gimp-prefs-display",
-                                  GTK_ICON_SIZE_BUTTON,
-                                  _("Display"),
-                                  GIMP_HELP_PREFS_DISPLAY,
-                                  NULL,
-                                  &top_iter);
-
-  size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-  /*  Transparency  */
-  vbox2 = prefs_frame_new (_("Transparency"), GTK_CONTAINER (vbox), FALSE);
-  table = prefs_table_new (2, GTK_CONTAINER (vbox2));
-
-  prefs_enum_combo_box_add (object, "transparency-type", 0, 0,
-                            _("_Check style:"),
-                            GTK_TABLE (table), 0, size_group);
-  prefs_enum_combo_box_add (object, "transparency-size", 0, 0,
-                            _("Check _size:"),
-                            GTK_TABLE (table), 1, size_group);
-
-  vbox2 = prefs_frame_new (_("Monitor Resolution"),
-                           GTK_CONTAINER (vbox), FALSE);
-
-  {
-    gchar *pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL);
-
-    entry = gimp_prop_coordinates_new (object,
-                                       "monitor-xresolution",
-                                       "monitor-yresolution",
-                                       NULL,
-                                       pixels_per_unit,
-                                       GIMP_SIZE_ENTRY_UPDATE_RESOLUTION,
-                                       0.0, 0.0,
-                                       TRUE);
-
-    g_free (pixels_per_unit);
-  }
-
-  gtk_table_set_col_spacings (GTK_TABLE (entry), 2);
-  gtk_table_set_row_spacings (GTK_TABLE (entry), 2);
-
-  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
-                                _("Horizontal"), 0, 1, 0.0);
-  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
-                                _("Vertical"), 0, 2, 0.0);
-  gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
-                                _("ppi"), 1, 4, 0.0);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
-  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 24);
-  gtk_widget_show (entry);
-  gtk_widget_set_sensitive (entry, ! display_config->monitor_res_from_gdk);
-
-  group = NULL;
-
-  {
-    gdouble  xres, yres;
-    gchar   *str;
-
-    gimp_get_monitor_resolution (gdk_screen_get_default (), /* FIXME monitor */
-                                 0, /* FIXME monitor */
-                                 &xres, &yres);
-
-    str = g_strdup_printf (_("_Detect automatically (currently %d × %d ppi)"),
-                           ROUND (xres), ROUND (yres));
-
-    button = gtk_radio_button_new_with_mnemonic (group, str);
-
-    g_free (str);
-  }
-
-  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-  gtk_widget_show (button);
-
-  g_object_set_data (G_OBJECT (button), "monitor_resolution_sizeentry", entry);
-
-  g_signal_connect (button, "toggled",
-                    G_CALLBACK (prefs_resolution_source_callback),
-                    config);
-
-  button = gtk_radio_button_new_with_mnemonic (group, _("_Enter manually"));
-  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-  gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
-  gtk_widget_show (button);
-
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
-
-  if (! display_config->monitor_res_from_gdk)
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
-  gtk_widget_show (hbox);
-
-  calibrate_button = gtk_button_new_with_mnemonic (_("C_alibrate..."));
-  label = gtk_bin_get_child (GTK_BIN (calibrate_button));
-  gtk_misc_set_padding (GTK_MISC (label), 4, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), calibrate_button, FALSE, FALSE, 0);
-  gtk_widget_show (calibrate_button);
-  gtk_widget_set_sensitive (calibrate_button,
-                            ! display_config->monitor_res_from_gdk);
-
-  g_object_bind_property (button, "active",
-                          entry,  "sensitive",
-                          G_BINDING_SYNC_CREATE);
-  g_object_bind_property (button,           "active",
-                          calibrate_button, "sensitive",
-                          G_BINDING_SYNC_CREATE);
-
-  g_signal_connect (calibrate_button, "clicked",
-                    G_CALLBACK (prefs_resolution_calibrate_callback),
-                    entry);
-
-  g_object_unref (size_group);
-  size_group = NULL;
-
-
-  /**********************/
-  /*  Color Management  */
-  /**********************/
-  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-color-management",
-                                  GTK_ICON_SIZE_DIALOG,
-                                  _("Color Management"),
-                                  "gimp-prefs-color-management",
-                                  GTK_ICON_SIZE_BUTTON,
-                                  _("Color Management"),
-                                  GIMP_HELP_PREFS_COLOR_MANAGEMENT,
-                                  NULL,
-                                  &top_iter);
-
-  table = prefs_table_new (10, GTK_CONTAINER (vbox));
-
-  {
-    static const struct
-    {
-      const gchar *label;
-      const gchar *fs_label;
-      const gchar *property_name;
-    }
-    profiles[] =
-    {
-      { N_("Preferred _RGB profile:"),
-        N_("Select RGB Color Profile"),     "rgb-profile"     },
-      { N_("_CMYK profile:"),
-        N_("Select CMYK Color Profile"),    "cmyk-profile"    },
-      { N_("_Monitor profile:"),
-        N_("Select Monitor Color Profile"), "display-profile" },
-      { N_("_Print simulation profile:"),
-        N_("Select Printer Color Profile"), "printer-profile" }
-    };
-
-    GObject      *color_config;
-    GtkListStore *store;
-    gchar        *filename;
-    gint          row = 0;
-
-    g_object_get (object, "color-management", &color_config, NULL);
-
-    prefs_enum_combo_box_add (color_config, "mode", 0, 0,
-                              _("_Mode of operation:"),
-                              GTK_TABLE (table), row++, NULL);
-    gtk_table_set_row_spacing (GTK_TABLE (table), row - 1, 12);
-
-    filename = gimp_personal_rc_file ("profilerc");
-    store = gimp_color_profile_store_new (filename);
-    g_free (filename);
-
-    gimp_color_profile_store_add_file (GIMP_COLOR_PROFILE_STORE (store),
-                                       NULL, NULL);
-
-    for (i = 0; i < G_N_ELEMENTS (profiles); i++)
-      {
-        button = prefs_profile_combo_box_new (color_config,
-                                              store,
-                                              gettext (profiles[i].fs_label),
-                                              profiles[i].property_name);
-
-        gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
-                                   gettext (profiles[i].label), 0.0, 0.5,
-                                   button, 1, FALSE);
-
-
-        if (i == 2) /* display profile */
-          {
-            gtk_table_set_row_spacing (GTK_TABLE (table), row - 2, 12);
-
-            button =
-              gimp_prop_check_button_new (color_config,
-                                          "display-profile-from-gdk",
-                                          _("_Try to use the system monitor "
-                                            "profile"));
-
-            gtk_table_attach_defaults (GTK_TABLE (table),
-                                       button, 1, 2, row, row + 1);
-            gtk_widget_show (button);
-            row++;
-
-            prefs_enum_combo_box_add (color_config,
-                                      "display-rendering-intent", 0, 0,
-                                      _("_Display rendering intent:"),
-                                      GTK_TABLE (table), row++, NULL);
-
-            button =
-              gimp_prop_check_button_new (color_config,
-                                          "display-use-black-point-compensation",
-                                          _("Use _black point compensation for "
-                                            "the display"));
-
-            gtk_table_attach_defaults (GTK_TABLE (table),
-                                       button, 1, 2, row, row + 1);
-            gtk_widget_show (button);
-            gtk_table_set_row_spacing (GTK_TABLE (table), row, 12);
-            row++;
-          }
-
-        if (i == 3) /* printer profile */
-          {
-            prefs_enum_combo_box_add (color_config,
-                                      "simulation-rendering-intent", 0, 0,
-                                      _("_Softproof rendering intent:"),
-                                      GTK_TABLE (table), row++, NULL);
-
-            button =
-              gimp_prop_check_button_new (color_config,
-                                          "simulation-use-black-point-compensation",
-                                          _("Use black _point compensation "
-                                            "for softproofing"));
-
-            gtk_table_attach_defaults (GTK_TABLE (table),
-                                       button, 1, 2, row, row + 1);
-            gtk_widget_show (button);
-            row++;
-          }
-      }
-
-    g_object_unref (store);
-
-    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-    gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
-    gtk_widget_show (hbox);
-    row++;
-
-    button = gimp_prop_check_button_new (color_config, "simulation-gamut-check",
-                                         _("Mark out of gamut colors"));
-    gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-    gtk_widget_show (button);
-
-    button = gimp_prop_color_button_new (color_config, "out-of-gamut-color",
-                                         _("Select Warning Color"),
-                                         COLOR_BUTTON_WIDTH,
-                                         COLOR_BUTTON_HEIGHT,
-                                         GIMP_COLOR_AREA_FLAT);
-    gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-    gtk_widget_show (button);
-
-    gimp_color_panel_set_context (GIMP_COLOR_PANEL (button),
-                                  gimp_get_user_context (gimp));
-
-    gtk_table_set_row_spacing (GTK_TABLE (table), row - 1, 12);
-
-    button = prefs_enum_combo_box_add (object, "color-profile-policy", 0, 0,
-                                       _("File Open behaviour:"),
-                                       GTK_TABLE (table), row++, NULL);
-
-    g_object_unref (color_config);
-  }
-
-
   /*******************/
   /*  Input Devices  */
   /*******************/
@@ -2661,64 +2719,6 @@ prefs_dialog_new (Gimp       *gimp,
   gtk_widget_show (vbox2);
 
 
-  /***********************/
-  /*  Window Management  */
-  /***********************/
-  vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
-                                  "gimp-prefs-window-management",
-                                  GTK_ICON_SIZE_DIALOG,
-                                  _("Window Management"),
-                                  "gimp-prefs-window-management",
-                                  GTK_ICON_SIZE_BUTTON,
-                                  _("Window Management"),
-                                  GIMP_HELP_PREFS_WINDOW_MANAGEMENT,
-                                  NULL,
-                                  &top_iter);
-
-  vbox2 = prefs_frame_new (_("Window Manager Hints"),
-                           GTK_CONTAINER (vbox), FALSE);
-
-  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
-
-  prefs_enum_combo_box_add (object, "dock-window-hint", 0, 0,
-                            _("Hint for _docks and toolbox:"),
-                            GTK_TABLE (table), 1, size_group);
-
-  vbox2 = prefs_frame_new (_("Focus"),
-                           GTK_CONTAINER (vbox), FALSE);
-
-  prefs_check_button_add (object, "activate-on-focus",
-                          _("Activate the _focused image"),
-                          GTK_BOX (vbox2));
-
-  /* Window Positions */
-  vbox2 = prefs_frame_new (_("Window Positions"), GTK_CONTAINER (vbox), FALSE);
-
-  prefs_check_button_add (object, "save-session-info",
-                          _("_Save window positions on exit"),
-                          GTK_BOX (vbox2));
-  prefs_check_button_add (object, "restore-monitor",
-                          _("Open windows on the same _monitor they were open before"),
-                          GTK_BOX (vbox2));
-
-  button = prefs_button_add ("document-save",
-                             _("Save Window Positions _Now"),
-                             GTK_BOX (vbox2));
-  g_signal_connect (button, "clicked",
-                    G_CALLBACK (prefs_session_save_callback),
-                    gimp);
-
-  button2 = prefs_button_add (GIMP_STOCK_RESET,
-                              _("_Reset Saved Window Positions to "
-                                "Default Values"),
-                              GTK_BOX (vbox2));
-  g_signal_connect (button2, "clicked",
-                    G_CALLBACK (prefs_session_clear_callback),
-                    gimp);
-
-  g_object_set_data (G_OBJECT (button), "clear-button", button2);
-
-
   /*************/
   /*  Folders  */
   /*************/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]