Merge lp:~gotwig/simple-scan/headerbars into lp:~simple-scan-team/simple-scan/trunk

[Eduard Gotwig]

Add headerbars; upcoming: add GtkActionBar

[lp:~gotwig/simple-scan/headerbars]

711. By Eduard Gotwig on 2014-05-25

Adjust minimum size to headerbar dimensions

[Eduard Gotwig (gotwig)]

The bottom line is missing. I have no idea how to add it... Please help if you can.

[lp:~gotwig/simple-scan/headerbars]

712. By Eduard Gotwig on 2014-05-27

add buttons back; still canvas styling issue

[Robert Ancell (robert-ancell)]

The new layout looks nice! Thanks.

- You can't access the preferences unless the scan fails - you need to be able to access these before starting a scan.
- The rotate buttons seem the wrong way around to me; did you switch them for a particular reason?
- There are some document level options that are no longer accessible, i.e. page reordering, email. We should be able to access these somehow - a drop down menu of less frequent options?
- You can't stop the scan - I agree that stop shouldn't be a top-level option but there should be a visible way to cancel a scan while in progress (a button over the currently scanning page?). This is because scans can take a long time to complete.
- The bottom of the pages seems to be clipped. Is this what you mean by the bottom line comment?
- We need to support non-headerbar operation for Ubuntu so both methods need to work.
- For some reason running a test scan fails (run "simple-scan test" to use the test backend). I can't immediately see how your changes could affect it though.

review: Needs Fixing

[Eduard Gotwig (gotwig)]

Thanks for the feedback.

Could you take a look at the "bottom line issue"? I really have no idea how it works :)

I am trying to work on the other issues as good as I can.

[Rico Tzschichholz (ricotz)]

@gotwig: you can avoid a large amount of the diff if you drop the additiontal indentation of 4 spaces in the whole file

[Eduard Gotwig (gotwig)]

Some answers to your critics

- You can't access the preferences unless the scan fails - you need to be able to access these before starting a scan. Answer: I didt change this behaviour. It was like it was before.
- The rotate buttons seem the wrong way around to me; did you switch them for a particular reason?
Answer: you are right. I will do them the right way, and add them into a link box.
- There are some document level options that are no longer accessible, i.e. page reordering, email. We should be able to access these somehow - a drop down menu of less frequent options?
Answer: I dont understand. I changed nothing about this??

- You can't stop the scan - I agree that stop shouldn't be a top-level option but there should be a visible way to cancel a scan while in progress (a button over the currently scanning page?). This is because scans can take a long time to complete.
Answer: I will be working on this. I try to fix this with a normaly invisible button for STOP, becoming visible, when a scan is in progress, replacing the "scan" button.

- The bottom of the pages seems to be clipped. Is this what you mean by the bottom line comment?
Answer: I hope you can work on that. I tried long and got no result. But when I tried the testscan, which btw should be documented in the simplescan manpage pls!, the bottom line for new pages was indeed there.
- We need to support non-headerbar operation for Ubuntu so both methods need to work.
Answer: I try to work on this. So we get the classical Toolbar back for Ubuntu only?
- For some reason running a test scan fails (run "simple-scan test" to use the test backend). I can't immediately see how your changes could affect it though.
Answer: The test scan worked for me.

[Eduard Gotwig (gotwig)]

- There are some document level options that are no longer accessible, i.e. page reordering, email. We should be able to access these somehow - a drop down menu of less frequent options?
Answer: I get what you mean. I try to work on a gnome headerbar solution for this.
Probably I will create a dropdown, and put all document-related actions in there, to save space.

So I will add rotate and cut there too.

[lp:~gotwig/simple-scan/headerbars]

713. By Eduardd Gotwig <email address hidden> on 2014-05-31

Added stop mechanism; introduced deprecated .UI file for deskop environments which not support GTK > 3.10 features
Added all actions to the headerbar, which were before in the menubar, linked rotate buttons

714. By Eduardd Gotwig <email address hidden> on 2014-05-31

