[simple-scan/crop-mode] Hide other controls when in crop mode

[Robert Ancell <rancell src gnome org>]

commit b89a6af06368a1d61bb09c96b4a06eda3b6fa8c4
Author: Robert Ancell <robert ancell canonical com>
Date:   Tue Sep 25 20:57:09 2018 +1200

    Hide other controls when in crop mode

 src/app-window.ui   | 32 +++++++++++++++++++++++++++++++-
 src/app-window.vala | 49 +++++++++++++++++++++++++++----------------------
 2 files changed, 58 insertions(+), 23 deletions(-)
---
diff --git a/src/app-window.ui b/src/app-window.ui
index cc9775e..4058abd 100644
--- a/src/app-window.ui
+++ b/src/app-window.ui
@@ -280,6 +280,19 @@
                 </style>
               </object>
             </child>
+            <child>
+              <object class="GtkButton" id="cancel_crop_button">
+                <property name="visible">False</property>
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for cancel crop 
button">Cancel the current crop</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="cancel_crop_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
             <child>
               <object class="GtkButton" id="scan_button">
                 <property name="label" translatable="yes" comments="Label on scan toolbar 
item">Scan</property>
@@ -295,7 +308,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuButton">
+              <object class="GtkMenuButton" id="scan_options_button">
                 <property name="visible">True</property>
                 <property name="receives_default">False</property>
                 <property name="popover">scan_options_popover</property>
@@ -367,6 +380,23 @@
             <property name="pack_type">end</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkButton" id="apply_crop_button">
+            <property name="visible">False</property>
+            <property name="receives_default">False</property>
+            <property name="label" translatable="yes" comments="Label on crop button">Crop</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for crop button">Crop 
page</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="apply_crop_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="text-button"/>
+              <class name="suggested-action"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
         <style>
           <class name="titlebar"/>
         </style>
diff --git a/src/app-window.vala b/src/app-window.vala
index d673725..bf317e1 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -81,8 +81,15 @@ public class AppWindow : Gtk.ApplicationWindow
     [GtkChild]
     private Gtk.Button scan_button;
     [GtkChild]
+    private Gtk.Button scan_options_button;
+    [GtkChild]
+    private Gtk.Button cancel_crop_button;
+    [GtkChild]
+    private Gtk.Button apply_crop_button;
+    [GtkChild]
     private Gtk.ActionBar action_bar;
-    private Gtk.ToggleButton crop_button;
+    private Gtk.Button start_again_button;
+    private Gtk.Button crop_button;
     private Gtk.Button delete_button;
 
     [GtkChild]
@@ -780,7 +787,6 @@ public class AppWindow : Gtk.ApplicationWindow
         }
 
         menuitem.active = true;
-        crop_button.active = page.has_crop;
 
         updating_page_menu = false;
     }
@@ -1547,11 +1553,11 @@ public class AppWindow : Gtk.ApplicationWindow
 
         /* Populate ActionBar (not supported in Glade) */
         /* https://bugzilla.gnome.org/show_bug.cgi?id=769966 */
-        var button = new Gtk.Button.with_label (/* Label on new document button */
-                                               _("Start Again…"));
-        button.visible = true;
-        button.clicked.connect (new_document_cb);
-        action_bar.pack_start (button);
+        start_again_button = new Gtk.Button.with_label (/* Label on new document button */
+                                                        _("Start Again…"));
+        start_again_button.visible = true;
+        start_again_button.clicked.connect (new_document_cb);
+        action_bar.pack_start (start_again_button);
 
         var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
         box.visible = true;
@@ -1562,7 +1568,7 @@ public class AppWindow : Gtk.ApplicationWindow
         rotate_box.visible = true;
         box.add (rotate_box);
 
-        button = new Gtk.Button.from_icon_name ("object-rotate-left-symbolic");
+        var button = new Gtk.Button.from_icon_name ("object-rotate-left-symbolic");
         button.visible = true;
         button.image.margin_start = 18;
         button.image.margin_end = 18;
@@ -1580,24 +1586,23 @@ public class AppWindow : Gtk.ApplicationWindow
         button.clicked.connect (rotate_right_button_clicked_cb);
         rotate_box.add (button);
 
-        crop_button = new Gtk.ToggleButton ();
+        crop_button = new Gtk.Button.from_icon_name ("edit-cut-symbolic");
         crop_button.visible = true;
-        var image = new Gtk.Image.from_icon_name ("edit-cut-symbolic", Gtk.IconSize.BUTTON);
-        image.visible = true;
-        image.margin_start = 18;
-        image.margin_end = 18;
-        crop_button.add (image);
+        crop_button.image.margin_start = 18;
+        crop_button.image.margin_end = 18;
         /* Tooltip for crop button */
         crop_button.tooltip_text = _("Crop the selected page");
-        crop_button.toggled.connect ((widget) =>
+        crop_button.clicked.connect ((widget) =>
         {
-            if (updating_page_menu)
-                return;
-
-            if (widget.active)
-                custom_crop_menuitem.active = true;
-            else
-                no_crop_menuitem.active = true;
+            header_bar.title = _("Crop Page");
+            scan_button.visible = false;
+            scan_options_button.visible = false;
+            save_button.visible = false;
+            stop_button.visible = false;
+            menu_button.visible = false;
+            start_again_button.visible = false;
+            cancel_crop_button.visible = true;
+            apply_crop_button.visible = true;
         });
         box.add (crop_button);