Merged revisions 4282-4285,4288-4293,4297-4298,4307,4309-4313,4322,4324-4431,4434-4494,4500-4508,4515,4517,4525-4545,4548-4555,4558-4572,4574-4576,4579,4582-4615,4618-4628,4630-4634,4636-4641,4643-4654,4656-4675,4677,4679-4685,4687-4750 via svnmerge from

svn://svn.netsurf-browser.org/branches/mikeL/netsurf

........
  r4689 | mikeL | 2008-07-17 19:59:20 +0100 (Thu, 17 Jul 2008) | 1 line
  
  Changed the toolbar at the bottom of the downloads dialog to a horizontal button box and added a 'Close' button (Based on a suggestion from the dev list). Internationalized the rest of the strings. Fixed many style errors (thanks rjek). Set authentication fields in the options dialog to be insensitive when proxy type is simple. Namespace'd the rest of download.h
........
  r4690 | mikeL | 2008-07-17 21:39:39 +0100 (Thu, 17 Jul 2008) | 1 line
  
  Removed close button. fixed text on resume button
........
  r4691 | mikeL | 2008-07-17 22:13:13 +0100 (Thu, 17 Jul 2008) | 1 line
  
  Added gtk downloads section
........
  r4715 | mikeL | 2008-07-20 19:41:39 +0100 (Sun, 20 Jul 2008) | 1 line
  
  Downloads are now automatically sorted (Downloading, Error'd, Completed, Canceled). New downloads appear at the beginning of the list. Removed leftover callback for close button. Downloads without a known total size are now handled correctly (bouncing progress block). Fixed bug where shift+click downloads would throw an error (encoding is now always set to binary).
........
  r4716 | mikeL | 2008-07-20 19:45:24 +0100 (Sun, 20 Jul 2008) | 1 line
  
  Removed unnecessary wndDownloads section
........
  r4717 | mikeL | 2008-07-20 19:53:44 +0100 (Sun, 20 Jul 2008) | 1 line
  
  Removed label on url in about dialog. Removed extra variable from the input callback. These changes should have already been committed a while back but for some reason they were skipped
........
  r4718 | mikeL | 2008-07-21 04:56:28 +0100 (Mon, 21 Jul 2008) | 1 line
  
  Total progress bar is now working and acts correctly with downloads of unknown size. All downloads are now stored in a GList (this will later make it possible to implement things like clearing all inactive downloads). Individual downloads no longer update themselves every .5 seconds, the function nsgtk_download_update is called using a g_timeout and cycles through the GList updating the total progress bar and each download. Downloads of unknown size now report their total size upon completion.
........
  r4719 | mikeL | 2008-07-21 05:06:17 +0100 (Mon, 21 Jul 2008) | 1 line
  
  Changed names of two functions that change sensitivity and status.
........
  r4720 | mikeL | 2008-07-21 16:56:41 +0100 (Mon, 21 Jul 2008) | 1 line
  
  Updated messages file
........
  r4722 | mikeL | 2008-07-21 21:44:23 +0100 (Mon, 21 Jul 2008) | 1 line
  
  Clear button now clears all inactive downloads when there is no selection.
........
  r4723 | mikeL | 2008-07-21 22:11:00 +0100 (Mon, 21 Jul 2008) | 1 line
  
  Fixed the total progress bar lagging behind events such as cancelations.
........
  r4727 | mikeL | 2008-07-23 19:33:53 +0100 (Wed, 23 Jul 2008) | 1 line
  
  Added an overwrite confirmation dialog for the 'save' button
........
  r4728 | mikeL | 2008-07-23 19:43:44 +0100 (Wed, 23 Jul 2008) | 1 line
  
  Save as dialog now starts in the default download directory instead of the user's home folder
........
  r4729 | mikeL | 2008-07-23 20:02:34 +0100 (Wed, 23 Jul 2008) | 1 line
  
  Updated Copyright information
........
  r4734 | mikeL | 2008-07-24 19:30:12 +0100 (Thu, 24 Jul 2008) | 1 line
  
  Fixed Info column not being set to expand
........

svn path=/trunk/netsurf/; revision=4752

1 files changed, 28 insertions, 181 deletions

diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade
index 9f9e036f4..f250be753 100644
--- a/gtk/res/netsurf.glade
+++ b/gtk/res/netsurf.glade
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <requires-version lib="gtk+" version="2.12"/>
   <widget class="GtkWindow" id="wndBrowser">
     <property name="title" translatable="yes">NetSurf</property>
     <property name="window_position">GTK_WIN_POS_CENTER</property>
@@ -24,7 +23,6 @@
                         <property name="tooltip" translatable="yes">Opens a new browser window.</property>
                         <property name="label" translatable="yes">_New Window</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image554">
                             <property name="visible">True</property>
@@ -32,6 +30,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="N" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -40,7 +39,6 @@
                         <property name="tooltip" translatable="yes">Open a file on your computer into this browser window.</property>
                         <property name="label" translatable="yes">_Open File...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image555">
                             <property name="visible">True</property>
@@ -48,6 +46,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="F" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -56,7 +55,6 @@
                         <property name="tooltip" translatable="yes">Close this browser window.</property>
                         <property name="label" translatable="yes">_Close Window</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="W" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image556">
                             <property name="visible">True</property>
@@ -64,6 +62,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="W" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -78,7 +77,6 @@
                         <property name="tooltip" translatable="yes">Save this page to disc, optionally including images, etc.</property>
                         <property name="label" translatable="yes">Save page...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image557">
                             <property name="visible">True</property>
@@ -86,6 +84,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="S" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -166,7 +165,6 @@
                         <property name="tooltip" translatable="yes">Produce a hardcopy on your printer.</property>
                         <property name="label" translatable="yes">Print...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image559">
                             <property name="visible">True</property>
@@ -174,6 +172,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -245,7 +244,7 @@
                         <property name="label">gtk-select-all</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="a" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -260,7 +259,7 @@
                         <property name="tooltip" translatable="yes">Find specific text in the current browser window.</property>
                         <property name="label" translatable="yes">_Find...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="F" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -299,7 +298,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Stop</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="Escape" modifiers="" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image561">
                             <property name="visible">True</property>
@@ -307,6 +305,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="Escape" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -314,7 +313,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Reload</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F5" modifiers="" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image562">
                             <property name="visible">True</property>
@@ -322,6 +320,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="F5" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -335,7 +334,6 @@
                         <property name="tooltip" translatable="yes">Scale the page in the current browser window to be smaller or larger.</property>
                         <property name="label" translatable="yes">_Scale View...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F11" modifiers="" signal="activate"/>
                         <child>
                           <widget class="GtkMenu" id="scale_view_menu">
                             <child>
@@ -343,9 +341,6 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Zoom _in</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <accelerator key="KP_Add" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="image564">
                                     <property name="visible">True</property>
@@ -353,6 +348,9 @@
                                     <property name="icon_size">1</property>
                                   </widget>
                                 </child>
+                                <accelerator key="equal" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                                <accelerator key="KP_Add" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                                <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -360,8 +358,6 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">_Normal size</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="KP_0" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <accelerator key="0" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="image565">
                                     <property name="visible">True</property>
@@ -369,6 +365,8 @@
                                     <property name="icon_size">1</property>
                                   </widget>
                                 </child>
+                                <accelerator key="KP_0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                                <accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                             <child>
@@ -376,8 +374,6 @@
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Zoom _out</property>
                                 <property name="use_underline">True</property>
-                                <accelerator key="KP_Subtract" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-                                <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                                 <child internal-child="image">
                                   <widget class="GtkImage" id="image566">
                                     <property name="visible">True</property>
@@ -385,6 +381,8 @@
                                     <property name="icon_size">1</property>
                                   </widget>
                                 </child>
+                                <accelerator key="KP_Subtract" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                                <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                               </widget>
                             </child>
                           </widget>
@@ -396,6 +394,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="F11" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -403,7 +402,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Fullscreen</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F11" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image567">
                             <property name="visible">True</property>
@@ -411,6 +409,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="F11" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -550,7 +549,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Back</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image568">
                             <property name="visible">True</property>
@@ -558,6 +556,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="Left" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -565,7 +564,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Forward</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image569">
                             <property name="visible">True</property>
@@ -573,6 +571,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="Right" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -580,7 +579,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Home</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="Home" modifiers="GDK_MOD1_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image570">
                             <property name="visible">True</property>
@@ -588,6 +586,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="Home" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -601,7 +600,7 @@
                         <property name="tooltip" translatable="yes">Show the history tree for this browser window.</property>
                         <property name="label" translatable="yes">_Local history...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F7" modifiers="" signal="activate"/>
+                        <accelerator key="F7" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -610,7 +609,7 @@
                         <property name="tooltip" translatable="yes">Show the history tree for all windows.</property>
                         <property name="label" translatable="yes">_Global history...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F7" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="F7" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -634,7 +633,7 @@
                         <property name="tooltip" translatable="yes">Open a window showing all your bookmarks.</property>
                         <property name="label" translatable="yes">_Show Bookmarks...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F6" modifiers="" signal="activate"/>
+                        <accelerator key="F6" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -648,7 +647,7 @@
                         <property name="tooltip" translatable="yes">Open an address into this browser window.</property>
                         <property name="label" translatable="yes">_Open location...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                   </widget>
@@ -669,7 +668,6 @@
                         <property name="tooltip" translatable="yes">Shows the contents of the NetSurf manual.</property>
                         <property name="label" translatable="yes">_Contents...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="F1" modifiers="" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image571">
                             <property name="visible">True</property>
@@ -677,6 +675,7 @@
                             <property name="icon_size">1</property>
                           </widget>
                         </child>
+                        <accelerator key="F1" signal="activate"/>
                       </widget>
                     </child>
                     <child>
@@ -839,7 +838,6 @@
                     <property name="label" translatable="yes">Status bar text goes here</property>
                     <property name="selectable">True</property>
                     <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
-                    <property name="width_chars">50</property>
                   </widget>
                   <packing>
                     <property name="resize">False</property>
@@ -1536,157 +1534,6 @@
       </widget>
     </child>
   </widget>
-  <widget class="GtkWindow" id="wndDownloads">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title" translatable="yes">NetSurf Downloads</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="default_width">500</property>
-    <property name="default_height">400</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
-    <signal name="delete_event" handler="gtk_widget_hide"/>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
-            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-            <child>
-              <widget class="GtkToolButton" id="downloadPause">
-                <property name="visible">True</property>
-                <property name="label">Pause</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-media-pause</property>
-                <signal name="clicked" handler="nsgtk_downloadPause_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="downloadResume">
-                <property name="visible">True</property>
-                <property name="label">Resume</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-media-play</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="downloadCancel">
-                <property name="visible">True</property>
-                <property name="label">Cancel</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-cancel</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="downloadCleanup">
-                <property name="visible">True</property>
-                <property name="tooltip" translatable="yes">Remove completed or cancelled downloads from the list</property>
-                <property name="visible_vertical">False</property>
-                <property name="is_important">True</property>
-                <property name="label">Clean up</property>
-                <property name="use_underline">True</property>
-                <property name="stock_id">gtk-clear</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="draw">False</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolProgress">
-                <property name="visible">True</property>
-                <property name="is_important">True</property>
-                <child>
-                  <widget class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <child>
-                      <widget class="GtkVBox" id="vbox2">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <widget class="GtkProgressBar" id="progressbar1">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="fraction">0.10000000149011612</property>
-                            <property name="text" translatable="yes">10% of 5 files</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
-                          </widget>
-                          <packing>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label" translatable="yes">230kB/sec, 12 minutes remaining</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="draw">False</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkTreeView" id="treeDownloads">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
-            <property name="reorderable">True</property>
-            <property name="rules_hint">True</property>
-            <property name="rubber_banding">True</property>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
   <widget class="GtkMenu" id="menuPopup">
     <child>
       <widget class="GtkImageMenuItem" id="popupBack">