gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r3545 - gnunet-gtk


From: grothoff
Subject: [GNUnet-SVN] r3545 - gnunet-gtk
Date: Sat, 21 Oct 2006 23:03:51 -0700 (PDT)

Author: grothoff
Date: 2006-10-21 23:03:48 -0700 (Sat, 21 Oct 2006)
New Revision: 3545

Modified:
   gnunet-gtk/gnunet-gtk.glade
Log:
glade UI update

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-10-22 02:55:29 UTC (rev 3544)
+++ gnunet-gtk/gnunet-gtk.glade 2006-10-22 06:03:48 UTC (rev 3545)
@@ -87,7 +87,7 @@
                          <child>
                            <widget class="GtkLabel" id="titleLabel">
                              <property name="visible">True</property>
-                             <property name="label" 
translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 
0.7.0e&lt;/span&gt;</property>
+                             <property name="label" 
translatable="yes">&lt;span size=&quot;x-large&quot;&gt;Welcome to gnunet-gtk 
0.7.1pre0&lt;/span&gt;</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">True</property>
                              <property 
name="justify">GTK_JUSTIFY_CENTER</property>
@@ -117,7 +117,7 @@
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="label133">
+                       <widget class="GtkLabel" id="label144">
                          <property name="visible">True</property>
                          <property name="label" translatable="yes">            
                                                           
 gnunet-gtk is the GTK+ user interface for GNUnet. It is intended to eventually 
provide a universal, pluggable interface for all GNUnet services.
@@ -134,6 +134,10 @@
 
 Advanced file-sharing features (in particular interactive assembly of 
directories and namespaces) still need work in this version.  If you find any 
bugs, please report them to our bugtracking system at 
https://gnunet.org/mantis/.
 
+&lt;span size=&quot;x-large&quot;&gt;Changes from gnunet-gtk 
0.7.0e:&lt;/span&gt;
+
+Made code compatible with GNUnet 0.7.1 APIs.
+
 &lt;span size=&quot;x-large&quot;&gt;Changes from gnunet-gtk 
0.7.0d:&lt;/span&gt;
 
 This release adds some additional statistics and includes various minor 
cosmetic improvements. Also, a stack overflow problem on some architectures was 
fixed.
@@ -861,84 +865,21 @@
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
                      <child>
-                       <widget class="GtkScrolledWindow" id="scrolledwindow9">
+                       <widget class="GtkHBox" id="hbox62">
                          <property name="visible">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>
-                         <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                         <child>
-                           <widget class="GtkTreeView" 
id="activeSearchesSummary">
-                             <property agent="glademm" 
name="cxx_visibility">public</property>
-                             <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="headers_visible">True</property>
-                             <property name="rules_hint">True</property>
-                             <property name="reorderable">True</property>
-                             <property name="enable_search">True</property>
-                             <property 
name="fixed_height_mode">False</property>
-                             <property name="hover_selection">False</property>
-                             <property name="hover_expand">False</property>
-                           </widget>
-                         </child>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkLabel" id="label16">
-                         <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">True</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">5</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="type">label_item</property>
-                       </packing>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkFrame" id="frame9">
-                     <property name="visible">True</property>
-                     <property name="label_xalign">0</property>
-                     <property name="label_yalign">0.5</property>
-                     <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-                     <child>
-                       <widget class="GtkVBox" id="vbox15">
-                         <property name="visible">True</property>
                          <property name="homogeneous">False</property>
                          <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkScrolledWindow" 
id="scrolledwindow20">
+                           <widget class="GtkScrolledWindow" 
id="scrolledwindow9">
                              <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>
                              <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
                              <child>
-                               <widget class="GtkTreeView" 
id="activeDownloadsList">
+                               <widget class="GtkTreeView" 
id="activeSearchesSummary">
                                  <property agent="glademm" 
name="cxx_visibility">public</property>
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
@@ -960,88 +901,128 @@
                          </child>
 
                          <child>
-                           <widget class="GtkHBox" id="hbox26">
+                           <widget class="GtkVBox" id="vbox22">
                              <property name="visible">True</property>
                              <property name="homogeneous">False</property>
                              <property name="spacing">0</property>
 
                              <child>
-                               <widget class="GtkButton" 
id="abortDownloadButton">
+                               <widget class="GtkButton" 
id="cancelSearchButton">
                                  <property name="visible">True</property>
-                                 <property name="tooltip" 
translatable="yes">Cancel the selected download</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected search</property>
                                  <property name="can_focus">True</property>
-                                 <property name="label">gtk-stop</property>
+                                 <property name="label">gtk-cancel</property>
                                  <property name="use_stock">True</property>
                                  <property 
name="relief">GTK_RELIEF_NORMAL</property>
                                  <property 
name="focus_on_click">True</property>
-                                 <signal name="clicked" 
handler="on_abortDownloadButton_clicked" last_modification_time="Wed, 01 Jun 
2005 19:54:07 GMT"/>
+                                 <signal name="clicked" 
handler="on_abortSearchButton_clicked" last_modification_time="Sun, 22 Oct 2006 
06:07:10 GMT"/>
                                </widget>
                                <packing>
