dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #10872: welcome dialog does not behave like the usual "new image" action. 

The alternative solution would be to call:

> image_new_dialog_set (dialog, NULL, NULL);

This would have reset to default template. But it's still not exactly like the
"new image" action which defaults to the active image's size if there is an
opened image.

In order to avoid complicating the code further, as well as code duplication,
hence code divergence, let's call the "image-new" action, making sure that this
button will always behave exactly like the "File > New" menu item.

Then since we need to process the return value of this dialog (either re-showing
the welcome dialog in case of new image creation cancelation, or destroying the
hidden welcome dialog otherwise), I check for the singleton pointer and connect
the handlers to it.

Moreover I made the "response" signal of ImageNewDialog be handled as
G_CONNECT_AFTER otherwise we nearly never had the possibility to handle its
responses properly (because the base handler was doing it first, then often
destroying the dialog).
This commit is contained in:
Jehan 2024-02-17 16:20:57 +01:00
parent ff459a5f4b
commit cb81d5224b
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/dialogs/image-new-dialog.c
View File

@ -121,9 +121,9 @@ image_new_dialog_new (GimpContext *context)
"gimp-image-new-dialog", private,
(GDestroyNotify) image_new_dialog_free);
g_signal_connect (dialog, "response",
G_CALLBACK (image_new_dialog_response),
private);
g_signal_connect_after (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);

55
app/dialogs/welcome-dialog.c
View File

@ -50,8 +50,11 @@
#include "gui/icon-themes.h"
#include "gui/themes.h"
#include "menus/menus.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimpprefsbox.h"
#include "widgets/gimpuimanager.h"
#include "widgets/gimpwidgets-utils.h"
#include "preferences-dialog-utils.h"
@ -100,8 +103,6 @@ static void welcome_dialog_new_image_dialog (GtkWidget *button,
GtkWidget *welcome_dialog);
static void welcome_dialog_open_image_dialog (GtkWidget *button,
GtkWidget *welcome_dialog);
static void welcome_dialog_new_dialog_close (GtkWidget *dialog,
GtkWidget *welcome_dialog);
static void welcome_dialog_new_dialog_response (GtkWidget *dialog,
gint response_id,
GtkWidget *welcome_dialog);
@ -1089,25 +1090,28 @@ static void
welcome_dialog_new_image_dialog (GtkWidget *button,
GtkWidget *welcome_dialog)
{
GtkWidget *dialog;
GimpUIManager *manager;
Gimp *gimp;
GtkWidget *dialog;
dialog = gimp_dialog_factory_dialog_new (gimp_dialog_factory_get_singleton (),
gimp_widget_get_monitor (welcome_dialog),
NULL /*ui_manager*/,
welcome_dialog,
"gimp-image-new-dialog", -1, FALSE);
gimp = g_object_get_data (G_OBJECT (welcome_dialog), "gimp");
manager = menus_get_image_manager_singleton (gimp);
if (dialog)
/* XXX: to avoid code duplication and divergence, we just call the "image-new"
* action, then we check that the new dialog singleton exists in order to
* handle its responses.
*/
if (gimp_ui_manager_activate_action (manager, "image", "image-new") &&
(dialog = gimp_dialog_factory_find_widget (gimp_dialog_factory_get_singleton (),
"gimp-image-new-dialog")))
{
gtk_widget_set_visible (welcome_dialog, FALSE);
gtk_window_present (GTK_WINDOW (dialog));
g_signal_connect (dialog, "response",
G_CALLBACK (welcome_dialog_new_dialog_response),
welcome_dialog);
g_signal_connect (dialog, "destroy",
G_CALLBACK (welcome_dialog_new_dialog_close),
welcome_dialog);
g_signal_connect_swapped (dialog, "destroy",
G_CALLBACK (gtk_widget_destroy),
welcome_dialog);
}
}
@ -1132,15 +1136,6 @@ welcome_dialog_open_image_dialog (GtkWidget *button,
}
}
static void
welcome_dialog_new_dialog_close (GtkWidget *dialog,
GtkWidget *welcome_dialog)
{
/* Reshow Welcome Dialog if secondary dialogue is cancelled */
if (welcome_dialog)
gtk_widget_set_visible (welcome_dialog, TRUE);
}
static void
welcome_dialog_new_dialog_response (GtkWidget *dialog,
gint response_id,
@ -1149,10 +1144,20 @@ welcome_dialog_new_dialog_response (GtkWidget *dialog,
switch (response_id)
{
case GTK_RESPONSE_OK:
/* Don't destroy the welcome dialog directly, because it's possible to get
* the OK response without the new image dialog closing (in case it
* triggers a confirm dialog), followed by a GTK_RESPONSE_CANCEL.
*
* Let the "destroy" handlers take care of destroying the welcome dialog.
*/
break;
case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_DELETE_EVENT:
g_signal_handlers_disconnect_by_func (dialog,
welcome_dialog_new_dialog_close,
G_CALLBACK (gtk_widget_destroy),
welcome_dialog);
gtk_widget_destroy (welcome_dialog);
gtk_widget_set_visible (welcome_dialog, TRUE);
break;
default: