app: disable the foreground select tool properly: #if 0 everything

so it's not in the way of further cruft removal.
This commit is contained in:
Michael Natterer
2012-05-21 03:09:08 +02:00
parent d93b7e5e54
commit 513e3b6a78
13 changed files with 43 additions and 13 deletions

View File

@ -260,6 +260,7 @@ tools_fg_select_brush_size_cmd_callback (GtkAction *action,
tool_info = gimp_context_get_tool (context); tool_info = gimp_context_get_tool (context);
#if 0
if (tool_info && GIMP_IS_FOREGROUND_SELECT_OPTIONS (tool_info->tool_options)) if (tool_info && GIMP_IS_FOREGROUND_SELECT_OPTIONS (tool_info->tool_options))
{ {
action_select_property ((GimpActionSelectType) value, action_select_property ((GimpActionSelectType) value,
@ -268,6 +269,7 @@ tools_fg_select_brush_size_cmd_callback (GtkAction *action,
"stroke-width", "stroke-width",
1.0, 4.0, 16.0, 0.1, FALSE); 1.0, 4.0, 16.0, 0.1, FALSE);
} }
#endif
} }
void void

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#include "config.h" #include "config.h"
#include <gegl.h> #include <gegl.h>
@ -23,10 +25,8 @@
#include "core-types.h" #include "core-types.h"
#if 0
#include "base/siox.h" #include "base/siox.h"
#include "base/tile-manager.h" #include "base/tile-manager.h"
#endif
#include "gegl/gimp-gegl-utils.h" #include "gegl/gimp-gegl-utils.h"
@ -47,7 +47,6 @@ gimp_drawable_foreground_extract (GimpDrawable *drawable,
GimpDrawable *mask, GimpDrawable *mask,
GimpProgress *progress) GimpProgress *progress)
{ {
#if 0
SioxState *state; SioxState *state;
const gdouble sensitivity[3] = { SIOX_DEFAULT_SENSITIVITY_L, const gdouble sensitivity[3] = { SIOX_DEFAULT_SENSITIVITY_L,
SIOX_DEFAULT_SENSITIVITY_A, SIOX_DEFAULT_SENSITIVITY_A,
@ -73,7 +72,6 @@ gimp_drawable_foreground_extract (GimpDrawable *drawable,
gimp_drawable_foreground_extract_siox_done (state); gimp_drawable_foreground_extract_siox_done (state);
} }
#endif
} }
SioxState * SioxState *
@ -83,7 +81,6 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
gint width, gint width,
gint height) gint height)
{ {
#if 0
GeglBuffer *buffer; GeglBuffer *buffer;
const guchar *colormap = NULL; const guchar *colormap = NULL;
gboolean intersect; gboolean intersect;
@ -117,9 +114,6 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
return siox_init (gimp_gegl_buffer_get_tiles (buffer), colormap, return siox_init (gimp_gegl_buffer_get_tiles (buffer), colormap,
offset_x, offset_y, offset_x, offset_y,
x, y, width, height); x, y, width, height);
#endif
return NULL;
} }
void void
@ -131,7 +125,6 @@ gimp_drawable_foreground_extract_siox (GimpDrawable *mask,
gboolean multiblob, gboolean multiblob,
GimpProgress *progress) GimpProgress *progress)
{ {
#if 0
GeglBuffer *buffer; GeglBuffer *buffer;
gint x1, y1; gint x1, y1;
gint x2, y2; gint x2, y2;
@ -171,15 +164,14 @@ gimp_drawable_foreground_extract_siox (GimpDrawable *mask,
gimp_progress_end (progress); gimp_progress_end (progress);
gimp_drawable_update (mask, x1, y1, x2, y2); gimp_drawable_update (mask, x1, y1, x2, y2);
#endif
} }
void void
gimp_drawable_foreground_extract_siox_done (SioxState *state) gimp_drawable_foreground_extract_siox_done (SioxState *state)
{ {
#if 0
g_return_if_fail (state != NULL); g_return_if_fail (state != NULL);
siox_done (state); siox_done (state);
#endif
} }
#endif

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#ifndef __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__ #ifndef __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__
#define __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__ #define __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__
@ -44,3 +46,5 @@ void gimp_drawable_foreground_extract_siox_done (SioxState *state);
#endif /* __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__ */ #endif /* __GIMP_DRAWABLE_FOREGROUND_EXTRACT_H__ */
#endif

View File

@ -932,10 +932,13 @@ drawable_foreground_extract_invoker (GimpProcedure *procedure,
if (success) if (success)
{ {
/*
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error)) if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error))
gimp_drawable_foreground_extract (drawable, mode, mask, progress); gimp_drawable_foreground_extract (drawable, mode, mask, progress);
else else
success = FALSE; success = FALSE;
*/
success = FALSE;
} }
return gimp_procedure_get_return_values (procedure, success, return gimp_procedure_get_return_values (procedure, success,

View File

@ -172,8 +172,8 @@ gimp_tools_init (Gimp *gimp)
/* selection tools */ /* selection tools */
gimp_foreground_select_tool_register,
#if 0 #if 0
gimp_foreground_select_tool_register,
gimp_iscissors_tool_register, gimp_iscissors_tool_register,
#endif #endif
gimp_by_color_select_tool_register, gimp_by_color_select_tool_register,

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#include "config.h" #include "config.h"
#include <gegl.h> #include <gegl.h>
@ -397,3 +399,5 @@ gimp_foreground_select_options_get_mask_color (GimpForegroundSelectOptions *opti
break; break;
} }
} }
#endif

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#ifndef __GIMP_FOREGROUND_SELECT_OPTIONS_H__ #ifndef __GIMP_FOREGROUND_SELECT_OPTIONS_H__
#define __GIMP_FOREGROUND_SELECT_OPTIONS_H__ #define __GIMP_FOREGROUND_SELECT_OPTIONS_H__
@ -56,3 +58,5 @@ void gimp_foreground_select_options_get_mask_color (GimpForegroundSelectO
#endif /* __GIMP_FOREGROUND_SELECT_OPTIONS_H__ */ #endif /* __GIMP_FOREGROUND_SELECT_OPTIONS_H__ */
#endif

View File

@ -18,6 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
@ -886,3 +888,5 @@ gimp_foreground_select_options_notify (GimpForegroundSelectOptions *options,
} }
} }
} }
#endif

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#ifndef __GIMP_FOREGROUND_SELECT_TOOL_H__ #ifndef __GIMP_FOREGROUND_SELECT_TOOL_H__
#define __GIMP_FOREGROUND_SELECT_TOOL_H__ #define __GIMP_FOREGROUND_SELECT_TOOL_H__
@ -61,3 +63,5 @@ GType gimp_foreground_select_tool_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_FOREGROUND_SELECT_TOOL_H__ */ #endif /* __GIMP_FOREGROUND_SELECT_TOOL_H__ */
#endif

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#include "config.h" #include "config.h"
#include <gegl.h> #include <gegl.h>
@ -163,3 +165,5 @@ gimp_foreground_select_tool_undo_free (GimpUndo *undo,
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode); GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
} }
#endif

