843866e7e7
There is now a preference option that determines whether windows
should be opened on the same monitor as before. It should be disabled
when the machine gets monitors plugged/unplugged dynamically ("laptop")
and enabled when there is a static multi-monitor setup ("wokstation").
This is merely the current simplistic policy on top of the newly added
underlying infrastructure:
- pass integer monitor numbers around in all places where we already
pass around a GdkScreen. Pass the "current" monitor to these changed
APIs, where "current" is either the monitor where the action-triggering
widget is, or if that is unavailable the monitor where the mouse is.
- add gimp_widget_get_monitor() in order to easily get to the monitor,
just like gtk_widget_get_screen().
- add screen and monitor parameters in some places that were missed
before.
- in sessionrc, save all window positions relative to the window's
monitor, and save the monitor separately, if it's not the screen's
primary monitor.
- when restoring window positions, use the stored monitor when the new
prefs options says so (use the screen's primary monitor if there is
no stored monitor), otherwise use current monitor that is now passed
around.
252 lines
9.0 KiB
C
252 lines
9.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 <gegl.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "widgets-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpbrush.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpgradient.h"
|
|
#include "core/gimppattern.h"
|
|
|
|
#include "gimpdnd.h"
|
|
#include "gimpview.h"
|
|
#include "gimptoolbox.h"
|
|
#include "gimptoolbox-indicator-area.h"
|
|
#include "gimpwidgets-utils.h"
|
|
#include "gimpwindowstrategy.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)
|
|
{
|
|
GimpContext *context = gimp_toolbox_get_context (toolbox);
|
|
|
|
gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
|
|
context->gimp,
|
|
gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
|
|
gtk_widget_get_screen (widget),
|
|
gimp_widget_get_monitor (widget),
|
|
"gimp-brush-grid|gimp-brush-list");
|
|
}
|
|
|
|
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)
|
|
{
|
|
GimpContext *context = gimp_toolbox_get_context (toolbox);
|
|
|
|
gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
|
|
context->gimp,
|
|
gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
|
|
gtk_widget_get_screen (widget),
|
|
gimp_widget_get_monitor (widget),
|
|
"gimp-pattern-grid|gimp-pattern-list");
|
|
}
|
|
|
|
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)
|
|
{
|
|
GimpContext *context = gimp_toolbox_get_context (toolbox);
|
|
|
|
gimp_window_strategy_show_dockable_dialog (GIMP_WINDOW_STRATEGY (gimp_get_window_strategy (context->gimp)),
|
|
context->gimp,
|
|
gimp_dock_get_dialog_factory (GIMP_DOCK (toolbox)),
|
|
gtk_widget_get_screen (widget),
|
|
gimp_widget_get_monitor (widget),
|
|
"gimp-gradient-list|gimp-gradient-grid");
|
|
}
|
|
|
|
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;
|
|
}
|