gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r6382 - gnunet-gtk


From: gnunet
Subject: [GNUnet-SVN] r6382 - gnunet-gtk
Date: Tue, 19 Feb 2008 14:06:41 -0700 (MST)

Author: moon
Date: 2008-02-19 14:06:41 -0700 (Tue, 19 Feb 2008)
New Revision: 6382

Modified:
   gnunet-gtk/gnunet-gtk.glade
Log:
UI improvements:
- removed ulgy shadows in viewports
- removed "." at the end of single-sentence tooltips
- corrected some missing caps and a string
- made the FS/Status right buttons layout nicer
- use the new addressbook icon for "Peers"
- made the FS/SearchResults Pause/Resume/Stop/Clos buttons align right 
handside (and added a 1px padding)
- several other minor fixes



Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-02-19 09:49:09 UTC (rev 6381)
+++ gnunet-gtk/gnunet-gtk.glade 2008-02-19 21:06:41 UTC (rev 6382)
@@ -6,7 +6,7 @@
     <property name="title" translatable="yes">gnunet-gtk, GNU's Peer-to-Peer 
Network</property>
     <property name="default_width">700</property>
     <property name="default_height">500</property>
-    <property name="icon">gnunet-gtk.png</property>
+    <property name="icon">gnunet-gtk</property>
     <signal name="delete_event" handler="GNUNET_GTK_main_quit" after="yes"/>
     <signal name="window_state_event" 
handler="GNUNET_GTK_save_main_window_state" after="yes"/>
     <child>
@@ -27,6 +27,7 @@
                 <child>
                   <widget class="GtkViewport" id="viewport6">
                     <property name="visible">True</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <widget class="GtkVBox" id="vbox14">
                         <property name="visible">True</property>
@@ -82,7 +83,7 @@
 
 &lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.2c:&lt;/span&gt;
 
-This release adds support for starting gnunetd and gnunet-setup with gdsu 
support.  The code was updated to work with GNUnet 0.7.3 (and will not work 
with previous GNUnet versions).  The release also fixes some memory leaks.
+This release adds support for starting gnunetd and gnunet-setup with gksu 
support.  The code was updated to work with GNUnet 0.7.3 (and will not work 
with previous GNUnet versions).  The release also fixes some memory leaks.
 
 &lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.1c:&lt;/span&gt;
 
@@ -160,6 +161,7 @@
                 <child>
                   <widget class="GtkViewport" id="viewport1">
                     <property name="visible">True</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">True</property>
@@ -169,6 +171,7 @@
                         <child>
                           <widget class="GtkViewport" id="viewport2">
                             <property name="visible">True</property>
+                            <property 
name="shadow_type">GTK_SHADOW_NONE</property>
                             <child>
                               <widget class="GtkVBox" id="vbox2">
                                 <property name="visible">True</property>
@@ -603,6 +606,7 @@
                             <child>
                               <widget class="GtkVBox" id="vbox22">
                                 <property name="visible">True</property>
+                                <property name="homogeneous">True</property>
                                 <child>
                                   <widget class="GtkButton" 
id="cancelSearchButton">
                                     <property name="visible">True</property>
@@ -614,6 +618,10 @@
                                     <property name="response_id">0</property>
                                     <signal name="clicked" 
handler="on_abortSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
                                   </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkButton" 
id="stopSearchButton">
@@ -627,6 +635,8 @@
                                     <signal name="clicked" 
handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -634,6 +644,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -658,72 +669,163 @@
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">GTK_SHADOW_NONE</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox61">
+                          <widget class="GtkTable" id="table4">
                             <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="n_rows">2</property>
+                            <property name="n_columns">2</property>
                             <child>
-                              <widget class="GtkVBox" id="vbox15">
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <widget class="GtkVBox" id="vbox8">
                                 <property name="visible">True</property>
+                                <property name="homogeneous">True</property>
                                 <child>
-                                  <widget class="GtkScrolledWindow" 
id="scrolledwindow20">
+                                  <widget class="GtkButton" 
id="abortDownloadButton">
                                     <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
                                     <property name="can_focus">True</property>
-                                    <property 
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property 
name="shadow_type">GTK_SHADOW_IN</property>
+                                    <property name="tooltip" 
translatable="yes">Cancel the selected download (and all 
sub-downloads)</property>
+                                    <property 
name="label">gtk-cancel</property>
+                                    <property name="use_stock">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" 
handler="on_abortDownloadButton_clicked_"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" 
id="stopDownloadButton">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" 
translatable="yes">Cancel the selected download (and all sub-downloads) 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_stopDownloadButton_clicked_"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" 
translatable="yes">Clear completed downloads from the download list</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" 
handler="on_clearCompletedDownloadsButton_clicked_"/>
                                     <child>
-                                      <widget class="GtkTreeView" 
id="activeDownloadsList">
+                                      <widget class="GtkHBox" id="hbox26">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="reorderable">True</property>
-                                        <property 
name="rules_hint">True</property>
+                                        <property name="spacing">2</property>
+                                        <child>
+                                          <widget class="GtkImage" 
id="image15">
+                                            <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="label14">
+                                            <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>
+                                  <packing>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
                                 </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="x_options"></property>
+                                <property name="x_padding">5</property>
+                              </packing>
+                            </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="GtkHBox" id="hbox26">
+                                  <widget class="GtkTreeView" 
id="activeDownloadsList">
                                     <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>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox24">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" 
id="fs_status_URI_label">
+                                    <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="use_underline">True</property>
+                                    <property name="selectable">True</property>
+                                    <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" 
id="statusDownloadURIEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="has_focus">True</property>
+                                    <property 
name="invisible_char">*</property>
+                                    <property 
name="activates_default">True</property>
+                                    <property 
name="text">gnunet://ecrs/</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" 
id="fs_status_download_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" 
translatable="yes">Download the content specified by the URI</property>
+                                    <property name="response_id">0</property>
                                     <child>
-                                      <widget class="GtkLabel" 
id="fs_status_URI_label">
+                                      <widget class="GtkAlignment" 
id="alignment9">
                                         <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="use_underline">True</property>
-                                        <property 
name="selectable">True</property>
-                                        <property 
name="mnemonic_widget">statusDownloadURIEntry</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkEntry" 
id="statusDownloadURIEntry">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="has_focus">True</property>
-                                        <property 
name="invisible_char">*</property>
-                                        <property 
name="activates_default">True</property>
-                                        <property 
name="text">gnunet://ecrs/</property>
-                                      </widget>
-                                      <packing>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkButton" 
id="fs_status_download_button">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property name="tooltip" 
translatable="yes">Download the content specified by the URI</property>
-                                        <property 
name="response_id">0</property>
-                                        <signal name="clicked" 
handler="on_statusDownloadURIEntry_editing_done_" 
object="statusDownloadURIEntry"/>
+                                        <property name="xscale">0</property>
+                                        <property name="yscale">0</property>
                                         <child>
-                                          <widget class="GtkHBox" 
id="downloadButtonHbox">
+                                          <widget class="GtkHBox" id="hbox25">
                                             <property 
name="visible">True</property>
                                             <property 
name="spacing">2</property>
                                             <child>
-                                              <widget class="GtkImage" 
id="downloadButtonImage">
+                                              <widget class="GtkImage" 
id="image14">
                                                 <property 
name="visible">True</property>
                                                 <property 
name="stock">gtk-go-down</property>
                                               </widget>
@@ -733,7 +835,7 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" 
id="downloadButtonLabel">
+                                              <widget class="GtkLabel" 
id="label12">
                                                 <property 
name="visible">True</property>
                                                 <property name="label" 
translatable="yes">D_ownload</property>
                                                 <property 
name="use_underline">True</property>
@@ -747,100 +849,48 @@
                                           </widget>
                                         </child>
                                       </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
                                     </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label136">
-                                        <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>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
-                                        <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>
-                                        <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="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">1</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkVBox" id="vbox20">
-                                <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkButton" 
id="abortDownloadButton">
+                                  <widget class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip" 
translatable="yes">Cancel the selected download (and all 
sub-downloads)</property>
-                                    <property 
name="label">gtk-cancel</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="response_id">0</property>
-                                    <signal name="clicked" 
handler="on_abortDownloadButton_clicked_" object="activeDownloadsList"/>
+                                    <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>
-                                </child>
-                                <child>
-                                  <widget class="GtkButton" 
id="stopDownloadButton">
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="tooltip" 
translatable="yes">Cancel the selected download (and all sub-downloads) 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_stopDownloadButton_clicked_" object="activeDownloadsList"/>
-                                  </widget>
                                   <packing>