-                                 <property name="padding">15</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                                 <property 
name="pack_type">GTK_PACK_END</property>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
+                               <widget class="GtkButton" id="stopSearchButton">
                                  <property name="visible">True</property>
-                                 <property name="tooltip" 
translatable="yes">Clear completed downloads from the download list</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected search and remove it from the 
list</property>
                                  <property name="can_focus">True</property>
-                                 <property name="label">gtk-clear</property>
+                                 <property name="label">gtk-stop</property>
                                  <property name="use_stock">True</property>
                                  <property 
name="relief">GTK_RELIEF_NORMAL</property>
                                  <property 
name="focus_on_click">True</property>
-                                 <signal name="clicked" 
handler="on_clearCompletedDownloadsButton_clicked" last_modification_time="Wed, 
01 Jun 2005 19:53:58 GMT"/>
+                                 <signal name="clicked" 
handler="on_stopSearchButton_clicked" last_modification_time="Sun, 22 Oct 2006 
06:07:31 GMT"/>
                                </widget>
                                <packing>
-                                 <property name="padding">15</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                                 <property 
name="pack_type">GTK_PACK_END</property>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
                                </packing>
                              </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
+                       </widget>
+                     </child>
 
+                     <child>
+                       <widget class="GtkLabel" id="label16">
+                         <property name="visible">True</property>
+                         <property name="label" 
translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
+                         <property name="use_underline">False</property>
+                         <property name="use_markup">True</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">5</property>
+                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
+                       </widget>
+                       <packing>
+                         <property name="type">label_item</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkFrame" id="frame9">
+                     <property name="visible">True</property>
+                     <property name="label_xalign">0</property>
+                     <property name="label_yalign">0.5</property>
+                     <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+                     <child>
+                       <widget class="GtkHBox" id="hbox61">
+                         <property name="visible">True</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
+
+                         <child>
+                           <widget class="GtkVBox" id="vbox15">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
                              <child>
-                               <widget class="GtkLabel" 
id="fs_status_URI_label">
+                               <widget class="GtkScrolledWindow" 
id="scrolledwindow20">
                                  <property name="visible">True</property>
                                  <property name="can_focus">True</property>
-                                 <property name="label" 
translatable="yes">_Enter URI:</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="use_markup">False</property>
-                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">True</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">5</property>
-                                 <property name="ypad">0</property>
-                                 <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
-                                 <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property 
name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
-                               </widget>
-                               <packing>
-                                 <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
-                               </packing>
-                             </child>
+                                 <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                 <property 
name="shadow_type">GTK_SHADOW_IN</property>
+                                 <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
-                             <child>
-                               <widget class="GtkEntry" 
id="statusDownloadURIEntry">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="has_focus">True</property>
-                                 <property name="editable">True</property>
-                                 <property name="visibility">True</property>
-                                 <property name="max_length">0</property>
-                                 <property 
name="text">gnunet://ecrs/</property>
-                                 <property name="has_frame">True</property>
-                                 <property name="invisible_char">*</property>
-                                 <property 
name="activates_default">True</property>
+                                 <child>
+                                   <widget class="GtkTreeView" 
id="activeDownloadsList">
+                                     <property agent="glademm" 
name="cxx_visibility">public</property>
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property 
name="headers_visible">True</property>
+                                     <property 
name="rules_hint">True</property>
+                                     <property 
name="reorderable">True</property>
+                                     <property 
name="enable_search">True</property>
+                                     <property 
name="fixed_height_mode">False</property>
+                                     <property 
name="hover_selection">False</property>
+                                     <property 
name="hover_expand">False</property>
+                                   </widget>
+                                 </child>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
@@ -1051,143 +1032,258 @@
                              </child>
 
                              <child>
-                               <widget class="GtkButton" 
id="fs_status_download_button">
+                               <widget class="GtkHBox" id="hbox26">
                                  <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
-                                 <property 
name="focus_on_click">True</property>
-                                 <signal name="clicked" 
handler="on_statusDownloadURIEntry_editing_done" 
object="statusDownloadURIEntry" last_modification_time="Tue, 02 May 2006 
05:03:46 GMT"/>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">0</property>
 
                                  <child>
-                                   <widget class="GtkAlignment" 
id="alignment19">
+                                   <widget class="GtkLabel" 
id="fs_status_URI_label">
                                      <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="label" 
translatable="yes">_Enter URI:</property>
+                                     <property 
name="use_underline">True</property>
+                                     <property 
name="use_markup">False</property>
+                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property 
name="selectable">True</property>
                                      <property name="xalign">0.5</property>
                                      <property name="yalign">0.5</property>
-                                     <property name="xscale">0</property>
-                                     <property name="yscale">0</property>
-                                     <property name="top_padding">0</property>
-                                     <property 
name="bottom_padding">0</property>
-                                     <property name="left_padding">0</property>
-                                     <property 
name="right_padding">0</property>
+                                     <property name="xpad">5</property>
+                                     <property name="ypad">0</property>
+                                     <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
+                                     <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property 
name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
 
