aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2005-08-27 23:49:27 +0000
committerChristian Grothoff <christian@grothoff.org>2005-08-27 23:49:27 +0000
commit4747bdd887388096bd86041e11608bf787caf07a (patch)
tree07f9a11a53dbb51247d2156dbaec7beccc50e14a
parente056460ef09a66334b2e81ddfc04ad00ad5f549f (diff)
downloadgnunet-gtk-4747bdd887388096bd86041e11608bf787caf07a.tar.gz
gnunet-gtk-4747bdd887388096bd86041e11608bf787caf07a.zip
direct indexing
Diffstat
-rw-r--r--TODO6
-rw-r--r--gnunet-gtk.glade99
-rw-r--r--src/plugins/fs/upload.c10
3 files changed, 96 insertions, 19 deletions
diff --git a/TODO b/TODO
index 0b48bb6f..6de9ed6a 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,4 @@
10.7.0 (all of these can go under "known limitations", that 10.7.1:
2 is, they are not release-critical IMO):
31) improve namespace search (and test)
4
5Later (0.7.1+):
60) better file-name selection, in particular for downloads from directories 20) better file-name selection, in particular for downloads from directories
71) create directory from known file IDs [ medium ] 31) create directory from known file IDs [ medium ]
82) disable inactive buttons (if no search/download 42) disable inactive buttons (if no search/download
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 3ca300c6..fd9b22b9 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -1816,6 +1816,92 @@ Thank you,
1816 <property name="y_options"></property> 1816 <property name="y_options"></property>
1817 </packing> 1817 </packing>
1818 </child> 1818 </child>
1819
1820 <child>
1821 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1822 <property name="visible">True</property>
1823 <property name="sensitive">False</property>
1824 <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>
1825 <property name="can_focus">True</property>
1826 <property name="relief">GTK_RELIEF_NORMAL</property>
1827 <property name="focus_on_click">True</property>
1828 <property name="active">True</property>
1829 <property name="inconsistent">False</property>
1830 <property name="draw_indicator">True</property>
1831
1832 <child>
1833 <widget class="GtkAlignment" id="alignment15">
1834 <property name="visible">True</property>
1835 <property name="xalign">0.5</property>
1836 <property name="yalign">0.5</property>
1837 <property name="xscale">0</property>
1838 <property name="yscale">0</property>
1839 <property name="top_padding">0</property>
1840 <property name="bottom_padding">0</property>
1841 <property name="left_padding">0</property>
1842 <property name="right_padding">0</property>
1843
1844 <child>
1845 <widget class="GtkHBox" id="hbox52">
1846 <property name="visible">True</property>
1847 <property name="homogeneous">False</property>
1848 <property name="spacing">2</property>
1849
1850 <child>
1851 <widget class="GtkImage" id="image40">
1852 <property name="visible">True</property>
1853 <property name="stock">gtk-index</property>
1854 <property name="icon_size">4</property>
1855 <property name="xalign">0.5</property>
1856 <property name="yalign">0.5</property>
1857 <property name="xpad">0</property>
1858 <property name="ypad">0</property>
1859 </widget>
1860 <packing>
1861 <property name="padding">0</property>
1862 <property name="expand">False</property>
1863 <property name="fill">False</property>
1864 </packing>
1865 </child>
1866
1867 <child>
1868 <widget class="GtkLabel" id="label128">
1869 <property name="visible">True</property>
1870 <property name="label" translatable="yes">add keywords for files in directories</property>
1871 <property name="use_underline">True</property>
1872 <property name="use_markup">False</property>
1873 <property name="justify">GTK_JUSTIFY_LEFT</property>
1874 <property name="wrap">False</property>
1875 <property name="selectable">False</property>
1876 <property name="xalign">0.5</property>
1877 <property name="yalign">0.5</property>
1878 <property name="xpad">0</property>
1879 <property name="ypad">0</property>
1880 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
1881 <property name="width_chars">-1</property>
1882 <property name="single_line_mode">False</property>
1883 <property name="angle">0</property>
1884 </widget>
1885 <packing>
1886 <property name="padding">0</property>
1887 <property name="expand">False</property>
1888 <property name="fill">False</property>
1889 </packing>
1890 </child>
1891 </widget>
1892 </child>
1893 </widget>
1894 </child>
1895 </widget>
1896 <packing>
1897 <property name="left_attach">2</property>
1898 <property name="right_attach">3</property>
1899 <property name="top_attach">2</property>
1900 <property name="bottom_attach">3</property>
1901 <property name="x_options">fill</property>
1902 <property name="y_options"></property>
1903 </packing>
1904 </child>
1819 </widget> 1905 </widget>
1820 <packing> 1906 <packing>
1821 <property name="padding">0</property> 1907 <property name="padding">0</property>
@@ -1901,7 +1987,7 @@ Thank you,
1901 <property name="use_underline">True</property> 1987 <property name="use_underline">True</property>
1902 1988
1903 <child internal-child="image"> 1989 <child internal-child="image">
1904 <widget class="GtkImage" id="image37"> 1990 <widget class="GtkImage" id="image38">
1905 <property name="visible">True</property> 1991 <property name="visible">True</property>
1906 <property name="stock">gtk-new</property> 1992 <property name="stock">gtk-new</property>
1907 <property name="icon_size">1</property> 1993 <property name="icon_size">1</property>
@@ -1925,15 +2011,6 @@ Thank you,
1925 </child> 2011 </child>
1926 2012
1927 <child> 2013 <child>
1928 <widget class="GtkMenuItem" id="createDirectory">
1929 <property name="visible">True</property>
1930 <property name="label" translatable="yes">_Directory</property>
1931 <property name="use_underline">True</property>
1932 <signal name="activate" handler="createDirectory_clicked" last_modification_time="Sat, 28 May 2005 14:39:59 GMT"/>
1933 </widget>
1934 </child>
1935
1936 <child>
1937 <widget class="GtkMenuItem" id="createCollection"> 2014 <widget class="GtkMenuItem" id="createCollection">
1938 <property name="visible">True</property> 2015 <property name="visible">True</property>
1939 <property name="label" translatable="yes">_Collection</property> 2016 <property name="label" translatable="yes">_Collection</property>
@@ -1953,7 +2030,7 @@ Thank you,
1953 <property name="use_underline">True</property> 2030 <property name="use_underline">True</property>
1954 2031
1955 <child internal-child="image"> 2032 <child internal-child="image">
1956 <widget class="GtkImage" id="image38"> 2033 <widget class="GtkImage" id="image39">
1957 <property name="visible">True</property> 2034 <property name="visible">True</property>
1958 <property name="stock">gtk-delete</property> 2035 <property name="stock">gtk-delete</property>
1959 <property name="icon_size">1</property> 2036 <property name="icon_size">1</property>
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index feda58ae..f84d3f07 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -288,6 +288,7 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
288 GtkWidget * dialog; 288 GtkWidget * dialog;
289 GtkWidget * recBut; 289 GtkWidget * recBut;
290 GtkWidget * idxBut; 290 GtkWidget * idxBut;
291 GtkWidget * deepIndex;
291 struct ECRS_MetaData * meta; 292 struct ECRS_MetaData * meta;
292 EXTRACTOR_ExtractorList * extractors; 293 EXTRACTOR_ExtractorList * extractors;
293 char * config; 294 char * config;
@@ -366,14 +367,17 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
366 keywordURI = getKeywordURIFromList(metaXML, 367 keywordURI = getKeywordURIFromList(metaXML,
367 "metaDataDialogKeywordList"); 368 "metaDataDialogKeywordList");
368 if (doRec) { 369 if (doRec) {
370 deepIndex = glade_xml_get_widget(getMainXML(),
371 "deepIndexCheckButton");
369 gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX 372 gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
370 ECRS_SEARCH_INFIX); 373 ECRS_SEARCH_INFIX);
371 FSUI_uploadAll(ctx, 374 FSUI_uploadAll(ctx,
372 filename, 375 filename,
373 getAnonymityLevel(metaXML, 376 getAnonymityLevel(metaXML,
374 "uploadAnonymityLevelSpinButton"), 377 "uploadAnonymityLevelSpinButton"),
375 doIndex, 378 doIndex,
376 NO, /* FIXME: make option! */ 379 (TRUE == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex)))
380 ? YES : NO,
377 meta, 381 meta,
378 gkeywordURI, 382 gkeywordURI,
379 keywordURI); 383 keywordURI);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-07 11:19:13 +0000