add "merge tab" menu

Author: jcupitt

CHANGELOG.md

@@ -3,6 +3,7 @@
 - refactor of tilesource improves OME_TIFF modes
 - fix menu state init
 - save and restore more view settings
+- add "Merge column" and "Merge tab" submenus
 
 ## 9.0.9 2025/05/28
 

TODO

@@ -1,20 +1,17 @@
-- load ws with locked tab, rightclick menu on locked tab does not
-  have tick selected
+- merge tab should not work when locked
 
-	a bit tricky to fix
-
-- the "new tab" icon is still broken in the windows build
+- scroll to view current column after tab merge
 
-- change "Merge into ..."
+- merge actions should be more robust
 
-	split to "Merge from file ..." and "Merge column >" with a
-	pullright listing all columns
+- load ws with locked tab, rightclick menu on locked tab does not
+  have tick selected
 
-	Same for merge in tab menu, except "Merge tab >"
+  two tabs, lock one, menu on other also shows lock
 
-	Just does save/load for you
+	a bit tricky to fix
 
-	how would we do a dynamic pullright menu?:n mes
+- the "new tab" icon is still broken in the windows build
 
 # menu redesign
 

src/gtk/workspaceviewlabel.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
 
-  <menu id="workspaceviewlabel-menu">
+  <menu id="workspaceviewlabel_menu">
     <section>
       <item>
         <attribute name='label' translatable='yes'>Rename</attribute>
@@ -15,9 +15,21 @@
         <attribute name='label' translatable='yes'>Duplicate</attribute>
         <attribute name='action'>win.tab-duplicate</attribute>
       </item>
+    </section>
+
+    <!-- the thing at this position is replaced dynamically by
+	 workspaceviewlabel_menu() with the tab merge menu
+      -->
+    <section>
+      <submenu>
+        <attribute name='label' translatable='yes'>placeholder1</attribute>
+      </submenu>
+    </section>
+
+    <section>
       <item>
-        <attribute name='label' translatable='yes'>Merge into ...</attribute>
-        <attribute name='action'>win.tab-merge</attribute>
+        <attribute name='label' translatable='yes'>Merge from file ...</attribute>
+        <attribute name='action'>win.tab-merge-file</attribute>
       </item>
       <item>
         <attribute name='label' translatable='yes'>Save as ...</attribute>
@@ -57,7 +69,7 @@
 
                 <child>
                   <object class="GtkPopoverMenu" id="right_click_menu">
-                    <property name="menu-model">workspaceviewlabel-menu</property>
+                    <property name="menu-model">workspaceviewlabel_menu</property>
                   </object>
                 </child>
 

src/mainwindow.c

@@ -594,7 +594,9 @@ static GActionEntry mainwindow_entries[] = {
 	{ "tab-rename", mainwindow_view_action },
 	{ "tab-select-all", mainwindow_view_action },
 	{ "tab-duplicate", mainwindow_view_action },
-	{ "tab-merge", mainwindow_view_action },
+	// takes name of tab to merge as a param
+	{ "tab-merge", mainwindow_view_action, "s" },
+	{ "tab-merge-file", mainwindow_view_action },
 	{ "tab-saveas", mainwindow_view_action },
 	{ "tab-lock", action_toggle, NULL, "false", mainwindow_view_action },
 	{ "tab-delete", mainwindow_view_action },

src/workspacegroupview.c

@@ -228,7 +228,6 @@ workspacegroupview_background_menu(GtkGestureClick *gesture,
 		g_menu_remove(column_menu, 1);
 		g_menu_insert_submenu(column_menu, 1, "Merge column",
 			G_MENU_MODEL(columns));
-
 	}
 	else if ((rview = workspacegroupview_pick_rowview(wsgview, x, y))) {
 		mainwindow_set_action_view(VIEW(rview));

src/workspaceview.c

@@ -824,6 +824,14 @@ workspaceview_merge(Workspaceview *wview)
 		&workspaceview_merge_sub, wview);
 }
 
