fix up Group action

Author: jcupitt

CHANGELOG.md

@@ -6,6 +6,8 @@
 - high-dpi support
 - icon for windows exe
 - fix Fontname creation
+- add ^G to group selected rows
+- add "Group selected" to column menu
 
 ## 9.0.11 2025/07/21
 

TODO

@@ -1,11 +1,3 @@
-
-- select two rows then ^G should make a Group[] at the bottom of the current
-  column
-
-	add "Group slected rows" to column menu
-
-	remove "Group" from row menu
-
 - make toolkilgroupview more compact
 
 	scrolling all the time in the default window size is a PITA

src/app.c

@@ -229,6 +229,7 @@ app_startup(GApplication *app)
 		{ "win.fullscreen", { "F11", NULL } },
 		{ "win.properties", { "<Alt>Return", NULL } },
 		{ "win.keyboard-duplicate", { "<Primary>d", NULL } },
+		{ "win.keyboard-group-selected", { "<Primary>g", NULL } },
 	};
 
 	// all our private application settings

src/columnview.c

@@ -52,6 +52,22 @@ columnview_edit(Columnview *cview)
 	}
 }
 
+static void
+columnview_group_selected(Columnview *cview)
+{
+	Column *col = COLUMN(VOBJECT(cview)->iobject);
+	Workspace *ws = col->ws;
+
+	if (workspace_selected_num(ws) > 0) {
+		icontainer_current(ICONTAINER(ws), ICONTAINER(col));
+		if (!workspace_selected_group(ws))
+			workspace_show_error(ws);
+
+		workspace_deselect_all(ws);
+		symbol_recalculate_all();
+	}
+}
+
 static void
 columnview_caption_edit_activate(GtkEntry *self, gpointer user_data)
 {
@@ -547,6 +563,8 @@ columnview_action(GSimpleAction *action, GVariant *parameter, View *view)
 		workspace_deselect_all(ws);
 		column_select_symbols(col);
 	}
+	else if (g_str_equal(name, "column-group-selected"))
+		columnview_group_selected(cview);
 	else if (g_str_equal(name, "column-duplicate")) {
 		char new_name[MAX_STRSIZE];
 		Column *new_col;

src/gtk/workspacegroupview.ui

@@ -7,10 +7,6 @@
         <attribute name="label">New column</attribute>
         <attribute name="action">win.column-new</attribute>
       </item>
-      <item>
-        <attribute name="label">Group selected</attribute>
-        <attribute name="action">win.prev</attribute>
-      </item>
       <item>
         <attribute name='label' translatable='yes'>Next error</attribute>
         <attribute name='action'>win.next-error</attribute>
@@ -51,10 +47,6 @@
         <attribute name='label' translatable='yes'>Duplicate</attribute>
         <attribute name='action'>win.row-duplicate</attribute>
       </item>
-      <item>
-        <attribute name='label' translatable='yes'>Group</attribute>
-        <attribute name='action'>win.row-group</attribute>
-      </item>
       <item>
         <attribute name='label' translatable='yes'>Ungroup</attribute>
         <attribute name='action'>win.row-ungroup</attribute>
@@ -101,6 +93,10 @@
         <attribute name='label' translatable='yes'>Select all</attribute>
         <attribute name='action'>win.column-select-all</attribute>
       </item>
+      <item>
+        <attribute name='label' translatable='yes'>Group selected</attribute>
+        <attribute name='action'>win.column-group-selected</attribute>
+      </item>
       <item>
         <attribute name='label' translatable='yes'>Duplicate</attribute>
         <attribute name='action'>win.column-duplicate</attribute>

src/mainwindow.c

@@ -621,6 +621,24 @@ mainwindow_keyboard_duplicate_action(GSimpleAction *action,
 	}
 }
 
+// ^G in the main window ... duplicate selected rows, or last row
+static void
+mainwindow_keyboard_group_selected_action(GSimpleAction *action,
+	GVariant *parameter, gpointer user_data)
+{
+	Mainwindow *main = MAINWINDOW(user_data);
+
+	Workspace *ws;
+	if ((ws = WORKSPACE(ICONTAINER(main->wsg)->current))) {
+		if (workspace_selected_num(ws) > 0 &&
+			!workspace_selected_group(ws))
+			workspace_show_error(ws);
+
+		workspace_deselect_all(ws);
+		symbol_recalculate_all();
+	}
+}
+
 static GActionEntry mainwindow_entries[] = {
 	// main window actions
 
@@ -632,9 +650,11 @@ static GActionEntry mainwindow_entries[] = {
 	{ "recover", mainwindow_recover_action },
 	{ "close", mainwindow_close_action },
 	{ "quit", mainwindow_quit_action },
-	{ "keyboard-duplicate", mainwindow_keyboard_duplicate_action },
 	{ "fullscreen", action_toggle, NULL, "false", mainwindow_fullscreen },
 
+	{ "keyboard-duplicate", mainwindow_keyboard_duplicate_action },
+	{ "keyboard-group-selected", mainwindow_keyboard_group_selected_action },
+
 	// workspace tab menu
 	{ "tab-new", mainwindow_tab_new },
 	{ "tab-close-current", mainwindow_tab_close_current },
@@ -659,6 +679,7 @@ static GActionEntry mainwindow_entries[] = {
 	// column menu
 	{ "column-edit-caption", mainwindow_view_action },
 	{ "column-select-all", mainwindow_view_action },
+	{ "column-group-selected", mainwindow_view_action },
 	{ "column-duplicate", mainwindow_view_action },
 	// takes a string param with the name of the column to merge
 	{ "column-merge", mainwindow_view_action, "s" },
@@ -668,10 +689,9 @@ static GActionEntry mainwindow_entries[] = {
 
 	// row menu
 	{ "row-edit", mainwindow_view_action },
+	{ "row-duplicate", mainwindow_view_action },
 	{ "row-saveas", mainwindow_view_action },
-	{ "row-group", mainwindow_view_action },
 	{ "row-ungroup", mainwindow_view_action },
-	{ "row-duplicate", mainwindow_view_action },
 	{ "row-replace", mainwindow_view_action },
 	{ "row-recalculate", mainwindow_view_action },
 	{ "row-reset", mainwindow_view_action },

src/rowview.c

@@ -376,20 +376,6 @@ rowview_duplicate(Rowview *rview)
 	symbol_recalculate_all();
 }
 
-static void
-rowview_group(Rowview *rview)
-{
-	Row *row = ROW(VOBJECT(rview)->iobject);
-
-	if (workspace_selected_num(row->ws) < 2)
-		row_select(row);
-	if (!workspace_selected_group(row->ws))
-		workspace_show_error(row->ws);
-	workspace_deselect_all(row->ws);
-
-	symbol_recalculate_all();
-}
-
 static void
 rowview_ungroup(Rowview *rview)
 {
@@ -456,8 +442,6 @@ rowview_action(GSimpleAction *action, GVariant *parameter, View *view)
 	}
 	else if (g_str_equal(name, "row-replace") && graphic)
 		classmodel_graphic_replace(CLASSMODEL(graphic), window);
-	else if (g_str_equal(name, "row-group"))
-		rowview_group(rview);
 	else if (g_str_equal(name, "row-ungroup"))
 		rowview_ungroup(rview);
 	else if (g_str_equal(name, "row-recalc"))