Add Start, Stop/Remove & Rehash actions.

1 files changed, 188 insertions, 8 deletions

diff --git a/gui/viewtorrents.glade b/gui/viewtorrents.glade
index 0068407..dee4204 100644
--- a/gui/viewtorrents.glade
+++ b/gui/viewtorrents.glade
@@ -1,7 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
+  <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy project-wide -->
+  <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>
+      <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>
+      <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="startaction">
+        <property name="label" translatable="yes">Start</property>
+        <property name="tooltip" translatable="yes">Start selected torrent</property>
+        <property name="stock_id">gtk-media-play</property>
+      </object>
+      <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>
+    </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>
+    </child>
+  </object>
   <object class="GtkDialog" id="connectdlg">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -193,6 +234,8 @@ If authentication is needed, enter username and password as well.</property>
       <column type="gint64"/>
       <!-- column-name ProgressSort -->
       <column type="gfloat"/>
+      <!-- column-name Hash -->
+      <column type="gpointer"/>
     </columns>
   </object>
   <object class="GtkWindow" id="main">
@@ -200,6 +243,9 @@ 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>
+    <accel-groups>
+      <group name="accelgroup1"/>
+    </accel-groups>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -221,22 +267,21 @@ If authentication is needed, enter username and password as well.</property>
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="connectmenuitem">
-                        <property name="label">gtk-connect</property>
+                        <property name="related_action">connectaction</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>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="disconnectmenuitem">
-                        <property name="label">gtk-disconnect</property>
+                        <property name="related_action">disconnectaction</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>
                       </object>
                     </child>
                     <child>
@@ -254,6 +299,52 @@ If authentication is needed, enter username and password as well.</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>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem2">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</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>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="startmenuitem">
+                        <property name="related_action">startaction</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>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="stopmenuitem">
+                        <property name="related_action">stopaction</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>
+                    </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="rehashmenuitem">
+                        <property name="related_action">rehashaction</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>
                     </child>
                   </object>
@@ -279,6 +370,7 @@ If authentication is needed, enter username and password as well.</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>
                       </object>
                     </child>
                   </object>
@@ -293,6 +385,93 @@ If authentication is needed, enter username and password as well.</property>
           </packing>
         </child>
         <child>
+          <object class="GtkToolbar" id="toolbar">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkToolButton" id="connecttoolitem">
+                <property name="related_action">connectaction</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Connect</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="disconnecttoolitem">
+                <property name="related_action">disconnectaction</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">toolbutton1</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="starttoolitem">
+                <property name="related_action">startaction</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">toolbutton2</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="stoptoolitem">
+                <property name="related_action">stopaction</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">toolbutton2</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="rehashtoolitem">
+                <property name="related_action">rehashaction</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">toolbutton2</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</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="GtkScrolledWindow" id="scrolledwindow">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -371,6 +550,7 @@ If authentication is needed, enter username and password as well.</property>
                     <property name="sizing">fixed</property>
                     <property name="fixed_width">80</property>
                     <property name="title" translatable="yes">Left</property>
+                    <property name="clickable">True</property>
                     <property name="sort_column_id">6</property>
                   </object>
                 </child>
@@ -380,7 +560,7 @@ If authentication is needed, enter username and password as well.</property>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
@@ -392,7 +572,7 @@ If authentication is needed, enter username and password as well.</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </object>