gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r7119 - in gnunet-gtk: . src/plugins/fs


From: gnunet
Subject: [GNUnet-SVN] r7119 - in gnunet-gtk: . src/plugins/fs
Date: Tue, 10 Jun 2008 07:44:55 -0600 (MDT)

Author: moon
Date: 2008-06-10 07:44:54 -0600 (Tue, 10 Jun 2008)
New Revision: 7119

Modified:
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/fs.h
   gnunet-gtk/src/plugins/fs/search.c
Log:
remove searches summary
reorganize FS tabs



Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-06-10 10:53:57 UTC (rev 7118)
+++ gnunet-gtk/gnunet-gtk.glade 2008-06-10 13:44:54 UTC (rev 7119)
@@ -565,29 +565,19 @@
               <widget class="GtkNotebook" id="fsnotebook">
                 <property name="scrollable">True</property>
                 <child>
-                  <widget class="GtkTable" id="fsstatustable">
+                  <widget class="GtkVBox" id="fsdownloadvbox">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
-                    <property name="n_rows">7</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">5</property>
                     <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <widget class="GtkVBox" id="vbox21">
+                      <widget class="GtkHBox" id="fssearchhbox">
                         <property name="visible">True</property>
-                        <property name="homogeneous">True</property>
                         <child>
-                          <widget class="GtkButton" id="stopUploadButton">
+                          <widget class="GtkLabel" id="searchkeywordlabel">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Cancel 
the selected upload (and all sub-uploads) and remove them from the 
list</property>
-                            <property name="label">gtk-stop</property>
-                            <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_stopUpload_clicked_" object="activeUploadsList"/>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Keyword:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">fssearchKeywordComboBoxEntry</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -595,162 +585,116 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" 
id="clearCompletedUploadsButton">
+                          <widget class="GtkAlignment" 
id="fssearchKeywordAlignment">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Clear 
completed uploads from the list</property>
-                            <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_clearCompletedUploads_clicked_"/>
+                            <property name="border_width">3</property>
                             <child>
-                              <widget class="GtkAlignment" id="alignment4">
+                              <widget class="GtkComboBoxEntry" 
id="fssearchKeywordComboBoxEntry">
                                 <property name="visible">True</property>
-                                <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="xscale">0</property>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox5">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <widget class="GtkImage" id="image4">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="stock">gtk-clear</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label2">
-                                        <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">_Clean</property>
-                                        <property 
name="use_underline">True</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
+                                <property name="can_focus">True</property>
+                                <property name="can_default">True</property>
+                                <signal name="changed" 
handler="on_fssearchKeywordComboBoxEntry_changed_"/>
+                                <child internal-child="entry">
+                                  <widget class="GtkEntry" 
id="comboboxentry-entry1">
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                           </widget>
                           <packing>
-                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="x_padding">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="stopSearchButton">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Cancel the 
selected search and remove it from the list</property>
-                        <property name="border_width">4</property>
-                        <property name="label">gtk-stop</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" 
handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
-                      </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">GTK_FILL</property>
-                        <property name="y_options"></property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment14">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label46">
+                          <widget class="GtkButton" id="fssearchbutton">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">5</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Search 
GNUnet for content under the specified keyword (and, if applicable, restrict 
the search to the given namespace)</property>
+                            <property name="label" 
translatable="yes">gtk-find</property>
+                            <property name="use_stock">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_fssearchbutton_clicked_"/>
+                            <accelerator key="Return" modifiers="" 
signal="activate"/>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment11">
-                        <property name="visible">True</property>
-                        <property name="top_padding">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label45">
+                          <widget class="GtkLabel" id="searchAnonymityLabel">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
                             <property name="xpad">5</property>
-                            <property name="ypad">5</property>
-                            <property name="label" 
translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="label" translatable="yes">with 
_anonymity</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">searchAnonymitySelectionSpinButton</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">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>
                         <child>
-                          <widget class="GtkTreeView" id="activeUploadsList">
+                          <widget class="GtkSpinButton" 
id="searchAnonymitySelectionSpinButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                            <signal name="button_press_event" 
handler="on_activeUploadsList_button_press_"/>
+                            <property name="tooltip" 
translatable="yes">Specify the anonymity level for the search, 0 for no 
anonymity.  Higher values provide more privacy but also less 
performance.</property>
+                            <property name="adjustment">1 0 100000 1 10 
10</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                            <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">4</property>
+                          </packing>
                         </child>
+                        <child>
+                          <widget class="GtkVSeparator" id="vseparator3">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">9</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="openDirectoryButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Open a 
GNUnet directory from a file</property>
+                            <property name="label">gtk-open</property>
+                            <property name="use_stock">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_open_menu_activate_"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">6</property>
+                          </packing>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox1">
+                      <widget class="GtkHBox" id="hbox53">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkLabel" id="fs_status_URI_label">
+                          <widget class="GtkLabel" id="label132">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">_Enter 
URI:</property>
+                            <property name="xpad">8</property>
+                            <property name="label" translatable="yes">in 
_namespace</property>
                             <property name="use_underline">True</property>
-                            <property name="selectable">True</property>
-                            <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
+                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -758,58 +702,34 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="statusDownloadURIEntry">
+                          <widget class="GtkAlignment" id="alignment18">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                            <property name="text">gnunet://ecrs/</property>
+                            <property name="border_width">3</property>
+                            <child>
+                              <widget class="GtkComboBoxEntry" 
id="searchNamespaceComboBoxEntry">
+                                <property name="visible">True</property>
+                                <signal name="changed" 
handler="on_searchNamespaceComboBoxEntry_changed_"/>
+                                <child internal-child="entry">
+                                  <widget class="GtkEntry" 
id="comboboxentry-entry2">
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="padding">5</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" 
id="fs_status_download_button">
+                          <widget class="GtkSpinButton" 
id="namespaceRatingSpinButton">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Download the content specified by the URI</property>
-                            <property name="response_id">0</property>
-                            <child>
-                              <widget class="GtkAlignment" id="alignment9">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox25">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <widget class="GtkImage" id="image14">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="stock">gtk-go-down</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label12">
-                                        <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">D_ownload</property>
-                                        <property 
name="use_underline">True</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
+                            <property name="tooltip" translatable="yes">This 
is the rating that you have given this namespace so far.  Ratings are private 
and not shared with other users in any way.  They are supposed to help each 
user remember which namespace is worthwile for him.</property>
+                            <property name="adjustment">0 -100000 100000 1 10 
10</property>
+                            <property name="climb_rate">1</property>
+                            <property name="numeric">True</property>
+                            <signal name="changed" 
handler="on_namespaceRatingSpinButton_changed_"/>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -817,40 +737,95 @@
                             <property name="position">2</property>
                           </packing>
                         </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkNotebook" id="downloadNotebook">
+                        <property name="can_focus">True</property>
+                        <property name="scrollable">True</property>
                         <child>
-                          <widget class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="xpad">3</property>
-                            <property name="label" translatable="yes">with 
_anonymity</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">fsstatusAnonymitySpin</property>
+                          <widget class="GtkLabel" id="label95">
+                            <property name="label">label95</property>
                           </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label94">
+                            <property name="label">label94</property>
+                          </widget>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">3</property>
+                            <property name="type">tab</property>
+                            <property name="tab_fill">False</property>
                           </packing>
                         </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox42">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImage" id="image25">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-find</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="downloadfstab">
+                        <property name="visible">True</property>
+                        <property name="label" 
translatable="yes">S_earch</property>
+                        <property name="use_underline">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkTable" id="fsstatustable">
+                    <property name="visible">True</property>
+                    <property name="border_width">5</property>
+                    <property name="n_rows">5</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
+                        <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>
                         <child>
-                          <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
+                          <widget class="GtkTreeView" id="activeDownloadsList">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">1 0 999999 1 10 
10</property>
-                            <property name="climb_rate">1</property>
-                            <property name="numeric">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="rules_hint">True</property>
+                            <signal name="button_press_event" 
handler="on_activeDownloadsList_button_press_"/>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">4</property>
-                          </packing>
                         </child>
                       </widget>
                       <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="y_options"></property>
-                        <property name="y_padding">5</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
@@ -941,115 +916,24 @@
                       <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="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                         <property name="x_options">GTK_FILL</property>
                         <property name="x_padding">5</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow10">
+                      <widget class="GtkHBox" id="hbox1">
                         <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>
                         <child>
-                          <widget class="GtkTreeView" id="activeDownloadsList">
+                          <widget class="GtkLabel" id="fs_status_URI_label">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                            <signal name="button_press_event" 
handler="on_activeDownloadsList_button_press_"/>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label16">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">1</property>
-                        <property name="xpad">5</property>
-                        <property name="ypad">5</property>
-                        <property name="label" 
translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">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>
-                        <child>
-                          <widget class="GtkTreeView" 
id="activeSearchesSummary">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkHBox" id="hbox44">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <widget class="GtkImage" id="image27">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-dialog-info</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="statusfstab">
-                        <property name="visible">True</property>
-                        <property name="label" 
translatable="yes">Stat_us</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">GTK_JUSTIFY_CENTER</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkVBox" id="fsdownloadvbox">
-                    <property name="visible">True</property>
-                    <property name="border_width">5</property>
-                    <child>
-                      <widget class="GtkHBox" id="fssearchhbox">
-                        <property name="visible">True</property>
-                        <child>
-                          <widget class="GtkLabel" id="searchkeywordlabel">
-                            <property name="visible">True</property>
                             <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Keyword:</property>
+                            <property name="label" translatable="yes">_Enter 
URI:</property>
                             <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">fssearchKeywordComboBoxEntry</property>
+                            <property name="selectable">True</property>
+                            <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1057,37 +941,58 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" 
id="fssearchKeywordAlignment">
+                          <widget class="GtkEntry" id="statusDownloadURIEntry">
                             <property name="visible">True</property>