Last commit contained Manpage change, to add [test] to the manpage (sry I forgot to note this)
Now both interfaces should work as expected; fixed deprecated crop button

715. By Eduardd Gotwig <email address hidden> on 2014-05-31

Update icons; reset deprecated UI icon

716. By Eduardd Gotwig <email address hidden> on 2014-05-31

Update icon again

[Eduard Gotwig (gotwig)]

I would be happy if you could take a look at it again.

review: Needs Resubmitting

[Robert Ancell (robert-ancell)]

Thanks Eduard! Patch is improving.

I was using the new Launchpad support for inline comments, I'm guessing they didn't show for you.

Things still needing fixing:
- Duplicating the whole .ui file for showing the HeaderBar is too hard to maintain. The .ui should contain a HeaderBar, menu and toolbar. For Systems that support it the HeaderBar should be shown and the menu and toolbar hidden. The opposite for systems that do not support HeaderBars.
- While you have added back some missing buttons to access document level functions there is still not a way to access preferences. Also, it looks very cluttered - did you investigate putting the less used options into a menu?
- You changed the return value of button_cb in book-view.vala to return true instead of false. Was there a reason for this change?
- You have some tab characters where they should be spaces
- You've changed the default window size but this doesn't seem necessary for this patch - does it not look correct with the existing defaults?

