[Xfce4-commits] <ristretto:devel> Remove .o files from git :-p Improve UI-definition

Stephan Arts stephan at xfce.org
Fri Aug 28 07:34:03 CEST 2009


Updating branch refs/heads/devel
         to c27fcffed7844054dc70702d14e12f0a0440f560 (commit)
       from ca95eab31a090a496999fdde39d81e653c3778d4 (commit)

commit c27fcffed7844054dc70702d14e12f0a0440f560
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Aug 28 07:32:34 2009 +0200

    Remove .o files from git :-p
    Improve UI-definition

 configure.in.in                      |    1 -
 src/main.c                           |   45 +-
 src/main_window.glade                |  924 -----------------------------
 src/main_window.ui                   | 1066 ++++++++++++++++++----------------
 src/ristretto-abstract_thumbnailer.o |  Bin 864 -> 0 bytes
 src/ristretto-dbus_thumbnailer.o     |  Bin 860 -> 0 bytes
 src/ristretto-internal_thumbnailer.o |  Bin 864 -> 0 bytes
 7 files changed, 591 insertions(+), 1445 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 123a1f1..13e7f23 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -59,7 +59,6 @@ XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.16.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.6.0])
 
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 
diff --git a/src/main.c b/src/main.c
index af6908a..9fa84f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -45,6 +45,7 @@
 gboolean version = FALSE;
 gboolean start_fullscreen = FALSE;
 gboolean start_slideshow = FALSE;
+gboolean play_slideshow = FALSE;
 
 GtkBuilder *builder;
 GtkRecentManager *manager;
@@ -88,21 +89,21 @@ rstto_main_window_configure_widgets ()
     switch (location)
     {
         case TOP:
-            gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menuitem_navbar_pos_top")), TRUE);
+            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menuitem_navbar_pos_top")), TRUE);
             break;
         case BOTTOM:
-            gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menuitem_navbar_pos_bottom")), TRUE);
+            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menuitem_navbar_pos_bottom")), TRUE);
             break;
         case LEFT:
-            gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menuitem_navbar_pos_left")), TRUE);
+            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menuitem_navbar_pos_left")), TRUE);
             break;
         case RIGHT:
-            gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menuitem_navbar_pos_right")), TRUE);
+            gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menuitem_navbar_pos_right")), TRUE);
             break;
     }
 
-    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menu_show_file_toolbar")), show_file_toolbar);
-    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(gtk_builder_get_object (builder, "menu_show_nav_toolbar")), show_nav_toolbar);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menu_show_file_toolbar")), show_file_toolbar);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(gtk_builder_get_object (builder, "menu_show_nav_toolbar")), show_nav_toolbar);
 
 }
 
@@ -152,6 +153,11 @@ main(int argc, char **argv)
         rstto_main_window_configure_widgets ();
         g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
     }
+    else
+    {
+        g_debug ("Error: %s", error->message);
+        exit (1);
+    }
 
 
     gtk_widget_show_all(window);
@@ -186,7 +192,22 @@ void
 cb_toolbtn_play_slideshow_clicked (GtkWidget *widget, gpointer user_data)
 {
     g_debug ("%s",__FUNCTION__);
+    GValue val = {0, };
+    g_value_init (&val, G_TYPE_STRING);
+
+    if (play_slideshow)
+    {
+        gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (widget), GTK_STOCK_MEDIA_PAUSE);
+        g_value_set_string (&val, N_("_Pause"));
+    }
+    else
+    {
+        gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (widget), GTK_STOCK_MEDIA_PLAY);
+        g_value_set_string (&val, N_("_Play"));
+    }
+    g_object_set_property (gtk_builder_get_object (builder, "menu_play"), "label", &val);
 
+    g_value_unset (&val);
 }
 
 void
@@ -282,7 +303,7 @@ cb_menuitem_navbar_pos_bottom_toggled (GtkWidget *widget, gpointer user_data)
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
     GtkWidget *table = GTK_WIDGET (gtk_builder_get_object (builder, "main_table"));
 
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
@@ -301,7 +322,7 @@ cb_menuitem_navbar_pos_top_toggled (GtkWidget *widget, gpointer user_data)
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
     GtkWidget *table = GTK_WIDGET (gtk_builder_get_object (builder, "main_table"));
 
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
@@ -320,7 +341,7 @@ cb_menuitem_navbar_pos_left_toggled (GtkWidget *widget, gpointer user_data)
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
     GtkWidget *table = GTK_WIDGET (gtk_builder_get_object (builder, "main_table"));
 
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
@@ -338,7 +359,7 @@ cb_menuitem_navbar_pos_right_toggled (GtkWidget *widget, gpointer user_data)
     GtkWidget *nav_bar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
     GtkWidget *table = GTK_WIDGET (gtk_builder_get_object (builder, "main_table"));
 
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         g_object_ref (nav_bar);
         gtk_container_remove (GTK_CONTAINER(table), nav_bar);
