revise saveoptions

remove use of dialog

still need to remove infobar

Author: jcupitt

TODO

@@ -1,11 +1,7 @@
 
-- saveoptions.c should derive from GtkWindow, not GtkDialog
+- remove use of deprecated GtkInfoBar
 
-	paste back into vipsdisp
-
-	other changes to go back?
-
-	use recover.c as a model
+	use a revealer with a label and button
 
 - try a flatpak build
 

src/gtk/nip4.css

@@ -80,4 +80,3 @@
   margin-left: 4px;
   margin-right: 4px;
 }
-

src/gtk/recover.ui

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="Recover" parent="GtkApplicationWindow">
-    <property name="title" translatable="yes">Recover after crash</property>
     <property name="modal">True</property>
     <property name="default-widget">ok</property>
 

src/gtk/saveoptions.css

@@ -1,3 +1,4 @@
+
 #saveoptions-label {
   color: gray;
   margin-top: 5px;

src/gtk/saveoptions.ui

@@ -1,16 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
 
-  <template class="SaveOptions" parent="GtkDialog">
-    <property name="title" translatable="yes">Save options</property>
+  <template class="SaveOptions" parent="GtkApplicationWindow">
     <property name="modal">True</property>
-    <signal name="response" handler="save_options_response"/>
+    <property name="default-widget">ok</property>
 
-    <style>
-      <class name="saveoptions"/>
-    </style>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">false</property>
 
-    <child internal-child="content_area">
+        <child type="start">
+          <object class="GtkButton">
+            <property name="label" translatable="yes">Cancel</property>
+            <property name="action-name">win.cancel</property>
+
+          </object>
+        </child>
+
+        <child type="title">
+          <object class="GtkLabel" id="title">
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+
+          </object>
+        </child>
+
+        <child type="end">
+          <object class="GtkButton" id="ok">
+            <property name="label" translatable="yes">Save</property>
+            <property name="action-name">win.ok</property>
+            <style>
+              <class name="suggested-action"/>
+            </style>
+
+          </object>
+        </child>
+
+      </object>
+    </child>
+
+    <child>
       <object class="GtkBox">
         <property name="orientation">1</property>
         <property name="spacing">2</property>
@@ -45,7 +75,6 @@
             <property name="message-type">error</property>
             <property name="show-close-button">true</property>
             <property name="revealed">false</property>
-            <signal name="response" handler="save_options_error_response"/>
 
             <child>
               <object class="GtkLabel" id="error_label">
@@ -79,27 +108,6 @@
       </object>
     </child>
 
-    <child type="action">
-      <object class="GtkButton" id="cancel_button">
-        <property name="use-underline">1</property>
-        <property name="label" translatable="yes">_Cancel</property>
-      </object>
-    </child>
-
-    <child type="action">
-      <object class="GtkButton" id="ok_button">
-        <property name="can-focus">True</property>
-        <property name="use-underline">1</property>
-        <property name="label" translatable="yes">_Save</property>
-      </object>
-    </child>
-
-    <action-widgets>
-      <action-widget response="cancel">cancel_button</action-widget>
-      <action-widget response="ok" default="true">ok_button</action-widget>
-    </action-widgets>
-
   </template>
-
 </interface>
 

src/iimage.c

@@ -287,25 +287,13 @@ iimage_class_new(Classmodel *classmodel, PElement *fn, PElement *out)
 	return TRUE;
 }
 
