start work

Author: jcupitt

TODO

@@ -1,9 +1,16 @@
-- row range select seems to have broken
+- row range select breaks after "duplicate"
+
+	shift and ctrl click stop affecting select
+
+	the keyboard focus is somewhere else, and left-click on rowview
+	buttons or on workspace background does not grab the focus
 
 - could right-click on a region label pop up the rowview menu?
 
 	difficult with the structure we have now
 
+	have a custom menu and reimplement actions there
+
 - put region snap back?
 
 - maxpos, then create mark from coordinate should be two clicks

src/gtk/imageui.ui

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+
   <template class="Imageui" parent="GtkWidget">
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
@@ -43,5 +44,6 @@
 
       </object>
     </child>
+
   </template>
 </interface>

src/gtk/imagewindow.ui

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+
   <menu id="imagewindow-menu">
     <section>
       <attribute name="display-hint">horizontal-buttons</attribute>
@@ -112,6 +113,29 @@
     </section>
   </menu>
 
+  <menu id="imagewindow-region-menu">
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>Duplicate</attribute>
+      </item>
+      <item>
+        <attribute name='label' translatable='yes'>Reset</attribute>
+      </item>
+    </section>
+
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>Save as ...</attribute>
+      </item>
+    </section>
+
+    <section>
+      <item>
+        <attribute name='label' translatable='yes'>Delete</attribute>
+      </item>
+    </section>
+  </menu>
+
   <template class="Imagewindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Image window</property>
     <property name="default-width">1100</property>
@@ -264,5 +288,12 @@
 
       </object>
     </child>
+
+    <child>
+      <object class="GtkPopoverMenu" id="region_menu">
+        <property name="menu-model">imagewindow-region-menu</property>
+      </object>
+    </child>
+
   </template>
 </interface>

src/imageui.c

@@ -136,7 +136,6 @@ struct _Imageui {
 	 * shift state here in the keyboard handler.
 	 */
 	guint modifiers;
-
 };
 
 G_DEFINE_TYPE(Imageui, imageui, GTK_TYPE_WIDGET);
@@ -986,7 +985,7 @@ imageui_key_released(GtkEventControllerKey *self,
 }
 
 // (x, y) in gtk cods
-static Regionview *
+Regionview *
 imageui_pick_regionview(Imageui *imageui, int x, int y)
 {
 	for (GSList *p = imageui->regionviews; p; p = p->next) {

src/imageui.h

@@ -53,6 +53,7 @@ double imageui_get_scale(Imageui *imageui);
 void imageui_get_mouse_position(Imageui *imageui,
 	double *image_x, double *image_y);
 
+Regionview *imageui_pick_regionview(Imageui *imageui, int x, int y);
 double imageui_get_zoom(Imageui *imageui);
 void imageui_bestfit(Imageui *imageui);
 void imageui_magin(Imageui *imageui);

src/imagewindow.c

@@ -108,6 +108,7 @@ struct _Imagewindow {
 	GtkWidget *properties;
 	GtkWidget *display_bar;
 	GtkWidget *info_bar;
+	GtkWidget *region_menu;
 
 	/* The set of active images in the stack right now. These are not
 	 * references.
@@ -118,6 +119,10 @@ struct _Imagewindow {
 	 */
 	ViewSettings view_settings;
 
+	/* Set on menu popup on a regionview.
+	 */
+	View *action_view;
+
 	GSettings *settings;
 };
 
@@ -1352,7 +1357,18 @@ imagewindow_pressed(GtkGestureClick *gesture,
 	guint n_press, double x, double y, Imagewindow *win)
 {
 	Imageui *imageui = win->imageui;
-	GtkWidget *menu = win->right_click_menu;
+
+	GtkWidget *menu;
+	Regionview *regionview;
+
+	menu = NULL;
+	if (imageui &&
+		(regionview = imageui_pick_regionview(imageui, x, y))) {
+		menu = win->region_menu;
+		win->action_view = VIEW(regionview);
+	}
+	else
+		menu = win->right_click_menu;
 
 	gtk_popover_set_pointing_to(GTK_POPOVER(menu),
 		&(const GdkRectangle){ x, y, 1, 1 });
@@ -1378,6 +1394,7 @@ imagewindow_class_init(ImagewindowClass *class)
 	BIND_VARIABLE(Imagewindow, properties);
 	BIND_VARIABLE(Imagewindow, display_bar);
 	BIND_VARIABLE(Imagewindow, info_bar);
+	BIND_VARIABLE(Imagewindow, region_menu);
 
 	BIND_CALLBACK(imagewindow_pressed);
 	BIND_CALLBACK(imagewindow_error_clicked);

src/workspaceview.c

@@ -1259,9 +1259,9 @@ workspaceview_key_pressed(GtkEventControllerKey *self,
 	gboolean handled;
 
 #ifdef DEBUG_VERBOSE
+#endif /*DEBUG_VERBOSE*/
 	printf("workspaceview_key_pressed: keyval = %d, state = %d\n",
 		keyval, state);
-#endif /*DEBUG_VERBOSE*/
 
 	handled = FALSE;
 
@@ -1292,6 +1292,11 @@ workspaceview_key_released(GtkEventControllerKey *self,
 
 	gboolean handled;
 
+#ifdef DEBUG_VERBOSE
+#endif /*DEBUG_VERBOSE*/
+	printf("workspaceview_key_released: keyval = %d, state = %d\n",
+		keyval, state);
+
 	handled = FALSE;
 
 	switch (keyval) {