polish

Author: jcupitt

TODO

@@ -1,16 +1,12 @@
-- merge tab should not work when locked
-
-- scroll to view current column after tab merge
-
-- merge actions should be more robust
-
 - load ws with locked tab, rightclick menu on locked tab does not
   have tick selected
 
   two tabs, lock one, menu on other also shows lock
 
 	a bit tricky to fix
 
+    maybe we are forced to have a separate menu for each tab?
+
 - the "new tab" icon is still broken in the windows build
 
 # menu redesign

src/columnview.c

@@ -568,10 +568,13 @@ columnview_action(GSimpleAction *action, GVariant *parameter, View *view)
 	}
 	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];
+		const char *from_name = g_variant_get_string(parameter, NULL);
+		Column *from = workspace_column_find(ws, from_name);
+
+		if (!(from = workspace_column_find(ws, from_name)))
+			return;
 
+		char filename[VIPS_PATH_MAX];
 		if (!temp_name(filename, IOBJECT(from)->name, "ws")) {
 			workspace_set_show_error(ws, TRUE);
 			return;

src/workspacegroup.c

@@ -86,6 +86,21 @@ workspacegroup_map(Workspacegroup *wsg, workspace_map_fn fn, void *a, void *b)
 		(icontainer_map_fn) fn, a, b);
 }
 
+static void *
+workspacegroup_find_workspace_sub(Workspace *ws, void *a)
+{
+	const char *name = (const char *) a;
+
+	return g_str_equal(IOBJECT(ws)->name, name) ? ws : NULL;
+}
+
+Workspace *
+workspacegroup_find_workspace(Workspacegroup *wsg, const char *name)
+{
+	return WORKSPACE(workspacegroup_map(wsg,
+		workspacegroup_find_workspace_sub, (void *) name, NULL));
+}
+
 static void *
 workspacegroup_is_empty_sub(Workspace *ws, gboolean *empty)
 {

src/workspacegroup.h

@@ -105,6 +105,7 @@ Workspace *workspacegroup_map(Workspacegroup *wsg,
 
 GType workspacegroup_get_type(void);
 
+Workspace *workspacegroup_find_workspace(Workspacegroup *wsg, const char *name);
 gboolean workspacegroup_is_empty(Workspacegroup *wsg);
 
 Workspacegroup *workspacegroup_new(Workspaceroot *wsr);

src/workspaceview.c

@@ -824,14 +824,6 @@ 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)
 {
@@ -841,41 +833,48 @@ workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
 	Workspace *ws = WORKSPACE(VOBJECT(wview)->iobject);
 	const char *name = g_action_get_name(G_ACTION(action));
 
-	if (g_str_equal(name, "column-new"))
+	if (g_str_equal(name, "column-new") &&
+		!ws->locked)
 		workspace_column_new(ws);
 	else if (g_str_equal(name, "next-error"))
 		workspace_set_show_error(ws, workspace_next_error(ws));
-	else if (g_str_equal(name, "program"))
+	else if (g_str_equal(name, "program") &&
+		!ws->locked)
 		program_new(app, ws->kitg);
-	else if (g_str_equal(name, "tab-rename"))
+	else if (g_str_equal(name, "tab-rename") &&
+		!ws->locked)
 		g_object_set(wview->label,
 			"edit", TRUE,
 			NULL);
-	else if (g_str_equal(name, "tab-select-all")) {
-		if (!ws->locked)
-			workspace_select_all(ws);
-	}
+	else if (g_str_equal(name, "tab-select-all") &&
+		!ws->locked)
+		workspace_select_all(ws);
 	else if (g_str_equal(name, "tab-duplicate"))
 		workspace_duplicate(ws);
 	else if (g_str_equal(name, "tab-merge") &&
-		parameter) {
+		parameter &&
+		!ws->locked) {
+		const char *from_name = g_variant_get_string(parameter, NULL);
 		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];
 
+		Workspace *from;
+
+		if (!(from = workspacegroup_find_workspace(wsg, from_name)))
+			return;
+
+		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));
+		icontainer_current(ICONTAINER(wsg), ICONTAINER(from));
 		if (!workspacegroup_save_current(wsg, filename)) {
 			workspace_set_show_error(ws, TRUE);
 			return;
 		}
 
+		icontainer_current(ICONTAINER(wsg), ICONTAINER(ws));
 		if (!workspace_merge_file(ws, filename)) {
 			workspace_set_show_error(ws, TRUE);
 			return;
@@ -886,7 +885,8 @@ workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
 		workspace_deselect_all(ws);
 		symbol_recalculate_all();
 	}
-	else if (g_str_equal(name, "tab-merge-file"))
+	else if (g_str_equal(name, "tab-merge-file") &&
+		!ws->locked)
 		workspaceview_merge(wview);
 	else if (g_str_equal(name, "tab-saveas"))
 		workspaceview_saveas(wview);
@@ -896,10 +896,9 @@ workspaceview_action(GSimpleAction *action, GVariant *parameter, View *view)
 		GVariant *locked = g_variant_new_boolean(ws->locked);
 		g_simple_action_set_state(action, locked);
 	}
-	else if (g_str_equal(name, "tab-delete")) {
-		if (!ws->locked)
-			model_check_destroy(view_get_window(VIEW(wview)), MODEL(ws));
-	}
+	else if (g_str_equal(name, "tab-delete") &&
+		!ws->locked)
+		model_check_destroy(view_get_window(VIEW(wview)), MODEL(ws));
 }
 
 static void