1 files changed, 105 insertions, 48 deletions
diff --git a/rapid/glade3/rapid.ui b/rapid/glade3/rapid.ui
index 1e49e4e..3ec67f4 100644
--- a/rapid/glade3/rapid.ui
+++ b/rapid/glade3/rapid.ui
@@ -1,73 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
-  <!-- interface-naming-policy project-wide -->
   <object class="GtkAction" id="about_action">
-    <property name="label" translatable="yes">About...</property>
+    <property name="label">About...</property>
     <property name="stock_id">gtk-about</property>
     <signal name="activate" handler="on_about_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="check_all_action">
-    <property name="label" translatable="yes">Check All</property>
+    <property name="label">Check All</property>
     <signal name="activate" handler="on_check_all_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="check_all_photos_action">
-    <property name="label" translatable="yes">Check All Photos</property>
+    <property name="label">Check All Photos</property>
     <signal name="activate" handler="on_check_all_photos_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="check_all_videos_action">
-    <property name="label" translatable="yes">Check All Videos</property>
+    <property name="label">Check All Videos</property>
     <signal name="activate" handler="on_check_all_videos_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="donate_action">
-    <property name="label" translatable="yes">Make a Donation...</property>
+    <property name="label">Make a Donation...</property>
     <signal name="activate" handler="on_donate_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="download_action">
-    <property name="label" translatable="yes">Download</property>
+    <property name="label">Download</property>
     <property name="icon_name">system-run</property>
     <property name="sensitive">False</property>
     <signal name="activate" handler="on_download_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="get_help_action">
-    <property name="label" translatable="yes">Get Help Online...</property>
+    <property name="label">Get Help Online...</property>
     <property name="stock_id">gtk-help</property>
     <signal name="activate" handler="on_get_help_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="help_action">
-    <property name="label" translatable="yes">Help</property>
+    <property name="label">Help</property>
     <signal name="activate" handler="on_help_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="next_image_action">
-    <property name="label" translatable="yes">Next File</property>
     <property name="tooltip">Next file</property>
-    <property name="stock_id">gtk-go-forward</property>
-    <property name="always_show_image">True</property>
     <signal name="activate" handler="on_next_image_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="preferences_action">
-    <property name="label" translatable="yes">Preferences</property>
+    <property name="label">Preferences</property>
     <signal name="activate" handler="on_preferences_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="prev_image_action">
-    <property name="label" translatable="yes">Previous File</property>
     <property name="tooltip">Previous file</property>
-    <property name="stock_id">gtk-go-back</property>
-    <property name="always_show_image">True</property>
     <signal name="activate" handler="on_prev_image_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="quit_action">
-    <property name="label" translatable="yes">Quit</property>
+    <property name="label">Quit</property>
     <property name="stock_id">gtk-quit</property>
     <signal name="activate" handler="on_quit_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="refresh_action">
-    <property name="label" translatable="yes">Refresh</property>
+    <property name="label">Refresh</property>
     <property name="stock_id">gtk-refresh</property>
     <signal name="activate" handler="on_refresh_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="report_problem_action">
-    <property name="label" translatable="yes">Report a Problem...</property>
+    <property name="label">Report a Problem...</property>
     <property name="stock_id">gtk-dialog-warning</property>
     <signal name="activate" handler="on_report_problem_action_activate" swapped="no"/>
   </object>
@@ -80,11 +73,11 @@
     <signal name="activate" handler="on_show_thumbnails_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="translate_action">
-    <property name="label" translatable="yes">Translate this Application...</property>
+    <property name="label">Translate this Application...</property>
     <signal name="activate" handler="on_translate_action_activate" swapped="no"/>
   </object>
   <object class="GtkAction" id="uncheck_all_action">
-    <property name="label" translatable="yes">Uncheck All</property>
+    <property name="label">Uncheck All</property>
     <signal name="activate" handler="on_uncheck_all_action_activate" swapped="no"/>
   </object>
   <object class="GtkWindow" id="rapidapp">
