Improve merge-toolbar behaviour

- Merge to the top toolbar
- Decrease toolbar timeout until hiding the toolbar in fullscreen mode.

src/image_list.c

@@ -14,6 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *  Sorting-algorithm taken from the thunar filemanager.
  */
 
 #include <config.h>

src/main_window_ui.xml

@@ -112,23 +112,30 @@
         <toolitem action="save-copy"/>
         <toolitem action="close"/>
         <toolitem action="delete"/>
+        <separator name="separator-1"/>
+        <toolitem action="back"/>
+        <placeholder name="placeholder-slideshow" />
+        <toolitem action="forward"/>
+        <separator name="separator-2"/>
+        <toolitem action="rotate-ccw"/>
+        <toolitem action="rotate-cw"/>
         <separator />
+        <toolitem action="zoom-in"/>
+        <toolitem action="zoom-out"/>
+        <toolitem action="zoom-100"/>
+        <toolitem action="zoom-fit"/>
+        <separator />
+        <placeholder name="placeholder-fullscreen" />
     </toolbar>
 
     <!--
 
     -->
     <toolbar name="navigation-toolbar">
-        <toolitem action="open"/>
-        <separator />
-        <toolitem action="save-copy"/>
-        <toolitem action="close"/>
-        <toolitem action="delete"/>
-        <separator name="separator-1"/>
         <toolitem action="back"/>
         <placeholder name="placeholder-slideshow" />
         <toolitem action="forward"/>
-        <separator name="separator-2"/>
+        <separator name="separator-1"/>
         <toolitem action="rotate-ccw"/>
         <toolitem action="rotate-cw"/>
         <separator />