+                                 <child>
+                                   <widget class="GtkEntry" 
id="statusDownloadURIEntry">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="has_focus">True</property>
+                                     <property name="editable">True</property>
+                                     <property 
name="visibility">True</property>
+                                     <property name="max_length">0</property>
+                                     <property 
name="text">gnunet://ecrs/</property>
+                                     <property name="has_frame">True</property>
+                                     <property 
name="invisible_char">*</property>
+                                     <property 
name="activates_default">True</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">True</property>
+                                     <property name="fill">True</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkButton" 
id="fs_status_download_button">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                     <property 
name="focus_on_click">True</property>
+                                     <signal name="clicked" 
handler="on_statusDownloadURIEntry_editing_done" 
object="statusDownloadURIEntry" last_modification_time="Tue, 02 May 2006 
05:03:46 GMT"/>
+
                                      <child>
-                                       <widget class="GtkHBox" id="hbox54">
+                                       <widget class="GtkAlignment" 
id="alignment19">
                                          <property 
name="visible">True</property>
-                                         <property 
name="homogeneous">False</property>
-                                         <property name="spacing">2</property>
+                                         <property name="xalign">0.5</property>
+                                         <property name="yalign">0.5</property>
+                                         <property name="xscale">0</property>
+                                         <property name="yscale">0</property>
+                                         <property 
name="top_padding">0</property>
+                                         <property 
name="bottom_padding">0</property>
+                                         <property 
name="left_padding">0</property>
+                                         <property 
name="right_padding">0</property>
 
                                          <child>
-                                           <widget class="GtkImage" 
id="image41">
+                                           <widget class="GtkHBox" id="hbox54">
                                              <property 
name="visible">True</property>
-                                             <property 
name="stock">gtk-go-down</property>
-                                             <property 
name="icon_size">4</property>
-                                             <property 
name="xalign">0.5</property>
-                                             <property 
name="yalign">0.5</property>
-                                             <property name="xpad">0</property>
-                                             <property name="ypad">0</property>
-                                           </widget>
-                                           <packing>
-                                             <property 
name="padding">0</property>
-                                             <property 
name="expand">False</property>
-                                             <property 
name="fill">False</property>
-                                           </packing>
-                                         </child>
+                                             <property 
name="homogeneous">False</property>
+                                             <property 
name="spacing">2</property>
 
-                                         <child>
-                                           <widget class="GtkLabel" 
id="label135">
-                                             <property 
name="visible">True</property>
-                                             <property name="label" 
translatable="yes">D_ownload</property>
-                                             <property 
name="use_underline">True</property>
-                                             <property 
name="use_markup">False</property>
-                                             <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                             <property 
name="wrap">False</property>
-                                             <property 
name="selectable">False</property>
-                                             <property 
name="xalign">0.5</property>
-                                             <property 
name="yalign">0.5</property>
-                                             <property name="xpad">0</property>
-                                             <property name="ypad">0</property>
-                                             <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                             <property 
name="width_chars">-1</property>
-                                             <property 
name="single_line_mode">False</property>
-                                             <property 
name="angle">0</property>
+                                             <child>
+                                               <widget class="GtkImage" 
id="image41">
+                                                 <property 
name="visible">True</property>
+                                                 <property 
name="stock">gtk-go-down</property>
+                                                 <property 
name="icon_size">4</property>
+                                                 <property 
name="xalign">0.5</property>
+                                                 <property 
name="yalign">0.5</property>
+                                                 <property 
name="xpad">0</property>
+                                                 <property 
name="ypad">0</property>
+                                               </widget>
+                                               <packing>
+                                                 <property 
name="padding">0</property>
+                                                 <property 
name="expand">False</property>
+                                                 <property 
name="fill">False</property>
+                                               </packing>
+                                             </child>
+
+                                             <child>
+                                               <widget class="GtkLabel" 
id="label135">
+                                                 <property 
name="visible">True</property>
+                                                 <property name="label" 
translatable="yes">D_ownload</property>
+                                                 <property 
name="use_underline">True</property>
+                                                 <property 
name="use_markup">False</property>
+                                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                                 <property 
name="wrap">False</property>
+                                                 <property 
name="selectable">False</property>
+                                                 <property 
name="xalign">0.5</property>
+                                                 <property 
name="yalign">0.5</property>
+                                                 <property 
name="xpad">0</property>
+                                                 <property 
name="ypad">0</property>
+                                                 <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                                 <property 
name="width_chars">-1</property>
+                                                 <property 
name="single_line_mode">False</property>
+                                                 <property 
name="angle">0</property>
+                                               </widget>
+                                               <packing>
+                                                 <property 
name="padding">0</property>
+                                                 <property 
name="expand">False</property>
+                                                 <property 
name="fill">False</property>
+                                               </packing>
+                                             </child>
                                            </widget>
