Implemented basic zoom modes (best fit and normal)

This lets the user switch between best fit and normal zoom modes.
Zooming in and out is not yet implemented.

1 files changed, 90 insertions, 4 deletions

diff --git a/walls.ui b/walls.ui
index 931b47e..7f3a410 100644
--- a/walls.ui
+++ b/walls.ui
@@ -55,6 +55,19 @@
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
+                <signal name="activate" handler="on_view_activate"/>
+                <child type="submenu">
+                  <object class="GtkMenu" id="viewmenu">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="view_toolbar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Toolbar</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
@@ -84,6 +97,67 @@
           </packing>
         </child>
         <child>
+          <object class="GtkToolbar" id="zoom_toolbar">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkRadioToolButton" id="zoom_bestfit">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Best fit</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-fit</property>
+                <property name="active">True</property>
+                <signal name="toggled" handler="on_zoom_mode_toggled"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioToolButton" id="zoom_normal">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Normal</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-100</property>
+                <property name="group">zoom_bestfit</property>
+                <signal name="toggled" handler="on_zoom_mode_toggled"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="zoom_in">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Zoom _In</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-in</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="zoom_out">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Zoom _Out</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-zoom-out</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkHPaned" id="window_hpane">
             <property name="visible">True</property>
             <child>
@@ -106,6 +180,7 @@
                           <object class="GtkTreeView" id="foldtree">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="has_focus">True</property>
                             <signal name="button_press_event" handler="on_foldtree_button_press_event"/>
                             <signal name="popup_menu" handler="on_foldtree_popup_menu"/>
                           </object>
@@ -186,11 +261,22 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLayout" id="layout">
+              <object class="GtkScrolledWindow" id="layout_scroller">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
                 <child>
-                  <object class="GtkImage" id="image">
+                  <object class="GtkLayout" id="layout">
                     <property name="visible">True</property>
+                    <signal name="button_press_event" handler="on_layout_button_press_event"/>
+                    <signal name="motion_notify_event" handler="on_layout_motion_notify_event"/>
+                    <signal name="button_release_event" handler="on_layout_button_release_event"/>
+                    <child>
+                      <object class="GtkImage" id="image">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -201,7 +287,7 @@
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -211,7 +297,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>