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.
174 lines
5.3 KiB
C
174 lines
5.3 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 <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpcontext.h"
|
|
|
|
#include "gimpcolordialog.h"
|
|
#include "gimpdialogfactory.h"
|
|
#include "gimpfgbgeditor.h"
|
|
#include "gimptoolbox.h"
|
|
#include "gimptoolbox-color-area.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void color_area_color_clicked (GimpFgBgEditor *editor,
|
|
GimpActiveColor active_color,
|
|
GimpContext *context);
|
|
static void color_area_dialog_update (GimpColorDialog *dialog,
|
|
const GimpRGB *color,
|
|
GimpColorDialogState state,
|
|
GimpContext *context);
|
|
|
|
|
|
/* local variables */
|
|
|
|
static GtkWidget *color_area = NULL;
|
|
static GtkWidget *color_dialog = NULL;
|
|
static gboolean color_dialog_active = FALSE;
|
|
static GimpActiveColor edit_color;
|
|
static GimpRGB revert_fg;
|
|
static GimpRGB revert_bg;
|
|
|
|
|
|
/* public functions */
|
|
|
|
GtkWidget *
|
|
gimp_toolbox_color_area_create (GimpToolbox *toolbox,
|
|
gint width,
|
|
gint height)
|
|
{
|
|
GimpContext *context;
|
|
|
|
g_return_val_if_fail (GIMP_IS_TOOLBOX (toolbox), NULL);
|
|
|
|
context = gimp_toolbox_get_context (toolbox);
|
|
|
|
color_area = gimp_fg_bg_editor_new (context);
|
|
gtk_widget_set_size_request (color_area, width, height);
|
|
gtk_widget_add_events (color_area,
|
|
GDK_ENTER_NOTIFY_MASK |
|
|
GDK_LEAVE_NOTIFY_MASK);
|
|
|
|
gimp_help_set_help_data
|
|
(color_area, _("Foreground & background colors.\n"
|
|
"The black and white squares reset colors.\n"
|
|
"The arrows swap colors.\n"
|
|
"Click to open the color selection dialog."), NULL);
|
|
|
|
g_signal_connect (color_area, "color-clicked",
|
|
G_CALLBACK (color_area_color_clicked),
|
|
context);
|
|
|
|
return color_area;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
color_area_dialog_update (GimpColorDialog *dialog,
|
|
const GimpRGB *color,
|
|
GimpColorDialogState state,
|
|
GimpContext *context)
|
|
{
|
|
switch (state)
|
|
{
|
|
case GIMP_COLOR_DIALOG_OK:
|
|
gtk_widget_hide (color_dialog);
|
|
color_dialog_active = FALSE;
|
|
/* Fallthrough */
|
|
|
|
case GIMP_COLOR_DIALOG_UPDATE:
|
|
if (edit_color == GIMP_ACTIVE_COLOR_FOREGROUND)
|
|
gimp_context_set_foreground (context, color);
|
|
else
|
|
gimp_context_set_background (context, color);
|
|
break;
|
|
|
|
case GIMP_COLOR_DIALOG_CANCEL:
|
|
gtk_widget_hide (color_dialog);
|
|
color_dialog_active = FALSE;
|
|
gimp_context_set_foreground (context, &revert_fg);
|
|
gimp_context_set_background (context, &revert_bg);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
color_area_color_clicked (GimpFgBgEditor *editor,
|
|
GimpActiveColor active_color,
|
|
GimpContext *context)
|
|
{
|
|
GimpRGB color;
|
|
const gchar *title;
|
|
|
|
if (! color_dialog_active)
|
|
{
|
|
gimp_context_get_foreground (context, &revert_fg);
|
|
gimp_context_get_background (context, &revert_bg);
|
|
}
|
|
|
|
if (active_color == GIMP_ACTIVE_COLOR_FOREGROUND)
|
|
{
|
|
gimp_context_get_foreground (context, &color);
|
|
title = _("Change Foreground Color");
|
|
}
|
|
else
|
|
{
|
|
gimp_context_get_background (context, &color);
|
|
title = _("Change Background Color");
|
|
}
|
|
|
|
edit_color = active_color;
|
|
|
|
if (! color_dialog)
|
|
{
|
|
GimpDialogFactory *toplevel_factory;
|
|
|
|
toplevel_factory = gimp_dialog_factory_from_name ("toplevel");
|
|
|
|
color_dialog = gimp_color_dialog_new (NULL, context,
|
|
NULL, NULL, NULL,
|
|
GTK_WIDGET (editor),
|
|
toplevel_factory,
|
|
"gimp-toolbox-color-dialog",
|
|
&color,
|
|
TRUE, FALSE);
|
|
|
|
g_signal_connect (color_dialog, "update",
|
|
G_CALLBACK (color_area_dialog_update),
|
|
context);
|
|
}
|
|
|
|
gtk_window_set_title (GTK_WINDOW (color_dialog), title);
|
|
gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (color_dialog), &color);
|
|
|
|
gtk_window_present (GTK_WINDOW (color_dialog));
|
|
color_dialog_active = TRUE;
|
|
}
|