-                                           <packing>
-                                             <property 
name="padding">0</property>
-                                             <property 
name="expand">False</property>
-                                             <property 
name="fill">False</property>
-                                           </packing>
                                          </child>
                                        </widget>
                                      </child>
                                    </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
                                  </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label136">
+                                     <property name="visible">True</property>
+                                     <property name="label" 
translatable="yes">with _anonymity</property>
+                                     <property 
name="use_underline">True</property>
+                                     <property 
name="use_markup">False</property>
+                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property 
name="selectable">False</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">3</property>
+                                     <property name="ypad">0</property>
+                                     <property 
name="mnemonic_widget">fsstatusAnonymitySpin</property>
+                                     <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property 
name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="climb_rate">1</property>
+                                     <property name="digits">0</property>
+                                     <property name="numeric">True</property>
+                                     <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                                     <property 
name="snap_to_ticks">False</property>
+                                     <property name="wrap">False</property>
+                                     <property name="adjustment">1 1 999999 1 
10 10</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
                                </widget>
                                <packing>
-                                 <property name="padding">0</property>
+                                 <property name="padding">5</property>
                                  <property name="expand">False</property>
                                  <property name="fill">False</property>
                                </packing>
                              </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
+                           </packing>
+                         </child>
 
+                         <child>
+                           <widget class="GtkVBox" id="vbox20">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
                              <child>
-                               <widget class="GtkLabel" id="label136">
+                               <widget class="GtkButton" 
id="abortDownloadButton">
                                  <property name="visible">True</property>
-                                 <property name="label" 
translatable="yes">with _anonymity</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="use_markup">False</property>
-                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
-                                 <property name="wrap">False</property>
-                                 <property name="selectable">False</property>
-                                 <property name="xalign">0.5</property>
-                                 <property name="yalign">0.5</property>
-                                 <property name="xpad">3</property>
-                                 <property name="ypad">0</property>
-                                 <property 
name="mnemonic_widget">fsstatusAnonymitySpin</property>
-                                 <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                 <property name="width_chars">-1</property>
-                                 <property 
name="single_line_mode">False</property>
-                                 <property name="angle">0</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected download</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-cancel</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_abortDownloadButton_clicked" last_modification_time="Wed, 01 Jun 
2005 19:54:07 GMT"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
+                               <widget class="GtkButton" 
id="stopDownloadButton">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected download and remove it from the 
list</property>
                                  <property name="can_focus">True</property>
-                                 <property name="climb_rate">1</property>
-                                 <property name="digits">0</property>
-                                 <property name="numeric">True</property>
-                                 <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
-                                 <property 
name="snap_to_ticks">False</property>
-                                 <property name="wrap">False</property>
-                                 <property name="adjustment">1 1 999999 1 10 
10</property>
+                                 <property name="label">gtk-stop</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_stopDownloadButton_clicked" last_modification_time="Sun, 22 Oct 
2006 06:00:17 GMT"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
                                </packing>
                              </child>
 
                              <child>
-                               <widget class="GtkVSeparator" id="vseparator2">
-                                 <property name="width_request">41</property>
+                               <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
                                  <property name="visible">True</property>
+                                 <property name="tooltip" 
translatable="yes">Clear completed downloads from the download list</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-clear</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_clearCompletedDownloadsButton_clicked" last_modification_time="Wed, 
01 Jun 2005 19:53:58 GMT"/>
                                </widget>
                                <packing>
                                  <property name="padding">0</property>
-                                 <property name="expand">False</property>
-                                 <property name="fill">False</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
                                </packing>
                              </child>
                            </widget>
                            <packing>
-                             <property name="padding">5</property>
+                             <property name="padding">0</property>
                              <property name="expand">False</property>
                              <property name="fill">False</property>
                            </packing>
@@ -1233,27 +1329,107 @@
                      <property name="shadow_type">GTK_SHADOW_NONE</property>
 
                      <child>
-                       <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                       <widget class="GtkHBox" id="hbox61">
                          <property name="visible">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>
-                         <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                         <property name="homogeneous">False</property>
+                         <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkTreeView" id="activeUploadsList">
-                             <property agent="glademm" 
name="cxx_visibility">public</property>
+                           <widget class="GtkScrolledWindow" 
id="scrolledwindow8">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="headers_visible">True</property>
-                             <property name="rules_hint">True</property>
-                             <property name="reorderable">True</property>
-                             <property name="enable_search">True</property>
-                             <property 
name="fixed_height_mode">False</property>
-                             <property name="hover_selection">False</property>
-                             <property name="hover_expand">False</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>
+                             <property 
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+                             <child>
+                               <widget class="GtkTreeView" 
id="activeUploadsList">
+                                 <property agent="glademm" 
name="cxx_visibility">public</property>
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">True</property>
+                                 <property 
name="headers_visible">True</property>
+                                 <property name="rules_hint">True</property>
+                                 <property name="reorderable">True</property>
+                                 <property name="enable_search">True</property>
+                                 <property 
name="fixed_height_mode">False</property>
+                                 <property 
name="hover_selection">False</property>
+                                 <property name="hover_expand">False</property>
+                               </widget>
+                             </child>
                            </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
