[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1979 - GNUnet/doc/man gnunet-gtk gnunet-gtk/src/plugins/fs
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1979 - GNUnet/doc/man gnunet-gtk gnunet-gtk/src/plugins/fs |
|
Date: |
Sat, 27 Aug 2005 16:49:29 -0700 (PDT) |
Author: grothoff
Date: 2005-08-27 16:49:27 -0700 (Sat, 27 Aug 2005)
New Revision: 1979
Modified:
GNUnet/doc/man/gnunet-insert.1
gnunet-gtk/TODO
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/plugins/fs/upload.c
Log:
direct indexing
Modified: GNUnet/doc/man/gnunet-insert.1
===================================================================
--- GNUnet/doc/man/gnunet-insert.1 2005-08-27 23:36:06 UTC (rev 1978)
+++ GNUnet/doc/man/gnunet-insert.1 2005-08-27 23:49:27 UTC (rev 1979)
@@ -1,6 +1,6 @@
-.TH GNUNET-INSERT "1" "31 Jan 2005" "GNUnet"
+.TH GNUNET-INSERT "1" "27 Aug 2005" "GNUnet"
.SH NAME
-gnunet-insert \- a command line interface for inserting new content into GNUnet
+gnunet\-insert \- a command line interface for inserting new content into
GNUnet
.SH SYNOPSIS
.B gnunet\-insert
[\fIOPTIONS\fR] FILENAME*
@@ -93,6 +93,10 @@
Even if using links to the .gnunet directory is generally permitted, make a
copy of the file (disables symlinking even if it is possible). When indexing a
file, gnunet\-insert will create a copy of the file in the "share" directory of
gnunetd. If that directory happens to be on the local machine (i.e. gnunetd
runs on localhost) then gnunet\-insert can instead just use a link. This will
not work over the network, if the file\-permissions do not allow gnunetd to
read the file or if the file maybe changed afterwards. Hence the default is to
be inefficient and to make a copy. With this option you can force
gnunet\-insert to not make a link. gnunet\-insert will fall back to creating a
copy.
.TP
+\fB\-d\fR, \fB\-\-direct\fR
+For a recursive upload, also create direct indexing information that will
refer to files inside of directories immediately. Without \-d, contents of
directories can only be found via the directory itself.
+
+.TP
\fB\-e\fR, \fB\-\-extract\fR
Print the list of keywords that will be extracted. Do not perform any
indexing or insertion.
Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO 2005-08-27 23:36:06 UTC (rev 1978)
+++ gnunet-gtk/TODO 2005-08-27 23:49:27 UTC (rev 1979)
@@ -1,8 +1,4 @@
-0.7.0 (all of these can go under "known limitations", that
- is, they are not release-critical IMO):
-1) improve namespace search (and test)
-
-Later (0.7.1+):
+0.7.1:
0) better file-name selection, in particular for downloads from directories
1) create directory from known file IDs [ medium ]
2) disable inactive buttons (if no search/download
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-08-27 23:36:06 UTC (rev 1978)
+++ gnunet-gtk/gnunet-gtk.glade 2005-08-27 23:49:27 UTC (rev 1979)
@@ -1816,6 +1816,92 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton"
id="deepIndexCheckButton">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="tooltip" translatable="yes">Controls
if GNUnet should also produce information for individual files inside of a
directory, as opposed to only allowing the directory itself to be found
directly. Only applies for recursive uploads.</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">True</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment15">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox52">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image40">
+ <property name="visible">True</property>
+ <property
name="stock">gtk-index</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label128">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">add keywords for files in directories</property>
+ <property
name="use_underline">True</property>
+ <property
name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property
name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property
name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1901,7 +1987,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image37">
+ <widget class="GtkImage" id="image38">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -1925,15 +2011,6 @@
</child>
<child>
- <widget class="GtkMenuItem"
id="createDirectory">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Directory</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="createDirectory_clicked" last_modification_time="Sat, 28 May 2005
14:39:59 GMT"/>
- </widget>
- </child>
-
- <child>
<widget class="GtkMenuItem"
id="createCollection">
<property name="visible">True</property>
<property name="label"
translatable="yes">_Collection</property>
@@ -1953,7 +2030,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image38">
+ <widget class="GtkImage" id="image39">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2005-08-27 23:36:06 UTC (rev 1978)
+++ gnunet-gtk/src/plugins/fs/upload.c 2005-08-27 23:49:27 UTC (rev 1979)
@@ -288,6 +288,7 @@
GtkWidget * dialog;
GtkWidget * recBut;
GtkWidget * idxBut;
+ GtkWidget * deepIndex;
struct ECRS_MetaData * meta;
EXTRACTOR_ExtractorList * extractors;
char * config;
@@ -366,14 +367,17 @@
keywordURI = getKeywordURIFromList(metaXML,
"metaDataDialogKeywordList");
if (doRec) {
+ deepIndex = glade_xml_get_widget(getMainXML(),
+ "deepIndexCheckButton");
gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
ECRS_SEARCH_INFIX);
FSUI_uploadAll(ctx,
filename,
- getAnonymityLevel(metaXML,
- "uploadAnonymityLevelSpinButton"),
+ getAnonymityLevel(metaXML,
+ "uploadAnonymityLevelSpinButton"),
doIndex,
- NO, /* FIXME: make option! */
+ (TRUE ==
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex)))
+ ? YES : NO,
meta,
gkeywordURI,
keywordURI);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1979 - GNUnet/doc/man gnunet-gtk gnunet-gtk/src/plugins/fs,
grothoff <=