@@ -378,7 +399,7 @@ void
 cb_menu_show_file_toolbar_toggled (GtkWidget *widget, gpointer user_data)
 {
     GtkWidget *toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "file_toolbar"));
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         gtk_widget_show (toolbar);
     }
@@ -393,7 +414,7 @@ void
 cb_menu_show_nav_toolbar_toggled (GtkWidget *widget, gpointer user_data)
 {
     GtkWidget *toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "nav_toolbar"));
-    if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (widget)))
+    if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM(widget)))
     {
         gtk_widget_show (toolbar);
     }
diff --git a/src/main_window.glade b/src/main_window.glade
deleted file mode 100644
index 8338653..0000000
--- a/src/main_window.glade
+++ /dev/null
@@ -1,924 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sat Aug 22 10:22:18 2009 -->
-<glade-interface>
-  <requires lib="xfce4"/>
-  <widget class="GtkWindow" id="main_window">
-    <property name="title" translatable="yes">Image Viewer</property>
-    <property name="icon_name">ristretto</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkMenuBar" id="menubar1">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_open_file">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Open</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="cb_menu_open_file_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image1">
-                            <property name="visible">True</property>
-                            <property name="icon_name">document-open</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_open_folder">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Open _Folder</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="cb_menu_open_folder_activate"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image2">
-                            <property name="visible">True</property>
-                            <property name="icon_name">folder-open</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="menu_open_recent">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Open _recent</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem6">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes"><separator></property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_save_copy">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-save-as</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem8">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes"><separator></property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem9">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-print</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="close_file ">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-close</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="close_all">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Close _all</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="quit">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-quit</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="gtk_main_quit"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkMenuItem" id="open_with">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Open with</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem12">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem12</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem13">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-delete</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem14">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem14</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_preferences">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-preferences</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="cb_menu_preferences_activate"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu4">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="menu_show_file_toolbar">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Show File Toolbar</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" handler="cb_menu_show_file_toolbar_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="menu_show_nav_toolbar">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Show Navigation Toolbar</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" handler="cb_menu_show_nav_toolbar_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="menu_show_thumbnail_bar">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Show ThumbnailBar</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="cb_menu_show_thumbnail_bar_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem28">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem28</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="menuitem18">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Zooming</property>
-                        <property name="use_underline">True</property>
-                        <child>
-                          <widget class="GtkMenu" id="menu5">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem19">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">gtk-zoom-fit</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_stock">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem20">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">gtk-zoom-100</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_stock">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem21">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">gtk-zoom-in</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_stock">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem22">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">gtk-zoom-out</property>
-                                <property name="use_underline">True</property>
-                                <property name="use_stock">True</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="menuitem23">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Rotation</property>
-                        <property name="use_underline">True</property>
-                        <child>
-                          <widget class="GtkMenu" id="menu6">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem24">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Rotate left</property>
-                                <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image7">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">object-rotate-left</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkImageMenuItem" id="menuitem25">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Rotate right</property>
-                                <property name="use_underline">True</property>
-                                <child internal-child="image">
-                                  <widget class="GtkImage" id="menu-item-image8">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">object-rotate-right</property>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem29">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem29</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_fullscreen">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-fullscreen</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="cb_menu_fullscreen_activate"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkMenuItem" id="menu_set_wallpaper">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Set as wallpaper</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="cb_menu_set_wallpaper_activate"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem5">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Go</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu7">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem7">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">gtk-go-back</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem10">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">gtk-go-forward</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem11">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">gtk-goto-first</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem31">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">gtk-goto-last</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="menuitem32">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">menuitem32</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menuitem33">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="label" translatable="yes">gtk-media-play</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem4">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu3">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="menu_about">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">gtk-about</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="cb_menu_about_activate"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolbar" id="file_toolbar">
-            <property name="visible">True</property>
-            <property name="no_show_all">True</property>
-            <child>
-              <widget class="GtkToolButton" id="toolbtn_open_file">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Open</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">document-open</property>
-                <signal name="clicked" handler="cb_toolbtn_open_file_clicked"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbtn_open_folder ">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Open _Folder</property>
-                <property name="use_underline">True</property>
-                <property name="icon_name">folder-open</property>
-                <signal name="clicked" handler="cb_toolbtn_open_folder_clicked"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton3">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbtn_save_copy">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="stock_id">gtk-save-as</property>
-                <signal name="clicked" handler="cb_toolbtn_save_copy_clicked"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbtn_close_file">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="stock_id">gtk-close</property>
-                <signal name="clicked" handler="cb_toolbtn_close_file_clicked"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbtn_delete_file">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="stock_id">gtk-delete</property>
-                <signal name="clicked" handler="cb_toolbtn_delete_file_clicked"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkTable" id="main_table">
-            <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">3</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <widget class="GtkHPaned" id="hpaned1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkHPaned" id="hpaned2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <widget class="GtkVPaned" id="vpaned1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <widget class="GtkVPaned" id="vpaned2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child>
-                              <widget class="GtkScrolledWindow" id="center_wiindow">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="resize">True</property>
-                            <property name="shrink">True</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="resize">False</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolbar" id="nav_toolbar">
-                <property name="visible">True</property>
-                <property name="no_show_all">True</property>
-                <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                <signal name="button_press_event" handler="cb_navbox_button_press_event"/>
-                <signal name="popup_context_menu" handler="cb_navbox_popup_context_menu"/>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_previous_image">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-go-up</property>
-                    <signal name="clicked" handler="cb_toolbtn_previous_image_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_play_slideshow">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-media-play</property>
-                    <signal name="clicked" handler="cb_toolbtn_play_slideshow_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_next_image">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-go-down</property>
-                    <signal name="clicked" handler="cb_toolbtn_next_image_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="toolbutton8">
-                    <property name="visible">True</property>
-                    <property name="draw">False</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_rotate_left">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="is_important">True</property>
-                    <property name="label" translatable="yes">Rotate Left</property>
-                    <property name="icon_name">object-rotate-left</property>
-                    <signal name="clicked" handler="cb_toolbtn_rotate_left_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_rotate_right">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label" translatable="yes">Rotate Right</property>
-                    <property name="icon_name">object-rotate-right</property>
-                    <signal name="clicked" handler="cb_toolbtn_rotate_right_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="toolbutton11">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_zoom_in">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-zoom-in</property>
-                    <signal name="clicked" handler="cb_toolbtn_zoom_in_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_zoom_out">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-zoom-out</property>
-                    <signal name="clicked" handler="cb_toolbtn_zoom_out_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_zoom_origin">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-zoom-100</property>
-                    <signal name="clicked" handler="cb_toolbtn_zoom_origin_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_zoom_fit">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="stock_id">gtk-zoom-fit</property>
-                    <signal name="clicked" handler="cb_toolbtn_zoom_fit_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="toolbutton16">
-                    <property name="visible">True</property>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="toolbtn_fullscreen">
-                    <property name="visible">True</property>
-                    <property name="stock_id">gtk-fullscreen</property>
-                    <signal name="clicked" handler="cb_toolbtn_fullscreen_clicked"/>
-                  </widget>
-                  <packing>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkStatusbar" id="statusbar1">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkMenu" id="navbar_popup_menu">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkMenuItem" id="menuitem30">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Position</property>
-        <property name="use_underline">True</property>
-        <child>
-          <widget class="GtkMenu" id="menu8">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkRadioMenuItem" id="menuitem_navbar_pos_left">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Left</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_as_radio">True</property>
-                <signal name="toggled" handler="cb_menuitem_navbar_pos_left_toggled"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkRadioMenuItem" id="menuitem_navbar_pos_right">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Right</property>
-                <property name="use_underline">True</property>
-                <property name="draw_as_radio">True</property>
-                <property name="group">menuitem_navbar_pos_left</property>
-                <signal name="toggled" handler="cb_menuitem_navbar_pos_right_toggled"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkRadioMenuItem" id="menuitem_navbar_pos_top">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Top</property>
-                <property name="use_underline">True</property>
-                <property name="draw_as_radio">True</property>
-                <property name="group">menuitem_navbar_pos_left</property>
-                <signal name="toggled" handler="cb_menuitem_navbar_pos_top_toggled"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkRadioMenuItem" id="menuitem_navbar_pos_bottom">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Bottom</property>
-                <property name="use_underline">True</property>
-                <property name="draw_as_radio">True</property>
-                <property name="group">menuitem_navbar_pos_left</property>
-                <signal name="toggled" handler="cb_menuitem_navbar_pos_bottom_toggled"/>
-              </widget>
-            </child>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="XfceTitledDialog" id="preferences_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Preferences</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="icon_name">preferences-desktop</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <property name="subtitle" translatable="yes">Configure the imageviewer</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="visible">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">page 1</property>
-              </widget>
-              <packing>
-                <property name="type">tab</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
-            <child>
-              <widget class="GtkButton" id="button1">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-11</property>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button2">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">-5</property>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkAboutDialog" id="about_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">About Ristretto</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon_name">ristretto</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="transient_for">main_window</property>
-    <property name="has_separator">False</property>
-    <property name="program_name">Ristretto</property>
-    <property name="copyright" translatable="yes">Copyright 2006-2009 Stephan Arts</property>
-    <property name="comments" translatable="yes">An image viewer for the Xfce Desktop Environment.</property>
-    <property name="website">goodies.xfce.org/projects/applications/ristretto</property>
-    <property name="website_label" translatable="yes">website</property>
-    <property name="authors">Stephan Arts <stephan at xfce.org></property>
-    <property name="logo_icon_name">ristretto</property>
-    <property name="wrap_license">True</property>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/src/main_window.ui b/src/main_window.ui
index 1a90573..9c1f558 100644
--- a/src/main_window.ui
+++ b/src/main_window.ui
@@ -1,355 +1,393 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Sat Aug 22 10:22:18 2009 -->
 <interface>
