dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/widgets/gimppaletteeditor.[ch] app/gui/palette-editor-commands.[ch] 

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

	* app/widgets/gimppaletteeditor.[ch]
	* app/gui/palette-editor-commands.[ch]
	* app/gui/palette-editor-menu.c: started to clean up the palette
	editor: added buttons for all menu items and menu items for all
	buttons. Improved selected palette entry handling. Moved all code
	to gimppaletteeditor.c and call it from the menu callbacks.  Lots
	of cleanup (unfinished).
This commit is contained in:
Michael Natterer 2003-05-26 14:56:57 +00:00 committed by Michael Natterer
parent 2f31d12f86
commit 4c070aff16
8 changed files with 439 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2003-05-26 Michael Natterer <mitch@gimp.org>
* app/widgets/gimppaletteeditor.[ch]
* app/gui/palette-editor-commands.[ch]
* app/gui/palette-editor-menu.c: started to clean up the palette
editor: added buttons for all menu items and menu items for all
buttons. Improved selected palette entry handling. Moved all code
to gimppaletteeditor.c and call it from the menu callbacks. Lots
of cleanup (unfinished).
2003-05-26 Pedro Gimeno <pggimeno@wanadoo.es> 2003-05-26 Pedro Gimeno <pggimeno@wanadoo.es>
* app/tools/gimpeditselectiontool.c (selection_transform_segs): * app/tools/gimpeditselectiontool.c (selection_transform_segs):

158
app/actions/palette-editor-commands.c
View File

@ -20,31 +20,12 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h" #include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimppalette.h"
#include "widgets/gimppaletteeditor.h" #include "widgets/gimppaletteeditor.h"
#include "widgets/gimptoolbox-color-area.h"
#include "color-notebook.h"
#include "dialogs.h"
#include "palette-editor-commands.h" #include "palette-editor-commands.h"
#include "gimp-intl.h"
/* local function prototypes */
static void palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* public functions */ /* public functions */
@ -53,26 +34,10 @@ palette_editor_new_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
GimpContext *user_context;
GimpRGB color;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->edit_button))
gtk_button_clicked (GTK_BUTTON (editor->edit_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! palette)
return;
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp);
if (active_color == FOREGROUND)
gimp_context_get_foreground (user_context, &color);
else if (active_color == BACKGROUND)
gimp_context_get_background (user_context, &color);
editor->color = gimp_palette_add_entry (palette, NULL, &color);
} }
void void
@ -80,44 +45,10 @@ palette_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->edit_button))
gtk_button_clicked (GTK_BUTTON (editor->edit_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! (palette && editor->color))
return;
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_viewable_new (GIMP_VIEWABLE (palette),
_("Edit Palette Color"),
GTK_STOCK_SELECT_COLOR,
_("Edit Color Palette Entry"),
global_dialog_factory,
"gimp-palette-editor-color-dialog",
(const GimpRGB *) &editor->color->color,
palette_editor_color_notebook_callback,
editor,
FALSE, FALSE);
editor->color_notebook_active = TRUE;
}
else
{
if (! editor->color_notebook_active)
{
color_notebook_set_viewable (editor->color_notebook,
GIMP_VIEWABLE (palette));
color_notebook_show (editor->color_notebook);
editor->color_notebook_active = TRUE;
}
color_notebook_set_color (editor->color_notebook,
&editor->color->color);
}
} }
void void
@ -125,64 +56,41 @@ palette_editor_delete_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->delete_button))
gtk_button_clicked (GTK_BUTTON (editor->delete_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! (palette && editor->color))
return;
gimp_palette_delete_entry (palette, editor->color);
} }
void
/* private functions */ palette_editor_zoom_in_cmd_callback (GtkWidget *widget,
gpointer data,
static void guint action)
palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
GimpContext *user_context;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->zoom_in_button))
gtk_button_clicked (GTK_BUTTON (editor->zoom_in_button));
}
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data); void
palette_editor_zoom_out_cmd_callback (GtkWidget *widget,
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp); gpointer data,
guint action)
switch (state)
{ {
case COLOR_NOTEBOOK_UPDATE: GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
break;
case COLOR_NOTEBOOK_OK: if (GTK_WIDGET_SENSITIVE (editor->zoom_out_button))
if (editor->color) gtk_button_clicked (GTK_BUTTON (editor->zoom_out_button));
}
void
palette_editor_zoom_all_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{ {
editor->color->color = *color; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
/* Update either foreground or background colors */ if (GTK_WIDGET_SENSITIVE (editor->zoom_all_button))
if (active_color == FOREGROUND) gtk_button_clicked (GTK_BUTTON (editor->zoom_all_button));
gimp_context_set_foreground (user_context, color);
else if (active_color == BACKGROUND)
gimp_context_set_background (user_context, color);
gimp_data_dirty (GIMP_DATA (palette));
}
/* Fallthrough */
case COLOR_NOTEBOOK_CANCEL:
if (editor->color_notebook_active)
{
color_notebook_hide (editor->color_notebook);
editor->color_notebook_active = FALSE;
}
}
} }