+                           </packing>
                          </child>
+
+                         <child>
+                           <widget class="GtkVBox" id="vbox21">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
+                             <child>
+                               <widget class="GtkButton" 
id="cancelUploadButton">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected upload</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-cancel</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_abortUploadButton_clicked" last_modification_time="Sun, 22 Oct 2006 
06:05:17 GMT"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkButton" id="stopUploadButton">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" 
translatable="yes">Cancel the selected upload and remove it from the 
list</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-stop</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_stopUploadButton_clicked" last_modification_time="Sun, 22 Oct 2006 
06:05:24 GMT"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkButton" 
id="clearUploadsButton">
+                                 <property name="visible">True</property>
+                                 <property name="tooltip" 
translatable="yes">Clear completed uploads from the upload list</property>
+                                 <property name="can_focus">True</property>
+                                 <property name="label">gtk-clear</property>
+                                 <property name="use_stock">True</property>
+                                 <property 
name="relief">GTK_RELIEF_NORMAL</property>
+                                 <property 
name="focus_on_click">True</property>
+                                 <signal name="clicked" 
handler="on_clearCompletedDownloadsButton_clicked" last_modification_time="Wed, 
01 Jun 2005 19:53:58 GMT"/>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
+                           </widget>
+                           <packing>
+                             <property name="padding">0</property>
+                             <property name="expand">False</property>
+                             <property name="fill">False</property>
+                           </packing>
+                         </child>
                        </widget>
                      </child>
 
@@ -1282,8 +1458,8 @@
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
                    </packing>
                  </child>
                </widget>
@@ -1557,6 +1733,110 @@
                  </child>
 
                  <child>
+                   <widget class="GtkHBox" id="hbox65">
+                     <property name="visible">True</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
+
+                     <child>
+                       <widget class="GtkLabel" id="label148">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_Maximum 
results:</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">True</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">6</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">maxResultsSpinButton</property>
+                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" id="maxResultsSpinButton">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">500</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1000 1 100000000 50 500 
500</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkLabel" id="label149">
+                         <property name="visible">True</property>
+                         <property name="label" 
translatable="yes">Aut_omatically abort search after (s):</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">3</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">searchDelaySpinButton</property>
+                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" 
id="searchDelaySpinButton">
+                         <property name="visible">True</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">100</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">300 0 100000000 10 100 
100</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">True</property>
+                         <property name="fill">True</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
                    <widget class="GtkHBox" id="hbox53">
                      <property name="visible">True</property>
                      <property name="homogeneous">False</property>
@@ -1778,10 +2058,10 @@
                  <child>
                    <widget class="GtkTable" id="fsinserttable">
                      <property name="visible">True</property>
-                     <property name="n_rows">5</property>
-                     <property name="n_columns">4</property>
+                     <property name="n_rows">6</property>
+                     <property name="n_columns">3</property>
                      <property name="homogeneous">False</property>
-                     <property name="row_spacing">5</property>
+                     <property name="row_spacing">10</property>
                      <property name="column_spacing">5</property>
 
                      <child>
@@ -1892,30 +2172,6 @@
                      </child>
 
                      <child>
-                       <widget class="GtkRadioButton" id="scopeFileOnlyButton">
-                         <property agent="glademm" 
name="cxx_visibility">public</property>
-                         <property name="visible">True</property>
-                         <property name="tooltip" translatable="yes">Only 
publish a single file.</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">file 
onl_y</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">True</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                       </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>
-                         <property name="x_options">fill</property>
-                         <property name="y_options"></property>
-                       </packing>
-                     </child>
-
-                     <child>
                        <widget class="GtkLabel" id="anonymityUploadLabel">
                          <property name="visible">True</property>
                          <property name="label" 
translatable="yes">_Anonymity:</property>
@@ -1945,45 +2201,66 @@
                      </child>
 
                      <child>
-                       <widget class="GtkLabel" id="uploadFilenameLabel">
+                       <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
+                         <property agent="glademm" 
name="cxx_visibility">public</property>
                          <property name="visible">True</property>
-                         <property name="label" 
translatable="yes">_Filename:</property>
+                         <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree.</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">_recursive 
(for entire directories)</property>
                          <property name="use_underline">True</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_CENTER</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <property name="active">False</property>
+                         <property name="inconsistent">False</property>
+                         <property name="draw_indicator">True</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">2</property>
+                         <property name="right_attach">3</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
+                         <property agent="glademm" 
name="cxx_visibility">public</property>
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">What 
level of sender-anonymity is desired when sharing this particular file?  0 
allows direct connections (no anonymity).  Higher levels require increasing 
amounts of cover traffic per shared block, increasing your privacy at the 
expense of efficiency.</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">1</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
                          <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">5</property>
-                         <property name="ypad">0</property>
-                         <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
-                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
+                         <property name="adjustment">0 0 10000 1 10 
10</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">0</property>
-                         <property name="right_attach">1</property>
-                         <property name="top_attach">3</property>
-                         <property name="bottom_attach">4</property>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">2</property>
+                         <property name="bottom_attach">3</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
+                       <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
                          <property name="visible">True</property>