-                                    <property name="position">1</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" 
id="clearCompletedDownloadsButton">
+                                  <widget class="GtkSpinButton" 
id="fsstatusAnonymitySpin">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip" 
translatable="yes">Clear completed downloads from the download list</property>
-                                    <property name="label">gtk-clear</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="response_id">0</property>
-                                    <signal name="clicked" 
handler="on_clearCompletedDownloadsButton_clicked_" 
object="activeDownloadsList"/>
+                                    <property name="adjustment">1 0 999999 1 
10 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="numeric">True</property>
                                   </widget>
                                   <packing>
-                                    <property name="position">2</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">4</property>
                                   </packing>
                                 </child>
                               </widget>
                               <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options"></property>
+                                <property name="y_padding">5</property>
                               </packing>
                             </child>
                           </widget>
@@ -889,6 +939,7 @@
                             <child>
                               <widget class="GtkVBox" id="vbox21">
                                 <property name="visible">True</property>
+                                <property name="homogeneous">True</property>
                                 <child>
                                   <widget class="GtkButton" 
id="cancelUploadButton">
                                     <property name="visible">True</property>
@@ -900,6 +951,10 @@
                                     <property name="response_id">0</property>
                                     <signal name="clicked" 
handler="on_abortUploadButton_clicked_" object="activeUploadsList"/>
                                   </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <widget class="GtkButton" 
id="stopUploadButton">
@@ -913,20 +968,49 @@
                                     <signal name="clicked" 
handler="on_stopUploadButton_clicked_" object="activeUploadsList"/>
                                   </widget>
                                   <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" 
id="clearUploadsButton">
+                                  <widget class="GtkButton" 
id="clearCompletedDownloadsButton2">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip" 
translatable="yes">Clear completed uploads from the upload list</property>
-                                    <property name="label">gtk-clear</property>
-                                    <property name="use_stock">True</property>
+                                    <property name="tooltip" 
translatable="yes">Clear completed downloads from the download list</property>
                                     <property name="response_id">0</property>
-                                    <signal name="clicked" 
handler="on_clearCompletedUploadsButton_clicked_" object="activeUploadsList"/>
+                                    <signal name="clicked" 
handler="on_clearCompletedUploadsButton_clicked_"/>
+                                    <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>
                                   <packing>
+                                    <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -934,6 +1018,7 @@
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
+                                <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1244,241 +1329,121 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
+                          <widget class="GtkLabel" id="methodLabel">
                             <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="alignment24">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <widget class="GtkHBox" id="hbox66">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <widget class="GtkImage" id="image49">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="stock">gtk-index</property>
-                                      </widget>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <widget class="GtkLabel" id="label151">
-                                        <property 
name="visible">True</property>
-                                        <property name="label" 
translatable="yes">Use libextractor for files in directories</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="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="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
-                            <property name="width_request">94</property>
+                          <widget class="GtkRadioButton" id="indexbutton">
                             <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">1000 0 100000000 50 
500 500</property>
-                            <property name="climb_rate">500</property>
-                            <property name="numeric">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="GtkRadioButton" 
id="scopeFileOnlyButton">
-                            <property name="visible">True</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="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>
-                            <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">
+                          <widget class="GtkRadioButton" id="insertButton">
                             <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="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>
-                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
-                            <child>
-                              <widget class="GtkHBox" id="hbox60">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <widget class="GtkImage" id="image46">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-open</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label143">
-                                    <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">_Browse</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>
+                            <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="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="GtkAlignment" 
id="uploadFilenameAlignment">
+                          <widget class="GtkLabel" id="scopeLabel">
                             <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">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">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</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="label150">
+                          <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">_Priority:</property>
+                            <property name="label" 
translatable="yes">_Anonymity:</property>
                             <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">contentPrioritySpinButton</property>
+                            <property 
name="mnemonic_widget">uploadAnonymityLevelSpinButton</property>
                           </widget>
                           <packing>
-                            <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="GtkLabel" id="uploadFilenameLabel">
+                          <widget class="GtkRadioButton" 
id="scopeRecursiveButton">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Filename:</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="justify">GTK_JUSTIFY_CENTER</property>
-                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
                           </widget>
                           <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <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="GtkButton" id="fsinsertuploadbutton">
+                          <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
                             <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="response_id">0</property>
-                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
-                            <child>
-                              <widget class="GtkHBox" id="hbox55">
-                                <property name="visible">True</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <widget class="GtkImage" id="image42">
-                                    <property name="visible">True</property>
-                                    <property name="stock">gtk-go-up</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label137">
-                                    <property name="visible">True</property>
-                                    <property name="label" 
translatable="yes">Pub_lish</property>
-                                    <property 
name="use_underline">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                            </child>
+                            <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>
+                            <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
                           </widget>
                           <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="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>
                             <property name="y_options"></property>
                           </packing>