+static void *
+workspaceview_find_workspace(Workspace *ws, void *a)
+{
+	const char *name = (const char *) a;
+
+	return g_str_equal(IOBJECT(ws)->name, name) ? ws : NULL;
+}
+
 static void
 workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
 {
@@ -849,7 +857,36 @@ workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
 	}
 	else if (g_str_equal(name, "tab-duplicate"))
 		workspace_duplicate(ws);
-	else if (g_str_equal(name, "tab-merge"))
+	else if (g_str_equal(name, "tab-merge") &&
+		parameter) {
+		Workspacegroup *wsg = workspace_get_workspacegroup(ws);
+		Workspace *from = workspacegroup_map(wsg,
+			workspaceview_find_workspace,
+			(void *) g_variant_get_string(parameter, NULL), NULL);
+		char filename[VIPS_PATH_MAX];
+
+		if (!temp_name(filename, IOBJECT(from)->name, "ws")) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		icontainer_current(ICONTAINER(wsg), ICONTAINER(ws));
+		if (!workspacegroup_save_current(wsg, filename)) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		if (!workspace_merge_file(ws, filename)) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		unlinkf("%s", filename);
+
+		workspace_deselect_all(ws);
+		symbol_recalculate_all();
+	}
+	else if (g_str_equal(name, "tab-merge-file"))
 		workspaceview_merge(wview);
 	else if (g_str_equal(name, "tab-saveas"))
 		workspaceview_saveas(wview);

src/workspaceviewlabel.c

@@ -49,6 +49,7 @@ struct _Workspaceviewlabel {
 	GtkWidget *lock;
 	GtkWidget *error;
 	GtkWidget *right_click_menu;
+	GMenu *workspaceviewlabel_menu;
 
 	/* State.
 	 */
@@ -137,10 +138,34 @@ workspaceviewlabel_init(Workspaceviewlabel *wviewlabel)
 	gtk_widget_init_template(GTK_WIDGET(wviewlabel));
 }
 
+static void *
+workspaceviewlabel_add_tab_item(Workspace *ws, void *user_data)
+{
+	GMenu *tabs = G_MENU(user_data);
+
+	GMenuItem *item = g_menu_item_new(IOBJECT(ws)->name, NULL);
+	GVariant *target = g_variant_new_string(IOBJECT(ws)->name);
+	g_menu_item_set_action_and_target_value(item, "win.tab-merge", target);
+	g_menu_append_item(tabs, item);
+
+	return NULL;
+}
+
 static void
 workspaceviewlabel_menu(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Workspaceviewlabel *wviewlabel)
 {
+	Workspaceview *wview = wviewlabel->wview;
+	Workspace *ws = WORKSPACE(VOBJECT(wview)->iobject);
+	Workspacegroup *wsg = workspace_get_workspacegroup(ws);
+
+	// generate the dynamic tab submenu
+	GMenu *tabs = g_menu_new();
+	workspacegroup_map(wsg, workspaceviewlabel_add_tab_item, tabs, NULL);
+	GMenu *tab_menu = wviewlabel->workspaceviewlabel_menu;
+	g_menu_remove(tab_menu, 1);
+	g_menu_insert_submenu(tab_menu, 1, "Merge tab", G_MENU_MODEL(tabs));
+
 	mainwindow_set_action_view(VIEW(wviewlabel->wview));
 
 	gtk_popover_set_pointing_to(GTK_POPOVER(wviewlabel->right_click_menu),
@@ -213,6 +238,7 @@ workspaceviewlabel_class_init(WorkspaceviewlabelClass *class)
 	BIND_VARIABLE(Workspaceviewlabel, lock);
 	BIND_VARIABLE(Workspaceviewlabel, error);
 	BIND_VARIABLE(Workspaceviewlabel, right_click_menu);
+	BIND_VARIABLE(Workspaceviewlabel, workspaceviewlabel_menu);
 
 	BIND_CALLBACK(workspaceviewlabel_menu);
 	BIND_CALLBACK(workspaceviewlabel_pressed);