-                         <property name="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish.</property>
+                         <property name="tooltip" translatable="yes">Controls 
if GNUnet should also produce information for individual files inside of a 
directory, as opposed to only allowing the directory itself to be found 
directly.  Only applies for recursive uploads.</property>
                          <property name="can_focus">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
-                         <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked" 
object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005 
17:09:36 GMT"/>
+                         <property name="active">True</property>
+                         <property name="inconsistent">False</property>
+                         <property name="draw_indicator">True</property>
 
                          <child>
-                           <widget class="GtkAlignment" id="alignment24">
+                           <widget class="GtkAlignment" id="alignment15">
                              <property name="visible">True</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
@@ -1995,15 +2272,15 @@
                              <property name="right_padding">0</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox60">
+                               <widget class="GtkHBox" id="hbox52">
                                  <property name="visible">True</property>
                                  <property name="homogeneous">False</property>
                                  <property name="spacing">2</property>
 
                                  <child>
-                                   <widget class="GtkImage" id="image46">
+                                   <widget class="GtkImage" id="image40">
                                      <property name="visible">True</property>
-                                     <property name="stock">gtk-open</property>
+                                     <property 
name="stock">gtk-index</property>
                                      <property name="icon_size">4</property>
                                      <property name="xalign">0.5</property>
                                      <property name="yalign">0.5</property>
@@ -2018,9 +2295,9 @@
                                  </child>
 
                                  <child>
-                                   <widget class="GtkLabel" id="label143">
+                                   <widget class="GtkLabel" id="label128">
                                      <property name="visible">True</property>
-                                     <property name="label" 
translatable="yes">_Browse</property>
+                                     <property name="label" 
translatable="yes">add keywords for files in directories</property>
                                      <property 
name="use_underline">True</property>
                                      <property 
name="use_markup">False</property>
                                      <property 
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2047,108 +2324,199 @@
                          </child>
                        </widget>
                        <packing>
-                         <property name="left_attach">3</property>
-                         <property name="right_attach">4</property>
-                         <property name="top_attach">3</property>
-                         <property name="bottom_attach">4</property>
+                         <property name="left_attach">2</property>
+                         <property name="right_attach">3</property>
+                         <property name="top_attach">2</property>
+                         <property name="bottom_attach">3</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
+                       <widget class="GtkButton" id="fsinsertuploadbutton">
                          <property name="visible">True</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xscale">1</property>
-                         <property name="yscale">1</property>
-                         <property name="top_padding">0</property>
-                         <property name="bottom_padding">0</property>
-                         <property name="left_padding">0</property>
-                         <property name="right_padding">0</property>
+                         <property name="tooltip" translatable="yes">Share the 
specified file with the selected options (you will then be prompted to enter 
meta-data and keywords).</property>
+                         <property name="can_focus">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked" last_modification_time="Mon, 23 May 
2005 19:12:55 GMT"/>
 
                          <child>
-                           <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
-                             <property agent="glademm" 
name="cxx_visibility">public</property>
+                           <widget class="GtkAlignment" id="alignment20">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="add_tearoffs">False</property>
-                             <property name="has_frame">True</property>
-                             <property name="focus_on_click">True</property>
+                             <property name="xalign">0.5</property>
+                             <property name="yalign">0.5</property>
+                             <property name="xscale">0</property>
+                             <property name="yscale">0</property>
+                             <property name="top_padding">0</property>
+                             <property name="bottom_padding">0</property>
+                             <property name="left_padding">0</property>
+                             <property name="right_padding">0</property>
+
+                             <child>
+                               <widget class="GtkHBox" id="hbox55">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">2</property>
+
+                                 <child>
+                                   <widget class="GtkImage" id="image42">
+                                     <property name="visible">True</property>
+                                     <property 
name="stock">gtk-go-up</property>
+                                     <property name="icon_size">4</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkLabel" id="label137">
+                                     <property name="visible">True</property>
+                                     <property name="label" 
translatable="yes">Pub_lish</property>
+                                     <property 
name="use_underline">True</property>
+                                     <property 
name="use_markup">False</property>
+                                     <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                     <property name="wrap">False</property>
+                                     <property 
name="selectable">False</property>
+                                     <property name="xalign">0.5</property>
+                                     <property name="yalign">0.5</property>
+                                     <property name="xpad">0</property>
+                                     <property name="ypad">0</property>
+                                     <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                     <property name="width_chars">-1</property>
+                                     <property 
name="single_line_mode">False</property>
+                                     <property name="angle">0</property>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                             </child>
                            </widget>
                          </child>
                        </widget>
                        <packing>
-                         <property name="left_attach">1</property>
+                         <property name="left_attach">2</property>
                          <property name="right_attach">3</property>
-                         <property name="top_attach">3</property>
-                         <property name="bottom_attach">4</property>
-                         <property 
name="x_options">expand|shrink|fill</property>
+                         <property name="top_attach">5</property>
+                         <property name="bottom_attach">6</property>
+                         <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
-                         <property agent="glademm" 
name="cxx_visibility">public</property>
+                       <widget class="GtkLabel" id="uploadFilenameLabel">
                          <property name="visible">True</property>
