We were doing it all the wrong way, fixing one combo box object at a time. So this commit basically reverses commits68a33ab5bd,6dfca83c2aanda9a979b2d0and instead runs the same code in the class code. This way, all objects based on these base classes will have the fix from scratch. These improved various other drop-down lists (I found some of them, and probably not all) as I fixed all GIMP custom widgets based on GtkComboBox. Note that it has to be run after filling the list apparently (I had the problem especially with GimpIntComboBox if running in the _init() code, then the list widget showed wrong).
380 lines
12 KiB
C
380 lines
12 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-1999 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <gegl.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
#include "libgimpconfig/gimpconfig.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "dialogs-types.h"
|
|
|
|
#include "config/gimpguiconfig.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpcontext.h"
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpimage-new.h"
|
|
#include "core/gimptemplate.h"
|
|
|
|
#include "widgets/gimpcontainercombobox.h"
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpmessagebox.h"
|
|
#include "widgets/gimpmessagedialog.h"
|
|
#include "widgets/gimptemplateeditor.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "image-new-dialog.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
#define RESPONSE_RESET 1
|
|
|
|
typedef struct
|
|
{
|
|
GtkWidget *dialog;
|
|
GtkWidget *confirm_dialog;
|
|
|
|
GtkWidget *combo;
|
|
GtkWidget *editor;
|
|
|
|
GimpContext *context;
|
|
GimpTemplate *template;
|
|
} ImageNewDialog;
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void image_new_dialog_free (ImageNewDialog *private);
|
|
static void image_new_dialog_response (GtkWidget *widget,
|
|
gint response_id,
|
|
ImageNewDialog *private);
|
|
static void image_new_template_changed (GimpContext *context,
|
|
GimpTemplate *template,
|
|
ImageNewDialog *private);
|
|
static void image_new_confirm_dialog (ImageNewDialog *private);
|
|
static void image_new_create_image (ImageNewDialog *private);
|
|
|
|
|
|
/* public functions */
|
|
|
|
GtkWidget *
|
|
image_new_dialog_new (GimpContext *context)
|
|
{
|
|
ImageNewDialog *private;
|
|
GtkWidget *dialog;
|
|
GtkWidget *main_vbox;
|
|
GtkWidget *hbox;
|
|
GtkWidget *label;
|
|
GimpSizeEntry *entry;
|
|
|
|
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
|
|
|
|
private = g_slice_new0 (ImageNewDialog);
|
|
|
|
private->context = gimp_context_new (context->gimp, "image-new-dialog",
|
|
context);
|
|
private->template = g_object_new (GIMP_TYPE_TEMPLATE, NULL);
|
|
|
|
private->dialog = dialog =
|
|
gimp_dialog_new (_("Create a New Image"),
|
|
"gimp-image-new",
|
|
NULL, 0,
|
|
gimp_standard_help_func, GIMP_HELP_FILE_NEW,
|
|
|
|
_("_Reset"), RESPONSE_RESET,
|
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
|
_("_OK"), GTK_RESPONSE_OK,
|
|
|
|
NULL);
|
|
|
|
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
|
|
RESPONSE_RESET,
|
|
GTK_RESPONSE_OK,
|
|
GTK_RESPONSE_CANCEL,
|
|
-1);
|
|
|
|
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
|
|
|
|
g_object_set_data_full (G_OBJECT (dialog),
|
|
"gimp-image-new-dialog", private,
|
|
(GDestroyNotify) image_new_dialog_free);
|
|
|
|
g_signal_connect (dialog, "response",
|
|
G_CALLBACK (image_new_dialog_response),
|
|
private);
|
|
|
|
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
|
|
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
|
|
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
|
|
main_vbox, TRUE, TRUE, 0);
|
|
gtk_widget_show (main_vbox);
|
|
|
|
/* The template combo */
|
|
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
|
|
gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
|
|
gtk_widget_show (hbox);
|
|
|
|
label = gtk_label_new_with_mnemonic (_("_Template:"));
|
|
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
|
gtk_widget_show (label);
|
|
|
|
private->combo = g_object_new (GIMP_TYPE_CONTAINER_COMBO_BOX,
|
|
"container", context->gimp->templates,
|
|
"context", private->context,
|
|
"view-size", 16,
|
|
"view-border-width", 0,
|
|
"ellipsize", PANGO_ELLIPSIZE_NONE,
|
|
"focus-on-click", FALSE,
|
|
NULL);
|
|
gtk_box_pack_start (GTK_BOX (hbox), private->combo, TRUE, TRUE, 0);
|
|
gtk_widget_show (private->combo);
|
|
|
|
gtk_label_set_mnemonic_widget (GTK_LABEL (label), private->combo);
|
|
|
|
g_signal_connect (private->context, "template-changed",
|
|
G_CALLBACK (image_new_template_changed),
|
|
private);
|
|
|
|
/* Template editor */
|
|
private->editor = gimp_template_editor_new (private->template, context->gimp,
|
|
FALSE);
|
|
gtk_box_pack_start (GTK_BOX (main_vbox), private->editor, FALSE, FALSE, 0);
|
|
gtk_widget_show (private->editor);
|
|
|
|
entry = GIMP_SIZE_ENTRY (gimp_template_editor_get_size_se (GIMP_TEMPLATE_EDITOR (private->editor)));
|
|
gimp_size_entry_set_activates_default (entry, TRUE);
|
|
gimp_size_entry_grab_focus (entry);
|
|
|
|
image_new_template_changed (private->context,
|
|
gimp_context_get_template (private->context),
|
|
private);
|
|
|
|
return dialog;
|
|
}
|
|
|
|
void
|
|
image_new_dialog_set (GtkWidget *dialog,
|
|
GimpImage *image,
|
|
GimpTemplate *template)
|
|
{
|
|
ImageNewDialog *private;
|
|
|
|
g_return_if_fail (GIMP_IS_DIALOG (dialog));
|
|
g_return_if_fail (image == NULL || GIMP_IS_IMAGE (image));
|
|
g_return_if_fail (template == NULL || GIMP_IS_TEMPLATE (template));
|
|
|
|
private = g_object_get_data (G_OBJECT (dialog), "gimp-image-new-dialog");
|
|
|
|
g_return_if_fail (private != NULL);
|
|
|
|
gimp_context_set_template (private->context, template);
|
|
|
|
if (! template)
|
|
{
|
|
template = gimp_image_new_get_last_template (private->context->gimp,
|
|
image);
|
|
|
|
image_new_template_changed (private->context, template, private);
|
|
|
|
g_object_unref (template);
|
|
}
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
image_new_dialog_free (ImageNewDialog *private)
|
|
{
|
|
g_object_unref (private->context);
|
|
g_object_unref (private->template);
|
|
|
|
g_slice_free (ImageNewDialog, private);
|
|
}
|
|
|
|
static void
|
|
image_new_dialog_response (GtkWidget *dialog,
|
|
gint response_id,
|
|
ImageNewDialog *private)
|
|
{
|
|
switch (response_id)
|
|
{
|
|
case RESPONSE_RESET:
|
|
gimp_config_sync (G_OBJECT (private->context->gimp->config->default_image),
|
|
G_OBJECT (private->template), 0);
|
|
gimp_context_set_template (private->context, NULL);
|
|
break;
|
|
|
|
case GTK_RESPONSE_OK:
|
|
if (gimp_template_get_initial_size (private->template) >
|
|
GIMP_GUI_CONFIG (private->context->gimp->config)->max_new_image_size)
|
|
image_new_confirm_dialog (private);
|
|
else
|
|
image_new_create_image (private);
|
|
break;
|
|
|
|
default:
|
|
gtk_widget_destroy (dialog);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
image_new_template_changed (GimpContext *context,
|
|
GimpTemplate *template,
|
|
ImageNewDialog *private)
|
|
{
|
|
GimpTemplateEditor *editor;
|
|
GtkWidget *chain;
|
|
gdouble xres, yres;
|
|
gchar *comment;
|
|
|
|
if (! template)
|
|
return;
|
|
|
|
editor = GIMP_TEMPLATE_EDITOR (private->editor);
|
|
chain = gimp_template_editor_get_resolution_chain (editor);
|
|
|
|
xres = gimp_template_get_resolution_x (template);
|
|
yres = gimp_template_get_resolution_y (template);
|
|
|
|
gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (chain),
|
|
ABS (xres - yres) < GIMP_MIN_RESOLUTION);
|
|
|
|
comment = (gchar *) gimp_template_get_comment (template);
|
|
|
|
if (! comment || ! strlen (comment))
|
|
comment = g_strdup (gimp_template_get_comment (private->template));
|
|
else
|
|
comment = NULL;
|
|
|
|
/* make sure the resolution values are copied first (see bug #546924) */
|
|
gimp_config_sync (G_OBJECT (template), G_OBJECT (private->template),
|
|
GIMP_TEMPLATE_PARAM_COPY_FIRST);
|
|
gimp_config_sync (G_OBJECT (template), G_OBJECT (private->template), 0);
|
|
|
|
if (comment)
|
|
{
|
|
g_object_set (private->template,
|
|
"comment", comment,
|
|
NULL);
|
|
|
|
g_free (comment);
|
|
}
|
|
}
|
|
|
|
|
|
/* the confirm dialog */
|
|
|
|
static void
|
|
image_new_confirm_response (GtkWidget *dialog,
|
|
gint response_id,
|
|
ImageNewDialog *private)
|
|
{
|
|
gtk_widget_destroy (dialog);
|
|
|
|
private->confirm_dialog = NULL;
|
|
|
|
if (response_id == GTK_RESPONSE_OK)
|
|
image_new_create_image (private);
|
|
else
|
|
gtk_widget_set_sensitive (private->dialog, TRUE);
|
|
}
|
|
|
|
static void
|
|
image_new_confirm_dialog (ImageNewDialog *private)
|
|
{
|
|
GimpGuiConfig *config;
|
|
GtkWidget *dialog;
|
|
gchar *size;
|
|
|
|
if (private->confirm_dialog)
|
|
{
|
|
gtk_window_present (GTK_WINDOW (private->confirm_dialog));
|
|
return;
|
|
}
|
|
|
|
private->confirm_dialog =
|
|
dialog = gimp_message_dialog_new (_("Confirm Image Size"),
|
|
GIMP_ICON_DIALOG_WARNING,
|
|
private->dialog,
|
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
gimp_standard_help_func, NULL,
|
|
|
|
_("_Cancel"), GTK_RESPONSE_CANCEL,
|
|
_("_OK"), GTK_RESPONSE_OK,
|
|
|
|
NULL);
|
|
|
|
gimp_dialog_set_alternative_button_order (GTK_DIALOG (private->confirm_dialog),
|
|
GTK_RESPONSE_OK,
|
|
GTK_RESPONSE_CANCEL,
|
|
-1);
|
|
|
|
g_signal_connect (dialog, "response",
|
|
G_CALLBACK (image_new_confirm_response),
|
|
private);
|
|
|
|
size = g_format_size (gimp_template_get_initial_size (private->template));
|
|
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
|
|
_("You are trying to create an image "
|
|
"with a size of %s."), size);
|
|
g_free (size);
|
|
|
|
config = GIMP_GUI_CONFIG (private->context->gimp->config);
|
|
size = g_format_size (config->max_new_image_size);
|
|
gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
|
|
_("An image of the chosen size will use more "
|
|
"memory than what is configured as "
|
|
"\"Maximum Image Size\" in the Preferences "
|
|
"dialog (currently %s)."), size);
|
|
g_free (size);
|
|
|
|
gtk_widget_set_sensitive (private->dialog, FALSE);
|
|
|
|
gtk_widget_show (dialog);
|
|
}
|
|
|
|
static void
|
|
image_new_create_image (ImageNewDialog *private)
|
|
{
|
|
GimpTemplate *template = g_object_ref (private->template);
|
|
Gimp *gimp = private->context->gimp;
|
|
GimpImage *image;
|
|
|
|
gtk_widget_hide (private->dialog);
|
|
|
|
image = gimp_image_new_from_template (gimp, template,
|
|
gimp_get_user_context (gimp));
|
|
gimp_create_display (gimp, image, gimp_template_get_unit (template), 1.0,
|
|
G_OBJECT (gimp_widget_get_monitor (private->dialog)));
|
|
g_object_unref (image);
|
|
|
|
gtk_widget_destroy (private->dialog);
|
|
|
|
gimp_image_new_set_last_template (gimp, template);
|
|
|
|
g_object_unref (template);
|
|
}
|