-                            <property name="border_width">3</property>
-                            <child>
-                              <widget class="GtkComboBoxEntry" 
id="fssearchKeywordComboBoxEntry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="can_default">True</property>
-                                <signal name="changed" 
handler="on_fssearchKeywordComboBoxEntry_changed_"/>
-                                <child internal-child="entry">
-                                  <widget class="GtkEntry" 
id="comboboxentry-entry1">
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
+                            <property name="text">gnunet://ecrs/</property>
                           </widget>
                           <packing>
+                            <property name="padding">5</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="fssearchbutton">
+                          <widget class="GtkButton" 
id="fs_status_download_button">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Search 
GNUnet for content under the specified keyword (and, if applicable, restrict 
the search to the given namespace)</property>
-                            <property name="label" 
translatable="yes">gtk-find</property>
-                            <property name="use_stock">True</property>
+                            <property name="tooltip" 
translatable="yes">Download the content specified by the URI</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_fssearchbutton_clicked_"/>
-                            <accelerator key="Return" modifiers="" 
signal="activate"/>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment9">
+                                <property name="visible">True</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox25">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image14">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="stock">gtk-go-down</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label12">
+                                        <property 
name="visible">True</property>
+                                        <property name="label" 
translatable="yes">D_ownload</property>
+                                        <property 
name="use_underline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1096,12 +1001,12 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="searchAnonymityLabel">
+                          <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>
-                            <property name="xpad">5</property>
+                            <property name="xpad">3</property>
                             <property name="label" translatable="yes">with 
_anonymity</property>
                             <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">searchAnonymitySelectionSpinButton</property>
+                            <property 
name="mnemonic_widget">fsstatusAnonymitySpin</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1110,152 +1015,188 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" 
id="searchAnonymitySelectionSpinButton">
+                          <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Specify the anonymity level for the search, 0 for no 
anonymity.  Higher values provide more privacy but also less 
performance.</property>
-                            <property name="adjustment">1 0 100000 1 10 
10</property>
+                            <property name="adjustment">1 0 999999 1 10 
10</property>
                             <property name="climb_rate">1</property>
                             <property name="numeric">True</property>
-                            <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">4</property>
                           </packing>
                         </child>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="y_options"></property>
+                        <property name="y_padding">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">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>
                         <child>
-                          <widget class="GtkVSeparator" id="vseparator3">
+                          <widget class="GtkTreeView" id="activeUploadsList">
                             <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="rules_hint">True</property>
+                            <signal name="button_press_event" 
handler="on_activeUploadsList_button_press_"/>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">9</property>
-                            <property name="position">5</property>
-                          </packing>
                         </child>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">4</property>
+                        <property name="bottom_attach">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment11">
+                        <property name="visible">True</property>
+                        <property name="top_padding">5</property>
                         <child>
-                          <widget class="GtkButton" id="openDirectoryButton">
+                          <widget class="GtkLabel" id="label45">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Open a 
GNUnet directory from a file</property>
-                            <property name="label">gtk-open</property>
-                            <property name="use_stock">True</property>
-                            <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_open_menu_activate_"/>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="ypad">5</property>
+                            <property name="label" 
translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">6</property>
-                          </packing>
                         </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="right_attach">2</property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkHBox" id="hbox53">
+                      <widget class="GtkAlignment" id="alignment14">
                         <property name="visible">True</property>
+                        <property name="top_padding">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label132">
+                          <widget class="GtkLabel" id="label46">
                             <property name="visible">True</property>
-                            <property name="xpad">8</property>
-                            <property name="label" translatable="yes">in 
_namespace</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="ypad">5</property>
+                            <property name="label" 
translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
                           </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">3</property>
+                        <property name="bottom_attach">4</property>
+                        <property name="y_options">GTK_FILL</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="vbox21">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <widget class="GtkButton" id="stopUploadButton">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Cancel 
the selected upload (and all sub-uploads) and remove them from the 
list</property>
+                            <property name="label">gtk-stop</property>
+                            <property name="use_stock">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_stopUpload_clicked_" object="activeUploadsList"/>
+                          </widget>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment18">
+                          <widget class="GtkButton" 
id="clearCompletedUploadsButton">
                             <property name="visible">True</property>
-                            <property name="border_width">3</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Clear 
completed uploads from the list</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" 
handler="on_clearCompletedUploads_clicked_"/>
                             <child>
-                              <widget class="GtkComboBoxEntry" 
id="searchNamespaceComboBoxEntry">
+                              <widget class="GtkAlignment" id="alignment4">
                                 <property name="visible">True</property>
-                                <signal name="changed" 
handler="on_searchNamespaceComboBoxEntry_changed_"/>
-                                <child internal-child="entry">
-                                  <widget class="GtkEntry" 
id="comboboxentry-entry2">
+                                <property 
name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xscale">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox5">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image4">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="stock">gtk-clear</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label2">
+                                        <property 
name="visible">True</property>
+                                        <property name="label" 
translatable="yes">_Clean</property>
+                                        <property 
name="use_underline">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </widget>
                                 </child>
                               </widget>
                             </child>
                           </widget>
                           <packing>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="GtkSpinButton" 