10
app/actions/palette-editor-commands.h
View File

@ -30,5 +30,15 @@ void palette_editor_delete_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);
void palette_editor_zoom_in_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void palette_editor_zoom_out_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void palette_editor_zoom_all_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
#endif /* __PALETTE_EDITOR_COMMANDS_H__ */ #endif /* __PALETTE_EDITOR_COMMANDS_H__ */

158
app/gui/palette-editor-commands.c
View File

@ -20,31 +20,12 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h" #include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimppalette.h"
#include "widgets/gimppaletteeditor.h" #include "widgets/gimppaletteeditor.h"
#include "widgets/gimptoolbox-color-area.h"
#include "color-notebook.h"
#include "dialogs.h"
#include "palette-editor-commands.h" #include "palette-editor-commands.h"
#include "gimp-intl.h"
/* local function prototypes */
static void palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* public functions */ /* public functions */
@ -53,26 +34,10 @@ palette_editor_new_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
GimpContext *user_context;
GimpRGB color;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->edit_button))
gtk_button_clicked (GTK_BUTTON (editor->edit_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! palette)
return;
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp);
if (active_color == FOREGROUND)
gimp_context_get_foreground (user_context, &color);
else if (active_color == BACKGROUND)
gimp_context_get_background (user_context, &color);
editor->color = gimp_palette_add_entry (palette, NULL, &color);
} }
void void
@ -80,44 +45,10 @@ palette_editor_edit_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->edit_button))
gtk_button_clicked (GTK_BUTTON (editor->edit_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! (palette && editor->color))
return;
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_viewable_new (GIMP_VIEWABLE (palette),
_("Edit Palette Color"),
GTK_STOCK_SELECT_COLOR,
_("Edit Color Palette Entry"),
global_dialog_factory,
"gimp-palette-editor-color-dialog",
(const GimpRGB *) &editor->color->color,
palette_editor_color_notebook_callback,
editor,
FALSE, FALSE);
editor->color_notebook_active = TRUE;
}
else
{
if (! editor->color_notebook_active)
{
color_notebook_set_viewable (editor->color_notebook,
GIMP_VIEWABLE (palette));
color_notebook_show (editor->color_notebook);
editor->color_notebook_active = TRUE;
}
color_notebook_set_color (editor->color_notebook,
&editor->color->color);
}
} }
void void
@ -125,64 +56,41 @@ palette_editor_delete_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action) guint action)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->delete_button))
gtk_button_clicked (GTK_BUTTON (editor->delete_button));
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! (palette && editor->color))
return;
gimp_palette_delete_entry (palette, editor->color);
} }
void
/* private functions */ palette_editor_zoom_in_cmd_callback (GtkWidget *widget,
gpointer data,
static void guint action)
palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
GimpPalette *palette;
GimpContext *user_context;
editor = GIMP_PALETTE_EDITOR (data); if (GTK_WIDGET_SENSITIVE (editor->zoom_in_button))
gtk_button_clicked (GTK_BUTTON (editor->zoom_in_button));
}
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data); void
palette_editor_zoom_out_cmd_callback (GtkWidget *widget,
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp); gpointer data,
guint action)
switch (state)
{ {
case COLOR_NOTEBOOK_UPDATE: GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
break;
case COLOR_NOTEBOOK_OK: if (GTK_WIDGET_SENSITIVE (editor->zoom_out_button))
if (editor->color) gtk_button_clicked (GTK_BUTTON (editor->zoom_out_button));
}
void
palette_editor_zoom_all_cmd_callback (GtkWidget *widget,
gpointer data,
guint action)
{ {
editor->color->color = *color; GimpPaletteEditor *editor = GIMP_PALETTE_EDITOR (data);
/* Update either foreground or background colors */ if (GTK_WIDGET_SENSITIVE (editor->zoom_all_button))
if (active_color == FOREGROUND) gtk_button_clicked (GTK_BUTTON (editor->zoom_all_button));
gimp_context_set_foreground (user_context, color);
else if (active_color == BACKGROUND)
gimp_context_set_background (user_context, color);
gimp_data_dirty (GIMP_DATA (palette));
}
/* Fallthrough */
case COLOR_NOTEBOOK_CANCEL:
if (editor->color_notebook_active)
{
color_notebook_hide (editor->color_notebook);
editor->color_notebook_active = FALSE;
}
}
} }