View File

@ -15,6 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if 0
#ifndef __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__ #ifndef __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__
#define __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__ #define __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__
@ -49,3 +51,5 @@ GType gimp_foreground_select_tool_undo_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__ */ #endif /* __GIMP_FOREGROUND_SELECT_TOOL_UNDO_H__ */
#endif

View File

@ -534,7 +534,9 @@
<menuitem action="tools-rect-select" /> <menuitem action="tools-rect-select" />
<menuitem action="tools-ellipse-select" /> <menuitem action="tools-ellipse-select" />
<menuitem action="tools-free-select" /> <menuitem action="tools-free-select" />
<!--
<menuitem action="tools-foreground-select" /> <menuitem action="tools-foreground-select" />
-->
<menuitem action="tools-fuzzy-select" /> <menuitem action="tools-fuzzy-select" />
<menuitem action="tools-by-color-select" /> <menuitem action="tools-by-color-select" />
<!-- <!--

View File

@ -946,10 +946,13 @@ HELP
headers => [ qw("core/gimpdrawable-foreground-extract.h") ], headers => [ qw("core/gimpdrawable-foreground-extract.h") ],
code => <<'CODE' code => <<'CODE'
{ {
/*
if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error)) if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error))
gimp_drawable_foreground_extract (drawable, mode, mask, progress); gimp_drawable_foreground_extract (drawable, mode, mask, progress);
else else
success = FALSE; success = FALSE;
*/
success = FALSE;
} }
CODE CODE
); );