add column merge

to the column menu

Author: jcupitt

TODO

@@ -1,6 +1,8 @@
 - load ws with locked tab, rightclick menu on locked tab does not
   have tick selected
 
+	a bit tricky to fix
+
 - the "new tab" icon is still broken in the windows build
 
 - change "Merge into ..."
@@ -12,6 +14,8 @@
 
 	Just does save/load for you
 
+	how would we do a dynamic pullright menu?:n mes
+
 # menu redesign
 
 - maxpos, then create mark from coordinate should be two clicks

src/columnview.c

@@ -566,7 +566,36 @@ columnview_action(GSimpleAction *action, GVariant *parameter, View *view)
 		workspace_queue_layout(ws);
 		symbol_recalculate_all();
 	}
-	else if (g_str_equal(name, "column-merge"))
+	else if (g_str_equal(name, "column-merge") &&
+		parameter) {
+		Column *from =
+			workspace_column_find(ws, g_variant_get_string(parameter, NULL));
+		char filename[VIPS_PATH_MAX];
+
+		if (!temp_name(filename, IOBJECT(from)->name, "ws")) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		workspace_deselect_all(ws);
+		column_select_symbols(from);
+		if (!workspacegroup_save_selected(wsg, filename)) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		workspace_column_select(ws, col);
+		if (!workspacegroup_merge_rows(wsg, filename)) {
+			workspace_set_show_error(ws, TRUE);
+			return;
+		}
+
+		unlinkf("%s", filename);
+
+		workspace_deselect_all(ws);
+		symbol_recalculate_all();
+	}
+	else if (g_str_equal(name, "column-merge-file"))
 		columnview_merge(cview);
 	else if (g_str_equal(name, "column-saveas"))
 		columnview_saveas(cview);

src/gtk/workspacegroupview.ui

@@ -91,7 +91,7 @@
     </section>
   </menu>
 
-  <menu id="workspacegroup-column-menu">
+  <menu id="workspacegroup_column_menu">
     <section>
       <item>
         <attribute name='label' translatable='yes'>Edit caption</attribute>
@@ -105,9 +105,21 @@
         <attribute name='label' translatable='yes'>Duplicate</attribute>
         <attribute name='action'>win.column-duplicate</attribute>
       </item>
+    </section>
+
+    <!-- the thing at this position is replaced dynamically by
+	 workspacegroupview_background_menu() with the column 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.column-merge</attribute>
+        <attribute name='label' translatable='yes'>Merge from file ...</attribute>
+        <attribute name='action'>win.column-merge-file</attribute>
       </item>
       <item>
         <attribute name='label' translatable='yes'>Save as ...</attribute>
@@ -157,7 +169,7 @@
 
     <child>
       <object class="GtkPopoverMenu" id="column_menu">
-        <property name="menu-model">workspacegroup-column-menu</property>
+        <property name="menu-model">workspacegroup_column_menu</property>
       </object>
     </child>
 

src/mainwindow.c

@@ -610,7 +610,9 @@ static GActionEntry mainwindow_entries[] = {
 	{ "column-edit-caption", mainwindow_view_action },
 	{ "column-select-all", mainwindow_view_action },
 	{ "column-duplicate", mainwindow_view_action },
-	{ "column-merge", mainwindow_view_action },
+	// takes a string param with the name of the column to merge
+	{ "column-merge", mainwindow_view_action, "s" },
+	{ "column-merge-file", mainwindow_view_action },
 	{ "column-saveas", mainwindow_view_action },
 	{ "column-delete", mainwindow_view_action },
 

src/workspacegroupview.c

@@ -188,6 +188,19 @@ workspacegroupview_pick_rowview(Workspacegroupview *wsgview,
 	return columnview_find_rowview(cview, x, y);
 }
 
+static void *
+workspacegroupview_add_column_item(Column *col, void *user_data)
+{
+	GMenu *columns = G_MENU(user_data);
+
+	GMenuItem *item = g_menu_item_new(IOBJECT(col)->name, NULL);
+	GVariant *target = g_variant_new_string(IOBJECT(col)->name);
+	g_menu_item_set_action_and_target_value(item, "win.column-merge", target);
+	g_menu_append_item(columns, item);
+
+	return NULL;
+}
+
 static void
 workspacegroupview_background_menu(GtkGestureClick *gesture,
 	guint n_press, double x, double y, void *user_data)
@@ -207,6 +220,15 @@ workspacegroupview_background_menu(GtkGestureClick *gesture,
 	if ((cview = workspacegroupview_pick_columnview_title(wsgview, x, y))) {
 		mainwindow_set_action_view(VIEW(cview));
 		menu = wsgview->column_menu;
+
+		// generate the dynamic column submenu
+		GMenu *columns = g_menu_new();
+		workspace_map_column(ws, workspacegroupview_add_column_item, columns);
+		GMenu *column_menu = wsgview->workspacegroup_column_menu;
+		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));
@@ -236,6 +258,7 @@ workspacegroupview_class_init(WorkspacegroupviewClass *class)
 	BIND_VARIABLE(Workspacegroupview, notebook);
 	BIND_VARIABLE(Workspacegroupview, workspace_menu);
 	BIND_VARIABLE(Workspacegroupview, column_menu);
+	BIND_VARIABLE(Workspacegroupview, workspacegroup_column_menu);
 	BIND_VARIABLE(Workspacegroupview, row_menu);
 
 	BIND_CALLBACK(workspacegroupview_new_tab_clicked);

src/workspacegroupview.h

@@ -45,6 +45,8 @@ struct _Workspacegroupview {
 	GtkWidget *workspace_menu;
 	GtkWidget *column_menu;
 	GtkWidget *row_menu;
+
+	GMenu *workspacegroup_column_menu;
 };
 
 typedef struct _WorkspacegroupviewClass {