10
app/gui/palette-editor-commands.h
View File

@ -30,5 +30,15 @@ void palette_editor_delete_color_cmd_callback (GtkWidget *widget,
gpointer data, gpointer data,
guint action); guint action);
void palette_editor_zoom_in_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void palette_editor_zoom_out_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
void palette_editor_zoom_all_cmd_callback (GtkWidget *widget,
gpointer data,
guint action);
#endif /* __PALETTE_EDITOR_COMMANDS_H__ */ #endif /* __PALETTE_EDITOR_COMMANDS_H__ */

46
app/gui/palette-editor-menu.c
View File

@ -35,21 +35,33 @@
GimpItemFactoryEntry palette_editor_menu_entries[] = GimpItemFactoryEntry palette_editor_menu_entries[] =
{ {
{ { N_("/New Color"), NULL, { { N_("/New Color"), "",
palette_editor_new_color_cmd_callback, 0, palette_editor_new_color_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW }, "<StockItem>", GTK_STOCK_NEW },
NULL, NULL, NULL, NULL },
NULL, NULL }, { { N_("/Edit Color..."), "",
{ { N_("/Edit Color..."), NULL,
palette_editor_edit_color_cmd_callback, 0, palette_editor_edit_color_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_EDIT }, "<StockItem>", GIMP_STOCK_EDIT },
NULL, NULL, NULL, NULL },
NULL, NULL }, { { N_("/Delete Color"), "",
{ { N_("/Delete Color"), NULL,
palette_editor_delete_color_cmd_callback, 0, palette_editor_delete_color_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_DELETE },
NULL, NULL, NULL, NULL },
NULL, NULL }
{ { "/---", NULL, NULL, 0, "<Separator>", NULL }, NULL, NULL, NULL },
{ { N_("/Zoom In"), "",
palette_editor_zoom_in_cmd_callback, 0,
"<StockItem>", GTK_STOCK_ZOOM_IN },
NULL, NULL, NULL },
{ { N_("/Zoom Out"), "",
palette_editor_zoom_out_cmd_callback, 0,
"<StockItem>", GTK_STOCK_ZOOM_OUT },
NULL, NULL, NULL },
{ { N_("/Zoom All"), "",
palette_editor_zoom_all_cmd_callback, 0,
"<StockItem>", GTK_STOCK_ZOOM_FIT },
NULL, NULL, NULL }
}; };
gint n_palette_editor_menu_entries = G_N_ELEMENTS (palette_editor_menu_entries); gint n_palette_editor_menu_entries = G_N_ELEMENTS (palette_editor_menu_entries);
@ -60,15 +72,25 @@ palette_editor_menu_update (GtkItemFactory *factory,
gpointer data) gpointer data)
{ {
GimpPaletteEditor *editor; GimpPaletteEditor *editor;
GimpDataEditor *data_editor;
gboolean editable = FALSE;
editor = GIMP_PALETTE_EDITOR (data); editor = GIMP_PALETTE_EDITOR (data);
data_editor = GIMP_DATA_EDITOR (data);
if (data_editor->data && data_editor->data_editable)
editable = TRUE;
#define SET_SENSITIVE(menu,condition) \ #define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/New Color", TRUE); SET_SENSITIVE ("/New Color", editable);
SET_SENSITIVE ("/Edit Color...", editor->color); SET_SENSITIVE ("/Edit Color...", editable && editor->color);
SET_SENSITIVE ("/Delete Color", editor->color); SET_SENSITIVE ("/Delete Color", editable && editor->color);
SET_SENSITIVE ("/Zoom In", data_editor->data);
SET_SENSITIVE ("/Zoom Out", data_editor->data);
SET_SENSITIVE ("/Zoom All", data_editor->data);
#undef SET_SENSITIVE #undef SET_SENSITIVE
} }

328
app/widgets/gimppaletteeditor.c
View File