id="namespaceRatingSpinButton">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">This 
is the rating that you have given this namespace so far.  Ratings are private 
and not shared with other users in any way.  They are supposed to help each 
user remember which namespace is worthwile for him.</property>
-                            <property name="adjustment">0 -100000 100000 1 10 
10</property>
-                            <property name="climb_rate">1</property>
-                            <property name="numeric">True</property>
-                            <signal name="changed" 
handler="on_namespaceRatingSpinButton_changed_"/>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
+                        <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="x_options">GTK_FILL</property>
+                        <property name="x_padding">5</property>
                       </packing>
                     </child>
-                    <child>
-                      <widget class="GtkNotebook" id="downloadNotebook">
-                        <property name="can_focus">True</property>
-                        <property name="scrollable">True</property>
-                        <child>
-                          <widget class="GtkLabel" id="label95">
-                            <property name="label">label95</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="label94">
-                            <property name="label">label94</property>
-                          </widget>
-                          <packing>
-                            <property name="type">tab</property>
-                            <property name="tab_fill">False</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
                   </widget>
                   <packing>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox42">
+                  <widget class="GtkHBox" id="hbox44">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <child>
-                      <widget class="GtkImage" id="image25">
+                      <widget class="GtkImage" id="image27">
                         <property name="visible">True</property>
-                        <property name="stock">gtk-go-down</property>
+                        <property name="stock">gtk-execute</property>
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="downloadfstab">
+                      <widget class="GtkLabel" id="statusfstab">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Search and 
_Download</property>
+                        <property name="label" 
translatable="yes">Ope_rations</property>
                         <property name="use_underline">True</property>
                         <property name="justify">GTK_JUSTIFY_CENTER</property>
                       </widget>
@@ -1291,52 +1232,80 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment8">
+                          <widget class="GtkLabel" id="methodLabel">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xscale">0</property>
-                            <child>
-                              <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
-                                <property name="width_request">94</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip" 
translatable="yes">How important is the file (used to prioritize data in the 
local datastore).</property>
-                                <property name="adjustment">950 0 100000000 50 
500 500</property>
-                                <property name="climb_rate">500</property>
-                                <property name="numeric">True</property>
-                              </widget>
-                            </child>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">Method:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">indexbutton</property>
                           </widget>
                           <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkRadioButton" id="indexbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Indexing will avoid copying the file into the GNUnet 
database.  Instead, GNUnet will try to add a symbolic link to the specified 
file.  If that fails, a copy of the file will be created.  Indexing should be 
used if the local machine is unlikely to ever be compromised by an adversary 
and if the uploaded file will not be modified or moved in the future.  Indexing 
is more efficient than insertion.</property>
+                            <property name="label" 
translatable="yes">Inde_x</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</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">3</property>
-                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" id="alignment7">
+                          <widget class="GtkRadioButton" id="insertButton">
                             <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Inserting a file means that an encrypted copy will be added 
to the GNUnet database.  Without the proper key (which is not stored in 
plaintext anywhere) the file cannot be decrypted.  Use this option for small 
files, files that will be modified soon, files that maybe moved or if you are 
afraid that an adversary may detect the file in plaintext on your machine 
(after compromising your machine).</property>
+                            <property name="label" 
translatable="yes">I_nsert</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">indexbutton</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="scopeLabel">
+                            <property name="visible">True</property>
                             <property name="xalign">0</property>
-                            <property name="xscale">0</property>
-                            <child>
-                              <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
-                                <property name="visible">True</property>
-                                <property name="can_focus">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="adjustment">1 0 10000 1 10 
10</property>
-                                <property name="climb_rate">1</property>
-                                <property name="numeric">True</property>
-                              </widget>
-                            </child>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">Scope:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="mnemonic_widget">scopeFileOnlyButton</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">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="anonymityUploadLabel">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Anonymity:</property>
+                            <property name="use_underline">True</property>
+                          </widget>
+                          <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
@@ -1344,24 +1313,43 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
+                          <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Controls if GNUnet should (automatically) extract metadata 
for files.  If unchecked, the default metadata for the upload will only contain 
the filename.  If checked, GNU libextractor will be used to provide additional 
metadata (such as thumbnails).  The option only applies when a directory is 
uploaded.  For individual files, GNU libextractor is always used (you will have 
a chance to edit the extracted metadata in a dialog).</property>
+                            <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree</property>
+                            <property name="label" 
translatable="yes">_Recursive (for entire directories)</property>
+                            <property name="use_underline">True</property>
                             <property name="response_id">0</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">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Should 
it be possible to directly find files in the directory?  If unchecked, it will 
only be possible for the directory itself to be found with a normal keyword 
search.  This option only really makes a difference for uploads of 
directories.</property>
+                            <property name="response_id">0</property>
                             <property name="active">True</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="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox66">
+                                  <widget class="GtkHBox" id="hbox52">
                                     <property name="visible">True</property>
                                     <property name="spacing">2</property>
                                     <child>
-                                      <widget class="GtkImage" id="image49">
+                                      <widget class="GtkImage" id="image40">
                                         <property 
name="visible">True</property>
                                         <property 
name="stock">gtk-index</property>
                                       </widget>
@@ -1371,9 +1359,9 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkLabel" id="label151">
+                                      <widget class="GtkLabel" id="label128">
                                         <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">Use libextractor for files in directories</property>