-  <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkAction" id="menuitem1">
-            <property name="name">menuitem1</property>
-            <property name="label" translatable="yes">_File</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_open_file">
-            <property name="name">menu_open_file</property>
-            <property name="label" translatable="yes">_Open</property>
-            <signal handler="cb_menu_open_file_activate" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_open_folder">
-            <property name="name">menu_open_folder</property>
-            <property name="label" translatable="yes">Open _Folder</property>
-            <signal handler="cb_menu_open_folder_activate" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_open_recent">
-            <property name="name">menu_open_recent</property>
-            <property name="label" translatable="yes">Open _recent</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_save_copy">
-            <property name="stock_id" translatable="yes">gtk-save-as</property>
-            <property name="name">menu_save_copy</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem9">
-            <property name="stock_id" translatable="yes">gtk-print</property>
-            <property name="name">menuitem9</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="close_file ">
-            <property name="stock_id" translatable="yes">gtk-close</property>
-            <property name="name">close_file </property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="close_all">
-            <property name="name">close_all</property>
-            <property name="label" translatable="yes">Close _all</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="quit">
-            <property name="stock_id" translatable="yes">gtk-quit</property>
-            <property name="name">quit</property>
-            <signal handler="gtk_main_quit" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem2">
-            <property name="name">menuitem2</property>
-            <property name="label" translatable="yes">_Edit</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="open_with">
-            <property name="name">open_with</property>
-            <property name="label" translatable="yes">Open with</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem13">
-            <property name="stock_id" translatable="yes">gtk-delete</property>
-            <property name="name">menuitem13</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_preferences">
-            <property name="stock_id" translatable="yes">gtk-preferences</property>
-            <property name="name">menu_preferences</property>
-            <signal handler="cb_menu_preferences_activate" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem3">
-            <property name="name">menuitem3</property>
-            <property name="label" translatable="yes">_View</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="menu_show_file_toolbar">
-            <property name="active">True</property>
-            <property name="name">menu_show_file_toolbar</property>
-            <property name="label" translatable="yes">Show File Toolbar</property>
-            <signal handler="cb_menu_show_file_toolbar_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="menu_show_nav_toolbar">
-            <property name="active">True</property>
-            <property name="name">menu_show_nav_toolbar</property>
-            <property name="label" translatable="yes">Show Navigation Toolbar</property>
-            <signal handler="cb_menu_show_nav_toolbar_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="menu_show_thumbnail_bar">
-            <property name="name">menu_show_thumbnail_bar</property>
-            <property name="label" translatable="yes">Show ThumbnailBar</property>
-            <signal handler="cb_menu_show_thumbnail_bar_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem18">
-            <property name="name">menuitem18</property>
-            <property name="label" translatable="yes">Zooming</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem19">
-            <property name="stock_id" translatable="yes">gtk-zoom-fit</property>
-            <property name="name">menuitem19</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem20">
-            <property name="stock_id" translatable="yes">gtk-zoom-100</property>
-            <property name="name">menuitem20</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem21">
-            <property name="stock_id" translatable="yes">gtk-zoom-in</property>
-            <property name="name">menuitem21</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem22">
-            <property name="stock_id" translatable="yes">gtk-zoom-out</property>
-            <property name="name">menuitem22</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem23">
-            <property name="name">menuitem23</property>
-            <property name="label" translatable="yes">Rotation</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem24">
-            <property name="name">menuitem24</property>
-            <property name="label" translatable="yes">Rotate left</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem25">
-            <property name="name">menuitem25</property>
-            <property name="label" translatable="yes">Rotate right</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_fullscreen">
-            <property name="stock_id" translatable="yes">gtk-fullscreen</property>
-            <property name="name">menu_fullscreen</property>
-            <signal handler="cb_menu_fullscreen_activate" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_set_wallpaper">
-            <property name="name">menu_set_wallpaper</property>
-            <property name="label" translatable="yes">Set as wallpaper</property>
-            <signal handler="cb_menu_set_wallpaper_activate" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem5">
-            <property name="name">menuitem5</property>
-            <property name="label" translatable="yes">_Go</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem7">
-            <property name="stock_id" translatable="yes">gtk-go-back</property>
-            <property name="name">menuitem7</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem10">
-            <property name="stock_id" translatable="yes">gtk-go-forward</property>
-            <property name="name">menuitem10</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem11">
-            <property name="stock_id" translatable="yes">gtk-goto-first</property>
-            <property name="name">menuitem11</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem31">
-            <property name="stock_id" translatable="yes">gtk-goto-last</property>
-            <property name="name">menuitem31</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem33">
-            <property name="stock_id" translatable="yes">gtk-media-play</property>
-            <property name="name">menuitem33</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menuitem4">
-            <property name="name">menuitem4</property>
-            <property name="label" translatable="yes">_Help</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="menu_about">
-            <property name="stock_id" translatable="yes">gtk-about</property>
-            <property name="name">menu_about</property>
-            <signal handler="cb_menu_about_activate" name="activate"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <menubar name="menubar1">
-        <menu action="menuitem1">
-          <menuitem action="menu_open_file"/>
-          <menuitem action="menu_open_folder"/>
-          <menuitem action="menu_open_recent"/>
-          <separator/>
-          <menuitem action="menu_save_copy"/>
-          <separator/>
-          <menuitem action="menuitem9"/>
-          <separator/>
-          <menuitem action="close_file "/>
-          <menuitem action="close_all"/>
-          <menuitem action="quit"/>
-        </menu>
-        <menu action="menuitem2">
-          <menuitem action="open_with"/>
-          <separator/>
-          <menuitem action="menuitem13"/>
-          <separator/>
-          <menuitem action="menu_preferences"/>
-        </menu>
-        <menu action="menuitem3">
-          <menuitem action="menu_show_file_toolbar"/>
-          <menuitem action="menu_show_nav_toolbar"/>
-          <menuitem action="menu_show_thumbnail_bar"/>
-          <separator/>
-          <menu action="menuitem18">
-            <menuitem action="menuitem19"/>
-            <menuitem action="menuitem20"/>
-            <menuitem action="menuitem21"/>
-            <menuitem action="menuitem22"/>
-          </menu>
-          <menu action="menuitem23">
-            <menuitem action="menuitem24"/>
-            <menuitem action="menuitem25"/>
-          </menu>
-          <separator/>
-          <menuitem action="menu_fullscreen"/>
-          <menuitem action="menu_set_wallpaper"/>
-        </menu>
-        <menu action="menuitem5">
-          <menuitem action="menuitem7"/>
-          <menuitem action="menuitem10"/>
-          <menuitem action="menuitem11"/>
-          <menuitem action="menuitem31"/>
-          <separator/>
-          <menuitem action="menuitem33"/>
-        </menu>
-        <menu action="menuitem4">
-          <menuitem action="menu_about"/>
-        </menu>
-      </menubar>
-    </ui>
-  </object>
-  <object class="GtkUIManager" id="uimanager2">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup2">
-        <child>
-          <object class="GtkAction" id="menuitem30">
-            <property name="name">menuitem30</property>
-            <property name="label" translatable="yes">Position</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkRadioAction" id="menuitem_navbar_pos_left">
-            <property name="active">True</property>
-            <property name="name">menuitem_navbar_pos_left</property>
-            <property name="label" translatable="yes">_Left</property>
-            <signal handler="cb_menuitem_navbar_pos_left_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkRadioAction" id="menuitem_navbar_pos_right">
-            <property name="group">menuitem_navbar_pos_left</property>
-            <property name="name">menuitem_navbar_pos_right</property>
-            <property name="label" translatable="yes">_Right</property>
-            <signal handler="cb_menuitem_navbar_pos_right_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkRadioAction" id="menuitem_navbar_pos_top">
-            <property name="group">menuitem_navbar_pos_left</property>
-            <property name="name">menuitem_navbar_pos_top</property>
-            <property name="label" translatable="yes">_Top</property>
-            <signal handler="cb_menuitem_navbar_pos_top_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkRadioAction" id="menuitem_navbar_pos_bottom">
-            <property name="group">menuitem_navbar_pos_left</property>
-            <property name="name">menuitem_navbar_pos_bottom</property>
-            <property name="label" translatable="yes">_Bottom</property>
-            <signal handler="cb_menuitem_navbar_pos_bottom_toggled" name="toggled"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <popup name="navbar_popup_menu">
-        <menu action="menuitem30">
-          <menuitem action="menuitem_navbar_pos_left"/>
-          <menuitem action="menuitem_navbar_pos_right"/>
-          <menuitem action="menuitem_navbar_pos_top"/>
-          <menuitem action="menuitem_navbar_pos_bottom"/>
-        </menu>
-      </popup>
-    </ui>
-  </object>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="main_window">
     <property name="title" translatable="yes">Image Viewer</property>
     <property name="icon_name">ristretto</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
         <child>