@@ -102,7 +95,6 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="ubuntu_local">True</property>
             <child>
               <object class="GtkMenuItem" id="menuitem7">
                 <property name="visible">True</property>
@@ -113,7 +105,6 @@
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem7_menu">
                     <property name="can_focus">False</property>
-                    <property name="ubuntu_local">True</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menu_download_pause">
                         <property name="label" translatable="yes">Download / Pause</property>
@@ -151,7 +142,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">quit_action</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -171,7 +161,6 @@
                 <child type="submenu">
                   <object class="GtkMenu" id="select_menu">
                     <property name="can_focus">False</property>
-                    <property name="ubuntu_local">True</property>
                     <child>
                       <object class="GtkMenuItem" id="menu_check_all">
                         <property name="visible">True</property>
@@ -244,7 +233,6 @@
                 <child type="submenu">
                   <object class="GtkMenu" id="menuitem10_menu">
                     <property name="can_focus">False</property>
-                    <property name="ubuntu_local">True</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menu_zoom_in">
                         <property name="label">gtk-zoom-in</property>
@@ -253,8 +241,8 @@
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                         <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </object>
                     </child>
                     <child>
@@ -304,6 +292,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">prev_image_action</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Previous File</property>
                         <accelerator key="bracketleft" signal="activate"/>
                       </object>
                     </child>
@@ -312,6 +302,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">next_image_action</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Next File</property>
                         <accelerator key="bracketright" signal="activate"/>
                       </object>
                     </child>
@@ -329,7 +321,6 @@
                 <child type="submenu">
                   <object class="GtkMenu" id="help_menu">
                     <property name="can_focus">False</property>
-                    <property name="ubuntu_local">True</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menu_get_help_online">
                         <property name="visible">True</property>
@@ -352,7 +343,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">donate_action</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Make a Donation...</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -362,7 +352,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">translate_action</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Translate this Application...</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -379,7 +368,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="related_action">about_action</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -396,27 +384,102 @@
           </packing>
         </child>
         <child>
+          <object class="GtkHBox" id="toobar_box">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkToolbar" id="from_toolbar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="show_arrow">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="copy_toolbar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="show_arrow">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="dest_toolbar">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="show_arrow">False</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolbar" id="menu_toolbar">
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkVPaned" id="main_vpaned">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="position">1</property>
             <property name="position_set">True</property>
             <child>
-              <object class="GtkScrolledWindow" id="device_collection_scrolledwindow">
+              <object class="GtkHBox" id="devices_box">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">automatic</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkViewport" id="device_collection_viewport">
+                  <object class="GtkScrolledWindow" id="device_collection_scrolledwindow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="resize_mode">queue</property>
-                    <property name="shadow_type">none</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="shadow_type">etched-out</property>
                     <child>
-                      <placeholder/>
+                      <object class="GtkViewport" id="device_collection_viewport">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="resize_mode">queue</property>
+                        <property name="shadow_type">none</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="padding">6</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -442,8 +505,6 @@
                           <object class="GtkScrolledWindow" id="thumbnails_scrolledwindow">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <placeholder/>
                             </child>
@@ -581,7 +642,6 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="related_action">next_image_action</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="relief">none</property>
                                     <property name="focus_on_click">False</property>
                                     <accelerator key="bracketright" signal="activate"/>
@@ -602,7 +662,6 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="related_action">prev_image_action</property>
-                                    <property name="use_action_appearance">False</property>
                                     <property name="relief">none</property>
                                     <property name="focus_on_click">False</property>
                                     <accelerator key="bracketleft" signal="activate"/>
@@ -740,7 +799,7 @@
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -751,7 +810,6 @@
               <object class="GtkHButtonBox" id="main_buttonbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="layout_style">edge</property>
                 <child>
                   <object class="GtkButton" id="help_button">
                     <property name="label">_Help</property>
@@ -797,7 +855,7 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="padding">6</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>
@@ -832,7 +890,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">2</property>
-                <property name="has_resize_grip">False</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -984,7 +1041,7 @@
             <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="pack_type">end</property>
-            <property name="position">3</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>