@@ -1537,125 +1502,245 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkSpinButton" 
id="uploadAnonymityLevelSpinButton">
+                          <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">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>
-                            <signal name="value_changed" 
handler="on_anonymity_spin_changed_"/>
+                            <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>
+                            <signal name="clicked" 
handler="on_fsinsertuploadbutton_clicked_"/>
+                            <child>
+                              <widget class="GtkHBox" id="hbox55">
+                                <property name="visible">True</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkImage" id="image42">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-go-up</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label137">
+                                    <property name="visible">True</property>
+                                    <property name="label" 
translatable="yes">Pub_lish</property>
+                                    <property 
name="use_underline">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </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="left_attach">2</property>
+                            <property name="right_attach">3</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="GtkRadioButton" 
id="scopeRecursiveButton">
+                          <widget class="GtkLabel" id="uploadFilenameLabel">
                             <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="xalign">0</property>
+                            <property name="xpad">5</property>
+                            <property name="label" 
translatable="yes">_Filename:</property>
                             <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
+                            <property 
name="justify">GTK_JUSTIFY_CENTER</property>
+                            <property 
name="mnemonic_widget">uploadFilenameComboBoxEntry</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="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="GtkLabel" id="anonymityUploadLabel">
+                          <widget class="GtkLabel" id="label150">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
-                            <property name="label" 
translatable="yes">_Anonymity:</property>
+                            <property name="label" 
translatable="yes">_Priority:</property>
                             <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">uploadAnonymityLevelSpinButton</property>
+                            <property 
name="mnemonic_widget">contentPrioritySpinButton</property>
                           </widget>
                           <packing>
-                            <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="GtkLabel" id="scopeLabel">
+                          <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">Scope:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">scopeFileOnlyButton</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="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</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="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="insertButton">
+                          <widget class="GtkButton" 
id="mainFileSharingInsertBrowseButton">
                             <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="tooltip" translatable="yes">Browse 
local computer for files (or directories) to publish</property>
                             <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">indexbutton</property>
+                            <signal name="clicked" 
handler="on_mainFileSharingInsertBrowseButton_clicked_" 
object="fsinsertfilenamecombo"/>
+                            <child>
+                              <widget class="GtkHBox" id="hbox60">
+                                <property name="visible">True</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkImage" id="image46">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-open</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label143">
+                                    <property name="visible">True</property>
+                                    <property name="label" 
translatable="yes">_Browse</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>
                           <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="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="indexbutton">
+                          <widget class="GtkRadioButton" 
id="scopeFileOnlyButton">
                             <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="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="GtkLabel" id="methodLabel">
+                          <widget class="GtkSpinButton" 
id="contentPrioritySpinButton">
+                            <property name="width_request">94</property>
                             <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>
+                            <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">1000 0 100000000 50 
500 500</property>
+                            <property name="climb_rate">500</property>
+                            <property name="numeric">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="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="alignment24">
+                                <property name="visible">True</property>
+                                <property name="xscale">0</property>
+                                <property name="yscale">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox66">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image49">
+                                        <property 
name="visible">True</property>
+                                        <property 
name="stock">gtk-index</property>
+                                      </widget>
+                                      <packing>
+                                        <property 
name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label151">
+                                        <property 
name="visible">True</property>
+                                        <property name="label" 
translatable="yes">Use libextractor for files in directories</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="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                     </child>
                   </widget>
@@ -1873,7 +1958,7 @@
                               <widget class="GtkCheckButton" 
id="trackingCheckButton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip" 
translatable="yes">should GNUnet track available content (for publishing in 
namespaces)?</property>
+                                <property name="tooltip" 
translatable="yes">Should GNUnet track available content (for publishing in 
namespaces)?</property>
                                 <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="toggled" 
handler="on_trackingCheckButton_toggled_" object="trackingCheckButton"/>
@@ -1899,7 +1984,7 @@
                                         <child>
                                           <widget class="GtkLabel" 
id="label117">
                                             <property 
name="visible">True</property>
-                                            <property name="label" 
translatable="yes">track available content</property>
+                                            <property name="label" 
translatable="yes">Track available content</property>
                                             <property 
name="use_underline">True</property>
                                           </widget>
                                           <packing>
@@ -1923,7 +2008,7 @@
                               <widget class="GtkButton" 
id="clearAvailableContentButton">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip" 
translatable="yes">deletes the tracked available content shown below</property>
+                                <property name="tooltip" 
translatable="yes">Delete the tracked available content shown below</property>
                                 <property name="label">gtk-clear</property>
                                 <property 