-          <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
+          <object class="GtkMenuBar" id="menubar1">
             <property name="visible">True</property>
+            <child>
+              <object class="GtkMenuItem" id="menuitem1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu10">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_open_file">
+                        <property name="label">_Open</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image2</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="cb_menu_open_file_activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_open_folder">
+                        <property name="label">Open _Folder</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="image">image1</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="cb_menu_open_folder_activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menu_open_recent">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Open _Recent</property>
+                        <property name="use_underline">True</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu8">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkMenuItem" id="menuitem_open_recent_item">
+                                <property name="visible">True</property>
+                                <property name="related_action">recentaction1</property>
+                                <property name="use_action_appearance">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem6">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu_save_copy">
+                        <property name="label">gtk-save-as</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem8">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem9">
+                        <property name="label">gtk-print</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="close_file ">
+                        <property name="label">gtk-close</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="close_all">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Close _all</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="quit">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="gtk_main_quit"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkMenuItem" id="open_with">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Open with</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem12">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem13">
+                        <property name="label">gtk-delete</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem14">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu_preferences">
+                        <property name="label">gtk-preferences</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="cb_menu_preferences_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu4">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="menu_show_file_toolbar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Show File Toolbar</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" handler="cb_menu_show_file_toolbar_toggled"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="menu_show_nav_toolbar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Show Navigation Toolbar</property>
+                        <property name="use_underline">True</property>
+                        <property name="active">True</property>
+                        <signal name="toggled" handler="cb_menu_show_nav_toolbar_toggled"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkCheckMenuItem" id="menu_show_thumbnail_bar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Show ThumbnailBar</property>
+                        <property name="use_underline">True</property>
+                        <signal name="toggled" handler="cb_menu_show_thumbnail_bar_toggled"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem28">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem18">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Zooming</property>
+                        <property name="use_underline">True</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu5">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem19">
+                                <property name="label">gtk-zoom-fit</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem20">
+                                <property name="label">gtk-zoom-100</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem21">
+                                <property name="label">gtk-zoom-in</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem22">
+                                <property name="label">gtk-zoom-out</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menuitem23">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Rotation</property>
+                        <property name="use_underline">True</property>
+                        <child type="submenu">
+                          <object class="GtkMenu" id="menu6">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem24">
+                                <property name="label">Rotate left</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkImageMenuItem" id="menuitem25">
+                                <property name="label">Rotate right</property>
+                                <property name="visible">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="use_stock">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem29">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu_fullscreen">
+                        <property name="label">gtk-fullscreen</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="cb_menu_fullscreen_activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menu_set_wallpaper">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Set as wallpaper</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="cb_menu_set_wallpaper_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Go</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu7">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem7">
+                        <property name="label">gtk-go-back</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem10">
+                        <property name="label">gtk-go-forward</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem11">
+                        <property name="label">gtk-goto-first</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem31">
+                        <property name="label">gtk-goto-last</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem" id="menuitem32">
+                        <property name="visible">True</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem33">
+                        <property name="label">gtk-media-play</property>
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="cb_menu_about_activate"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -357,15 +395,15 @@
             <property name="visible">True</property>
             <property name="no_show_all">True</property>
             <child>
