callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove all use-gegl config stuff

Browse Source
This commit is contained in:
Michael Natterer
2012-05-19 00:50:53 +02:00
parent 06c59973d3
commit 01c92a7c4e
13 changed files with 0 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/actions/Makefile.am
View File

@ -35,10 +35,6 @@ libappactions_a_SOURCES = \
colormap-actions.h \
colormap-commands.c \
colormap-commands.h \
config-actions.c \
config-actions.h \
config-commands.c \
config-commands.h \
context-actions.c \
context-actions.h \
context-commands.c \

4
app/actions/actions.c
View File

@ -55,7 +55,6 @@
#include "buffers-actions.h"
#include "channels-actions.h"
#include "colormap-actions.h"
#include "config-actions.h"
#include "context-actions.h"
#include "cursor-info-actions.h"
#include "debug-actions.h"
@ -122,9 +121,6 @@ static const GimpActionFactoryEntry action_groups[] =
{ "colormap", N_("Colormap"), GIMP_STOCK_COLORMAP,
colormap_actions_setup,
colormap_actions_update },
{ "config", N_("Configuration"), GTK_STOCK_PREFERENCES,
config_actions_setup,
config_actions_update },
{ "context", N_("Context"), GIMP_STOCK_TOOL_OPTIONS /* well... */,
context_actions_setup,
context_actions_update },

79
app/actions/config-actions.c
View File

@ -1,79 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "actions-types.h"
#include "core/gimp.h"
#include "widgets/gimpactiongroup.h"
#include "widgets/gimphelp-ids.h"
#include "config-actions.h"
#include "config-commands.h"
#include "gimp-intl.h"
static const GimpToggleActionEntry config_toggle_actions[] =
{
{ "config-use-gegl", NULL,
NC_("config-action", "Use _GEGL"), NULL,
NC_("config-action", "If possible, use GEGL for image processing"),
G_CALLBACK (config_use_gegl_cmd_callback),
FALSE,
GIMP_HELP_CONFIG_USE_GEGL }
};
static void
config_actions_use_gegl_notify (GObject *config,
GParamSpec *pspec,
GimpActionGroup *group)
{
gboolean active;
g_object_get (config,
"use-gegl", &active,
NULL);
gimp_action_group_set_action_active (group, "config-use-gegl", active);
}
void
config_actions_setup (GimpActionGroup *group)
{
gimp_action_group_add_toggle_actions (group, "config-action",
config_toggle_actions,
G_N_ELEMENTS (config_toggle_actions));
config_actions_use_gegl_notify (G_OBJECT (group->gimp->config), NULL, group);
g_signal_connect_object (group->gimp->config,
"notify::use-gegl",
G_CALLBACK (config_actions_use_gegl_notify),
group, 0);
}
void
config_actions_update (GimpActionGroup *group,
gpointer data)
{
}

27
app/actions/config-actions.h
View File

@ -1,27 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CONFIG_ACTIONS_H__
#define __CONFIG_ACTIONS_H__
void config_actions_setup (GimpActionGroup *group);
void config_actions_update (GimpActionGroup *group,
gpointer data);
#endif /* __CONFIG_ACTIONS_H__ */

43
app/actions/config-commands.c
View File

@ -1,43 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "actions-types.h"
#include "core/gimp.h"
#include "actions.h"
#include "config-commands.h"
/* public functions */
void
config_use_gegl_cmd_callback (GtkAction *action,
gpointer data)
{
GtkToggleAction *toggle_action = GTK_TOGGLE_ACTION (action);
Gimp *gimp = NULL;
return_if_no_gimp (gimp, data);
g_object_set (gimp->config,
"use-gegl", gtk_toggle_action_get_active (toggle_action),
NULL);
}

26
app/actions/config-commands.h
View File

@ -1,26 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CONFIG_COMMANDS_H__
#define __CONFIG_COMMANDS_H__
void config_use_gegl_cmd_callback (GtkAction *action,
gpointer data);
#endif /* __CONFIG_COMMANDS_H__ */

