[gimp] app: move symmetry painting out of the playground
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: move symmetry painting out of the playground
- Date: Sat, 6 Feb 2016 22:34:30 +0000 (UTC)
commit 406e1819d0ec1cee4fa7f7c0271a77f136684ff7
Author: Michael Natterer <mitch gimp org>
Date: Sat Feb 6 23:33:04 2016 +0100
app: move symmetry painting out of the playground
Also fixes bug #761617 because we don't unconditionally dereference
image_editor->context in gimp_symmetry_editor_set_image() any longer.
app/config/gimpguiconfig.c | 14 --------------
app/config/gimpguiconfig.h | 1 -
app/dialogs/preferences-dialog.c | 3 ---
app/widgets/gimpsymmetryeditor.c | 26 +-------------------------
4 files changed, 1 insertions(+), 43 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 3ec5369..ef08362 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -83,7 +83,6 @@ enum
PROP_PLAYGROUND_NPD_TOOL,
PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL,
PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
- PROP_PLAYGROUND_SYMMETRY,
PROP_HIDE_DOCKS,
PROP_SINGLE_WINDOW_MODE,
@@ -302,13 +301,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
GIMP_PARAM_STATIC_STRINGS |
GIMP_CONFIG_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
- PROP_PLAYGROUND_SYMMETRY,
- "playground-symmetry",
- PLAYGROUND_SYMMETRY_BLURB,
- FALSE,
- GIMP_PARAM_STATIC_STRINGS |
- GIMP_CONFIG_PARAM_RESTART);
- GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class,
PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL,
"playground-seamless-clone-tool",
PLAYGROUND_SEAMLESS_CLONE_TOOL_BLURB,
@@ -536,9 +528,6 @@ gimp_gui_config_set_property (GObject *object,
case PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL:
gui_config->playground_handle_transform_tool = g_value_get_boolean (value);
break;
- case PROP_PLAYGROUND_SYMMETRY:
- gui_config->playground_symmetry = g_value_get_boolean (value);
- break;
case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
gui_config->playground_seamless_clone_tool = g_value_get_boolean (value);
break;
@@ -689,9 +678,6 @@ gimp_gui_config_get_property (GObject *object,
case PROP_PLAYGROUND_HANDLE_TRANSFORM_TOOL:
g_value_set_boolean (value, gui_config->playground_handle_transform_tool);
break;
- case PROP_PLAYGROUND_SYMMETRY:
- g_value_set_boolean (value, gui_config->playground_symmetry);
- break;
case PROP_PLAYGROUND_SEAMLESS_CLONE_TOOL:
g_value_set_boolean (value, gui_config->playground_seamless_clone_tool);
break;
diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h
index 309c2fe..d487d0e 100644
--- a/app/config/gimpguiconfig.h
+++ b/app/config/gimpguiconfig.h
@@ -83,7 +83,6 @@ struct _GimpGuiConfig
gboolean playground_npd_tool;
gboolean playground_handle_transform_tool;
gboolean playground_seamless_clone_tool;
- gboolean playground_symmetry;
/* saved in sessionrc */
gboolean hide_docks;
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 9b866ae..c839c83 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1601,9 +1601,6 @@ prefs_dialog_new (Gimp *gimp,
button = prefs_check_button_add (object, "playground-seamless-clone-tool",
_("_Seamless Clone tool"),
GTK_BOX (vbox2));
- button = prefs_check_button_add (object, "playground-symmetry",
- _("_Symmetry Painting"),
- GTK_BOX (vbox2));
}
diff --git a/app/widgets/gimpsymmetryeditor.c b/app/widgets/gimpsymmetryeditor.c
index c41d341..29337bc 100644
--- a/app/widgets/gimpsymmetryeditor.c
+++ b/app/widgets/gimpsymmetryeditor.c
@@ -27,17 +27,12 @@
#include "widgets-types.h"
-#include "config/gimpguiconfig.h"
-
-#include "core/gimp.h"
-#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "core/gimpimage-symmetry.h"
#include "core/gimpsymmetry.h"
#include "gimpmenufactory.h"
#include "gimppropgui.h"
-#include "gimpspinscale.h"
#include "gimpsymmetryeditor.h"
#include "gimp-intl.h"
@@ -118,9 +113,6 @@ gimp_symmetry_editor_set_image (GimpImageEditor *image_editor,
GimpImage *image)
{
GimpSymmetryEditor *editor = GIMP_SYMMETRY_EDITOR (image_editor);
- GimpGuiConfig *guiconfig;
-
- guiconfig = GIMP_GUI_CONFIG (image_editor->context->gimp->config);
if (image_editor->image)
{
@@ -138,7 +130,7 @@ gimp_symmetry_editor_set_image (GimpImageEditor *image_editor,
editor->p->menu = NULL;
}
- if (image_editor->image && guiconfig->playground_symmetry)
+ if (image_editor->image)
{
GtkListStore *store;
GtkTreeIter iter;
@@ -198,22 +190,6 @@ gimp_symmetry_editor_set_image (GimpImageEditor *image_editor,
symmetry = gimp_image_get_active_symmetry (image_editor->image);
gimp_symmetry_editor_set_options (editor, symmetry);
}
- else if (! guiconfig->playground_symmetry)
- {
- GtkWidget *label;
-
- /* Display a text when the feature is disabled. */
- label = gtk_label_new (_("Symmetry Painting is disabled.\n"
- "You can enable the feature in the "
- "\"Experimental Playground\" section of \"Preferences\"."));
- gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gimp_label_set_attributes (GTK_LABEL (label),
- PANGO_ATTR_WEIGHT, PANGO_WEIGHT_BOLD,
- -1);
- gtk_container_add (GTK_CONTAINER (editor->p->options_vbox), label);
- gtk_widget_show (label);
- }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]