-              <object class="GtkToolButton" id="toolbtn_open_file">
+              <object class="GtkMenuToolButton" id="toolbtn_open_file">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Open</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">document-open</property>
-                <signal handler="cb_toolbtn_open_file_clicked" name="clicked"/>
+                <property name="menu">menu1</property>
               </object>
               <packing>
-                <property name="homogeneous">True</property>
+                <property name="expand">False</property>
               </packing>
             </child>
             <child>
@@ -374,9 +412,10 @@
                 <property name="label" translatable="yes">Open _Folder</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">folder-open</property>
-                <signal handler="cb_toolbtn_open_folder_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_toolbtn_open_folder_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -385,6 +424,7 @@
                 <property name="visible">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -393,9 +433,10 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-save-as</property>
-                <signal handler="cb_toolbtn_save_copy_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_toolbtn_save_copy_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -404,9 +445,10 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-close</property>
-                <signal handler="cb_toolbtn_close_file_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_toolbtn_close_file_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -415,9 +457,10 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="stock_id">gtk-delete</property>
-                <signal handler="cb_toolbtn_delete_file_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_toolbtn_delete_file_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="homogeneous">True</property>
               </packing>
             </child>
@@ -433,116 +476,32 @@
             <property name="n_rows">3</property>
             <property name="n_columns">3</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkHPaned" id="hpaned1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkHPaned" id="hpaned2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkVPaned" id="vpaned1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkVPaned" id="vpaned2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="center_wiindow">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_IN</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="resize">False</property>