+                                        <property name="label" 
translatable="yes">Add keywords for files in directories</property>
                                         <property 
name="use_underline">True</property>
                                       </widget>
                                       <packing>
@@ -1390,48 +1378,28 @@
                           <packing>
                             <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="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" 
id="scopeFileOnlyButton">
+                          <widget class="GtkButton" id="fsinsertuploadbutton">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Only 
publish a single file</property>
-                            <property name="label" translatable="yes">File 
onl_y</property>
-                            <property name="use_underline">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="response_id">0</property>
-                            <property name="active">True</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">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish</property>
-                            <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
+                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
                             <child>
-                              <widget class="GtkHBox" id="hbox60">
+                              <widget class="GtkHBox" id="hbox55">
                                 <property name="visible">True</property>
                                 <property name="spacing">2</property>
                                 <child>
-                                  <widget class="GtkImage" id="image46">
+                                  <widget class="GtkImage" id="image42">
                                     <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
+                                    <property name="stock">gtk-go-up</property>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1439,9 +1407,9 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label143">
+                                  <widget class="GtkLabel" id="label137">
                                     <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">_Browse</property>
+                                    <property name="label" 
translatable="yes">Pub_lish</property>
                                     <property 
name="use_underline">True</property>
                                   </widget>
                                   <packing>
@@ -1456,32 +1424,26 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="top_attach">5</property>
+                            <property name="bottom_attach">6</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
+                          <widget class="GtkLabel" id="uploadFilenameLabel">
                             <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <signal name="changed" 
handler="on_uploadFilenameComboBoxEntry_changed_"/>
-                                <child internal-child="entry">
-                                  <widget class="GtkEntry" 
id="comboboxentry-entry3">
-                                  </widget>
-                                </child>
-                              </widget>
-                            </child>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Filename:</property>
+                            <property name="use_underline">True</property>
+                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
+                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
                           </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="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
@@ -1501,38 +1463,43 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="uploadFilenameLabel">
+                          <widget class="GtkAlignment" 
id="uploadFilenameAlignment">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Filename:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
-                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
+                            <child>
+                              <widget class="GtkComboBoxEntry" 
id="uploadFilenameComboBoxEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <signal name="changed" 
handler="on_uploadFilenameComboBoxEntry_changed_"/>
+                                <child internal-child="entry">
+                                  <widget class="GtkEntry" 
id="comboboxentry-entry3">
+                                  </widget>
+                                </child>
+                              </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="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="fsinsertuploadbutton">
+                          <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can_focus">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="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish</property>
                             <property name="response_id">0</property>
-                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
+                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
                             <child>
-                              <widget class="GtkHBox" id="hbox55">
+                              <widget class="GtkHBox" id="hbox60">
                                 <property name="visible">True</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>
                                   </widget>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1540,9 +1507,9 @@
                                   </packing>
                                 </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>
                                   </widget>
                                   <packing>
@@ -1557,31 +1524,52 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
-                            <property name="top_attach">5</property>
-                            <property name="bottom_attach">6</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" 
id="deepIndexCheckButton">
+                          <widget class="GtkRadioButton" 
id="scopeFileOnlyButton">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip" translatable="yes">Should 
it be possible to directly find files in the directory?  If unchecked, it will 
only be possible for the directory itself to be found with a normal keyword 
search.  This option only really makes a difference for uploads of 
directories.</property>
+                            <property name="tooltip" translatable="yes">Only 
publish a single file</property>
+                            <property name="label" translatable="yes">File 
onl_y</property>
+                            <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="active">True</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">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" 
translatable="yes">Controls if GNUnet should (automatically) extract metadata 
for files.  If unchecked, the default metadata for the upload will only contain 
the filename.  If checked, GNU libextractor will be used to provide additional 
metadata (such as thumbnails).  The option only applies when a directory is 
uploaded.  For individual files, GNU libextractor is always used (you will have 
a chance to edit the extracted metadata in a dialog).</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
                             <child>
-                              <widget class="GtkAlignment" id="alignment15">
+                              <widget class="GtkAlignment" id="alignment24">
                                 <property name="visible">True</property>
                                 <property name="xscale">0</property>
                                 <property name="yscale">0</property>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox52">
+                                  <widget class="GtkHBox" id="hbox66">
                                     <property name="visible">True</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>
                                       </widget>
@@ -1591,9 +1579,9 @@
                                       </packing>
                                     </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>
                                       </widget>
                                       <packing>
@@ -1610,40 +1598,32 @@
                           <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">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
+                          <widget class="GtkAlignment" id="alignment7">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Recursively publish an entire directory tree</property>
-                            <property name="label" 
translatable="yes">_Recursive (for entire directories)</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</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">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="anonymityUploadLabel">
-                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Anonymity:</property>
-                            <property name="use_underline">True</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">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="adjustment">1 0 10000 1 10 
10</property>
+                                <property name="climb_rate">1</property>
+                                <property name="numeric">True</property>
+                              </widget>
+                            </child>
                           </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="x_options">GTK_FILL</property>