-                         <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree.</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">_recursive 
(for entire directories)</property>
+                         <property name="label" 
translatable="yes">_Filename:</property>
                          <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                         <property name="focus_on_click">True</property>
-                         <property name="active">False</property>
-                         <property name="inconsistent">False</property>
-                         <property name="draw_indicator">True</property>
-                         <property name="group">scopeFileOnlyButton</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_CENTER</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">5</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
+                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">2</property>
-                         <property name="right_attach">3</property>
-                         <property name="top_attach">1</property>
-                         <property name="bottom_attach">2</property>
+                         <property name="left_attach">0</property>
+                         <property name="right_attach">1</property>
+                         <property name="top_attach">4</property>
+                         <property name="bottom_attach">5</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
-                         <property agent="glademm" 
name="cxx_visibility">public</property>
+                       <widget class="GtkLabel" id="label150">
                          <property name="visible">True</property>
-                         <property name="tooltip" translatable="yes">What 
level of sender-anonymity is desired when sharing this particular file?  0 
allows direct connections (no anonymity).  Higher levels require increasing 
amounts of cover traffic per shared block, increasing your privacy at the 
expense of efficiency.</property>
-                         <property name="can_focus">True</property>
-                         <property name="climb_rate">1</property>
-                         <property name="digits">0</property>
-                         <property name="numeric">True</property>
-                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
-                         <property name="snap_to_ticks">False</property>
+                         <property name="label" 
translatable="yes">_Priority:</property>
+                         <property name="use_underline">True</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
                          <property name="wrap">False</property>
-                         <property name="adjustment">1 0 10000 1 10 
10</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">5</property>
+                         <property name="ypad">0</property>
+                         <property 
name="mnemonic_widget">contentPrioritySpinButton</property>
+                         <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
                        </widget>
                        <packing>
-                         <property name="left_attach">1</property>
-                         <property name="right_attach">2</property>
-                         <property name="top_attach">2</property>
-                         <property name="bottom_attach">3</property>
+                         <property name="left_attach">0</property>
+                         <property name="right_attach">1</property>
+                         <property name="top_attach">3</property>
+                         <property name="bottom_attach">4</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkButton" id="fsinsertuploadbutton">
+                       <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
                          <property name="visible">True</property>
-                         <property name="tooltip" translatable="yes">Share the 
specified file with the selected options (you will then be prompted to enter 
meta-data and keywords).</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xscale">1</property>
+                         <property name="yscale">1</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
+
+                         <child>
+                           <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
+                             <property agent="glademm" 
name="cxx_visibility">public</property>
+                             <property name="visible">True</property>
+                             <property name="can_focus">True</property>
+                             <property name="add_tearoffs">False</property>
+                             <property name="has_frame">True</property>
+                             <property name="focus_on_click">True</property>
+                           </widget>
+                         </child>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">4</property>
+                         <property name="bottom_attach">5</property>
+                         <property name="y_options">fill</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish.</property>
                          <property name="can_focus">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
                          <property name="focus_on_click">True</property>
-                         <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked" last_modification_time="Mon, 23 May 
2005 19:12:55 GMT"/>
+                         <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked" 
object="fsinsertfilenamecombo" last_modification_time="Mon, 23 May 2005 
17:09:36 GMT"/>
 
                          <child>
-                           <widget class="GtkAlignment" id="alignment20">
+                           <widget class="GtkAlignment" id="alignment24">
                              <property name="visible">True</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
@@ -2160,15 +2528,15 @@
                              <property name="right_padding">0</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox55">
+                               <widget class="GtkHBox" id="hbox60">
                                  <property name="visible">True</property>
                                  <property name="homogeneous">False</property>
                                  <property name="spacing">2</property>
 
                                  <child>
-                                   <widget class="GtkImage" id="image42">
+                                   <widget class="GtkImage" id="image46">
                                      <property name="visible">True</property>
-                                     <property 
name="stock">gtk-go-up</property>
+                                     <property name="stock">gtk-open</property>
                                      <property name="icon_size">4</property>
                                      <property name="xalign">0.5</property>
                                      <property name="yalign">0.5</property>
@@ -2183,9 +2551,9 @@
                                  </child>
 
                                  <child>
-                                   <widget class="GtkLabel" id="label137">
+                                   <widget class="GtkLabel" id="label143">
                                      <property name="visible">True</property>
-                                     <property name="label" 
translatable="yes">Pub_lish</property>
+                                     <property name="label" 
translatable="yes">_Browse</property>
                                      <property 
name="use_underline">True</property>
                                      <property 
name="use_markup">False</property>
                                      <property 
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2213,19 +2581,66 @@
                        </widget>
                        <packing>
                          <property name="left_attach">2</property>
-                         <property name="right_attach">4</property>
+                         <property name="right_attach">3</property>
                          <property name="top_attach">4</property>
                          <property name="bottom_attach">5</property>
