remove an InfoBar use

Author: jcupitt

TODO

@@ -1,7 +1,10 @@
+- never connected to button "activate", always to "clicked"
+
+	fix names of signal handlers (sometimes call them _pressed)
 
 - remove use of deprecated GtkInfoBar
 
-	use a revealer with a label and button
+	use GtkActionBar instead, see imagewindow
 
 - try a flatpak build
 

src/gtk/imagewindow.ui

@@ -191,20 +191,28 @@
         <property name="orientation">vertical</property>
 
         <child>
-          <object class="GtkInfoBar" id="error_bar">
-            <property name="message-type">error</property>
-            <property name="show-close-button">true</property>
+          <object class="GtkActionBar" id="error_bar">
             <property name="revealed">false</property>
-            <signal name="response" handler="imagewindow_error_response"/>
 
-            <child>
+            <child type="center">
               <object class="GtkLabel" id="error_label">
+                <property name="hexpand">true</property>
                 <property name="ellipsize">middle</property>
+                <property name="xalign">0.0</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
+
               </object>
             </child>
+
+            <child type="end">
+              <object class="GtkButton">
+                <property name="label">OK</property>
+                <signal name="clicked" handler="imagewindow_error_clicked"/>
+              </object>
+            </child>
+
           </object>
         </child>
 

src/imagewindow.c

@@ -161,7 +161,7 @@ imagewindow_set_error(Imagewindow *win, const char *message)
 		err[i - 1] = '\0';
 	gtk_label_set_text(GTK_LABEL(win->error_label), err);
 
-	gtk_info_bar_set_revealed(GTK_INFO_BAR(win->error_bar), TRUE);
+	gtk_action_bar_set_revealed(GTK_ACTION_BAR(win->error_bar), TRUE);
 }
 
 static void
@@ -187,7 +187,13 @@ imagewindow_error_hide(Imagewindow *win)
 	printf("imagewindow_error_hide:\n");
 #endif /*DEBUG*/
 
-	gtk_info_bar_set_revealed(GTK_INFO_BAR(win->error_bar), FALSE);
+	gtk_action_bar_set_revealed(GTK_ACTION_BAR(win->error_bar), FALSE);
+}
+
+static void
+imagewindow_error_clicked(GtkWidget *button, Imagewindow *win)
+{
+	imagewindow_error_hide(win);
 }
 
 /* Manage the set of active views.
@@ -587,8 +593,6 @@ imagewindow_imageui_set_visible(Imagewindow *win,
 
 	VipsImage *image;
 
-	printf("imagewindow_imageui_set_visible\n");
-
 	/* Save the current view settings in case we need to restore them.
 	 */
 	imagewindow_save_view_settings(win, &win->view_settings);
@@ -741,12 +745,6 @@ imagewindow_dispose(GObject *object)
 	G_OBJECT_CLASS(imagewindow_parent_class)->dispose(object);
 }
 
-static void
-imagewindow_error_response(GtkWidget *button, int response, Imagewindow *win)
-{
-	imagewindow_error_hide(win);
-}
-
 static GdkTexture *
 texture_new_from_image(VipsImage *image)
 {
@@ -1387,7 +1385,7 @@ imagewindow_class_init(ImagewindowClass *class)
 	BIND_VARIABLE(Imagewindow, info_bar);
 
 	BIND_CALLBACK(imagewindow_pressed);
-	BIND_CALLBACK(imagewindow_error_response);
+	BIND_CALLBACK(imagewindow_error_clicked);
 
 	gobject_class->dispose = imagewindow_dispose;
 

src/workspacegroup.c

@@ -615,8 +615,6 @@ workspacegroup_checkmark_timeout(Workspacegroup *wsg)
 		wsg->retain_files[wsg->retain_next] = g_strdup(filename);
 	}
 
-	printf("workspacegroup_checkmark_timeout:\n");
-
 	if (!filemodel_top_save(FILEMODEL(wsg),
 		wsg->retain_files[wsg->retain_next]))
 		return FALSE;