As Rico said, please investigate if you can make the .ui files easier to diff. It is very hard to review the changes as they are currently (a big downside of using .ui files :( ).

I think the bottom being clipped off the page is due to the border size changes. I will have a look later when I have time (I am currently travelling).

review: Needs Fixing

[Eduard Gotwig (gotwig)]

I tried to not duplicate the .ui file, but (!), there is no way to enable/disable headerbars trough .ui logic. I tried it. What you have to do, is to remove the "type="titlebar" option from the <child> tag. You cant do this. I found no way to do this.

There is a way to access the preferences. There is an entry in the AppMenu for this. This is following GNOME HIG.

There was a reason for this change, because if I wouldnt have done this, there would be no right-click in the headerbar version. Try it yourself.

I have no idea how to do the spaces/tabs/indentation. Im sorry.

The window size thing should be reverted, I agree. But this is very easy todo. I experimented with this, because I wanted to enable the most minimium size by default for the window.

Thanks for your review. I think about howto put the less used actions into some submenu.

[Michael Catanzaro (mike-catanzaro)]

I think that if you want to add the header bar only conditionally, then you should not attempt to do so in the UI file at all; this is doomed. Create the header bar entirely in Vala, pack your buttons into it, then grab your GtkApplicationWindow out of the UI file using GtkBuilder in order to set it as the titlebar. It's much, much nicer to define the header bar in a UI file than in Vala, but only if you want to use it unconditionally. Mahjongg is probably the best example of how to do this in Vala: https://git.gnome.org/browse/gnome-mahjongg/tree/src/gnome-mahjongg.vala

P.S. To convert tabs to spaces, open the file in gedit, press Ctrl+H to do a search and replace, type \t in the search box and the desired number of spaces in the replace box.

P.S.S. Also, saving the toolbar toolbuttons and header bar toolbar buttons separately is not a good idea; note that Gtk.ToolButton is derived from Gtk.Button so you should not need two different variables.

[Robert Ancell (robert-ancell)]

I've pushed a branch to lp:~robert-ancell/simple-scan/optional-headerbar-ui that shows how you can have both the header bar and the toolbar in the same .ui file and conditionally use each one.

You disable the HeaderBar by using Gtk.Window.set_titlebar (null). This doesn't work in GTK+ 3.10 because it doesn't have [1] but I will backport that to Ubuntu.

I'm also open to changes that do the UI in the .vala files. Vala is not too bad at being concise in generating UI and it makes the patches easier to read.

[1] https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-12&id=8db2ba425aaff107faaa4c7468be63f8ef2fa8e9

[Robert Ancell (robert-ancell)]

Regarding the size changes - these aren't the minimum sizes but the default size. The numbers you have chosen are probably related to the particular theme you are using and will probably change over time as the theme is changed.

I recommend removing these changes from this branch and they can be re-proposed as a later merge proposal. Smaller branches are easier to review.

[Eduard Gotwig (gotwig)]

Hey Robert,

I would welcome it, if you could take a look at this bug report as well.
https://bugs.launchpad.net/simple-scan/+bug/1325760

Its somewhat related to this headerbar change as well.

We could move the buttons from the headerbar, to a GtkActionBar. And its not so hard to do, I just dont know yet where to place it. Would be nice if you could take a look, and tell me where the right place would be to add a GtkActionBar as a child of a page for the book view.

[lp:~gotwig/simple-scan/headerbars]

717. By Eduard Gotwig <<email address hidden> on 2014-06-08

Merge lp:~robert-ancell/simple-scan/optional-headerbar-ui , revert commit nr 771

718. By Eduard Gotwig <<email address hidden> on 2014-06-08

Fix last merge with lp:~robert-ancell/simple-scan/optional-headerbar-ui

719. By Eduard Gotwig <<email address hidden> on 2014-06-08

Reset book-view border

720. By Eduard Gotwig <<email address hidden> on 2014-06-08

Revert /* Show pop-up menu on right click */ to return false again

721. By Eduard Gotwig <<email address hidden> on 2014-06-08

revert to old style, fix border problem

[Eduard Gotwig (gotwig)]

Good news: I finally fixed the border problem.

I can reproduce the problem with no image after a scan.

[Eduard Gotwig (gotwig)]

The part about the broken image scan functionality is a problem of simple scan trunk, master branch and not of this branch.

[Robert Ancell (robert-ancell)]

Please fix the whitespace changes in the .ui file - I've made p:~robert-ancell/simple-scan/headerbars-ui-whitespace with these fixed, please merge/copy in those changes.

[Robert Ancell (robert-ancell)]

Please drop the changes to the man page - they don't relate to this merge.

Note that 'simple-scan test' works because SANE has a 'test' driver compiled in by default. It's probably worth mentioning that in the man page, and not that it's not guaranteed to be provided. This should be a separate merge though.

[Robert Ancell (robert-ancell)]

Looking at the diff below you seem to have moved the app menu logic inside the try clause for no reason - please move it back to the original location. Also there is a whitespace change on line 2521 which doesn't seem relevant.

With those changes this diff should be the appropriate size for this enhancement.

[Robert Ancell (robert-ancell)]

A number of buttons don't work after these changes - it's because of the object renames you did in the .ui file - check references to these are updated both in the .ui file and in the .vala files.

[Eduard Gotwig (gotwig)]

I will update the button names. "Looking at the diff below you seem to have moved the app menu logic inside the try clause for no reason - please move it back to the original location. Also there is a whitespace change on line 2521 which doesn't seem relevant."

Ok, I did the app menu logic in another line, to not check twice for has_app_menu().

In your version, the part was missing where you actually add the appmenu.ui file if the application has an app_menu.

[lp:~gotwig/simple-scan/headerbars]

722. By Eduard Gotwig <<email address hidden> on 2014-06-09

remove whitespace with merge lp:~robert-ancell/simple-scan/headerbars-ui-whitespace; revert manpage change

723. By Eduard Gotwig <<email address hidden> on 2014-06-09

Fix buttonnames

[Eduard Gotwig (gotwig)]

Please check it again...

review: Needs Resubmitting

[Eduard Gotwig (gotwig)]

In your merge you replaced all my GtkButtons with GtkToolButtons again.
This is against the GNOME HIG, I have to disapprove this merge.

review: Disapprove

[Robert Ancell (robert-ancell)]

Thanks for fixing the .ui file indentation - it's much easier to read now.

You haven't done the replaces in src/ui.vala - for example on line 1670 there is a reference to "text_toolbutton_menuitem" but you've renamed it to "text_menuitem".

Please move the app menu logic back - there's no problem calling has_app_menu () more than once and it makes the try clause contain more code than necessary. We are only checking for UI load failures at this point.

btw You should change your review to "Approve" unless you disapprove of your own code!

[Eduard Gotwig (gotwig)]

I don't know if this is really the way to do buttons for the headerbar.
My version with a seperate UI files used GtkButtons instead of GtkToolButtons, and also, when I tested with Ubuntu 14.04, it worked. When I now test your version with the headerbar version, I see GtkToolButtons instead of GtkButtons, they look different. And also your version fails to work for me under Ubuntu 14.04. I dont see window rendering, only the content. I tried to remove every toolbutton from the new version.. thats the reason we have now these references without toolbutton ...

When I talked to users in GTK+ in IRC on GIMPNet, they actually told me that soon toolbars are going to be deprecated. I fear when this happens, we cant use GtkToolButtons anymore as well.

[Robert Ancell (robert-ancell)]

Eduard, you shouldn't need to modify any of the existing code. Your additions don't add GtkToolButtons, and the existing code continues to work as it did before.

[Eduard Gotwig (gotwig)]

I talk about wanting to use GtkButtons not GtkToolButtons

[Robert Ancell (robert-ancell)]

This merge request is "Add headerbars" - the current changes do that and don't add any use of GtkButton. The best way to make changes is to keep them as small as possible. If there's an issue with the existing use of GtkToolButton then this should be proposed in a separate merge.

[Eduard Gotwig (gotwig)]

Ok, I will sort out your issues soon and approve it.

[lp:~gotwig/simple-scan/headerbars]

724. By Eduard Gotwig <<email address hidden> on 2014-06-15

Clearer AppMenu Check logic

725. By Eduard Gotwig <<email address hidden> on 2014-06-15

Renamed buttonnames

[Eduard Gotwig (gotwig)]

I renamed the buttonnames, and added the old load appmenu logic back.

review: Needs Resubmitting

[Robert Ancell (robert-ancell)]

Eduard - my apologies I misread your comments regarding the less frequently used options. As you correctly stated they are in the appmenu (which wasn't showing in Unity when I was testing it). So I have removed those options and let the user use the appmenu instead.

I added the reorder pages to the appmenu as it was never added there.

Merged with fixed to the indentation added in your last commit.

Thanks for your work!

review: Approve

[Robert Ancell (robert-ancell)]

Also regarding the use of Launchpad - when you set the review field to "resubmit" you are asking yourself to resubmit the proposal (kind of sounds like you have a split personality). In Launchpad you should never need to review your own code - it's implied you approve of your own proposal!! Not a problem, just looks kind of funny :) It's a Launchpad UI bug I guess - a proposer should probably not see the review options since they're not applicable.

Resubmitting is a method of proposing where you can generate a new merge request for this proposal (obsoleting the current one). I don't know of any projects that use that since just making new commits and then merging when ready seems sufficient for me.

[Robert Ancell (robert-ancell)]

I opened bug 1330333 about the Launchpad UI issue.

=== modified file 'data/simple-scan.ui'
--- data/simple-scan.ui	2014-04-14 03:59:00 +0000
+++ data/simple-scan.ui	2014-06-15 15:40:52 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkDialog" id="authorize_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -254,7 +253,7 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="document_menuitem">
@@ -683,8 +682,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
+          <object class="GtkToolbar" id="toolbar">
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <style>
               <class name="primary-toolbar"/>
@@ -713,7 +712,7 @@
                 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">scanner</property>
-                <property name="menu">scan_toolbutton_menu</property>
+                <property name="menu">scan_button_menu</property>
                 <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -822,6 +821,258 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="show_close_button">True</property>
+        <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
+        <style>
+          <class name="titlebar"/>
+        </style>
+        <child>
+          <object class="GtkBox" id="open_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="stop_button">
+                <property name="visible">false</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
+                <property name="label" translatable="yes">Stop</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="stop_image">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">process-stop-symbolic</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="scan_button">
+                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
+                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="open_menu">
+                <property name="visible">True</property>
+                <property name="popup">scan_button_menu</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="save_button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="save_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-save-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="new_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="new_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-new-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="rotate_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="rotate_right_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateright-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-right-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="rotate_left_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateleft-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-left-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="crop_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Crop the selected page</property>
+            <property name="use_underline">True</property>
+            <signal name="toggled" handler="crop_button_toggled_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectcrop-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">edit-cut-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="email_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="email_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectemail-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-send-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="print_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="print_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectprint-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-print</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="reorder_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="reorder_menuitem_activate_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectreorder-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">view-paged-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+      </packing>
+    </child>
   </object>
   <object class="GtkListStore" id="text_dpi_store">
     <columns>
@@ -903,7 +1154,6 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="model">device_store</property>
-                <property name="button_sensitivity">on</property>
                 <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
               </object>
               <packing>
@@ -1138,11 +1388,11 @@
       <action-widget response="1">preferences_close_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkMenu" id="scan_toolbutton_menu">
+  <object class="GtkMenu" id="scan_button_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="scan_single_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_single_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
@@ -1151,7 +1401,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="scan_all_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_all_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
@@ -1166,7 +1416,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="text_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="text_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Text</property>
@@ -1176,14 +1426,14 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="photo_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Photo</property>
         <property name="use_underline">True</property>
         <property name="active">True</property>
         <property name="draw_as_radio">True</property>
-        <property name="group">text_toolbutton_menuitem</property>
+        <property name="group">text_button_menuitem</property>
         <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>

=== modified file 'src/ui.vala'
--- src/ui.vala	2014-04-14 23:46:26 +0000
+++ src/ui.vala	2014-06-15 15:40:52 +0000
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2009-2011 Canonical Ltd.
- * Author: Robert Ancell <[e-mail]>
+ * Author: Robert Ancell <[e-mail]>,
+ *         Eduard Gotwig <[e-mail]>
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -33,7 +34,6 @@
 
     private Gtk.ApplicationWindow window;
     private GLib.MenuModel app_menu;
-    private Gtk.MenuBar menubar;
     private Gtk.Box main_vbox;
     private Gtk.InfoBar info_bar;
     private Gtk.Image info_bar_image;
@@ -47,9 +47,12 @@
     private Gtk.MenuItem save_menuitem;
     private Gtk.MenuItem save_as_menuitem;
     private Gtk.MenuItem copy_to_clipboard_menuitem;
+    private Gtk.Button save_button;
     private Gtk.ToolButton save_toolbutton;
     private Gtk.MenuItem stop_menuitem;
     private Gtk.ToolButton stop_toolbutton;
+    private Gtk.Button stop_button;
+    private Gtk.Button scan_button;
 
     private Gtk.RadioMenuItem text_toolbar_menuitem;
     private Gtk.RadioMenuItem text_menu_menuitem;
@@ -126,6 +129,8 @@
             page_delete_menuitem.sensitive = !value;
             stop_menuitem.sensitive = value;
             stop_toolbutton.sensitive = value;
+            scan_button.visible = !value;
+            stop_button.visible = value;
         }
     }
 