-                         <property name="x_padding">98</property>
-                         <property name="y_padding">23</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
                      </child>
 
                      <child>
-                       <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
+                       <widget class="GtkRadioButton" id="scopeFileOnlyButton">
+                         <property agent="glademm" 
name="cxx_visibility">public</property>
                          <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">Only 
publish a single file.</property>
+                         <property name="can_focus">True</property>
+                         <property name="label" translatable="yes">file 
onl_y</property>
+                         <property name="use_underline">True</property>
+                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                         <property name="focus_on_click">True</property>
+                         <property name="active">True</property>
+                         <property name="inconsistent">False</property>
+                         <property name="draw_indicator">True</property>
+                         <property name="group">scopeRecursiveButton</property>
+                       </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>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
+                         <property name="width_request">94</property>
+                         <property name="visible">True</property>
+                         <property name="tooltip" translatable="yes">How 
important is the file (used to prioritize data in the local 
datastore).</property>
+                         <property name="can_focus">True</property>
+                         <property name="climb_rate">500</property>
+                         <property name="digits">0</property>
+                         <property name="numeric">True</property>
+                         <property 
name="update_policy">GTK_UPDATE_ALWAYS</property>
+                         <property name="snap_to_ticks">False</property>
+                         <property name="wrap">False</property>
+                         <property name="adjustment">1000 0 100000000 50 500 
500</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">2</property>
+                         <property name="top_attach">3</property>
+                         <property name="bottom_attach">4</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options"></property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkCheckButton" 
id="doExtractCheckButton">
+                         <property name="visible">True</property>
                          <property name="tooltip" translatable="yes">Controls 
if GNUnet should also produce information for individual files inside of a 
directory, as opposed to only allowing the directory itself to be found 
directly.  Only applies for recursive uploads.</property>
                          <property name="can_focus">True</property>
                          <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -2235,7 +2650,7 @@
                          <property name="draw_indicator">True</property>
 
                          <child>
-                           <widget class="GtkAlignment" id="alignment15">
+                           <widget class="GtkAlignment" id="alignment24">
                              <property name="visible">True</property>
                              <property name="xalign">0.5</property>
                              <property name="yalign">0.5</property>
@@ -2247,13 +2662,13 @@
                              <property name="right_padding">0</property>
 
                              <child>
-                               <widget class="GtkHBox" id="hbox52">
+                               <widget class="GtkHBox" id="hbox66">
                                  <property name="visible">True</property>
                                  <property name="homogeneous">False</property>
                                  <property name="spacing">2</property>
 
                                  <child>
-                                   <widget class="GtkImage" id="image40">
+                                   <widget class="GtkImage" id="image49">
                                      <property name="visible">True</property>
                                      <property 
name="stock">gtk-index</property>
                                      <property name="icon_size">4</property>
@@ -2270,9 +2685,9 @@
                                  </child>
 
                                  <child>
-                                   <widget class="GtkLabel" id="label128">
+                                   <widget class="GtkLabel" id="label151">
                                      <property name="visible">True</property>
-                                     <property name="label" 
translatable="yes">add keywords for files in directories</property>
+                                     <property name="label" 
translatable="yes">use libextractor for files in directories</property>
                                      <property 
name="use_underline">True</property>
                                      <property 
name="use_markup">False</property>
                                      <property 
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2301,8 +2716,8 @@
                        <packing>
                          <property name="left_attach">2</property>
                          <property name="right_attach">3</property>
-                         <property name="top_attach">2</property>
-                         <property name="bottom_attach">3</property>
+                         <property name="top_attach">3</property>
+                         <property name="bottom_attach">4</property>
                          <property name="x_options">fill</property>
                          <property name="y_options"></property>
                        </packing>
@@ -3967,8 +4382,8 @@
                    </widget>
                    <packing>
                      <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
                    </packing>
                  </child>
 
@@ -4110,6 +4525,55 @@
                      <property name="fill">True</property>
                    </packing>
                  </child>
+
+                 <child>
+                   <widget class="GtkVSeparator" id="vseparator2">
+                     <property name="visible">True</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="searchCancelButton">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Abort the 
search, but keep search tab open.</property>
+                     <property name="can_focus">True</property>
+                     <property name="label">gtk-cancel</property>
+                     <property name="use_stock">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">False</property>
+                     <signal name="clicked" 
handler="on_searchCancelButton_clicked" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/>
+                     <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="searchCloseButton">
+                     <property name="visible">True</property>
+                     <property name="tooltip" translatable="yes">Close search 
tab (also aborts search).</property>
+                     <property name="can_focus">True</property>
+                     <property name="label">gtk-close</property>
+                     <property name="use_stock">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">False</property>
+                     <signal name="clicked" 
handler="on_searchClosedButton_clicked" object="searchResultsFrame" 
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
+                     <accelerator key="Return" modifiers="GDK_CONTROL_MASK" 
signal="activate"/>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
                </widget>
                <packing>
                  <property name="padding">0</property>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]