-static void
-iimage_graphic_save_response(GtkDialog *dialog,
-	gint response, gpointer user_data)
-{
-	if (response == GTK_RESPONSE_ACCEPT ||
-		response == GTK_RESPONSE_CANCEL)
-		gtk_window_destroy(GTK_WINDOW(dialog));
-
-	// other return codes are intermediate stages of processing and we
-	// should do nothing
-}
-
 static gboolean
 iimage_graphic_save(Classmodel *classmodel,
 	GtkWidget *parent, const char *filename)
 {
 	iImage *iimage = IIMAGE(classmodel);
 	VipsImage *image = iimage->value.ii->image;
-	GtkWindow *window = GTK_WINDOW(gtk_widget_get_root(parent));
+	GtkWindow *window = view_get_window(VIEW(parent));
 
 	if (image) {
 		char buf[FILENAME_MAX];
@@ -320,10 +308,6 @@ iimage_graphic_save(Classmodel *classmodel,
 		if (!options)
 			return FALSE;
 
-		g_signal_connect_object(options, "response",
-			G_CALLBACK(iimage_graphic_save_response),
-			NULL, 0);
-
 		gtk_window_present(GTK_WINDOW(options));
 	}
 

src/recover.c

@@ -485,16 +485,6 @@ recover_ok_action(GSimpleAction *action,
 }
 
 static GActionEntry recover_entries[] = {
-	// FIXME ... ooof
-
-	// { "open", program_open_action },
-
-	// { "new-toolkit", program_new_toolkit_action },
-	// { "new-tool", program_new_tool_action },
-
-	// { "save", program_saveas_action },
-	// { "saveas", program_saveas_action },
-
 	{ "delete", recover_delete_action },
 	{ "cancel", recover_cancel_action },
 	{ "ok", recover_ok_action },

src/rowview.c

@@ -443,8 +443,6 @@ rowview_action(GSimpleAction *action, GVariant *parameter, View *view)
 	Workspace *ws = row->ws;
 	const char *name = g_action_get_name(G_ACTION(action));
 
-	printf("rowview_action: %s\n", name);
-
 	if (graphic &&
 		g_str_equal(name, "row-edit"))
 		model_edit(GTK_WIDGET(rview), MODEL(rhs));
@@ -477,8 +475,6 @@ rowview_paste_filename(const char *filename, void *user_data)
 	Rowview *rview = ROWVIEW(user_data);
 	Row *row = ROW(VOBJECT(rview)->iobject);
 
-	printf("rowview_paste_filename:\n");
-
 	// no rhs graphic? we can't paste into it
 	if (!row->child_rhs ||
 		!row->child_rhs->graphic)

src/saveoptions.c

@@ -34,7 +34,7 @@
 #include "nip4.h"
 
 struct _SaveOptions {
-	GtkDialog parent_instance;
+	GtkApplicationWindow parent_instance;
 
 	VipsImage *image;
 	VipsOperation *save_operation;
@@ -47,7 +47,7 @@ struct _SaveOptions {
 	GtkWidget *progress;
 	GtkWidget *error_bar;
 	GtkWidget *error_label;
-	GtkWidget *ok_button;
+	GtkWidget *title;
 
 	// hash property names to the widget for that property ... we fetch
 	// values from here when we make the saver
@@ -60,10 +60,10 @@ struct _SaveOptions {
 };
 
 struct _SaveOptionsClass {
-	GtkDialogClass parent_class;
+	GtkApplicationWindowClass parent_class;
 };
 
-G_DEFINE_TYPE(SaveOptions, save_options, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE(SaveOptions, save_options, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
 save_options_dispose(GObject *object)
@@ -81,32 +81,17 @@ save_options_dispose(GObject *object)
 static void
 save_options_error(SaveOptions *options)
 {
-	int i;
-
 	/* Remove any trailing \n.
 	 */
 	g_autofree char *err = vips_error_buffer_copy();
 	vips_error_clear();
-	for (i = strlen(err); i > 0 && err[i - 1] == '\n'; i--)
+	for (int i = strlen(err); i > 0 && err[i - 1] == '\n'; i--)
 		err[i - 1] = '\0';
 	gtk_label_set_text(GTK_LABEL(options->error_label), err);
 
 	gtk_info_bar_set_revealed(GTK_INFO_BAR(options->error_bar), TRUE);
 }
 
-static void
-save_options_error_hide(SaveOptions *options)
-{
-	gtk_info_bar_set_revealed(GTK_INFO_BAR(options->error_bar), FALSE);
-}
-
-static void
-save_options_error_response(GtkWidget *button, int response,
-	SaveOptions *options)
-{
-	save_options_error_hide(options);
-}
-
 static void
 save_options_preeval(VipsImage *image,
 	VipsProgress *progress, SaveOptions *options)
@@ -287,7 +272,7 @@ save_options_fetch_option(SaveOptions *options, GParamSpec *pspec)
 }
 
 static void *
-save_options_response_map_fn(VipsObject *operation,
+save_options_set_argument(VipsObject *operation,
 	GParamSpec *pspec, VipsArgumentClass *argument_class,
 	VipsArgumentInstance *argument_instance, void *a, void *b)
 {
@@ -307,42 +292,61 @@ save_options_response_map_fn(VipsObject *operation,
 }
 
 static void
-save_options_response(GtkWidget *dialog, int response, void *user_data)
+save_options_ok_action(GSimpleAction *action,
+	GVariant *parameter, gpointer user_data)
 {
-	SaveOptions *options = SAVE_OPTIONS(dialog);
+	SaveOptions *options = SAVE_OPTIONS(user_data);
 
-	if (response == GTK_RESPONSE_OK) {
-		vips_argument_map(VIPS_OBJECT(options->save_operation),
-			save_options_response_map_fn, options, NULL);
-
-		// this will trigger the save and loop while we write ... the
-		// UI will stay live thanks to event processing in the eval
-		// handler
-		if (vips_cache_operation_buildp(&options->save_operation))
-			save_options_error(options);
-		else
-			// everything worked, we can post success back to
-			// our caller
-			gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
-	}
+	vips_argument_map(VIPS_OBJECT(options->save_operation),
+		save_options_set_argument, options, NULL);
+
+	// this will trigger the save and loop while we write ... the
+	// UI will stay live thanks to event processing in the eval
+	// handler
+	if (vips_cache_operation_buildp(&options->save_operation))
+		save_options_error(options);
+	else
+		// everything worked, we can post success back to
+		// our caller
+		gtk_window_destroy(GTK_WINDOW(options));
 }
 
 static void
-save_options_cancel_clicked(GtkWidget *button, SaveOptions *options)
+save_options_cancel_action(GSimpleAction *action,
+	GVariant *parameter, gpointer user_data)
 {
-	vips_image_set_kill(options->image, TRUE);
+	SaveOptions *options = SAVE_OPTIONS(user_data);
+
+	gtk_window_destroy(GTK_WINDOW(options));
 }
 
+static GActionEntry save_options_entries[] = {
+	{ "ok", save_options_ok_action },
+	{ "cancel", save_options_cancel_action },
+};
+
 static void
 save_options_init(SaveOptions *options)
 {
 	gtk_widget_init_template(GTK_WIDGET(options));
 
+	g_action_map_add_action_entries(G_ACTION_MAP(options),
+		save_options_entries, G_N_ELEMENTS(save_options_entries),
+		options);
+
 	options->value_widgets = g_hash_table_new(g_str_hash, g_str_equal);
 
 	options->progress_timer = g_timer_new();
 }
 
+static void
+save_options_cancel_clicked(GtkWidget *button, gpointer user_data)
+{
+	SaveOptions *options = SAVE_OPTIONS(user_data);
+
+	vips_image_set_kill(options->image, TRUE);
+}
+
 static void
 save_options_class_init(SaveOptionsClass *class)
 {
@@ -357,11 +361,9 @@ save_options_class_init(SaveOptionsClass *class)
 	BIND_VARIABLE(SaveOptions, error_bar);
 	BIND_VARIABLE(SaveOptions, error_label);
 	BIND_VARIABLE(SaveOptions, options_grid);
-	BIND_VARIABLE(SaveOptions, ok_button);
+	BIND_VARIABLE(SaveOptions, title);
 
-	BIND_CALLBACK(save_options_response);
 	BIND_CALLBACK(save_options_cancel_clicked);
-	BIND_CALLBACK(save_options_error_response);
 }
 
 /* This function is used by:
@@ -569,15 +571,14 @@ save_options_new(GtkWindow *parent_window,
 	const char *saver;
 	SaveOptions *options;
 
-	g_autofree char *base = g_path_get_basename(filename);
-	g_autofree char *title = g_strdup_printf("Save image to \"%s\"", base);
 	options = g_object_new(SAVE_OPTIONS_TYPE,
-		// we have to set this here, not in the ui file, for some reason
-		"use-header-bar", true,
 		"transient-for", parent_window,
-		"title", title,
+		"application", gtk_window_get_application(parent_window),
 		NULL);
 
+	g_autofree char *base = g_path_get_basename(filename);
+	set_glabel(options->title, "Save image to \"%s\"", base);
+
 	options->image = image;
 	g_object_ref(image);
 
@@ -608,7 +609,5 @@ save_options_new(GtkWindow *parent_window,
 			save_options_add_options_fn, options, &row);
 	}
 
-	gtk_widget_grab_focus(options->ok_button);
-
 	return options;
 }