gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r6586 - gnunet-gtk


From: gnunet
Subject: [GNUnet-SVN] r6586 - gnunet-gtk
Date: Fri, 21 Mar 2008 16:55:17 -0600 (MDT)

Author: nevans
Date: 2008-03-21 16:55:17 -0600 (Fri, 21 Mar 2008)
New Revision: 6586

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


Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-03-21 22:54:07 UTC (rev 6585)
+++ gnunet-gtk/gnunet-gtk.glade 2008-03-21 22:55:17 UTC (rev 6586)
@@ -666,107 +666,6 @@
                               <placeholder/>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox8">
-                                <property name="visible">True</property>
-                                <property name="homogeneous">True</property>
-                                <child>
-                                  <widget class="GtkButton" 
id="abortDownloadButton">
-                                    <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_"/>
-                                  </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="GtkHBox" id="hbox26">
-                                        <property 
name="visible">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="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>
@@ -880,6 +779,107 @@
                                 <property name="y_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="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="GtkVBox" id="vbox8">
+                                <property name="visible">True</property>
+                                <property name="homogeneous">True</property>
+                                <child>
+                                  <widget class="GtkButton" 
id="abortDownloadButton">
+                                    <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_"/>
+                                  </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="GtkHBox" id="hbox26">
+                                        <property 
name="visible">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>
                           </widget>
                         </child>
                         <child>
@@ -1314,121 +1314,241 @@
                           <placeholder/>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="methodLabel">
+                          <widget class="GtkCheckButton" 
id="doExtractCheckButton">
                             <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">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>
                         <child>
-                          <widget class="GtkRadioButton" id="indexbutton">
+                          <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">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">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="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="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="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="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="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="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>
@@ -1487,245 +1607,125 @@
                           </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>
                         </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="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="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="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="GtkRadioButton" 
id="scopeFileOnlyButton">
+                          <widget class="GtkRadioButton" id="indexbutton">
                             <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="GtkSpinButton" 
id="contentPrioritySpinButton">
-                            <property name="width_request">94</property>
+                          <widget class="GtkLabel" id="methodLabel">
                             <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>
+                            <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">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>
@@ -2119,6 +2119,51 @@
                       <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>
@@ -2164,51 +2209,6 @@
                         <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>
@@ -2880,8 +2880,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>
@@ -3371,11 +3371,10 @@
             <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
             <property name="shadow_type">GTK_SHADOW_IN</property>
             <child>
-              <widget class="GtkTreeView" id="chatUserListTreeView">
+              <widget class="GtkTextView" id="chatNickList">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip" translatable="yes">List of the 
participants in the chat room</property>
-                <property name="rules_hint">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | 
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK</property>
               </widget>
             </child>
           </widget>
@@ -5066,8 +5065,8 @@
     <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="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox7">
         <property name="visible">True</property>





reply via email to

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