mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-24 07:11:04 +00:00
bcd9794a99
2003-11-08 Michael Natterer <mitch@gimp.org> To be multihead safe, each new window or menu needs to be associated with a GdkScreen or it will pop up on the default screen. * libgimpwidgets/gimpquerybox.[ch] * app/display/gimpdisplayshell-layer-select.[ch] * app/widgets/widgets-types.h * app/widgets/gimpitemfactory.[ch] * app/widgets/gimpitemtreeview.[ch] * app/widgets/gimptemplateview.[ch] * app/widgets/gimptooldialog.[ch] * app/widgets/gimpviewabledialog.[ch] * app/gui/channels-commands.[ch] * app/gui/color-notebook.[ch] * app/gui/convert-dialog.[ch] * app/gui/edit-commands.[ch] * app/gui/grid-dialog.[ch] * app/gui/image-commands.[ch] * app/gui/info-dialog.[ch] * app/gui/layers-commands.[ch] * app/gui/offset-dialog.[ch] * app/gui/resize-dialog.[ch] * app/gui/stroke-dialog.[ch] * app/gui/templates-commands.[ch] * app/gui/vectors-commands.[ch]: added "GtkWidget *parent" paramaters to all functions which create menus, popups or windows and pass "parent" to gimp_dialog_new() or one of the various wrappers around it. As a side effect, this fixes bug #61092. * app/widgets/gimpdialogfactory.[ch]: added "GdkScreen *screen" instead of "parent" here since there are no possible parent windows on startup. * app/display/gimpdisplayshell-callbacks.c (gimp_display_shell_origin_button_press): added a quick hack to send a display to another screen: click the origin button with the middle mouse button. * app/display/gimpdisplayshell.c (gimp_display_shell_screen_changed): don't chain up undonditionally (don't crash). * libgimpwidgets/gimpdialog.c (gimp_dialog_new_valist): set the dialog's screen from a non-GtkWidget parent widget. The rest of non-window parent widget handling is still unimplemented. * libgimpwidgets/gimpcolorbutton.c * app/widgets/gimpcolormapeditor.c * app/widgets/gimpcolorpanel.c * app/widgets/gimpcomponenteditor.c * app/widgets/gimpcontainereditor.c * app/widgets/gimpcontainergridview.c * app/widgets/gimpcontainerpopup.c * app/widgets/gimpcontainertreeview.c * app/widgets/gimpdatafactoryview.c * app/widgets/gimpdevicestatus.c * app/widgets/gimpdockable.c * app/widgets/gimpdrawabletreeview.c * app/widgets/gimperrorconsole.c * app/widgets/gimpgradienteditor.c * app/widgets/gimphelp.c * app/widgets/gimppaletteeditor.c * app/widgets/gimppreview-popup.c * app/widgets/gimpselectioneditor.c * app/widgets/gimpsessioninfo.c * app/widgets/gimptoolbox-color-area.c * app/widgets/gimptoolbox-indicator-area.c * app/widgets/gimptoolbox.c * app/widgets/gimptooloptionseditor.c * app/widgets/gimpvectorstreeview.c * app/widgets/gimpwidgets-utils.c * app/display/gimpdisplayshell-scale.c * app/display/gimpnavigationview.c * app/gui/module-browser.c * app/gui/dialogs-commands.c * app/gui/dialogs-constructors.c * app/gui/drawable-commands.c * app/gui/file-commands.c * app/gui/file-new-dialog.c * app/gui/file-save-dialog.c * app/gui/gradient-editor-commands.c * app/gui/gui-vtable.c * app/gui/gui.c * app/gui/info-window.c * app/gui/palette-import-dialog.c * app/gui/palettes-commands.c * app/gui/qmask-commands.c * app/gui/select-commands.c * app/gui/tool-options-commands.c * app/gui/view-commands.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpimagemaptool.c * app/tools/gimpmeasuretool.c * app/tools/gimptransformtool.c * plug-ins/FractalExplorer/FractalExplorer.c * plug-ins/gfig/gfig.c * plug-ins/gflare/gflare.c: changed addordingly. Changed all menu_position funcs to place the menu on the right screen.
154 lines
4.5 KiB
C
154 lines
4.5 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* Copyright (C) 2003 Henrik Brix Andersen <brix@gimp.org>
|
|
*
|
|
* 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 2 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimplimits.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "gui-types.h"
|
|
|
|
#include "config/gimpconfig.h"
|
|
#include "config/gimpconfig-types.h"
|
|
#include "config/gimpconfig-utils.h"
|
|
#include "config/gimpcoreconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-grid.h"
|
|
#include "core/gimpimage-undo.h"
|
|
#include "core/gimpimage-undo-push.h"
|
|
#include "core/gimpgrid.h"
|
|
|
|
#include "widgets/gimpgrideditor.h"
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpviewabledialog.h"
|
|
|
|
#include "grid-dialog.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define GRID_RESPONSE_RESET 1
|
|
#define GRID_COLOR_SIZE 20
|
|
|
|
|
|
/* local functions */
|
|
|
|
static void grid_dialog_response (GtkWidget *widget,
|
|
gint response_id,
|
|
GtkWidget *dialog);
|
|
|
|
|
|
/* public function */
|
|
|
|
|
|
GtkWidget *
|
|
grid_dialog_new (GimpImage *gimage,
|
|
GtkWidget *parent)
|
|
{
|
|
GimpGrid *grid;
|
|
GimpGrid *grid_backup;
|
|
GtkWidget *dialog;
|
|
GtkWidget *editor;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
|
|
g_return_val_if_fail (parent == NULL || GTK_IS_WIDGET (parent), NULL);
|
|
|
|
grid = gimp_image_get_grid (GIMP_IMAGE (gimage));
|
|
grid_backup = gimp_config_duplicate (GIMP_CONFIG (grid));
|
|
|
|
dialog = gimp_viewable_dialog_new (GIMP_VIEWABLE (gimage),
|
|
_("Configure Grid"), "gimp-grid-configure",
|
|
GIMP_STOCK_GRID, _("Configure Image Grid"),
|
|
parent,
|
|
gimp_standard_help_func,
|
|
GIMP_HELP_IMAGE_GRID,
|
|
|
|
GIMP_STOCK_RESET, GRID_RESPONSE_RESET,
|
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
GTK_STOCK_OK, GTK_RESPONSE_OK,
|
|
|
|
NULL);
|
|
|
|
g_signal_connect (dialog, "response",
|
|
G_CALLBACK (grid_dialog_response),
|
|
dialog);
|
|
|
|
editor = gimp_grid_editor_new (grid,
|
|
gimage->xresolution,
|
|
gimage->yresolution);
|
|
gtk_container_set_border_width (GTK_CONTAINER (editor), 6);
|
|
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
|
|
editor);
|
|
|
|
gtk_widget_show (editor);
|
|
|
|
g_object_set_data (G_OBJECT (dialog), "gimage", gimage);
|
|
g_object_set_data (G_OBJECT (dialog), "grid", grid);
|
|
|
|
g_object_set_data_full (G_OBJECT (dialog), "grid-backup", grid_backup,
|
|
(GDestroyNotify) g_object_unref);
|
|
|
|
return dialog;
|
|
}
|
|
|
|
|
|
/* local functions */
|
|
|
|
static void
|
|
grid_dialog_response (GtkWidget *widget,
|
|
gint response_id,
|
|
GtkWidget *dialog)
|
|
{
|
|
GimpImage *gimage;
|
|
GimpImage *grid;
|
|
GimpGrid *grid_backup;
|
|
|
|
gimage = g_object_get_data (G_OBJECT (dialog), "gimage");
|
|
grid = g_object_get_data (G_OBJECT (dialog), "grid");
|
|
grid_backup = g_object_get_data (G_OBJECT (dialog), "grid-backup");
|
|
|
|
switch (response_id)
|
|
{
|
|
case GRID_RESPONSE_RESET:
|
|
gimp_config_sync (GIMP_CONFIG (gimage->gimp->config->default_grid),
|
|
GIMP_CONFIG (grid), 0);
|
|
break;
|
|
|
|
case GTK_RESPONSE_OK:
|
|
if (! gimp_config_is_equal_to (GIMP_CONFIG (grid_backup),
|
|
GIMP_CONFIG (grid)))
|
|
{
|
|
gimp_image_undo_push_image_grid (gimage, _("Grid"), grid_backup);
|
|
}
|
|
|
|
gtk_widget_destroy (dialog);
|
|
break;
|
|
|
|
default:
|
|
gimp_image_set_grid (GIMP_IMAGE (gimage), grid_backup, FALSE);
|
|
gtk_widget_destroy (dialog);
|
|
}
|
|
}
|