@@ -897,9 +902,12 @@
 
         var menuitem = builder.get_object (name) as Gtk.RadioMenuItem;
         menuitem.active = true;
-        var toolbutton = builder.get_object ("crop_toolbutton") as Gtk.ToggleToolButton;
-        toolbutton.active = page.has_crop;
+        var crop_button = builder.get_object ("crop_button") as Gtk.ToggleButton;
+        crop_button.active = page.has_crop;
 
+        var crop_toolbutton = builder.get_object ("crop_toolbutton") as Gtk.ToggleToolButton;
+        crop_toolbutton.active = page.has_crop;
+        
         updating_page_menu = false;
     }
 
@@ -1003,6 +1011,20 @@
             set_crop ("custom");
     }
 
+    [CCode (cname = "G_MODULE_EXPORT crop_button_toggled_cb", instance_pos = -1)]
+    public void crop_button_toggled_cb (Gtk.ToggleButton widget)
+    {
+        if (updating_page_menu)
+            return;
+
+        Gtk.RadioMenuItem menuitem;
+        if (widget.active)
+            menuitem = builder.get_object ("custom_crop_menuitem") as Gtk.RadioMenuItem;
+        else
+            menuitem = builder.get_object ("no_crop_menuitem") as Gtk.RadioMenuItem;
+        menuitem.active = true;
+    }
+    
     [CCode (cname = "G_MODULE_EXPORT crop_toolbutton_toggled_cb", instance_pos = -1)]
     public void crop_toolbutton_toggled_cb (Gtk.ToggleToolButton widget)
     {
@@ -1564,6 +1586,7 @@
     private void needs_saving_cb (Book book)
     {
         save_menuitem.sensitive = book.needs_saving;
+        save_button.sensitive = book.needs_saving;
         save_toolbutton.sensitive = book.needs_saving;
         if (book.needs_saving)
             save_as_menuitem.sensitive = true;
@@ -1598,8 +1621,11 @@
         try
         {
             builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan.ui");
-            if (has_app_menu (app))
-                builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan-menu.ui");
+        if (has_app_menu (app))
+        {
+            builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan-menu.ui");
+        }
+
         }
         catch (Error e)
         {
@@ -1612,16 +1638,22 @@
         }
         builder.connect_signals (this);
 
-        window = builder.get_object ("simple_scan_window") as Gtk.ApplicationWindow;
-        app.add_window (window);
-        menubar = builder.get_object ("menubar") as Gtk.MenuBar;
+ window = builder.get_object ("simple_scan_window") as Gtk.ApplicationWindow;
         if (has_app_menu (app))
         {
             app_menu = builder.get_object ("appmenu") as GLib.MenuModel;
             app.add_action_entries (action_entries, this);
             app.app_menu = app_menu;
-            menubar.visible = false;
-        }
+        }
+        else
+        {
+            window.set_titlebar (null);
+            var menubar = builder.get_object ("menubar") as Gtk.MenuBar;
+            menubar.visible = true;
+            var toolbar = builder.get_object ("toolbar") as Gtk.Toolbar;
+            toolbar.visible = true;
+        }
+        app.add_window (window);
         main_vbox = builder.get_object ("main_vbox") as Gtk.Box;
         page_move_left_menuitem = builder.get_object ("page_move_left_menuitem") as Gtk.MenuItem;
         page_move_right_menuitem = builder.get_object ("page_move_right_menuitem") as Gtk.MenuItem;
@@ -1630,13 +1662,16 @@
         save_menuitem = builder.get_object ("save_menuitem") as Gtk.MenuItem;
         save_as_menuitem = builder.get_object ("save_as_menuitem") as Gtk.MenuItem;
         copy_to_clipboard_menuitem = builder.get_object ("copy_to_clipboard_menuitem") as Gtk.MenuItem;
+        save_button = builder.get_object ("save_button") as Gtk.Button;
         save_toolbutton = builder.get_object ("save_toolbutton") as Gtk.ToolButton;
         stop_menuitem = builder.get_object ("stop_scan_menuitem") as Gtk.MenuItem;
+        stop_button = builder.get_object ("stop_button") as Gtk.Button;
         stop_toolbutton = builder.get_object ("stop_toolbutton") as Gtk.ToolButton;
+        scan_button = builder.get_object ("scan_button") as Gtk.Button;
 
-        text_toolbar_menuitem = builder.get_object ("text_toolbutton_menuitem") as Gtk.RadioMenuItem;
+        text_toolbar_menuitem = builder.get_object ("text_button_menuitem") as Gtk.RadioMenuItem;
         text_menu_menuitem = builder.get_object ("text_menuitem") as Gtk.RadioMenuItem;
-        photo_toolbar_menuitem = builder.get_object ("photo_toolbutton_menuitem") as Gtk.RadioMenuItem;
+        photo_toolbar_menuitem = builder.get_object ("photo_button_menuitem") as Gtk.RadioMenuItem;
         photo_menu_menuitem = builder.get_object ("photo_menuitem") as Gtk.RadioMenuItem;
 
         authorize_dialog = builder.get_object ("authorize_dialog") as Gtk.Dialog;