-                                <property name="shrink">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="resize">True</property>
-                            <property name="shrink">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="resize">False</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="resize">True</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkToolbar" id="nav_toolbar">
                 <property name="visible">True</property>
                 <property name="no_show_all">True</property>
-                <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                <signal handler="cb_navbox_button_press_event" name="button_press_event"/>
-                <signal handler="cb_navbox_popup_context_menu" name="popup_context_menu"/>
+                <property name="orientation">vertical</property>
+                <signal name="button_press_event" handler="cb_navbox_button_press_event"/>
+                <signal name="popup_context_menu" handler="cb_navbox_popup_context_menu"/>
                 <child>
                   <object class="GtkToolButton" id="toolbtn_previous_image">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-up</property>
-                    <signal handler="cb_toolbtn_previous_image_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_previous_image_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="toolbtn_play_slideshow">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
                     <property name="stock_id">gtk-media-play</property>
-                    <signal handler="cb_toolbtn_play_slideshow_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_play_slideshow_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -551,9 +510,10 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-go-down</property>
-                    <signal handler="cb_toolbtn_next_image_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_next_image_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -573,9 +533,10 @@
                     <property name="is_important">True</property>
                     <property name="label" translatable="yes">Rotate Left</property>
                     <property name="icon_name">object-rotate-left</property>