name="relief">GTK_RELIEF_NONE</property>
                                 <property name="use_stock">True</property>
@@ -2141,10 +2226,10 @@
               <widget class="GtkScrolledWindow" id="peersScrolledWindow">
                 <property name="can_focus">True</property>
                 <property 
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
                 <child>
                   <widget class="GtkViewport" id="viewport10">
                     <property name="visible">True</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                     <child>
                       <widget class="GtkScrolledWindow" id="scrolledwindow33">
                         <property name="visible">True</property>
@@ -2173,13 +2258,13 @@
                 <child>
                   <widget class="GtkImage" id="image55">
                     <property name="visible">True</property>
-                    <property name="yalign">0.50999999046325684</property>
-                    <property name="stock">gtk-info</property>
+                    <property name="pixbuf">gnunet-gtk-peers.png</property>
                   </widget>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="labelPeers">
                     <property name="visible">True</property>
+                    <property name="xpad">5</property>
                     <property name="label" translatable="yes">_Peers</property>
                     <property name="use_underline">True</property>
                     <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -2711,8 +2796,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="Escape" modifiers="" signal="activate"/>
                 <accelerator key="Return" modifiers="" signal="activate"/>
-                <accelerator key="Escape" modifiers="" signal="activate"/>
               </widget>
             </child>
           </widget>
@@ -2726,6 +2811,7 @@
   </widget>
   <widget class="GtkWindow" id="searchResultsFrame">
     <property name="title" translatable="yes">Search Results</property>
+    <property name="decorated">False</property>
     <child>
       <widget class="GtkScrolledWindow" id="searchPageScrolledWindow">
         <property name="visible">True</property>
@@ -2735,6 +2821,7 @@
         <child>
           <widget class="GtkViewport" id="viewport5">
             <property name="visible">True</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
             <child>
               <widget class="GtkVBox" id="vbox11">
                 <property name="visible">True</property>
@@ -2766,11 +2853,11 @@
                     </child>
                     <child>
                       <widget class="GtkVSeparator" id="vseparator1">
-                        <property name="visible">True</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">1</property>
+                        <property name="padding">5</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
@@ -2820,7 +2907,7 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">2</property>
+                        <property name="position">6</property>
                       </packing>
                     </child>
                     <child>
@@ -2837,7 +2924,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">3</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
@@ -2851,7 +2938,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">4</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
@@ -2866,17 +2953,11 @@
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="position">5</property>
+                        <property name="position">9</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkVSeparator" id="vseparator2">
-                        <property name="visible">True</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">6</property>
-                      </packing>
+                      <placeholder/>
                     </child>
                     <child>
                       <widget class="GtkButton" id="searchPauseButton">
@@ -2894,7 +2975,9 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">7</property>
+                        <property name="padding">5</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
@@ -2936,15 +3019,17 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">8</property>
+                        <property name="padding">5</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkButton" id="searchCancelButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Abort the 
search, but keep search tab open.</property>
-                        <property name="label">gtk-cancel</property>
+                        <property name="tooltip" translatable="yes">Abort the 
search, but keep search tab open</property>
+                        <property name="label">gtk-stop</property>
                         <property name="use_stock">True</property>
                         <property name="focus_on_click">False</property>
                         <property name="response_id">0</property>
@@ -2953,14 +3038,16 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">9</property>
+                        <property name="padding">5</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkButton" id="searchCloseButton">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Close 
search tab (also aborts search).</property>
+                        <property name="tooltip" translatable="yes">Close 
search tab (also aborts search)</property>
                         <property name="label">gtk-close</property>
                         <property name="use_stock">True</property>
                         <property name="focus_on_click">False</property>
@@ -2970,13 +3057,16 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">10</property>
+                        <property name="padding">5</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="padding">2</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -3569,7 +3659,7 @@
   <widget class="GtkFileChooserDialog" id="uploadfilechooserdialog">
     <property name="visible">True</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Select file to publish to 
GNUnet</property>
+    <property name="title" translatable="yes">Publish a file to 
GNUnet</property>
     <property name="modal">True</property>
     <property name="icon">up.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
@@ -4883,6 +4973,7 @@
               <widget class="GtkImage" id="image50">
                 <property name="visible">True</property>
                 <property name="stock">gtk-cancel</property>
+                <property name="icon_size">1</property>
               </widget>
             </child>
           </widget>





reply via email to

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