15
app/config/gimpcoreconfig.c
View File

@ -103,7 +103,6 @@ enum
PROP_COLOR_PROFILE_POLICY,
PROP_SAVE_DOCUMENT_HISTORY,
PROP_QUICK_MASK_COLOR,
PROP_USE_GEGL,
/* ignored, only for backward compatibility: */
PROP_INSTALL_COLORMAP,
@ -450,14 +449,6 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
TRUE, &red,
GIMP_PARAM_STATIC_STRINGS);
/* not serialized */
g_object_class_install_property (object_class, PROP_USE_GEGL,
g_param_spec_boolean ("use-gegl",
"Use GEGL", NULL,
TRUE,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
/* only for backward compatibility: */
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_INSTALL_COLORMAP,
"install-colormap", NULL,
@ -730,9 +721,6 @@ gimp_core_config_set_property (GObject *object,
case PROP_QUICK_MASK_COLOR:
gimp_value_get_rgb (value, &core_config->quick_mask_color);
break;
case PROP_USE_GEGL:
core_config->use_gegl = g_value_get_boolean (value);
break;
case PROP_INSTALL_COLORMAP:
case PROP_MIN_COLORS:
@ -902,9 +890,6 @@ gimp_core_config_get_property (GObject *object,
case PROP_QUICK_MASK_COLOR:
gimp_value_set_rgb (value, &core_config->quick_mask_color);
break;
case PROP_USE_GEGL:
g_value_set_boolean (value, core_config->use_gegl);
break;
case PROP_INSTALL_COLORMAP:
case PROP_MIN_COLORS:

1
app/config/gimpcoreconfig.h
View File

@ -88,7 +88,6 @@ struct _GimpCoreConfig
GimpColorProfilePolicy color_profile_policy;
gboolean save_document_history;
GimpRGB quick_mask_color;
gboolean use_gegl;
};
struct _GimpCoreConfigClass

8
app/core/gimp.c
View File

@ -1324,11 +1324,3 @@ gimp_get_temp_filename (Gimp *gimp,
return filename;
}
gboolean
gimp_use_gegl (Gimp *gimp)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), FALSE);
return gimp->config->use_gegl;
}

2
app/core/gimp.h
View File

@ -216,7 +216,5 @@ void gimp_image_opened (Gimp *gimp,
gchar * gimp_get_temp_filename (Gimp *gimp,
const gchar *extension);
gboolean gimp_use_gegl (Gimp *gimp);
#endif /* __GIMP_H__ */

3
app/menus/menus.c
View File

@ -93,7 +93,6 @@ menus_init (Gimp *gimp,
gimp_menu_factory_manager_register (global_menu_factory, "<Image>",
"file",
"config",
"context",
"debug",
"help",
@ -122,7 +121,6 @@ menus_init (Gimp *gimp,
gimp_menu_factory_manager_register (global_menu_factory, "<Toolbox>",
"file",
"config",
"context",
"help",
"edit",
@ -143,7 +141,6 @@ menus_init (Gimp *gimp,
gimp_menu_factory_manager_register (global_menu_factory, "<Dock>",
"file",
"config",
"context",
"edit",
"select",

2
menus/image-menu.xml.in
View File

@ -512,8 +512,6 @@
<menuitem action="drawable-value-invert" />
</placeholder>
<separator />
<menuitem action="config-use-gegl" />
<separator />
<menu action="colors-auto-menu" name="Auto">
<menuitem action="drawable-equalize" />
<menuitem action="drawable-levels-stretch" />

1
po/POTFILES.in
View File

@ -21,7 +21,6 @@ app/actions/channels-actions.c
app/actions/channels-commands.c
app/actions/colormap-actions.c
app/actions/colormap-commands.c
app/actions/config-actions.c
app/actions/context-actions.c
app/actions/context-commands.c
app/actions/cursor-info-actions.c