-                    <signal handler="cb_toolbtn_rotate_left_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_rotate_left_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -585,9 +546,10 @@
                     <property name="sensitive">False</property>
                     <property name="label" translatable="yes">Rotate Right</property>
                     <property name="icon_name">object-rotate-right</property>
-                    <signal handler="cb_toolbtn_rotate_right_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_rotate_right_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -596,6 +558,7 @@
                     <property name="visible">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -604,9 +567,10 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-in</property>
-                    <signal handler="cb_toolbtn_zoom_in_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_in_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -615,9 +579,10 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-out</property>
-                    <signal handler="cb_toolbtn_zoom_out_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_out_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -626,9 +591,10 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-100</property>
-                    <signal handler="cb_toolbtn_zoom_origin_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_origin_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -637,9 +603,10 @@
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="stock_id">gtk-zoom-fit</property>
-                    <signal handler="cb_toolbtn_zoom_fit_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_zoom_fit_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -648,6 +615,7 @@
                     <property name="visible">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -655,9 +623,10 @@
                   <object class="GtkToolButton" id="toolbtn_fullscreen">
                     <property name="visible">True</property>
                     <property name="stock_id">gtk-fullscreen</property>
-                    <signal handler="cb_toolbtn_fullscreen_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_toolbtn_fullscreen_clicked"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -667,6 +636,91 @@
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHPaned" id="hpaned1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <object class="GtkHPaned" id="hpaned2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <child>
+                      <object class="GtkVPaned" id="vpaned1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <object class="GtkVPaned" id="vpaned2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <object class="GtkScrolledWindow" id="center_wiindow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="resize">False</property>
+                                <property name="shrink">True</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="resize">True</property>
+                            <property name="shrink">True</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="resize">False</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="position">2</property>
@@ -685,84 +739,57 @@
       </object>
     </child>
   </object>