@ -44,6 +44,7 @@
#include "gimptoolbox-color-area.h" #include "gimptoolbox-color-area.h"
#include "gui/color-notebook.h" #include "gui/color-notebook.h"
#include "gui/dialogs.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -85,15 +86,24 @@ static void palette_editor_draw_entries (GimpPaletteEditor *editor,
static void palette_editor_redraw (GimpPaletteEditor *editor); static void palette_editor_redraw (GimpPaletteEditor *editor);
static void palette_editor_scroll_top_left (GimpPaletteEditor *editor); static void palette_editor_scroll_top_left (GimpPaletteEditor *editor);
static void palette_editor_select_entry (GimpPaletteEditor *editor,
GimpPaletteEntry *entry);
static void palette_editor_color_name_changed (GtkWidget *widget, static void palette_editor_color_name_changed (GtkWidget *widget,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_columns_changed (GtkAdjustment *adj, static void palette_editor_columns_changed (GtkAdjustment *adj,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_zoom_in_callback (GtkWidget *widget,
static void palette_editor_new_clicked (GtkWidget *widget,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_zoom_out_callback (GtkWidget *widget, static void palette_editor_edit_clicked (GtkWidget *widget,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_zoom_all_callback (GtkWidget *widget, static void palette_editor_delete_clicked (GtkWidget *widget,
GimpPaletteEditor *editor);
static void palette_editor_zoom_in_clicked (GtkWidget *widget,
GimpPaletteEditor *editor);
static void palette_editor_zoom_out_clicked (GtkWidget *widget,
GimpPaletteEditor *editor);
static void palette_editor_zoom_all_clicked (GtkWidget *widget,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_redraw_zoom (GimpPaletteEditor *editor); static void palette_editor_redraw_zoom (GimpPaletteEditor *editor);
@ -108,6 +118,10 @@ static void palette_editor_drop_palette (GtkWidget *widget,
gpointer data); gpointer data);
static void palette_editor_invalidate_preview (GimpPalette *palette, static void palette_editor_invalidate_preview (GimpPalette *palette,
GimpPaletteEditor *editor); GimpPaletteEditor *editor);
static void palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data);
/* dnd stuff */ /* dnd stuff */
@ -181,7 +195,6 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
editor->zoom_factor = 1.0; editor->zoom_factor = 1.0;
editor->columns = COLUMNS; editor->columns = COLUMNS;
editor->columns_valid = TRUE; editor->columns_valid = TRUE;
editor->freeze_update = FALSE;
editor->scrolled_window = scrolledwindow = editor->scrolled_window = scrolledwindow =
gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_new (NULL, NULL);
@ -244,7 +257,6 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
gtk_widget_set_sensitive (editor->color_name, FALSE); gtk_widget_set_sensitive (editor->color_name, FALSE);
gtk_widget_show (editor->color_name); gtk_widget_show (editor->color_name);
editor->entry_sig_id =
g_signal_connect (editor->color_name, "changed", g_signal_connect (editor->color_name, "changed",
G_CALLBACK (palette_editor_color_name_changed), G_CALLBACK (palette_editor_color_name_changed),
editor); editor);
@ -262,25 +274,51 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
G_CALLBACK (palette_editor_columns_changed), G_CALLBACK (palette_editor_columns_changed),
editor); editor);
/* + and - buttons */ editor->new_button =
gimp_editor_add_button (GIMP_EDITOR (editor), gimp_editor_add_button (GIMP_EDITOR (editor),
GTK_STOCK_ZOOM_FIT, GTK_STOCK_NEW,
_("Zoom All"), NULL, _("New Color"), NULL,
G_CALLBACK (palette_editor_zoom_all_callback), G_CALLBACK (palette_editor_new_clicked),
NULL, NULL,
editor); editor);
editor->edit_button =
gimp_editor_add_button (GIMP_EDITOR (editor),
GIMP_STOCK_EDIT,
_("Edit Color"), NULL,
G_CALLBACK (palette_editor_edit_clicked),
NULL,
editor);
editor->delete_button =
gimp_editor_add_button (GIMP_EDITOR (editor),
GTK_STOCK_DELETE,
_("Delete Color"), NULL,
G_CALLBACK (palette_editor_delete_clicked),
NULL,
editor);
editor->zoom_in_button =
gimp_editor_add_button (GIMP_EDITOR (editor), gimp_editor_add_button (GIMP_EDITOR (editor),
GTK_STOCK_ZOOM_IN, GTK_STOCK_ZOOM_IN,
_("Zoom In"), NULL, _("Zoom In"), NULL,
G_CALLBACK (palette_editor_zoom_in_callback), G_CALLBACK (palette_editor_zoom_in_clicked),
NULL, NULL,
editor); editor);
editor->zoom_out_button =
gimp_editor_add_button (GIMP_EDITOR (editor), gimp_editor_add_button (GIMP_EDITOR (editor),
GTK_STOCK_ZOOM_OUT, GTK_STOCK_ZOOM_OUT,
_("Zoom Out"), NULL, _("Zoom Out"), NULL,
G_CALLBACK (palette_editor_zoom_out_callback), G_CALLBACK (palette_editor_zoom_out_clicked),
NULL,
editor);
editor->zoom_all_button =
gimp_editor_add_button (GIMP_EDITOR (editor),
GTK_STOCK_ZOOM_FIT,
_("Zoom All"), NULL,
G_CALLBACK (palette_editor_zoom_all_clicked),
NULL, NULL,
editor); editor);
} }
@ -296,7 +334,6 @@ gimp_palette_editor_destroy (GtkObject *object)
{ {
color_notebook_free (editor->color_notebook); color_notebook_free (editor->color_notebook);
editor->color_notebook = NULL; editor->color_notebook = NULL;
editor->color_notebook_active = FALSE;
} }
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
@ -309,11 +346,8 @@ gimp_palette_editor_unmap (GtkWidget *widget)
editor = GIMP_PALETTE_EDITOR (widget); editor = GIMP_PALETTE_EDITOR (widget);
if (editor->color_notebook_active) if (editor->color_notebook)
{
color_notebook_hide (editor->color_notebook); color_notebook_hide (editor->color_notebook);
editor->color_notebook_active = FALSE;
}
GTK_WIDGET_CLASS (parent_class)->unmap (widget); GTK_WIDGET_CLASS (parent_class)->unmap (widget);
} }
@ -326,8 +360,6 @@ gimp_palette_editor_set_data (GimpDataEditor *editor,
palette_editor = GIMP_PALETTE_EDITOR (editor); palette_editor = GIMP_PALETTE_EDITOR (editor);
g_signal_handler_block (palette_editor->color_name,
palette_editor->entry_sig_id);
g_signal_handlers_block_by_func (palette_editor->columns_data, g_signal_handlers_block_by_func (palette_editor->columns_data,
palette_editor_columns_changed, palette_editor_columns_changed,
editor); editor);
@ -338,7 +370,6 @@ gimp_palette_editor_set_data (GimpDataEditor *editor,
{ {
color_notebook_free (palette_editor->color_notebook); color_notebook_free (palette_editor->color_notebook);
palette_editor->color_notebook = NULL; palette_editor->color_notebook = NULL;
palette_editor->color_notebook_active = FALSE;
} }
g_signal_handlers_disconnect_by_func (editor->data, g_signal_handlers_disconnect_by_func (editor->data,
@ -346,12 +377,8 @@ gimp_palette_editor_set_data (GimpDataEditor *editor,
editor); editor);
palette_editor->columns_valid = FALSE; palette_editor->columns_valid = FALSE;
palette_editor->color = NULL;
gtk_entry_set_text (GTK_ENTRY (palette_editor->color_name), palette_editor_select_entry (palette_editor, NULL);
_("Undefined"));
gtk_widget_set_sensitive (palette_editor->color_name, FALSE);
gtk_adjustment_set_value (palette_editor->columns_data, 0); gtk_adjustment_set_value (palette_editor->columns_data, 0);
} }
@ -380,8 +407,18 @@ gimp_palette_editor_set_data (GimpDataEditor *editor,
g_signal_handlers_unblock_by_func (palette_editor->columns_data, g_signal_handlers_unblock_by_func (palette_editor->columns_data,
palette_editor_columns_changed, palette_editor_columns_changed,
editor); editor);
g_signal_handler_unblock (palette_editor->color_name,
palette_editor->entry_sig_id); gtk_widget_set_sensitive (palette_editor->new_button,
editor->data_editable);
gtk_widget_set_sensitive (palette_editor->edit_button, FALSE);
gtk_widget_set_sensitive (palette_editor->delete_button, FALSE);
gtk_widget_set_sensitive (palette_editor->zoom_in_button,
editor->data != NULL);
gtk_widget_set_sensitive (palette_editor->zoom_out_button,
editor->data != NULL);
gtk_widget_set_sensitive (palette_editor->zoom_all_button,
editor->data != NULL);
} }
/* public functions */ /* public functions */
@ -455,11 +492,9 @@ palette_editor_eventbox_button_press (GtkWidget *widget,
GdkEventButton *bevent, GdkEventButton *bevent,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
if (bevent->button == 3 && GIMP_DATA_EDITOR (editor)->data_editable) if (bevent->button == 3)
{
gimp_item_factory_popup_with_data (GIMP_EDITOR (editor)->item_factory, gimp_item_factory_popup_with_data (GIMP_EDITOR (editor)->item_factory,
editor, NULL); editor, NULL);
}
return TRUE; return TRUE;
} }
@ -469,6 +504,7 @@ palette_editor_color_area_button_press (GtkWidget *widget,
GdkEventButton *bevent, GdkEventButton *bevent,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
GimpDataEditor *data_editor;
GimpPalette *palette; GimpPalette *palette;
GimpContext *user_context; GimpContext *user_context;
GList *list; GList *list;
@ -477,9 +513,11 @@ palette_editor_color_area_button_press (GtkWidget *widget,
gint row, col; gint row, col;
gint pos; gint pos;
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data); data_editor = GIMP_DATA_EDITOR (editor);
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp); palette = GIMP_PALETTE (data_editor->data);
user_context = gimp_get_user_context (data_editor->gimp);
entry_width = editor->col_width + SPACING; entry_width = editor->col_width + SPACING;
entry_height = (ENTRY_HEIGHT * editor->zoom_factor) + SPACING; entry_height = (ENTRY_HEIGHT * editor->zoom_factor) + SPACING;
@ -500,16 +538,10 @@ palette_editor_color_area_button_press (GtkWidget *widget,
if ((bevent->button == 1 || bevent->button == 3) && palette) if ((bevent->button == 1 || bevent->button == 3) && palette)
{ {
palette_editor_select_entry (editor, list ? list->data : NULL);
if (list) if (list)
{ {
if (editor->color)
{
editor->freeze_update = TRUE;
palette_editor_draw_entries (editor, -1, -1);
editor->freeze_update = FALSE;
}
editor->color = (GimpPaletteEntry *) list->data;
if (active_color == FOREGROUND) if (active_color == FOREGROUND)
{ {
if (bevent->state & GDK_CONTROL_MASK) if (bevent->state & GDK_CONTROL_MASK)
@ -531,23 +563,12 @@ palette_editor_color_area_button_press (GtkWidget *widget,
palette_editor_draw_entries (editor, row, col); palette_editor_draw_entries (editor, row, col);
/* Update the active color name */ if (data_editor->data_editable &&
g_signal_handler_block (editor->color_name, bevent->button == 1 &&
editor->entry_sig_id); ((GdkEventAny *) bevent)->type == GDK_2BUTTON_PRESS)
gtk_entry_set_text (GTK_ENTRY (editor->color_name),
editor->color->name);
g_signal_handler_unblock (editor->color_name,
editor->entry_sig_id);
gtk_widget_set_sensitive (editor->color_name,
GIMP_DATA_EDITOR (editor)->data_editable);
/* palette_update_current_entry (editor); */
}
else
{ {
gtk_widget_set_sensitive (editor->color_name, FALSE); gtk_button_clicked (GTK_BUTTON (editor->edit_button));
}
} }
} }
@ -804,7 +825,6 @@ palette_editor_draw_entries (GimpPaletteEditor *editor,
g_free (buffer); g_free (buffer);
g_free (colors); g_free (colors);
if (! editor->freeze_update)
gtk_widget_queue_draw (editor->color_area); gtk_widget_queue_draw (editor->color_area);
} }
@ -870,11 +890,48 @@ palette_editor_redraw (GimpPaletteEditor *editor)
palette_editor_draw_entries (editor, -1, -1); palette_editor_draw_entries (editor, -1, -1);
if (editor->color) if (editor->color)
{
palette_editor_draw_entries (editor, palette_editor_draw_entries (editor,
editor->color->position / editor->columns, editor->color->position / editor->columns,
editor->color->position % editor->columns); editor->color->position % editor->columns);
} }
static void
palette_editor_select_entry (GimpPaletteEditor *editor,
GimpPaletteEntry *entry)
{
GimpDataEditor *data_editor;
GimpPalette *palette;
data_editor = GIMP_DATA_EDITOR (editor);
palette = GIMP_PALETTE (data_editor->data);
if (editor->color != entry)
{
if (editor->color)
palette_editor_draw_entries (editor, -1, -1);
editor->color = entry;
g_signal_handlers_block_by_func (editor->color_name,
palette_editor_color_name_changed,
editor);
gtk_entry_set_text (GTK_ENTRY (editor->color_name),
entry ? entry->name : _("Undefined"));
g_signal_handlers_unblock_by_func (editor->color_name,
palette_editor_color_name_changed,
editor);
gtk_widget_set_sensitive (editor->color_name,
entry && data_editor->data_editable);
gtk_widget_set_sensitive (editor->edit_button,
entry && data_editor->data_editable);
gtk_widget_set_sensitive (editor->delete_button,
entry && data_editor->data_editable);
}
} }
@ -883,14 +940,13 @@ palette_editor_redraw (GimpPaletteEditor *editor)
static void static void
palette_editor_color_name_changed (GtkWidget *widget, palette_editor_color_name_changed (GtkWidget *widget,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{
if (GIMP_DATA_EDITOR (editor)->data)
{ {
GimpPalette *palette; GimpPalette *palette;
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data); palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! palette)
return;
if (editor->color->name) if (editor->color->name)
g_free (editor->color->name); g_free (editor->color->name);
@ -899,27 +955,109 @@ palette_editor_color_name_changed (GtkWidget *widget,
gimp_data_dirty (GIMP_DATA (palette)); gimp_data_dirty (GIMP_DATA (palette));
} }
}
/* the columns spinbutton callback *****************************************/ /* the columns spinbutton callback *****************************************/
static void static void
palette_editor_columns_changed (GtkAdjustment *adj, palette_editor_columns_changed (GtkAdjustment *adj,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{
if (GIMP_DATA_EDITOR (editor)->data)
{ {
GimpPalette *palette; GimpPalette *palette;
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data); palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
if (! palette)
return;
gimp_palette_set_n_columns (palette, ROUND (adj->value)); gimp_palette_set_n_columns (palette, ROUND (adj->value));
} }
}
/* palette zoom functions & callbacks **************************************/ /* palette zoom functions & callbacks **************************************/
static void static void
palette_editor_zoom_in_callback (GtkWidget *widget, palette_editor_new_clicked (GtkWidget *widget,
GimpPaletteEditor *editor)
{
GimpDataEditor *data_editor;
GimpPalette *palette;
GimpContext *user_context;
GimpRGB color;
data_editor = GIMP_DATA_EDITOR (editor);
if (! (data_editor->data && data_editor->data_editable))
return;
palette = GIMP_PALETTE (data_editor->data);
user_context = gimp_get_user_context (data_editor->gimp);
if (active_color == FOREGROUND)
gimp_context_get_foreground (user_context, &color);
else if (active_color == BACKGROUND)
gimp_context_get_background (user_context, &color);
editor->color = gimp_palette_add_entry (palette, NULL, &color);
}
static void
palette_editor_edit_clicked (GtkWidget *widget,
GimpPaletteEditor *editor)
{
GimpDataEditor *data_editor;
GimpPalette *palette;
data_editor = GIMP_DATA_EDITOR (editor);
if (! (data_editor->data && data_editor->data_editable && editor->color))
return;
palette = GIMP_PALETTE (data_editor->data);
if (! editor->color_notebook)
{
editor->color_notebook =
color_notebook_viewable_new (GIMP_VIEWABLE (palette),
_("Edit Palette Color"),
GTK_STOCK_SELECT_COLOR,
_("Edit Color Palette Entry"),
global_dialog_factory,
"gimp-palette-editor-color-dialog",
(const GimpRGB *) &editor->color->color,
palette_editor_color_notebook_callback,
editor,
FALSE, FALSE);
}
else
{
color_notebook_set_viewable (editor->color_notebook,
GIMP_VIEWABLE (palette));
color_notebook_set_color (editor->color_notebook,
&editor->color->color);
color_notebook_show (editor->color_notebook);
}
}
static void
palette_editor_delete_clicked (GtkWidget *widget,
GimpPaletteEditor *editor)
{
GimpDataEditor *data_editor;
GimpPalette *palette;
data_editor = GIMP_DATA_EDITOR (editor);
if (! (data_editor->data && data_editor->data_editable && editor->color))
return;
palette = GIMP_PALETTE (data_editor->data);
gimp_palette_delete_entry (palette, editor->color);
}
static void
palette_editor_zoom_in_clicked (GtkWidget *widget,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
editor->zoom_factor += 0.1; editor->zoom_factor += 0.1;
@ -928,7 +1066,7 @@ palette_editor_zoom_in_callback (GtkWidget *widget,
} }
static void static void
palette_editor_zoom_out_callback (GtkWidget *widget, palette_editor_zoom_out_clicked (GtkWidget *widget,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
editor->zoom_factor -= 0.1; editor->zoom_factor -= 0.1;
@ -937,7 +1075,7 @@ palette_editor_zoom_out_callback (GtkWidget *widget,
} }
static void static void
palette_editor_zoom_all_callback (GtkWidget *widget, palette_editor_zoom_all_clicked (GtkWidget *widget,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
if (GIMP_DATA_EDITOR (editor)->data) if (GIMP_DATA_EDITOR (editor)->data)
@ -969,14 +1107,7 @@ palette_editor_zoom_all_callback (GtkWidget *widget,
static void static void
palette_editor_redraw_zoom (GimpPaletteEditor *editor) palette_editor_redraw_zoom (GimpPaletteEditor *editor)
{ {
if (editor->zoom_factor > 4.0) editor->zoom_factor = CLAMP (editor->zoom_factor, 0.1, 4.0);
{
editor->zoom_factor = 4.0;
}
else if (editor->zoom_factor < 0.1)
{
editor->zoom_factor = 0.1;
}
if (GIMP_DATA_EDITOR (editor)->data) if (GIMP_DATA_EDITOR (editor)->data)
{ {
@ -1027,7 +1158,7 @@ palette_editor_drop_color (GtkWidget *widget,
editor = GIMP_PALETTE_EDITOR (data); editor = GIMP_PALETTE_EDITOR (data);
if (editor && GIMP_DATA_EDITOR (editor)->data_editable) if (GIMP_DATA_EDITOR (editor)->data_editable)
{ {
editor->color = editor->color =
gimp_palette_add_entry (GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data), gimp_palette_add_entry (GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data),
@ -1048,6 +1179,12 @@ static void
palette_editor_invalidate_preview (GimpPalette *palette, palette_editor_invalidate_preview (GimpPalette *palette,
GimpPaletteEditor *editor) GimpPaletteEditor *editor)
{ {
if (editor->color && ! g_list_find (palette->colors, editor->color))
palette_editor_select_entry (editor, NULL);
if (editor->dnd_color && ! g_list_find (palette->colors, editor->dnd_color))
editor->dnd_color = NULL;
if (palette->n_columns) if (palette->n_columns)
editor->columns = palette->n_columns; editor->columns = palette->n_columns;
else else
@ -1056,3 +1193,44 @@ palette_editor_invalidate_preview (GimpPalette *palette,
editor->columns_valid = FALSE; editor->columns_valid = FALSE;
palette_editor_redraw (editor); palette_editor_redraw (editor);
} }
static void
palette_editor_color_notebook_callback (ColorNotebook *color_notebook,
const GimpRGB *color,
ColorNotebookState state,
gpointer data)
{
GimpPaletteEditor *editor;
GimpPalette *palette;
GimpContext *user_context;
editor = GIMP_PALETTE_EDITOR (data);
palette = GIMP_PALETTE (GIMP_DATA_EDITOR (editor)->data);
user_context = gimp_get_user_context (GIMP_DATA_EDITOR (editor)->gimp);
switch (state)
{
case COLOR_NOTEBOOK_UPDATE:
break;
case COLOR_NOTEBOOK_OK:
if (editor->color)
{
editor->color->color = *color;
/* Update either foreground or background colors */
if (active_color == FOREGROUND)
gimp_context_set_foreground (user_context, color);
else if (active_color == BACKGROUND)
gimp_context_set_background (user_context, color);
gimp_data_dirty (GIMP_DATA (palette));
}
/* Fallthrough */
case COLOR_NOTEBOOK_CANCEL:
color_notebook_hide (editor->color_notebook);
}
}

10
app/widgets/gimppaletteeditor.h
View File

@ -53,18 +53,22 @@ struct _GimpPaletteEditor
GtkWidget *color_name; GtkWidget *color_name;
GtkAdjustment *columns_data; GtkAdjustment *columns_data;
GtkWidget *new_button;
GtkWidget *edit_button;
GtkWidget *delete_button;
GtkWidget *zoom_in_button;
GtkWidget *zoom_out_button;
GtkWidget *zoom_all_button;
ColorNotebook *color_notebook; ColorNotebook *color_notebook;
gboolean color_notebook_active;
GimpPaletteEntry *color; GimpPaletteEntry *color;
GimpPaletteEntry *dnd_color; GimpPaletteEntry *dnd_color;
guint entry_sig_id;
gfloat zoom_factor; /* range from 0.1 to 4.0 */ gfloat zoom_factor; /* range from 0.1 to 4.0 */
gint col_width; gint col_width;
gint last_width; gint last_width;
gint columns; gint columns;
gboolean freeze_update;
gboolean columns_valid; gboolean columns_valid;
}; };