@@ -1651,71 +1631,32 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="scopeLabel">
+                          <widget class="GtkAlignment" id="alignment8">
                             <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
                             <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">Scope:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">scopeFileOnlyButton</property>
+                            <property name="xscale">0</property>
+                            <child>
+                              <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
+                                <property name="width_request">94</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip" 
translatable="yes">How important is the file (used to prioritize data in the 
local datastore).</property>
+                                <property name="adjustment">950 0 100000000 50 
500 500</property>
+                                <property name="climb_rate">500</property>
+                                <property name="numeric">True</property>
+                              </widget>
+                            </child>
                           </widget>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioButton" id="insertButton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Inserting a file means that an encrypted copy will be added 
to the GNUnet database.  Without the proper key (which is not stored in 
plaintext anywhere) the file cannot be decrypted.  Use this option for small 
files, files that will be modified soon, files that maybe moved or if you are 
afraid that an adversary may detect the file in plaintext on your machine 
(after compromising your machine).</property>
-                            <property name="label" 
translatable="yes">I_nsert</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">indexbutton</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioButton" id="indexbutton">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip" 
translatable="yes">Indexing will avoid copying the file into the GNUnet 
database.  Instead, GNUnet will try to add a symbolic link to the specified 
file.  If that fails, a copy of the file will be created.  Indexing should be 
used if the local machine is unlikely to ever be compromised by an adversary 
and if the uploaded file will not be modified or moved in the future.  Indexing 
is more efficient than insertion.</property>
-                            <property name="label" 
translatable="yes">Inde_x</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="active">True</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">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
-                        <child>
-                          <widget class="GtkLabel" id="methodLabel">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">Method:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">indexbutton</property>
-                          </widget>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
-                          </packing>
-                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -1989,7 +1930,7 @@
                     <child>
                       <widget class="GtkImage" id="image28">
                         <property name="visible">True</property>
-                        <property name="stock">gtk-execute</property>
+                        <property name="stock">gtk-properties</property>
                       </widget>
                     </child>
                     <child>
@@ -2082,51 +2023,6 @@
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">_Room 
Name</property>
-                        <property name="use_underline">True</property>
-                        <property 
name="mnemonic_widget">chatRoomNameEntry</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" 
translatable="yes">_Moniker</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="chatRoomNameEntry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkEntry" id="chatRoomMonikerEntry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</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>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="GtkButton" id="on_chat_room_name_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
@@ -2173,6 +2069,51 @@
                         <property name="y_options"></property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkEntry" id="chatRoomMonikerEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</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>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="chatRoomNameEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                      </widget>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" 
translatable="yes">_Moniker</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">_Room 
Name</property>
+                        <property name="use_underline">True</property>
+                        <property 
name="mnemonic_widget">chatRoomNameEntry</property>
+                      </widget>
+                    </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -2354,7 +2295,7 @@
                 <child>
                   <widget class="GtkImage" id="image8">
                     <property name="visible">True</property>
-                    <property name="stock">gtk-justify-fill</property>
+                    <property name="pixbuf">gnunet-gtk-logs.png</property>
                   </widget>
                 </child>
                 <child>
@@ -2903,8 +2844,8 @@
                 <property name="response_id">-5</property>
                 <signal name="clicked" handler="gtk_widget_destroy" 
object="metaDisplayDialog"/>
                 <signal name="activate" handler="gtk_widget_destroy" 
object="metaDisplayDialog"/>
-                <accelerator key="Return" modifiers="" signal="activate"/>
                 <accelerator key="Escape" modifiers="" signal="activate"/>
+                <accelerator key="Return" modifiers="" signal="activate"/>
               </widget>
             </child>
           </widget>
@@ -4905,9 +4846,9 @@
     <property name="modal">True</property>
     <property name="icon_name">gtk-save-as</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="do_overwrite_confirmation">True</property>
     <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
     <property name="show_hidden">True</property>
+    <property name="do_overwrite_confirmation">True</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2008-06-10 10:53:57 UTC (rev 7118)
+++ gnunet-gtk/src/plugins/fs/fs.c      2008-06-10 13:44:54 UTC (rev 7119)
@@ -329,35 +329,6 @@
                             > 0);
 }
 
