Commit 487f71ba authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Removed the old paths and the remaining legacy stuff it needed. Fixes bug

2003-05-21  Michael Natterer  <mitch@gimp.org>

	Removed the old paths and the remaining legacy stuff it needed.
	Fixes bug #104471.

	* Makefile.am
	* configure.in
	* pixmaps/*: removed the pixmaps/ directory.

	* app/ops_buttons.[ch]
	* app/path.[ch]
	* app/pathP.h
	* app/path_transform.h
	* app/gui/paths-dialog.[ch]
	* app/tools/gimpbezierselecttool.[ch]: removed these files.

	* app/Makefile.am
	* app/gui/Makefile.am
	* app/tools/Makefile.am: changed accordingly.

	* app/core/core-types.h: removed the Path* types.

	* app/core/gimpimage.[ch]
	* app/core/gimpimage-duplicate.c: removed gimage->paths.

	* app/gui/about-dialog.c: inline wilber2_xpm for now.

	* app/gui/dialogs-constructors.c
	* app/gui/dialogs-menu.c
	* app/gui/dialogs.c
	* app/gui/menus.c: removed the old paths dialog.

	* app/gui/gui.c: removed gui_rotate_the_shield_harmonics() hack
	which was broken anyway.

	* app/tools/gimptransformtool.c: #if 0 path_transform preview stuff.

	* app/tools/gimpiscissorstool.c: removed useless include.

	* app/tools/tools.c: removed the bezier select tool.

	* app/vectors/gimpvectors.c (gimp_vectors_real_stroke_add): use
	g_list_append(), not g_list_prepend() so some ugly side conditions
	of legacy path loading are honored.

	* app/xcf/xcf-load.c
	* app/xcf/xcf-save.c: load and save only GimpVectors.
parent bf4d38d7
2003-05-21 Michael Natterer <mitch@gimp.org>
Removed the old paths and the remaining legacy stuff it needed.
Fixes bug #104471.
* Makefile.am
* configure.in
* pixmaps/*: removed the pixmaps/ directory.
* app/ops_buttons.[ch]
* app/path.[ch]
* app/pathP.h
* app/path_transform.h
* app/gui/paths-dialog.[ch]
* app/tools/gimpbezierselecttool.[ch]: removed these files.
* app/Makefile.am
* app/gui/Makefile.am
* app/tools/Makefile.am: changed accordingly.
* app/core/core-types.h: removed the Path* types.
* app/core/gimpimage.[ch]
* app/core/gimpimage-duplicate.c: removed gimage->paths.
* app/gui/about-dialog.c: inline wilber2_xpm for now.
* app/gui/dialogs-constructors.c
* app/gui/dialogs-menu.c
* app/gui/dialogs.c
* app/gui/menus.c: removed the old paths dialog.
* app/gui/gui.c: removed gui_rotate_the_shield_harmonics() hack
which was broken anyway.
* app/tools/gimptransformtool.c: #if 0 path_transform preview stuff.
* app/tools/gimpiscissorstool.c: removed useless include.
* app/tools/tools.c: removed the bezier select tool.
* app/vectors/gimpvectors.c (gimp_vectors_real_stroke_add): use
g_list_append(), not g_list_prepend() so some ugly side conditions
of legacy path loading are honored.
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c: load and save only GimpVectors.
2003-05-21 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable.[ch]: added GimpDrawable::alpha_changed()
......@@ -4,7 +4,6 @@ SUBDIRS = \
m4macros \
tools \
regexrepl \
pixmaps \
cursors \
themes \
po \
......
......@@ -35,21 +35,7 @@ scriptdata =
bin_PROGRAMS = gimp-1.3
##
## stuff which is about to be replaced by new subsystems
##
bye_sources = \
ops_buttons.c \
ops_buttons.h \
path.c \
path.h \
pathP.h \
path_transform.h
##
## stuff
##
stuff_sources = \
gimp_1_3_SOURCES = \
appenv.h \
app_procs.c \
app_procs.h \
......@@ -62,10 +48,6 @@ stuff_sources = \
libgimp_glue.c \
libgimp_glue.h
gimp_1_3_SOURCES = \
$(bye_sources) \
$(stuff_sources)
EXTRA_DIST = \
makefile.msc \
gimp.rc \
......@@ -95,6 +77,7 @@ INCLUDES = \
gimp_1_3_LDADD = \
$(gimp_exp) \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
config/libappconfig.a \
gui/libappgui.a \
display/libappdisplay.a \
......@@ -114,7 +97,6 @@ gimp_1_3_LDADD = \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpmodule/libgimpmodule-$(LT_RELEASE).la \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la \
$(GTK_LIBS) \
$(PANGOFT2_LIBS) \
$(LIBART_LIBS) \
......
......@@ -131,13 +131,6 @@ typedef struct _GimpPaletteEntry GimpPaletteEntry;
typedef struct _GimpPlugInDebug GimpPlugInDebug;
/* EEK stuff */
typedef struct _Path Path;
typedef struct _PathPoint PathPoint;
typedef struct _PathList PathList;
/* functions */
typedef void (* GimpInitStatusFunc) (const gchar *text1,
......
......@@ -42,8 +42,6 @@
#include "gimplist.h"
#include "gimpparasitelist.h"
#include "path.h"
#include "gimp-intl.h"
......@@ -61,7 +59,6 @@ gimp_image_duplicate (GimpImage *gimage)
GimpDrawable *new_floating_sel_drawable = NULL;
GimpDrawable *floating_sel_drawable = NULL;
GimpParasiteList *parasites;
PathList *paths;
gint count;
g_return_val_if_fail (gimage != NULL, NULL);
......@@ -222,26 +219,6 @@ gimp_image_duplicate (GimpImage *gimage)
new_gimage->parasites = gimp_parasite_list_copy (parasites);
}
/* Copy paths */
paths = gimp_image_get_paths (gimage);
if (paths)
{
GSList *plist = NULL;
GSList *new_plist = NULL;
Path *path;
PathList *new_paths;
for (plist = paths->bz_paths; plist; plist = plist->next)
{
path = plist->data;
new_plist = g_slist_append (new_plist, path_copy (new_gimage, path));
}
new_paths = path_list_new (new_gimage,
paths->last_selected_row, new_plist);
gimp_image_set_paths (new_gimage, new_paths);
}
gimp_image_undo_enable (new_gimage);
return new_gimage;
......
......@@ -60,8 +60,6 @@
#include "vectors/gimpvectors.h"
#include "path.h"
#include "gimp-intl.h"
......@@ -474,8 +472,6 @@ gimp_image_init (GimpImage *gimage)
gimage->parasites = gimp_parasite_list_new ();
gimage->paths = NULL;
gimage->qmask_state = FALSE;
gimage->qmask_inverted = FALSE;
gimage->qmask_color.r = 1.0;
......@@ -641,8 +637,6 @@ gimp_image_get_memsize (GimpObject *object)
memsize += gimp_object_get_memsize (GIMP_OBJECT (gimage->parasites));
/* FIXME paths */
memsize += gimp_object_get_memsize (GIMP_OBJECT (gimage->undo_stack));
memsize += gimp_object_get_memsize (GIMP_OBJECT (gimage->redo_stack));
......@@ -2066,7 +2060,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
}
/* layers / channels / paths */
/* layers / channels / vectors */
GimpContainer *
gimp_image_get_layers (const GimpImage *gimage)
......@@ -2092,23 +2086,6 @@ gimp_image_get_vectors (const GimpImage *gimage)
return gimage->vectors;
}
void
gimp_image_set_paths (GimpImage *gimage,
PathList *paths)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
gimage->paths = paths;
}
PathList *
gimp_image_get_paths (const GimpImage *gimage)
{
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
return gimage->paths;
}
GimpDrawable *
gimp_image_active_drawable (const GimpImage *gimage)
{
......
......@@ -140,8 +140,6 @@ struct _GimpImage
GimpParasiteList *parasites; /* Plug-in parasite data */
PathList *paths; /* Paths data for this image */
gboolean visible[MAX_CHANNELS]; /* visible channels */
gboolean active[MAX_CHANNELS]; /* active channels */
......@@ -385,10 +383,6 @@ GimpContainer * gimp_image_get_layers (const GimpImage *gimage);
GimpContainer * gimp_image_get_channels (const GimpImage *gimage);
GimpContainer * gimp_image_get_vectors (const GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage,
PathList *paths);
PathList * gimp_image_get_paths (const GimpImage *gimage);
GimpDrawable * gimp_image_active_drawable (const GimpImage *gimage);
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
......
......@@ -41,13 +41,119 @@
#include "gimp-intl.h"
#include "pixmaps/wilber2.xpm"
#define ANIMATION_STEPS 16
#define ANIMATION_SIZE 2
static char * wilber2_xpm[] = {
"95 95 9 1",
" c None",
". c #FFFFFF",
"+ c #B6B6B6",
"@ c #494949",
"# c #DBDBDB",
"$ c #6D6D6D",
"% c #929292",
"& c #242424",
"* c #000000",
" .+. ",
" .+. .+@# ..+. ",
" #@+. .$@# .%&. ",
" #&+. .&@#. .+&$. ..#. ",
" .++. +*$.. .$*%. .%*%. ..%%. ",
" .$@. #@*%. .#*&. .#&@. .%*%. ",
" .$&+. .#&&+ .%*&# .#&*# #&@.. ",
" .+*&+. .#*&+ .#&*$. .#@*&# #&$. ",
" .+#. ..%&&+. .%*&# .%**+. .$**%. .+&@. ..++. ",
" .%@#. ..@*$. #@*&#. .$**+. #**@.. ..+@*@. .#$&%. ",
" .+&$.. .@*%. .@**%. .#&*@.. #&*@. .%**&+. .%*%.. ",
" #&*@+. #&*@.. .+&*&+. .%**%. .$*&#. #&*&+. .$*#. ",
" .#+.+$*&+. #&*&%.. .+&*&+..#&*&#..+**%. #&*@. ..+&*# ",
" ... .@&...@*%. .%***$#. .%**&# .@**%. #&*@. .@*@. .+@&*&. .... ",
" +%..#&$+..@*@.. ..+@**&+..#&**+ .@**$..#**&# .$*&# #&**@+. .#+@%. ",
" +&%.+*@+#.@**%#.. .#@**@. #&**+.#&**+..%**&. .$*&+ +**$#. .$*@#. ",
" #@&$@**%+#%***@%#...+**&#.+&*@##@**$..%&**$..#&**+ .+**+. .#&&#. ",
" .+@&***@##.%&***&%. #&*&#.@*&+#@**$.#@**&%..#$**&+ .%*&# ..#+$*%. ",
" ..+&**&#...#+&**&#.#&*$.%**@.#&**+.%**&+.#$&***$. .$*&# .#$&**&+. ",
" .@***%.....+&**+.%**+.%**@.#&**+.$**@..@***&%#..+&*&# .%***@%. ",
" ... .$***@......$**+.@**+.+***+.@**$.%**@.+&**$#..#%&**&#..$**%#.. ..... ",
" #$#. .$***&%.....#@*#.@**@#.$**&+#&**+#&*&#+**&#.%&*****%.#$@*@.. ..%@&+ ",
" #@@++#.. .$****&$+....#$#.%***@+#$**&+%**@.$**+#&*@.#&***&@%#%$+$*%. .%*&%. ",
" .+&*&&$. .@******&%.....++#%&**&+#@**$#***#%**$#&*&#+**&%##+@%##&*+. .#+++@&+.. ",
" .+%$**+..$********$.....#+++@**&+%**&#&**#%**@#@*&#%**$#$&*%..%*&# .+&****$. ",
" ...@*&%#%*****@$@*@#....#&$+&**$+**&+***#@**$#&*&+%**&***@..#&*$. .@***&@#. ",
" .+***&&*****&##+@@+....%&&&**@+**&@**@%***+$**&+$*****@#..#@%#..+&*@+#.. ",
" .@**********%..#@&+...#&$%&*&@**&**&@***@%&***&*****&+.........$*&#. ",
" ... ..+++%&*****@...#&@...#&@##@*********************@%&%....++###$**$. ..##.. ",
" +$+..#.. ..+*****&#...+&+..+@&$.#&@%+%$$@&&**&***&&@$+#%&#...$&*&&&**&+. .....#@&&%. ",
" #@&@@&$#. #@*****@#...%$...#@&.+$#......##++%%%%+#.+$@&%...+&*******@. .#%$++@*$%#. ",
" .#&*&**$#..#++#.#******&+..#%....+%....................#&@%+....@**&$$@&$#..#@*****$... ",
" ..#.%**&@&***&+.$*******&%%++%$@&$.............##++#..#+......+**&#........$***&&@#. ",
" ..@********@##&*************&%..........+##....+$%#.......+@**%.#++#...%&*@+##.. ",
" .#@@@%%$&**+.+&************%..........%&&@$.....$$#.....+&**&##@**&$%@**&#. ",
" .......+&*&##@***********@...........%$%+@+.....$%.#%$$@***%#@*********%. ",
" .%***&&***********+...............+@#....#$+#+##+@&%#$***@@&***$.. ... ..... ",
" .##..#+#. ..###.#&**************&#........#$#.....%#.....#@.....#$%$&*&%#.#%$+....+%#..+@@%# ",
" #@@$$&*@#..+@&&@+.%&*&&@&*********@+#......+*@$$+..........@#.....#&***%..##... ..$&*&$$&&&@+ ",
" .#@**@**&@&*****&#.####.#%*******@&*&$+....+%+++$$#.....##.%+......&**@#+@&@%...#$******&+... ",
" ..+#.%&****&&***$#.#+$&@&******&+##%@&@#........$+.....%&@%%......@&$#+&****@%$@**@%%$$#. ",
" ..%&&$+##+@**&@&***********&#....%&#..#......#.....@**&%...#+.@+#+&**********$#..... ",
" ..##.. .#&***************&#....+&#.#$........+.#%****%...$*%&@&***@%+$****@#. ",
" .....+&**&@%%$*******&#....+@#.#&&@$@$..#*&&*****#.+#$*******$#...+@@%#. ",
" .#%@$#.+%%##++%&******&#...#@+...+%+$$$%.#&******&.#&&&**&**&$##%%#.......#.. ",
" .###...+&***&#...+@&*********&+...$%.....#.......%&*****%.#@****%%%+#%&**&+. .#%&@+..#+#..",
".##.+@*&%%$******&++$&************%..+&#.....+#.......%@&**&+..#+@**@%%%@*****&+##+@***&$%&*&%#",
"#$&&*&&*****&$$@*******&&&********@..%$.......%%#......#$@++@$%$@&&*************&&***&&***&$$$#",
".#%@@##$**&$#...%****&$##+&*******&#.%$........%@%%%%%$$%#..#+++%$$@@&***&*********&+##%@$#....",
" .......+$+.. ..%&&@+#+@&*********$.+@.........#+++++#.............+&**$+$****&**@#. ..... ",
" ... ..#+#.##..$*************$#&$..........%$@$$%...........#&**@+$&****$+#.. ",
" .#$&*&%#.#$***************$@*$.......+@&@@@$+..........#@***********@# .... ",
" .#$*****@@&**&@%%***********&&*%.....$@%#...............%************&#..#%%#. ",
" ..+#.#$***&&*****&%#+@**************&#....#.................#&*************$%$&**&#... ",
" ..#@*&&&**@+##%&**&+#@*****************@+....................#@&********************&%%@. ",
" .#+%@*&****$#. ..+$%##$*******************&&$%+###............#$&@***********&&**&$+%&***&. ",
" #$&*&%#%@&$#...##....+&**@%@***************@@@&&&@@$+#......#%@**@&*********&@@$%#...+@@%%. ",
" ..#++....#....%&&@%+%&**%#+&***********&%@*@##&&@&***&@%%%%$&****&$********@$@#... ..... ",
" .%*********@#$************&@+&&@$.&*+%****************&%@&**&@$@$#. ",
" .#&**&&****&#+&***&*******&+$&*$#$%&*$$*$&***&**********&@@@@$@&*@+###++#. ",
" ....#@**$##+$&$+.@**&+%&********&&*%.#@&&@@*@$*&&***************$+#@***&&&**$.. ",
" .#%%$&**%.. .....+**&#+&***********@+..#&%+*&$&&+%****************$.+*********%.... ",
" .#@*****@#..#+%+#+&**%#&***&*********&$+.+#.@$#+++&***@***$%@@&&&**&#.%@@@%+%&*&%%%$. ",
" ..#%*&@&&@#..#@**&&&**&#%***%%&**********&@+#.####+&****%***@+####+@*&+...#....#@*****. ",
" #$&*@#.###. .$********%.@**$#@**************&@@@&****&**%$****@$%#.#**$.. .#%%+%.. ",
" #%$%#. #&**@%%$@+.#&*&#$***$%&*****************&$**@#$******@#.&**$#..... .... ",
" ..... .+**$#......%**@#&**$+&**&@&**********&**@%***%#+$@&***%.@***&@@@%#. ",
" ...#@*@#...+%%$&**$#&*&#$**&%@**&$**&$&*&%**&#@***$+..+@**$.+&*******%. ",
" .#%$&**%..#$******&+#&*@.@**$+&**%@**$%**@+***++@****@#.#&*$..#%$$$@**@.. ",
" #@****@#..%****&&&+.#**@#&**+%**@+&**+%**&#@**@+#%&***@#.&*@........%&*%##. ",
" .+*&@@$+. .@**@+###..%**@.@**#%**@#&**++**&++&**&%##$***+.&**%.. ..$**&@+. ",
" ..+@&#.... .&*&#...#+$&**$.$**++**@#@**%.&**@#+&***$.#@*&+.@***$+#.. .#%$@&@# ",
" .$*&$. .#**%..#$*****&#.$**%#@*&+%**&#+&**@##@***#.$*&#.+&*****@+. ....+@% ",
" #++#.. ..$*&+..%***&@%+.#@**$.$**$.@**$.+&**$.#&**%.@*&#..+$@&***@. .## ",
" ..+$**&# .$**@#...+@***+.%**@.+***#.%**&#.@**##@**+. ...#+&*&# ",
" .$****$. .@**+..#@****$..$**@.#&**+.#**&##@*@..@**&+.. .#**+.. ",
" #&*@$+.. .$*@. .@***$#.#%&**%.#&**+.+**$.+**%..+&**&$+.. .@*&%+. ",
" .+*$#.. .@*@. .&**%..#@**&%##@**$.#@*&#.$**$. .+@&**&$. .+@&*&#. ",
" .#@*+. .#&*@. .&*&#..%**&+..$**$#.%**$..%**&#. ..+$**&# ..#%*%. ",
" #&&%. .#@**$. .@*&. .@**$. +**&#..@**%..#&**@#.. ..$**+ ..$@. ",
" #+#.. .+&**&+. .%*&. .$**+. +**@# .$**@#..+@**&%.. .#&*+. ..#. ",
" .$*@%#. .%*&# .+**%. #&*&#..+&*&+. .#%&**%. #&*$#. ",
" .@&#.. ..$**+ .&*$. .$**+. .+&*&+. ..%**$. .%&*@+. ",
" .#@&. ..%**&# .$*&#...@*&#. .+&*&#. .#&*%. ..#%*$. ",
" .$&$. .%**@+. .%**%. .+**$. .$**%. #&*+. ..@@. ",
" #@%#. .$*@#. ..@**+. #**&. .%**+. #&*%.. .+$# ",
" ##.. .%*+. .%**$. .+**$. .%*&# .%&&%. ... ",
" .+*%. #@*$.. .@*@#. .@*$. ..#&&# ",
" #@&+. .$*+. .@*%. .%&@#. .%&# ",
" +&%. .+*%. .$*%. ..%*$. .+@# ",
" ##.. .+*$. .#&&# .#@@. .#. ",
" .$&#. .$&# .@$. ",
" .$%. .@@. .%+. ",
" .#.. .%+. .... ",
" ... "};
static gboolean about_dialog_load_logo (GtkWidget *window);
static void about_dialog_destroy (GtkObject *object,
gpointer data);
......@@ -68,7 +174,7 @@ static void about_dialog_tool_drop (GtkWidget *widget,
static gboolean about_dialog_timer (gpointer data);
extern gboolean double_speed;
static gboolean double_speed = FALSE;
static GtkWidget *about_dialog = NULL;
static GtkWidget *logo_area = NULL;
......
......@@ -83,7 +83,6 @@
#include "file-new-dialog.h"
#include "layers-commands.h"
#include "module-browser.h"
#include "paths-dialog.h"
#include "preferences-dialog.h"
#include "templates-commands.h"
#include "tips-dialog.h"
......@@ -123,8 +122,6 @@ static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_path_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_navigation_context_func (GimpDockable *dockable,
......@@ -141,9 +138,6 @@ static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
static void dialogs_image_item_view_image_changed (GimpContext *context,
GimpImage *gimage,
GimpContainerView *view);
static void dialogs_path_view_image_changed (GimpContext *context,
GimpImage *gimage,
GtkWidget *view);
static void dialogs_image_editor_image_changed (GimpContext *context,
GimpImage *gimage,
GimpImageEditor *editor);
......@@ -740,32 +734,6 @@ dialogs_vectors_list_view_new (GimpDialogFactory *factory,
return dockable;
}
GtkWidget *
dialogs_path_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
static GtkWidget *view = NULL;
GtkWidget *dockable;
if (view)
return NULL;
view = paths_dialog_create ();
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
dockable = dialogs_dockable_new (view,
"Old Path List", "Old Paths", NULL,
NULL, NULL,
dialogs_set_path_context_func);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
}
GtkWidget *
dialogs_indexed_palette_new (GimpDialogFactory *factory,
GimpContext *context,
......@@ -1312,41 +1280,6 @@ dialogs_set_image_item_context_func (GimpDockable *dockable,
}
}
static void
dialogs_set_path_context_func (GimpDockable *dockable,
GimpContext *context)
{
GtkWidget *view;
view = (GtkWidget *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (! view)
return;
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_path_view_image_changed,
view);
}
if (context)
{
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_path_view_image_changed),
view);
dialogs_path_view_image_changed (context,
gimp_context_get_image (context),
view);
}
else
{
dialogs_path_view_image_changed (NULL, NULL, view);
}
}
static void
dialogs_set_image_editor_context_func (GimpDockable *dockable,
GimpContext *context)
......@@ -1450,14 +1383,6 @@ dialogs_image_item_view_image_changed (GimpContext *context,
gimp_item_tree_view_set_image (GIMP_ITEM_TREE_VIEW (view), gimage);
}
static void
dialogs_path_view_image_changed (GimpContext *context,
GimpImage *gimage,
GtkWidget *widget)
{
paths_dialog_update (gimage);
}
static void
dialogs_image_editor_image_changed (GimpContext *context,
GimpImage *gimage,
......
......@@ -165,8 +165,6 @@ static const GimpDialogFactoryEntry dock_entries[] =
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-vectors-list", dialogs_vectors_list_view_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-path-list", dialogs_path_list_view_new,
0, TRUE, FALSE, FALSE, TRUE },
{ "gimp-indexed-palette", dialogs_indexed_palette_new,
0, FALSE, FALSE, FALSE, TRUE },
{ "gimp-selection-editor", dialogs_selection_editor_new,
......
......@@ -43,8 +43,6 @@ dialogs_sources = \
palette-import-dialog.h \
palette-select.c \
palette-select.h \
paths-dialog.c \
paths-dialog.h \
pattern-select.c \
pattern-select.h \
preferences-dialog.c \
......
......@@ -41,13 +41,119 @@
#include "gimp-intl.h"
#include "pixmaps/wilber2.xpm"
#define ANIMATION_STEPS 16
#define ANIMATION_SIZE 2
static char * wilber2_xpm[] = {
"95 95 9 1",
" c None",
". c #FFFFFF",
"+ c #B6B6B6",
"@ c #494949",
"# c #DBDBDB",
"$ c #6D6D6D",
"% c #929292",
"& c #242424",
"* c #000000",
" .+. ",
" .+. .+@# ..+. ",
" #@+. .$@# .%&. ",
" #&+. .&@#. .+&$. ..#. ",
" .++. +*$.. .$*%. .%*%. ..%%. ",
" .$@. #@*%. .#*&. .#&@. .%*%. ",
" .$&+. .#&&+ .%*&# .#&*# #&@.. ",
" .+*&+. .#*&+ .#&*$. .#@*&# #&$. ",
" .+#. ..%&&+. .%*&# .%**+. .$**%. .+&@. ..++. ",
" .%@#. ..@*$. #@*&#. .$**+. #**@.. ..+@*@. .#$&%. ",
" .+&$.. .@*%. .@**%. .#&*@.. #&*@. .%**&+. .%*%.. ",
" #&*@+. #&*@.. .+&*&+. .%**%. .$*&#. #&*&+. .$*#. ",
" .#+.+$*&+. #&*&%.. .+&*&+..#&*&#..+**%. #&*@. ..+&*# ",
" ... .@&...@*%. .%***$#. .%**&# .@**%. #&*@. .@*@. .+@&*&. .... ",
" +%..#&$+..@*@.. ..+@**&+..#&**+ .@**$..#**&# .$*&# #&**@+. .#+@%. ",
" +&%.+*@+#.@**%#.. .#@**@. #&**+.#&**+..%**&. .$*&+ +**$#. .$*@#. ",
" #@&$@**%+#%***@%#...+**&#.+&*@##@**$..%&**$..#&**+ .+**+. .#&&#. ",
" .+@&***@##.%&***&%. #&*&#.@*&+#@**$.#@**&%..#$**&+ .%*&# ..#+$*%. ",
" ..+&**&#...#+&**&#.#&*$.%**@.#&**+.%**&+.#$&***$. .$*&# .#$&**&+. ",
" .@***%.....+&**+.%**+.%**@.#&**+.$**@..@***&%#..+&*&# .%***@%. ",
" ... .$***@......$**+.@**+.+***+.@**$.%**@.+&**$#..#%&**&#..$**%#.. ..... ",
" #$#. .$***&%.....#@*#.@**@#.$**&+#&**+#&*&#+**&#.%&*****%.#$@*@.. ..%@&+ ",
" #@@++#.. .$****&$+....#$#.%***@+#$**&+%**@.$**+#&*@.#&***&@%#%$+$*%. .%*&%. ",
" .+&*&&$. .@******&%.....++#%&**&+#@**$#***#%**$#&*&#+**&%##+@%##&*+. .#+++@&+.. ",
" .+%$**+..$********$.....#+++@**&+%**&#&**#%**@#@*&#%**$#$&*%..%*&# .+&****$. ",
" ...@*&%#%*****@$@*@#....#&$+&**$+**&+***#@**$#&*&+%**&***@..#&*$. .@***&@#. ",
" .+***&&*****&##+@@+....%&&&**@+**&@**@%***+$**&+$*****@#..#@%#..+&*@+#.. ",
" .@**********%..#@&+...#&$%&*&@**&**&@***@%&***&*****&+.........$*&#. ",
" ... ..+++%&*****@...#&@...#&@##@*********************@%&%....++###$**$. ..##.. ",
" +$+..#.. ..+*****&#...+&+..+@&$.#&@%+%$$@&&**&***&&@$+#%&#...$&*&&&**&+. .....#@&&%. ",
" #@&@@&$#. #@*****@#...%$...#@&.+$#......##++%%%%+#.+$@&%...+&*******@. .#%$++@*$%#. ",
" .#&*&**$#..#++#.#******&+..#%....+%....................#&@%+....@**&$$@&$#..#@*****$... ",
" ..#.%**&@&***&+.$*******&%%++%$@&$.............##++#..#+......+**&#........$***&&@#. ",
" ..@********@##&*************&%..........+##....+$%#.......+@**%.#++#...%&*@+##.. ",
" .#@@@%%$&**+.+&************%..........%&&@$.....$$#.....+&**&##@**&$%@**&#. ",
" .......+&*&##@***********@...........%$%+@+.....$%.#%$$@***%#@*********%. ",
" .%***&&***********+...............+@#....#$+#+##+@&%#$***@@&***$.. ... ..... ",
" .##..#+#. ..###.#&**************&#........#$#.....%#.....#@.....#$%$&*&%#.#%$+....+%#..+@@%# ",
" #@@$$&*@#..+@&&@+.%&*&&@&*********@+#......+*@$$+..........@#.....#&***%..##... ..$&*&$$&&&@+ ",
" .#@**@**&@&*****&#.####.#%*******@&*&$+....+%+++$$#.....##.%+......&**@#+@&@%...#$******&+... ",
" ..+#.%&****&&***$#.#+$&@&******&+##%@&@#........$+.....%&@%%......@&$#+&****@%$@**@%%$$#. ",
" ..%&&$+##+@**&@&***********&#....%&#..#......#.....@**&%...#+.@+#+&**********$#..... ",
" ..##.. .#&***************&#....+&#.#$........+.#%****%...$*%&@&***@%+$****@#. ",
" .....+&**&@%%$*******&#....+@#.#&&@$@$..#*&&*****#.+#$*******$#...+@@%#. ",
" .#%@$#.+%%##++%&******&#...#@+...+%+$$$%.#&******&.#&&&**&**&$##%%#.......#.. ",
" .###...+&***&#...+@&*********&+...$%.....#.......%&*****%.#@****%%%+#%&**&+. .#%&@+..#+#..",
".##.+@*&%%$******&++$&************%..+&#.....+#.......%@&**&+..#+@**@%%%@*****&+##+@***&$%&*&%#",
"#$&&*&&*****&$$@*******&&&********@..%$.......%%#......#$@++@$%$@&&*************&&***&&***&$$$#",
".#%@@##$**&$#...%****&$##+&*******&#.%$........%@%%%%%$$%#..#+++%$$@@&***&*********&+##%@$#....",
" .......+$+.. ..%&&@+#+@&*********$.+@.........#+++++#.............+&**$+$****&**@#. ..... ",
" ... ..#+#.##..$*************$#&$..........%$@$$%...........#&**@+$&****$+#.. ",
" .#$&*&%#.#$***************$@*$.......+@&@@@$+..........#@***********@# .... ",
" .#$*****@@&**&@%%***********&&*%.....$@%#...............%************&#..#%%#. ",
" ..+#.#$***&&*****&%#+@**************&#....#.................#&*************$%$&**&#... ",
" ..#@*&&&**@+##%&**&+#@*****************@+....................#@&********************&%%@. ",
" .#+%@*&****$#. ..+$%##$*******************&&$%+###............#$&@***********&&**&$+%&***&. ",
" #$&*&%#%@&$#...##....+&**@%@***************@@@&&&@@$+#......#%@**@&*********&@@$%#...+@@%%. ",
" ..#++....#....%&&@%+%&**%#+&***********&%@*@##&&@&***&@%%%%$&****&$********@$@#... ..... ",
" .%*********@#$************&@+&&@$.&*+%****************&%@&**&@$@$#. ",
" .#&**&&****&#+&***&*******&+$&*$#$%&*$$*$&***&**********&@@@@$@&*@+###++#. ",
" ....#@**$##+$&$+.@**&+%&********&&*%.#@&&@@*@$*&&***************$+#@***&&&**$.. ",
" .#%%$&**%.. .....+**&#+&***********@+..#&%+*&$&&+%****************$.+*********%.... ",
" .#@*****@#..#+%+#+&**%#&***&*********&$+.+#.@$#+++&***@***$%@@&&&**&#.%@@@%+%&*&%%%$. ",
" ..#%*&@&&@#..#@**&&&**&#%***%%&**********&@+#.####+&****%***@+####+@*&+...#....#@*****. ",
" #$&*@#.###. .$********%.@**$#@**************&@@@&****&**%$****@$%#.#**$.. .#%%+%.. ",
" #%$%#. #&**@%%$@+.#&*&#$***$%&*****************&$**@#$******@#.&**$#..... .... ",
" ..... .+**$#......%**@#&**$+&**&@&**********&**@%***%#+$@&***%.@***&@@@%#. ",
" ...#@*@#...+%%$&**$#&*&#$**&%@**&$**&$&*&%**&#@***$+..+@**$.+&*******%. ",
" .#%$&**%..#$******&+#&*@.@**$+&**%@**$%**@+***++@****@#.#&*$..#%$$$@**@.. ",
" #@****@#..%****&&&+.#**@#&**+%**@+&**+%**&#@**@+#%&***@#.&*@........%&*%##. ",
" .+*&@@$+. .@**@+###..%**@.@**#%**@#&**++**&++&**&%##$***+.&**%.. ..$**&@+. ",
" ..+@&#.... .&*&#...#+$&**$.$**++**@#@**%.&**@#+&***$.#@*&+.@***$+#.. .#%$@&@# ",
" .$*&$. .#**%..#$*****&#.$**%#@*&+%**&#+&**@##@***#.$*&#.+&*****@+. ....+@% ",
" #++#.. ..$*&+..%***&@%+.#@**$.$**$.@**$.+&**$.#&**%.@*&#..+$@&***@. .## ",
" ..+$**&# .$**@#...+@***+.%**@.+***#.%**&#.@**##@**+. ...#+&*&# ",
" .$****$. .@**+..#@****$..$**@.#&**+.#**&##@*@..@**&+.. .#**+.. ",
" #&*@$+.. .$*@. .@***$#.#%&**%.#&**+.+**$.+**%..+&**&$+.. .@*&%+. ",
" .+*$#.. .@*@. .&**%..#@**&%##@**$.#@*&#.$**$. .+@&**&$. .+@&*&#. ",
" .#@*+. .#&*@. .&*&#..%**&+..$**$#.%**$..%**&#. ..+$**&# ..#%*%. ",
" #&&%. .#@**$. .@*&. .@**$. +**&#..@**%..#&**@#.. ..$**+ ..$@. ",
" #+#.. .+&**&+. .%*&. .$**+. +**@# .$**@#..+@**&%.. .#&*+. ..#. ",
" .$*@%#. .%*&# .+**%. #&*&#..+&*&+. .#%&**%. #&*$#. ",
" .@&#.. ..$**+ .&*$. .$**+. .+&*&+. ..%**$. .%&*@+. ",
" .#@&. ..%**&# .$*&#...@*&#. .+&*&#. .#&*%. ..#%*$. ",
" .$&$. .%**@+. .%**%. .+**$. .$**%. #&*+. ..@@. ",
" #@%#. .$*@#. ..@**+. #**&. .%**+. #&*%.. .+$# ",
" ##.. .%*+. .%**$. .+**$. .%*&# .%&&%. ... ",
" .+*%. #@*$.. .@*@#. .@*$. ..#&&# ",
" #@&+. .$*+. .@*%. .%&@#. .%&# ",
" +&%. .+*%. .$*%. ..%*$. .+@# ",
" ##.. .+*$. .#&&# .#@@. .#. ",
" .$&#. .$&# .@$. ",
" .$%. .@@. .%+. ",
" .#.. .%+. .... ",
" ... "};
static gboolean about_dialog_load_logo (GtkWidget *window);
static void about_dialog_destroy (GtkObject *object,
gpointer data);
......@@ -68,7 +174,7 @@ static void about_dialog_tool_drop (GtkWidget *widget,
static gboolean about_dialog_timer (gpointer data);
extern gboolean double_speed;
static gboolean double_speed = FALSE;
static GtkWidget *about_dialog = NULL;
static GtkWidget *logo_area = NULL;
......
......@@ -83,7 +83,6 @@
#include "file-new-dialog.h"
#include "layers-commands.h"
#include "module-browser.h"
#include "paths-dialog.h"
#include "preferences-dialog.h"
#include "templates-commands.h"
#include "tips-dialog.h"
......@@ -123,8 +122,6 @@ static void dialogs_set_color_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_item_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_path_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_image_editor_context_func (GimpDockable *dockable,
GimpContext *context);
static void dialogs_set_navigation_context_func (GimpDockable *dockable,
......@@ -141,9 +138,6 @@ static GtkWidget * dialogs_dockable_new (GtkWidget *widget,
static void dialogs_image_item_view_image_changed (GimpContext *context,
GimpImage *gimage,
GimpContainerView *view);
static void dialogs_path_view_image_changed (GimpContext *context,
GimpImage *gimage,
GtkWidget *view);
static void dialogs_image_editor_image_changed (GimpContext *context,
GimpImage *gimage,
GimpImageEditor *editor);
......@@ -740,32 +734,6 @@ dialogs_vectors_list_view_new (GimpDialogFactory *factory,
return dockable;
}
GtkWidget *
dialogs_path_list_view_new (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
static GtkWidget *view = NULL;
GtkWidget *dockable;
if (view)
return NULL;
view = paths_dialog_create ();
g_object_add_weak_pointer (G_OBJECT (view), (gpointer *) &view);
dockable = dialogs_dockable_new (view,
"Old Path List", "Old Paths", NULL,
NULL, NULL,
dialogs_set_path_context_func);
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
return dockable;
}
GtkWidget *
dialogs_indexed_palette_new (GimpDialogFactory *factory,
GimpContext *context,
......@@ -1312,41 +1280,6 @@ dialogs_set_image_item_context_func (GimpDockable *dockable,
}
}
static void
dialogs_set_path_context_func (GimpDockable *dockable,
GimpContext *context)
{
GtkWidget *view;
view = (GtkWidget *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (! view)
return;
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_path_view_image_changed,
view);
}
if (context)
{
g_signal_connect (context, "image_changed",