
Move the Image Selection Menu from GimpMenuDock to GimpDockWindow. That is, if a dock window contains many docks then they will share the same Image Selection Menu. To do this we need to move around quite a bit of code. Move the "context", "dialog-factory" and "ui-manager" properties from GimpDock to GimpToolbox, GimpMenuDock doesn't need it any longer. Turn the GimpDock getters for these properties into wrappers that go to the GimpDockWindow properties. In some places, most notably GimpToolbox construction, we use the GimpToolbox values of these properties, but most of the time it works fine to just use the GimpDockWindow properties. GimpDock::setup() and set/get_aux_info() have also been moved to GimpDockWindow since the only aux info for docks was for the image selection menu. Also, we don't bother porting gimp_menu_dock_destroy() to GimpDockWindow, but we leave the code around. If this is a problem, it will show.
234 lines
8.0 KiB
C
234 lines
8.0 KiB
C
/* 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 <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimpbrush.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpgradient.h"
|
|
#include "core/gimppattern.h"
|
|
|
|
#include "gimpdialogfactory.h"
|
|
#include "gimpdnd.h"
|
|
#include "gimpview.h"
|
|
#include "gimptoolbox.h"
|
|
#include "gimptoolbox-indicator-area.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define CELL_SIZE 24 /* The size of the previews */
|
|
#define GRAD_CELL_WIDTH 52 /* The width of the gradient preview */
|
|
#define GRAD_CELL_HEIGHT 12 /* The height of the gradient preview */
|
|
#define CELL_SPACING 2 /* How much between brush and pattern cells */
|
|
|
|
|
|
static void
|
|
brush_preview_clicked (GtkWidget *widget,
|
|
GdkModifierType state,
|
|
GimpToolbox *toolbox)
|
|
{
|
|
gimp_dialog_factory_dialog_raise (gimp_toolbox_get_dialog_factory (toolbox),
|
|
gtk_widget_get_screen (widget),
|
|
"gimp-brush-grid|gimp-brush-list", -1);
|
|
}
|
|
|
|
static void
|
|
brush_preview_drop_brush (GtkWidget *widget,
|
|
gint x,
|
|
gint y,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpContext *context = GIMP_CONTEXT (data);
|
|
|
|
gimp_context_set_brush (context, GIMP_BRUSH (viewable));
|
|
}
|
|
|
|
static void
|
|
pattern_preview_clicked (GtkWidget *widget,
|
|
GdkModifierType state,
|
|
GimpToolbox *toolbox)
|
|
{
|
|
gimp_dialog_factory_dialog_raise (gimp_toolbox_get_dialog_factory (toolbox),
|
|
gtk_widget_get_screen (widget),
|
|
"gimp-pattern-grid|gimp-pattern-list", -1);
|
|
}
|
|
|
|
static void
|
|
pattern_preview_drop_pattern (GtkWidget *widget,
|
|
gint x,
|
|
gint y,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpContext *context = GIMP_CONTEXT (data);
|
|
|
|
gimp_context_set_pattern (context, GIMP_PATTERN (viewable));
|
|
}
|
|
|
|
static void
|
|
gradient_preview_clicked (GtkWidget *widget,
|
|
GdkModifierType state,
|
|
GimpToolbox *toolbox)
|
|
{
|
|
gimp_dialog_factory_dialog_raise (gimp_toolbox_get_dialog_factory (toolbox),
|
|
gtk_widget_get_screen (widget),
|
|
"gimp-gradient-list|gimp-gradient-grid", -1);
|
|
}
|
|
|
|
static void
|
|
gradient_preview_drop_gradient (GtkWidget *widget,
|
|
gint x,
|
|
gint y,
|
|
GimpViewable *viewable,
|
|
gpointer data)
|
|
{
|
|
GimpContext *context = GIMP_CONTEXT (data);
|
|
|
|
gimp_context_set_gradient (context, GIMP_GRADIENT (viewable));
|
|
}
|
|
|
|
|
|
/* public functions */
|
|
|
|
GtkWidget *
|
|
gimp_toolbox_indicator_area_create (GimpToolbox *toolbox)
|
|
{
|
|
GimpContext *context;
|
|
GtkWidget *indicator_table;
|
|
GtkWidget *brush_view;
|
|
GtkWidget *pattern_view;
|
|
GtkWidget *gradient_view;
|
|
|
|
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
|
|
|
|
context = gimp_toolbox_get_context (toolbox);
|
|
|
|
indicator_table = gtk_table_new (2, 2, FALSE);
|
|
gtk_table_set_row_spacings (GTK_TABLE (indicator_table), CELL_SPACING);
|
|
gtk_table_set_col_spacings (GTK_TABLE (indicator_table), CELL_SPACING);
|
|
|
|
/* brush view */
|
|
|
|
brush_view =
|
|
gimp_view_new_full_by_types (context,
|
|
GIMP_TYPE_VIEW, GIMP_TYPE_BRUSH,
|
|
CELL_SIZE, CELL_SIZE, 1,
|
|
FALSE, TRUE, TRUE);
|
|
gimp_view_set_viewable (GIMP_VIEW (brush_view),
|
|
GIMP_VIEWABLE (gimp_context_get_brush (context)));
|
|
gtk_table_attach_defaults (GTK_TABLE (indicator_table), brush_view,
|
|
0, 1, 0, 1);
|
|
gtk_widget_show (brush_view);
|
|
|
|
gimp_help_set_help_data (brush_view,
|
|
_("The active brush.\n"
|
|
"Click to open the Brush Dialog."), NULL);
|
|
|
|
g_signal_connect_object (context, "brush-changed",
|
|
G_CALLBACK (gimp_view_set_viewable),
|
|
brush_view,
|
|
G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect (brush_view, "clicked",
|
|
G_CALLBACK (brush_preview_clicked),
|
|
toolbox);
|
|
|
|
gimp_dnd_viewable_dest_add (brush_view,
|
|
GIMP_TYPE_BRUSH,
|
|
brush_preview_drop_brush,
|
|
context);
|
|
|
|
/* pattern view */
|
|
|
|
pattern_view =
|
|
gimp_view_new_full_by_types (context,
|
|
GIMP_TYPE_VIEW, GIMP_TYPE_PATTERN,
|
|
CELL_SIZE, CELL_SIZE, 1,
|
|
FALSE, TRUE, TRUE);
|
|
gimp_view_set_viewable (GIMP_VIEW (pattern_view),
|
|
GIMP_VIEWABLE (gimp_context_get_pattern (context)));
|
|
|
|
gtk_table_attach_defaults (GTK_TABLE (indicator_table), pattern_view,
|
|
1, 2, 0, 1);
|
|
gtk_widget_show (pattern_view);
|
|
|
|
gimp_help_set_help_data (pattern_view,
|
|
_("The active pattern.\n"
|
|
"Click to open the Pattern Dialog."), NULL);
|
|
|
|
g_signal_connect_object (context, "pattern-changed",
|
|
G_CALLBACK (gimp_view_set_viewable),
|
|
pattern_view,
|
|
G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect (pattern_view, "clicked",
|
|
G_CALLBACK (pattern_preview_clicked),
|
|
toolbox);
|
|
|
|
gimp_dnd_viewable_dest_add (pattern_view,
|
|
GIMP_TYPE_PATTERN,
|
|
pattern_preview_drop_pattern,
|
|
context);
|
|
|
|
/* gradient view */
|
|
|
|
gradient_view =
|
|
gimp_view_new_full_by_types (context,
|
|
GIMP_TYPE_VIEW, GIMP_TYPE_GRADIENT,
|
|
GRAD_CELL_WIDTH, GRAD_CELL_HEIGHT, 1,
|
|
FALSE, TRUE, TRUE);
|
|
gimp_view_set_viewable (GIMP_VIEW (gradient_view),
|
|
GIMP_VIEWABLE (gimp_context_get_gradient (context)));
|
|
|
|
gtk_table_attach_defaults (GTK_TABLE (indicator_table), gradient_view,
|
|
0, 2, 1, 2);
|
|
gtk_widget_show (gradient_view);
|
|
|
|
gimp_help_set_help_data (gradient_view,
|
|
_("The active gradient.\n"
|
|
"Click to open the Gradient Dialog."), NULL);
|
|
|
|
g_signal_connect_object (context, "gradient-changed",
|
|
G_CALLBACK (gimp_view_set_viewable),
|
|
gradient_view,
|
|
G_CONNECT_SWAPPED);
|
|
|
|
g_signal_connect (gradient_view, "clicked",
|
|
G_CALLBACK (gradient_preview_clicked),
|
|
toolbox);
|
|
|
|
gimp_dnd_viewable_dest_add (gradient_view,
|
|
GIMP_TYPE_GRADIENT,
|
|
gradient_preview_drop_gradient,
|
|
context);
|
|
|
|
gtk_widget_show (indicator_table);
|
|
|
|
return indicator_table;
|
|
}
|