-/**
- * The selection of the download summary changed.
- * Update button status.
- */
-static void
-on_search_summary_selection_changed (gpointer signal, gpointer cls)
-{
-  GtkTreeSelection *selection;
-  GtkWidget *button;
-
-  selection =
-    gtk_tree_view_get_selection (GTK_TREE_VIEW
-                                 (glade_xml_get_widget
-                                  (GNUNET_GTK_get_main_glade_XML (),
-                                   "activeSearchesSummary")));
-  button =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "cancelSearchButton");
-  gtk_widget_set_sensitive (button,
-                            gtk_tree_selection_count_selected_rows (selection)
-                            > 0);
-  button =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "stopSearchButton");
-  gtk_widget_set_sensitive (button,
-                            gtk_tree_selection_count_selected_rows (selection)
-                            > 0);
-}
-
 int
 on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget *dummy2)
 {
@@ -405,7 +376,6 @@
 {
   GtkComboBoxEntry *searchCB;
   GtkWidget *uploadEntry;
-  GtkTreeView *searchList;
   GtkTreeView *downloadList;
   GtkTreeView *uploadList;
   GtkListStore *model;
@@ -438,52 +408,6 @@
   gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
   gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 
-  /* search summary setup */
-  searchList =
-    GTK_TREE_VIEW (glade_xml_get_widget
-                   (GNUNET_GTK_get_main_glade_XML (),
-                    "activeSearchesSummary"));
-  search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING,      
 /* name */
-                                       G_TYPE_INT,      /* # results */
-                                       G_TYPE_POINTER); /* internal: search 
list */
-  gtk_tree_view_set_model (searchList, GTK_TREE_MODEL (search_summary));
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (searchList),
-                               GTK_SELECTION_MULTIPLE);
-  g_signal_connect_data (gtk_tree_view_get_selection (searchList),
-                         "changed",
-                         G_CALLBACK (&on_search_summary_selection_changed),
-                         NULL, NULL, 0);
-
-  renderer = gtk_cell_renderer_text_new ();
-  col = gtk_tree_view_insert_column_with_attributes (searchList,
-                                                     -1,
-                                                     _("Query"),
-                                                     renderer,
-                                                     "text",
-                                                     SEARCH_SUMMARY_NAME,
-                                                     NULL);
-  column = gtk_tree_view_get_column (searchList, col - 1);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  gtk_tree_view_column_set_clickable (column, TRUE);
-  gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_sort_column_id (column, SEARCH_SUMMARY_NAME);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  renderer = gtk_cell_renderer_text_new ();
-  col = gtk_tree_view_insert_column_with_attributes (searchList,
-                                                     -1,
-                                                     _("Results"),
-                                                     renderer,
-                                                     "text",
-                                                     
SEARCH_SUMMARY_RESULT_COUNT,
-                                                     NULL);
-  column = gtk_tree_view_get_column (searchList, col - 1);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-  gtk_tree_view_column_set_clickable (column, TRUE);
-  gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_sort_column_id (column,
-                                           SEARCH_SUMMARY_RESULT_COUNT);
-  gtk_tree_view_column_set_resizable (column, TRUE);
-
   /* download summary setup */
   downloadList =
     GTK_TREE_VIEW (glade_xml_get_widget

Modified: gnunet-gtk/src/plugins/fs/fs.h
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.h      2008-06-10 10:53:57 UTC (rev 7118)
+++ gnunet-gtk/src/plugins/fs/fs.h      2008-06-10 13:44:54 UTC (rev 7119)
@@ -77,18 +77,6 @@
 };
 
 /**
- * Search entry in search summary list.
- * Represents a search process.
- */
-enum
-{
-  SEARCH_SUMMARY_NAME = 0,
-  SEARCH_SUMMARY_RESULT_COUNT,
-  SEARCH_SUMMARY_INTERNAL,
-  SEARCH_SUMMARY_NUM
-};
-
-/**
  * Entry in download summary.
  */
 enum
@@ -197,12 +185,6 @@
   GtkWidget *searchpage;
 
   /**
-   * Path to the entry in the summary list
-   * for this search.
-   */
-  GtkTreeRowReference *summaryViewRowReference;
-
-  /**
    * URI for this search.
    */
   struct GNUNET_ECRS_URI *uri;

Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c  2008-06-10 10:53:57 UTC (rev 7118)
+++ gnunet-gtk/src/plugins/fs/search.c  2008-06-10 13:44:54 UTC (rev 7119)
@@ -61,33 +61,14 @@
 /* **************** FSUI event handling ****************** */
 
 /**
- * Update the number of results received for the given
- * search in the summary and in the label of the tab.
+ * Update the number of results received in the label of the tab.
  */
 static void
-updateSearchSummary (SearchList * searchContext)
+updateResultsCount (SearchList * searchContext)
 {
-  GtkTreePath *path;
-  GtkTreeIter iter;
   char *new_title;
   GtkLabel *label;
 
-  path =
-    gtk_tree_row_reference_get_path (searchContext->summaryViewRowReference);
-  if (TRUE !=
-      gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
-    {
-      GNUNET_GE_BREAK (ectx, 0);
-      return;
-    }
-  gtk_tree_path_free (path);
-  gtk_list_store_set (search_summary,
-                      &iter,
-                      SEARCH_SUMMARY_RESULT_COUNT,
-                      searchContext->resultsReceived, -1);
-
-
-
   /* update tab title with the number of results */
   new_title =
     g_strdup_printf ("%.*s%s (%u)",
@@ -336,7 +317,7 @@
   gtk_tree_store_append (model, &iter, NULL);
   addEntryToSearchTree (searchContext, NULL, info, &iter);
   searchContext->resultsReceived++;
-  updateSearchSummary (searchContext);
+  updateResultsCount (searchContext);
 }
 
 /**
@@ -644,8 +625,7 @@
 }
 
 /**
- * FSUI event: a search was started; create the
- * tab and add an entry to the summary.
+ * FSUI event: a search was started; create the tab
  */
 SearchList *
 fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
@@ -661,8 +641,6 @@
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   GtkNotebook *notebook;
-  GtkTreePath *path;
-  GtkTreeIter iter;
   int col;
   unsigned int i;
 
@@ -680,7 +658,7 @@
           for (i = 0; i < resultCount; i++)
             fs_search_result_received (list, &results[i], uri);
           if (resultCount == 0) /* otherwise already done! */
-            updateSearchSummary (list);
+            updateResultsCount (list);
           return list;
         }
       list = list->next;
@@ -888,18 +866,6 @@
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_DESC);
 