-  <object class="GtkMenu" constructor="uimanager2" id="navbar_popup_menu">
+  <object class="GtkMenu" id="navbar_popup_menu">
     <property name="visible">True</property>
-  </object>
-  <object class="XfceTitledDialog" id="preferences_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Preferences</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="icon_name">preferences-desktop</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <property name="subtitle" translatable="yes">Configure the imageviewer</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+    <child>
+      <object class="GtkMenuItem" id="menuitem30">
         <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkNotebook" id="notebook1">
+        <property name="label" translatable="yes">Position</property>
+        <property name="use_underline">True</property>
+        <child type="submenu">
+          <object class="GtkMenu" id="menu8">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
             <child>
-              <object class="GtkVBox" id="vbox2">
+              <object class="GtkRadioMenuItem" id="menuitem_navbar_pos_left">
                 <property name="visible">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">_Left</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_as_radio">True</property>
+                <signal name="toggled" handler="cb_menuitem_navbar_pos_left_toggled"/>
               </object>
             </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label1">
+            <child>
+              <object class="GtkRadioMenuItem" id="menuitem_navbar_pos_right">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">page 1</property>
+                <property name="label" translatable="yes">_Right</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">menuitem_navbar_pos_left</property>
+                <signal name="toggled" handler="cb_menuitem_navbar_pos_right_toggled"/>
               </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
             <child>
-              <object class="GtkButton" id="button1">
+              <object class="GtkRadioMenuItem" id="menuitem_navbar_pos_top">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-help</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Top</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">menuitem_navbar_pos_left</property>
+                <signal name="toggled" handler="cb_menuitem_navbar_pos_top_toggled"/>
               </object>
             </child>
             <child>
-              <object class="GtkButton" id="button2">
+              <object class="GtkRadioMenuItem" id="menuitem_navbar_pos_bottom">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">gtk-ok</property>
-                <property name="use_stock">True</property>
+                <property name="label" translatable="yes">_Bottom</property>
+                <property name="use_underline">True</property>
+                <property name="draw_as_radio">True</property>
+                <property name="group">menuitem_navbar_pos_left</property>
+                <signal name="toggled" handler="cb_menuitem_navbar_pos_bottom_toggled"/>
               </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
         </child>
       </object>
     </child>
@@ -772,10 +799,10 @@
     <property name="title" translatable="yes">About Ristretto</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon_name">ristretto</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="transient_for">main_window</property>
@@ -798,14 +825,37 @@
         <child internal-child="action_area">
           <object class="GtkHButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
+  <object class="GtkRecentAction" id="recentaction1">
+    <property name="sort_type">mru</property>
+    <property name="limit">10</property>
+  </object>
+  <object class="GtkMenu" id="menu1">
+    <property name="visible">True</property>
+    <child>
+      <object class="GtkMenuItem" id="menuitem1">
+        <property name="visible">True</property>
+        <property name="related_action">recentaction1</property>
+        <property name="use_action_appearance">True</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="icon_name">folder-open</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="icon_name">document-open</property>
+  </object>
 </interface>
diff --git a/src/ristretto-abstract_thumbnailer.o b/src/ristretto-abstract_thumbnailer.o
deleted file mode 100644
index 42402bb..0000000
Binary files a/src/ristretto-abstract_thumbnailer.o and /dev/null differ
diff --git a/src/ristretto-dbus_thumbnailer.o b/src/ristretto-dbus_thumbnailer.o
deleted file mode 100644
index c4b87dc..0000000
Binary files a/src/ristretto-dbus_thumbnailer.o and /dev/null differ
diff --git a/src/ristretto-internal_thumbnailer.o b/src/ristretto-internal_thumbnailer.o
deleted file mode 100644
index ad19f39..0000000
Binary files a/src/ristretto-internal_thumbnailer.o and /dev/null differ



More information about the Xfce4-commits mailing list