From 76bf2f26705b06297ef8d54f7870092defc3adf9 Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@yahoo.com>
Date: Fri, 18 Nov 2011 23:58:19 +0100
Subject: Fix loading glade file when installed. Added desktop entry.

---
 gui/viewtorrents.glade | 57 ++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'gui')

diff --git a/gui/viewtorrents.glade b/gui/viewtorrents.glade
index dee4204..cee5b9a 100644
--- a/gui/viewtorrents.glade
+++ b/gui/viewtorrents.glade
@@ -5,20 +5,18 @@
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkActionGroup" id="actiongroup">
     <child>
-      <object class="GtkAction" id="rehashaction">
-        <property name="label" translatable="yes">Rehash</property>
-        <property name="tooltip" translatable="yes">Rehash selected torrent</property>
-        <property name="stock_id">gtk-refresh</property>
+      <object class="GtkAction" id="connectaction">
+        <property name="label" translatable="yes">Connect</property>
+        <property name="tooltip" translatable="yes">Connect to rTorrent</property>
+        <property name="stock_id">gtk-connect</property>
       </object>
-      <accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="stopaction">
-        <property name="label" translatable="yes">Stop</property>
-        <property name="tooltip" translatable="yes">Stop selected torrent</property>
-        <property name="stock_id">gtk-media-stop</property>
+      <object class="GtkAction" id="disconnectaction">
+        <property name="label" translatable="yes">Disconnect</property>
+        <property name="tooltip" translatable="yes">Disconnect from rTorrent</property>
+        <property name="stock_id">gtk-disconnect</property>
       </object>
-      <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="startaction">
@@ -29,18 +27,20 @@
       <accelerator key="s" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="disconnectaction">
-        <property name="label" translatable="yes">Disconnect</property>
-        <property name="tooltip" translatable="yes">Disconnect from rTorrent</property>
-        <property name="stock_id">gtk-disconnect</property>
+      <object class="GtkAction" id="stopaction">
+        <property name="label" translatable="yes">Stop</property>
+        <property name="tooltip" translatable="yes">Stop selected torrent</property>
+        <property name="stock_id">gtk-media-stop</property>
       </object>
+      <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="connectaction">
-        <property name="label" translatable="yes">Connect</property>
-        <property name="tooltip" translatable="yes">Connect to rTorrent</property>
-        <property name="stock_id">gtk-connect</property>
+      <object class="GtkAction" id="rehashaction">
+        <property name="label" translatable="yes">Rehash</property>
+        <property name="tooltip" translatable="yes">Rehash selected torrent</property>
+        <property name="stock_id">gtk-refresh</property>
       </object>
+      <accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
     </child>
   </object>
   <object class="GtkDialog" id="connectdlg">
@@ -65,10 +65,10 @@
             <child>
               <object class="GtkButton" id="button4">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -80,11 +80,11 @@
             <child>
               <object class="GtkButton" id="button3">
                 <property name="label">gtk-connect</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -243,6 +243,8 @@ If authentication is needed, enter username and password as well.</property>
     <property name="title" translatable="yes">Viewtorrents</property>
     <property name="default_width">600</property>
     <property name="default_height">400</property>
+    <property name="icon_name">viewtorrents</property>
+    <property name="startup_id">viewtorrents</property>
     <accel-groups>
       <group name="accelgroup1"/>
     </accel-groups>
@@ -256,9 +258,9 @@ If authentication is needed, enter username and password as well.</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="menuitem1">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -270,6 +272,7 @@ If authentication is needed, enter username and password as well.</property>
                         <property name="related_action">connectaction</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
                       </object>
@@ -286,17 +289,17 @@ If authentication is needed, enter username and password as well.</property>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="quitmenuitem">
                         <property name="label">gtk-quit</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -353,9 +356,9 @@ If authentication is needed, enter username and password as well.</property>
             </child>
             <child>
               <object class="GtkMenuItem" id="menuitem4">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
@@ -365,9 +368,9 @@ If authentication is needed, enter username and password as well.</property>
                     <child>
                       <object class="GtkImageMenuItem" id="aboutmenuitem">
                         <property name="label">gtk-about</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <property name="accel_group">accelgroup1</property>
@@ -600,10 +603,10 @@ If authentication is needed, enter username and password as well.</property>
             <child>
               <object class="GtkButton" id="button2">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -615,11 +618,11 @@ If authentication is needed, enter username and password as well.</property>
             <child>
               <object class="GtkButton" id="button1">
                 <property name="label">gtk-connect</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
-- 
cgit v1.2.3-70-g09d2