[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6564 - in gnunet-gtk: . pixmaps/icons src/plugins/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6564 - in gnunet-gtk: . pixmaps/icons src/plugins/fs |
|
Date: |
Thu, 13 Mar 2008 15:11:07 -0600 (MDT) |
Author: moon
Date: 2008-03-13 15:11:06 -0600 (Thu, 13 Mar 2008)
New Revision: 6564
Modified:
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/pixmaps/icons/gnunet-gtk.svg
gnunet-gtk/src/plugins/fs/collection.c
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
create collection, namespace & publish dialogs:
- more cosmetic improvements
- use ENTER to add keywords/metadata, not validate
updated SVG icon
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2008-03-13 20:30:34 UTC (rev 6563)
+++ gnunet-gtk/gnunet-gtk.glade 2008-03-13 21:11:06 UTC (rev 6564)
@@ -3,6 +3,7 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="mainWindow">
+ <property name="can_default">True</property>
<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>
@@ -37,7 +38,8 @@
<child>
<widget class="GtkButton" id="aboutButton">
<property name="can_focus">True</property>
- <property name="has_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="tooltip"
translatable="yes">Show credits</property>
<property name="label">gtk-about</property>
<property name="use_stock">True</property>
@@ -664,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>
@@ -878,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>
@@ -1312,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>
@@ -1485,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>
@@ -2117,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>
@@ -2162,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>
@@ -2480,6 +2482,7 @@
<child>
<widget class="GtkComboBox"
id="metaDataDialogMetaTypeComboBox">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Type of the
metadata that will be added</property>
</widget>
</child>
</widget>
@@ -2514,7 +2517,7 @@
Press ENTER to add the data.</atkproperty>
</accessibility>
<signal name="changed"
handler="on_metaDataDialogValueEntry_changed_"/>
- <accelerator key="Return" modifiers="" signal="activate"/>
+ <signal name="activate"
handler="on_metaDataDialogValueEntry_activate_"/>
</widget>
<packing>
<property name="padding">5</property>
@@ -2535,6 +2538,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">4</property>
</packing>
</child>
@@ -2552,6 +2556,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">5</property>
</packing>
</child>
@@ -2625,7 +2630,7 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Enter
keywords</property>
<signal name="changed"
handler="on_fileInformationKeywordEntry_changed_"/>
- <accelerator key="Return" modifiers="" signal="activate"/>
+ <signal name="activate"
handler="on_fileInformationKeywordEntry_activate_"/>
</widget>
<packing>
<property name="padding">5</property>
@@ -2646,6 +2651,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
@@ -2663,6 +2669,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
@@ -2742,6 +2749,7 @@
<child>
<widget class="GtkViewport" id="viewport7">
<property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkImage" id="previewImage">
<property name="visible">True</property>
@@ -2763,6 +2771,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
<property name="position">2</property>
</packing>
@@ -2871,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="Return" modifiers="" signal="activate"/>
<accelerator key="Escape" modifiers="" signal="activate"/>
- <accelerator key="Return" modifiers="" signal="activate"/>
</widget>
</child>
</widget>
@@ -3795,13 +3804,14 @@
<property name="visible">True</property>
<property name="xpad">9</property>
<property name="ypad">5</property>
- <property name="label" translatable="yes">Please provide
information about the namespace</property>
+ <property name="label" translatable="yes">Please provide
information about the namespace:</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
@@ -3925,7 +3935,7 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Enter a keyword
under which advertisements for this namespace will be published.</property>
<signal name="changed"
handler="on_namespaceKeywordEntry_changed_"/>
- <accelerator key="Return" modifiers="" signal="activate"/>
+ <signal name="activate"
handler="on_namespaceKeywordEntry_activate_"/>
</widget>
<packing>
<property name="position">1</property>
@@ -3936,7 +3946,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Add the given
keyword to the list of keywords under which advertisements for the namespace
will be published.</property>
+ <property name="tooltip" translatable="yes">Add the given
keyword to the list of keywords under which advertisements for the namespace
will be published</property>
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
@@ -3954,8 +3964,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Add the given
keyword to the list of keywords under which advertisements for the namespace
will be published.</property>
- <property name="border_width">2</property>
+ <property name="tooltip" translatable="yes">Remove the
selected keyword from the list of keywords under which advertisements for the
namespace will be published</property>
<property name="label">gtk-remove</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
@@ -3964,6 +3973,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
@@ -3990,7 +4000,7 @@
<widget class="GtkTreeView"
id="namespaceMetaDataDialogKeywordList">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Select entries
and use the button to delete keywords.</property>
+ <property name="tooltip" translatable="yes">Select entries
and use the button to delete keywords</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
</widget>
@@ -4031,6 +4041,7 @@
<child>
<widget class="GtkComboBox"
id="namespaceMetaDataDialogMetaTypeComboBox">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Type of the
metadata to be added</property>
</widget>
<packing>
<property name="position">1</property>
@@ -4057,7 +4068,7 @@
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Enter meta-data
(descriptions) for this namespace</property>
<signal name="changed"
handler="on_namespaceMetaDataValueEntry_changed_"/>
- <accelerator key="Return" modifiers="" signal="activate"/>
+ <signal name="activate"
handler="on_namespaceMetaDataEntry_activate_"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -4069,7 +4080,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Add the given
metadata entry to the metadata for this namespace.</property>
+ <property name="tooltip" translatable="yes">Add the given
metadata entry to the metadata for this namespace</property>
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
@@ -4087,7 +4098,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Add the given
metadata entry to the metadata for this namespace.</property>
+ <property name="tooltip" translatable="yes">Remove the
selected metadata entry from the metadata for this namespace</property>
<property name="label">gtk-remove</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
@@ -4096,6 +4107,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">5</property>
</packing>
</child>
@@ -4123,7 +4135,7 @@
<widget class="GtkTreeView"
id="namespaceMetaDataDialogMetaDataList">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Metadata
describing the namespace (used in advertisements).</property>
+ <property name="tooltip" translatable="yes">Metadata
describing the namespace (used in advertisements)</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
</widget>
@@ -4155,7 +4167,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Cancel namespace
creation.</property>
+ <property name="tooltip" translatable="yes">Cancel namespace
creation</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
@@ -4165,13 +4177,11 @@
<child>
<widget class="GtkButton" id="button17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="tooltip" translatable="yes">Confirm the
specified data. Creates the namespace and publishes the
advertisements.</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
- <accelerator key="Return" modifiers="" signal="activate"/>
</widget>
<packing>
<property name="position">1</property>
@@ -4476,12 +4486,13 @@
<property name="visible">True</property>
<property name="xpad">9</property>
<property name="ypad">5</property>
- <property name="label" translatable="yes">Please provide meta-data
and an identifier for the collection.</property>
+ <property name="label" translatable="yes">Please provide meta-data
and an identifier for the collection:</property>
<property name="justify">GTK_JUSTIFY_CENTER</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="padding">5</property>
<property name="position">2</property>
</packing>
</child>
@@ -4506,8 +4517,6 @@
<widget class="GtkEntry" id="collectionIdentifierEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Enter
keywords</property>
- <accelerator key="Return" modifiers="" signal="activate"/>
</widget>
<packing>
<property name="padding">5</property>
@@ -4611,6 +4620,7 @@
<child>
<widget class="GtkComboBox"
id="collectionMetaDataTypeComboBox">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Type of the
metadata that will be added</property>
</widget>
</child>
</widget>
@@ -4639,7 +4649,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip" translatable="yes">Enter metadata
about the upload</property>
- <accelerator key="Return" modifiers="" signal="activate"/>
+ <signal name="activate"
handler="on_collectionMetaDataValueEntry_activate_"/>
</widget>
<packing>
<property name="padding">5</property>
@@ -4650,7 +4660,7 @@
<widget class="GtkButton" id="button13">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Add the given
description to the meta-data describing the published file.</property>
+ <property name="tooltip" translatable="yes">Add the given
description to the meta-data describing the published file</property>
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
@@ -4685,7 +4695,7 @@
<widget class="GtkTreeView" id="collectionMetaDataTreeView">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">Select entries
and use the button to delete keywords.</property>
+ <property name="tooltip" translatable="yes">Select entries
and use the button to delete keywords</property>
<property name="reorderable">True</property>
<property name="rules_hint">True</property>
</widget>
@@ -4717,7 +4727,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Cancel the
publication.</property>
+ <property name="tooltip" translatable="yes">Cancel the
publication</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
@@ -4729,7 +4739,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="tooltip" translatable="yes">Confirm the
displayed meta-data and keywords and proceed with the publication.</property>
+ <property name="tooltip" translatable="yes">Confirm the
displayed meta-data and keywords and proceed with the publication</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
Modified: gnunet-gtk/pixmaps/icons/gnunet-gtk.svg
===================================================================
--- gnunet-gtk/pixmaps/icons/gnunet-gtk.svg 2008-03-13 20:30:34 UTC (rev
6563)
+++ gnunet-gtk/pixmaps/icons/gnunet-gtk.svg 2008-03-13 21:11:06 UTC (rev
6564)
@@ -14,13 +14,13 @@
id="svg3440"
sodipodi:version="0.32"
inkscape:version="0.45.1"
- sodipodi:docbase="/home/milan/Dev/gnunet-gtk/pixmaps"
+ sodipodi:docbase="/home/milan/Dev/gnunet-gtk/pixmaps/drafting"
sodipodi:docname="gnunet-gtk.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
-
inkscape:export-filename="/home/milan/Dev/gnunet-gtk/pixmaps/gnunet-gtk-32.png"
- inkscape:export-xdpi="60"
- inkscape:export-ydpi="60">
+ inkscape:export-filename="/home/milan/Dev/gnunet-gtk/pixmaps/gnunet-gtk.png"
+ inkscape:export-xdpi="41.25"
+ inkscape:export-ydpi="41.25">
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -3071,12 +3071,12 @@
<dc:title>GNUnet</dc:title>
<dc:creator>
<cc:Agent>
- <dc:title>Milan Bouchet-Valat & Nils Durner</dc:title>
+ <dc:title>Milan Bouchet-Valat</dc:title>
</cc:Agent>
</dc:creator>
<dc:contributor>
<cc:Agent>
- <dc:title>Original icons from the Tango project: rights derivated
from Jakub Steiner, Tuomas Kuosmanen, Garrett LeSage.</dc:title>
+ <dc:title>Original icons from the Tango project: rights derivated
from Jakub Steiner, Tuomas Kuosmanen.</dc:title>
</cc:Agent>
</dc:contributor>
<cc:license
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2008-03-13 20:30:34 UTC (rev
6563)
+++ gnunet-gtk/src/plugins/fs/collection.c 2008-03-13 21:11:06 UTC (rev
6564)
@@ -45,7 +45,22 @@
"collectionMetaDataTreeView");
}
+void
+on_collectionMetaDataValueEntry_activate_fs (GtkWidget *
collectionMetaDataValueEntry,
+ gpointer dummy)
+{
+ const char *input;
+ input = gtk_entry_get_text (GTK_ENTRY (collectionMetaDataValueEntry));
+ if ((input == NULL) || (strlen (input) == 0))
+ return;
+ handleMetaDataListUpdate (metaXML,
+ "collectionMetaDataTypeComboBox",
+ "collectionMetaDataValueEntry",
+ "collectionMetaDataTreeView");
+}
+
+
void
createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
{
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2008-03-13 20:30:34 UTC
(rev 6563)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2008-03-13 21:11:06 UTC
(rev 6564)
@@ -77,6 +77,38 @@
"namespaceMetaDataDialogMetaDataList");
}
+void
+on_namespaceKeywordEntry_activate_fs (GtkWidget *
+ namespaceKeywordEntry,
+ gpointer dummy)
+{
+ const char *input;
+
+ input = gtk_entry_get_text (GTK_ENTRY (namespaceKeywordEntry));
+ if ((input == NULL) || (strlen (input) == 0))
+ return;
+ handleKeywordListUpdate (metaXML,
+ "namespaceKeywordEntry",
+ "namespaceMetaDataDialogKeywordList");
+}
+
+void
+on_namespaceMetaDataEntry_activate_fs (GtkWidget *
+ namespaceMetaDataEntry,
+ gpointer dummy)
+{
+ const char *input;
+
+ input = gtk_entry_get_text (GTK_ENTRY (namespaceMetaDataEntry));
+ if ((input == NULL) || (strlen (input) == 0))
+ return;
+ handleMetaDataListUpdate (metaXML,
+ "namespaceMetaDataDialogMetaTypeComboBox",
+ "namespaceMetaDataValueEntry",
+ "namespaceMetaDataDialogMetaDataList");
+}
+
+
/**
* The selection of the keyword list changed.
* Update button status.
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-03-13 20:30:34 UTC (rev 6563)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-03-13 21:11:06 UTC (rev 6564)
@@ -228,6 +228,34 @@
"metaDataDialogMetaDataList");
}
+on_fileInformationKeywordEntry_activate_fs (GtkWidget *
fileInformationKeywordEntry,
+ gpointer dummy)
+{
+ const char *input;
+
+ input = gtk_entry_get_text (GTK_ENTRY (fileInformationKeywordEntry));
+ if ((input == NULL) || (strlen (input) == 0))
+ return;
+ handleKeywordListUpdate (metaXML,
+ "fileInformationKeywordEntry",
+ "metaDataDialogKeywordList");
+}
+
+on_metaDataDialogValueEntry_activate_fs (GtkWidget * metaDataDialogValueEntry,
+ gpointer dummy)
+{
+ const char *input;
+
+ input = gtk_entry_get_text (GTK_ENTRY (metaDataDialogValueEntry));
+ if ((input == NULL) || (strlen (input) == 0))
+ return;
+ handleMetaDataListUpdate (metaXML,
+ "metaDataDialogMetaTypeComboBox",
+ "metaDataDialogValueEntry",
+ "metaDataDialogMetaDataList");
+}
+
+
void
on_metaDataDialogKeywordRemoveButton_clicked_fs (gpointer dummy,
GtkWidget * button)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6564 - in gnunet-gtk: . pixmaps/icons src/plugins/fs,
gnunet <=