-  /* add entry in search summary */
-  gtk_list_store_append (search_summary, &iter);
-  gtk_list_store_set (search_summary,
-                      &iter,
-                      SEARCH_SUMMARY_NAME, description,
-                      SEARCH_SUMMARY_RESULT_COUNT, 0,
-                      SEARCH_SUMMARY_INTERNAL, list, -1);
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
-  list->summaryViewRowReference
-    = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
-  gtk_tree_path_free (path);
-
   /* load label */
   list->labelXML
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -913,7 +879,7 @@
   for (i = 0; i < resultCount; i++)
     fs_search_result_received (list, &results[i], uri);
   if (resultCount == 0)         /* otherwise already done! */
-    updateSearchSummary (list);
+    updateResultsCount (list);
 
   /* insert new page into search notebook */
   notebook
@@ -983,17 +949,15 @@
 }
 
 /**
- * FSUI event: a search was stopped.  Remove the
- * respective tab and its entry in the summary.
+ * FSUI event: a search was stopped.
+ * Remove the respective tab.
  */
 void
 fs_search_stopped (SearchList * list)
 {
   GtkNotebook *notebook;
-  GtkTreeIter iter;
   SearchList *prev;
   DownloadList *downloads;
-  GtkTreePath *path;
   int index;
   int i;
 
@@ -1034,19 +998,9 @@
       index = i;
   GNUNET_GE_BREAK (ectx, index != -1);
   gtk_notebook_remove_page (notebook, index);
-  /* recursively free search model */
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
-    freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
-
-  /* destroy entry in summary */
-  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
-  gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path);
-  gtk_tree_path_free (path);
-  gtk_list_store_remove (search_summary, &iter);
   /* free list state itself */
   UNREF (list->searchXML);
   UNREF (list->labelXML);
-  gtk_tree_row_reference_free (list->summaryViewRowReference);
   GNUNET_free (list->searchString);
   GNUNET_ECRS_uri_destroy (list->uri);
   GNUNET_free (list);
@@ -1286,7 +1240,7 @@
 
 
 /**
- * The abort button in the search summary was clicked.
+ * The pause button in a search results tab was clicked.
  */
 void
 on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
@@ -1315,7 +1269,7 @@
 }
 
 /**
- * The abort button in the search summary was clicked.
+ * The resume button in a search results tab was clicked.
  */
 void
 on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
@@ -1343,102 +1297,4 @@
     }
 }
 
-/**
- * The abort button was clicked.  Abort the search.
- */
-void
-on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
-                                 GtkWidget * abortButton)
-{
-  SearchList *list;
-  struct FCBC fcbc;
-
-  list = search_head;
-  while (list != NULL)
-    {
-      if (list->searchpage == searchPage)
-        break;
-      list = list->next;
-    }
-  GNUNET_GE_ASSERT (ectx, list != NULL);
-  gtk_widget_hide (abortButton);
-  if (list->fsui_list != NULL)
-    {
-      fcbc.method = &GNUNET_FSUI_search_abort;
-      fcbc.argument = list->fsui_list;
-      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-    }
-}
-
-static void
-stopSearch (GtkTreeModel * model,
-            GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
-{
-  SearchList *s;
-  struct FCBC fcbc;
-
-  s = NULL;
-  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
-  if (s != NULL)
-    {
-      if (s->fsui_list == NULL)
-        {
-          /* open directory - close directly */
-          fs_search_stopped (s);
-        }
-      else
-        {
-          fcbc.method = &GNUNET_FSUI_search_abort;
-          fcbc.argument = s->fsui_list;
-          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-          fcbc.method = &GNUNET_FSUI_search_stop;
-          GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-        }
-    }
-}
-
-/**
- * The stop button in the search summary was clicked.
- */
-void
-on_closeSearchSummaryButton_clicked_fs (GtkWidget * treeview,
-                                        GtkWidget * closeButton)
-{
-  GtkTreeSelection *selection;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &stopSearch, NULL);
-}
-
-static void
-abortSearch (GtkTreeModel * model,
-             GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
-{
-  SearchList *s;
-  struct FCBC fcbc;
-
-  s = NULL;
-  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
-  if ((s != NULL) && (s->fsui_list != NULL))
-    {
-      fcbc.method = &GNUNET_FSUI_search_abort;
-      fcbc.argument = s->fsui_list;
-      GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
-    }
-}
-
-/**
- * The abort button in the search summary was clicked.
- */
-void
-on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
-                                        GtkWidget * closeButton)
-{
-  GtkTreeSelection *selection;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
-}
-
-
 /* end of search.c */





reply via email to

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