aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-07-30 11:14:07 +0000
committerChristian Grothoff <christian@grothoff.org>2008-07-30 11:14:07 +0000
commitf7a6fd75d373b5da22f5229f03c8c9837546100c (patch)
treeedc10cd4f58a6c4d4e159aad19302aedea345278
parentea031bfd782151a584ee2af07db201b693d97d2f (diff)
downloadgnunet-gtk-f7a6fd75d373b5da22f5229f03c8c9837546100c.tar.gz
gnunet-gtk-f7a6fd75d373b5da22f5229f03c8c9837546100c.zip
fix
Diffstat
-rw-r--r--TODO3
-rw-r--r--gnunet-gtk.glade733
-rw-r--r--src/plugins/fs/fs.c8
-rw-r--r--src/plugins/fs/namespace_search.c14
-rw-r--r--src/plugins/fs/search.c4
5 files changed, 385 insertions, 377 deletions
diff --git a/TODO b/TODO
index a99e1c1b..1ec89305 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,6 @@
1This is just the current plan, plans change. 1This is just the current plan, plans change.
2 2
30.8.1 [8'08] (aka "growth"): 30.8.1 [8'08] (aka "growth"):
4- bugs:
5 * manual entry of namespace name in search tab does not
6 work (results in global search)
7- improve collection handling 4- improve collection handling
8 * show content of current collection somewhere 5 * show content of current collection somewhere
9 * add 'publish now' button / menu entry 6 * add 'publish now' button / menu entry
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index f4807526..ce9a4226 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -694,6 +694,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
694 <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed_"/> 694 <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed_"/>
695 <child internal-child="entry"> 695 <child internal-child="entry">
696 <widget class="GtkEntry" id="comboboxentry-entry2"> 696 <widget class="GtkEntry" id="comboboxentry-entry2">
697 <property name="editable">False</property>
697 </widget> 698 </widget>
698 </child> 699 </child>
699 </widget> 700 </widget>
@@ -790,80 +791,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
790 <placeholder/> 791 <placeholder/>
791 </child> 792 </child>
792 <child> 793 <child>
793 <widget class="GtkScrolledWindow" id="scrolledwindow10"> 794 <widget class="GtkVBox" id="vbox21">
794 <property name="visible">True</property>
795 <property name="can_focus">True</property>
796 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
797 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
798 <property name="shadow_type">GTK_SHADOW_IN</property>
799 <child>
800 <widget class="GtkTreeView" id="activeDownloadsList">
801 <property name="visible">True</property>
802 <property name="can_focus">True</property>
803 <property name="reorderable">True</property>
804 <property name="rules_hint">True</property>
805 <signal name="button_press_event" handler="on_activeDownloadsList_button_press_"/>
806 </widget>
807 </child>
808 </widget>
809 <packing>
810 <property name="top_attach">1</property>
811 <property name="bottom_attach">2</property>
812 </packing>
813 </child>
814 <child>
815 <widget class="GtkVBox" id="vbox8">
816 <property name="visible">True</property> 795 <property name="visible">True</property>
817 <property name="homogeneous">True</property> 796 <property name="homogeneous">True</property>
818 <child> 797 <child>
819 <widget class="GtkButton" id="abortDownloadButton"> 798 <widget class="GtkButton" id="stopUploadButton">
820 <property name="visible">True</property>
821 <property name="sensitive">False</property>
822 <property name="can_focus">True</property>
823 <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and delete incomplete download files</property>
824 <property name="label">gtk-delete</property>
825 <property name="use_stock">True</property>
826 <property name="response_id">0</property>
827 <signal name="clicked" handler="on_abortDownload_clicked_"/>
828 </widget>
829 <packing>
830 <property name="fill">False</property>
831 </packing>
832 </child>
833 <child>
834 <widget class="GtkButton" id="stopDownloadButton">
835 <property name="visible">True</property> 799 <property name="visible">True</property>
836 <property name="sensitive">False</property> 800 <property name="sensitive">False</property>
837 <property name="can_focus">True</property> 801 <property name="can_focus">True</property>
838 <property name="tooltip" translatable="yes">Stop the selected download (and all sub-downloads) and remove them from the list. This will NOT cause the deletion of files from incomplete downloads.</property> 802 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property>
839 <property name="label">gtk-stop</property> 803 <property name="label">gtk-stop</property>
840 <property name="use_stock">True</property> 804 <property name="use_stock">True</property>
841 <property name="response_id">0</property> 805 <property name="response_id">0</property>
842 <signal name="clicked" handler="on_stopDownload_clicked_"/> 806 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/>
843 </widget> 807 </widget>
844 <packing> 808 <packing>
809 <property name="expand">False</property>
845 <property name="fill">False</property> 810 <property name="fill">False</property>
846 <property name="position">1</property>
847 </packing> 811 </packing>
848 </child> 812 </child>
849 <child> 813 <child>
850 <widget class="GtkButton" id="clearCompletedDownloadsButton"> 814 <widget class="GtkButton" id="clearCompletedUploadsButton">
851 <property name="visible">True</property> 815 <property name="visible">True</property>
852 <property name="can_focus">True</property> 816 <property name="can_focus">True</property>
853 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property> 817 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property>
854 <property name="response_id">0</property> 818 <property name="response_id">0</property>
855 <signal name="clicked" handler="on_clearCompletedDownloads_clicked_"/> 819 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/>
856 <child> 820 <child>
857 <widget class="GtkAlignment" id="alignment3"> 821 <widget class="GtkAlignment" id="alignment4">
858 <property name="visible">True</property> 822 <property name="visible">True</property>
859 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 823 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
860 <property name="xscale">0</property> 824 <property name="xscale">0</property>
861 <child> 825 <child>
862 <widget class="GtkHBox" id="hbox4"> 826 <widget class="GtkHBox" id="hbox5">
863 <property name="visible">True</property> 827 <property name="visible">True</property>
864 <property name="spacing">2</property> 828 <property name="spacing">2</property>
865 <child> 829 <child>
866 <widget class="GtkImage" id="image3"> 830 <widget class="GtkImage" id="image4">
867 <property name="visible">True</property> 831 <property name="visible">True</property>
868 <property name="stock">gtk-clear</property> 832 <property name="stock">gtk-clear</property>
869 </widget> 833 </widget>
@@ -873,7 +837,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
873 </packing> 837 </packing>
874 </child> 838 </child>
875 <child> 839 <child>
876 <widget class="GtkLabel" id="label5"> 840 <widget class="GtkLabel" id="label2">
877 <property name="visible">True</property> 841 <property name="visible">True</property>
878 <property name="label" translatable="yes">_Clean</property> 842 <property name="label" translatable="yes">_Clean</property>
879 <property name="use_underline">True</property> 843 <property name="use_underline">True</property>
@@ -890,22 +854,85 @@ This release adds context-menus (right-click) which allow copying the URI of sea
890 </child> 854 </child>
891 </widget> 855 </widget>
892 <packing> 856 <packing>
893 <property name="expand">False</property>
894 <property name="fill">False</property> 857 <property name="fill">False</property>
895 <property name="position">2</property> 858 <property name="position">1</property>
896 </packing> 859 </packing>
897 </child> 860 </child>
898 </widget> 861 </widget>
899 <packing> 862 <packing>
900 <property name="left_attach">1</property> 863 <property name="left_attach">1</property>
901 <property name="right_attach">2</property> 864 <property name="right_attach">2</property>
902 <property name="top_attach">1</property> 865 <property name="top_attach">4</property>
903 <property name="bottom_attach">2</property> 866 <property name="bottom_attach">5</property>
904 <property name="x_options">GTK_FILL</property> 867 <property name="x_options">GTK_FILL</property>
905 <property name="x_padding">5</property> 868 <property name="x_padding">5</property>
906 </packing> 869 </packing>
907 </child> 870 </child>
908 <child> 871 <child>
872 <widget class="GtkAlignment" id="alignment14">
873 <property name="visible">True</property>
874 <property name="top_padding">5</property>
875 <child>
876 <widget class="GtkLabel" id="label46">
877 <property name="visible">True</property>
878 <property name="xalign">0</property>
879 <property name="xpad">5</property>
880 <property name="ypad">5</property>
881 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
882 <property name="use_markup">True</property>
883 </widget>
884 </child>
885 </widget>
886 <packing>
887 <property name="right_attach">2</property>
888 <property name="top_attach">3</property>
889 <property name="bottom_attach">4</property>
890 <property name="y_options">GTK_FILL</property>
891 </packing>
892 </child>
893 <child>
894 <widget class="GtkAlignment" id="alignment11">
895 <property name="visible">True</property>
896 <property name="top_padding">5</property>
897 <child>
898 <widget class="GtkLabel" id="label45">
899 <property name="visible">True</property>
900 <property name="xalign">0</property>
901 <property name="xpad">5</property>
902 <property name="ypad">5</property>
903 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
904 <property name="use_markup">True</property>
905 </widget>
906 </child>
907 </widget>
908 <packing>
909 <property name="right_attach">2</property>
910 <property name="y_options">GTK_FILL</property>
911 </packing>
912 </child>
913 <child>
914 <widget class="GtkScrolledWindow" id="scrolledwindow8">
915 <property name="visible">True</property>
916 <property name="can_focus">False</property>
917 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
918 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
919 <property name="shadow_type">GTK_SHADOW_IN</property>
920 <child>
921 <widget class="GtkTreeView" id="activeUploadsList">
922 <property name="visible">True</property>
923 <property name="can_focus">True</property>
924 <property name="reorderable">True</property>
925 <property name="rules_hint">True</property>
926 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/>
927 </widget>
928 </child>
929 </widget>
930 <packing>
931 <property name="top_attach">4</property>
932 <property name="bottom_attach">5</property>
933 </packing>
934 </child>
935 <child>
909 <widget class="GtkHBox" id="hbox1"> 936 <widget class="GtkHBox" id="hbox1">
910 <property name="visible">True</property> 937 <property name="visible">True</property>
911 <child> 938 <child>
@@ -1022,107 +1049,58 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1022 </packing> 1049 </packing>
1023 </child> 1050 </child>
1024 <child> 1051 <child>
1025 <widget class="GtkScrolledWindow" id="scrolledwindow8"> 1052 <widget class="GtkVBox" id="vbox8">
1026 <property name="visible">True</property> 1053 <property name="visible">True</property>
1027 <property name="can_focus">False</property> 1054 <property name="homogeneous">True</property>
1028 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1029 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1030 <property name="shadow_type">GTK_SHADOW_IN</property>
1031 <child> 1055 <child>
1032 <widget class="GtkTreeView" id="activeUploadsList"> 1056 <widget class="GtkButton" id="abortDownloadButton">
1033 <property name="visible">True</property> 1057 <property name="visible">True</property>
1058 <property name="sensitive">False</property>
1034 <property name="can_focus">True</property> 1059 <property name="can_focus">True</property>
1035 <property name="reorderable">True</property> 1060 <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and delete incomplete download files</property>
1036 <property name="rules_hint">True</property> 1061 <property name="label">gtk-delete</property>
1037 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/> 1062 <property name="use_stock">True</property>
1038 </widget> 1063 <property name="response_id">0</property>
1039 </child> 1064 <signal name="clicked" handler="on_abortDownload_clicked_"/>
1040 </widget>
1041 <packing>
1042 <property name="top_attach">4</property>
1043 <property name="bottom_attach">5</property>
1044 </packing>
1045 </child>
1046 <child>
1047 <widget class="GtkAlignment" id="alignment11">
1048 <property name="visible">True</property>
1049 <property name="top_padding">5</property>
1050 <child>
1051 <widget class="GtkLabel" id="label45">
1052 <property name="visible">True</property>
1053 <property name="xalign">0</property>
1054 <property name="xpad">5</property>
1055 <property name="ypad">5</property>
1056 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
1057 <property name="use_markup">True</property>
1058 </widget>
1059 </child>
1060 </widget>
1061 <packing>
1062 <property name="right_attach">2</property>
1063 <property name="y_options">GTK_FILL</property>
1064 </packing>
1065 </child>
1066 <child>
1067 <widget class="GtkAlignment" id="alignment14">
1068 <property name="visible">True</property>
1069 <property name="top_padding">5</property>
1070 <child>
1071 <widget class="GtkLabel" id="label46">
1072 <property name="visible">True</property>
1073 <property name="xalign">0</property>
1074 <property name="xpad">5</property>
1075 <property name="ypad">5</property>
1076 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
1077 <property name="use_markup">True</property>
1078 </widget> 1065 </widget>
1066 <packing>
1067 <property name="fill">False</property>
1068 </packing>
1079 </child> 1069 </child>
1080 </widget>
1081 <packing>
1082 <property name="right_attach">2</property>
1083 <property name="top_attach">3</property>
1084 <property name="bottom_attach">4</property>
1085 <property name="y_options">GTK_FILL</property>
1086 </packing>
1087 </child>
1088 <child>
1089 <widget class="GtkVBox" id="vbox21">
1090 <property name="visible">True</property>
1091 <property name="homogeneous">True</property>
1092 <child> 1070 <child>
1093 <widget class="GtkButton" id="stopUploadButton"> 1071 <widget class="GtkButton" id="stopDownloadButton">
1094 <property name="visible">True</property> 1072 <property name="visible">True</property>
1095 <property name="sensitive">False</property> 1073 <property name="sensitive">False</property>
1096 <property name="can_focus">True</property> 1074 <property name="can_focus">True</property>
1097 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property> 1075 <property name="tooltip" translatable="yes">Stop the selected download (and all sub-downloads) and remove them from the list. This will NOT cause the deletion of files from incomplete downloads.</property>
1098 <property name="label">gtk-stop</property> 1076 <property name="label">gtk-stop</property>
1099 <property name="use_stock">True</property> 1077 <property name="use_stock">True</property>
1100 <property name="response_id">0</property> 1078 <property name="response_id">0</property>
1101 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/> 1079 <signal name="clicked" handler="on_stopDownload_clicked_"/>
1102 </widget> 1080 </widget>
1103 <packing> 1081 <packing>
1104 <property name="expand">False</property>
1105 <property name="fill">False</property> 1082 <property name="fill">False</property>
1083 <property name="position">1</property>
1106 </packing> 1084 </packing>
1107 </child> 1085 </child>
1108 <child> 1086 <child>
1109 <widget class="GtkButton" id="clearCompletedUploadsButton"> 1087 <widget class="GtkButton" id="clearCompletedDownloadsButton">
1110 <property name="visible">True</property> 1088 <property name="visible">True</property>
1111 <property name="can_focus">True</property> 1089 <property name="can_focus">True</property>
1112 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property> 1090 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property>
1113 <property name="response_id">0</property> 1091 <property name="response_id">0</property>
1114 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/> 1092 <signal name="clicked" handler="on_clearCompletedDownloads_clicked_"/>
1115 <child> 1093 <child>
1116 <widget class="GtkAlignment" id="alignment4"> 1094 <widget class="GtkAlignment" id="alignment3">
1117 <property name="visible">True</property> 1095 <property name="visible">True</property>
1118 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1096 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1119 <property name="xscale">0</property> 1097 <property name="xscale">0</property>
1120 <child> 1098 <child>
1121 <widget class="GtkHBox" id="hbox5"> 1099 <widget class="GtkHBox" id="hbox4">
1122 <property name="visible">True</property> 1100 <property name="visible">True</property>
1123 <property name="spacing">2</property> 1101 <property name="spacing">2</property>
1124 <child> 1102 <child>
1125 <widget class="GtkImage" id="image4"> 1103 <widget class="GtkImage" id="image3">
1126 <property name="visible">True</property> 1104 <property name="visible">True</property>
1127 <property name="stock">gtk-clear</property> 1105 <property name="stock">gtk-clear</property>
1128 </widget> 1106 </widget>
@@ -1132,7 +1110,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1132 </packing> 1110 </packing>
1133 </child> 1111 </child>
1134 <child> 1112 <child>
1135 <widget class="GtkLabel" id="label2"> 1113 <widget class="GtkLabel" id="label5">
1136 <property name="visible">True</property> 1114 <property name="visible">True</property>
1137 <property name="label" translatable="yes">_Clean</property> 1115 <property name="label" translatable="yes">_Clean</property>
1138 <property name="use_underline">True</property> 1116 <property name="use_underline">True</property>
@@ -1149,20 +1127,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1149 </child> 1127 </child>
1150 </widget> 1128 </widget>
1151 <packing> 1129 <packing>
1130 <property name="expand">False</property>
1152 <property name="fill">False</property> 1131 <property name="fill">False</property>
1153 <property name="position">1</property> 1132 <property name="position">2</property>
1154 </packing> 1133 </packing>
1155 </child> 1134 </child>
1156 </widget> 1135 </widget>
1157 <packing> 1136 <packing>
1158 <property name="left_attach">1</property> 1137 <property name="left_attach">1</property>
1159 <property name="right_attach">2</property> 1138 <property name="right_attach">2</property>
1160 <property name="top_attach">4</property> 1139 <property name="top_attach">1</property>
1161 <property name="bottom_attach">5</property> 1140 <property name="bottom_attach">2</property>
1162 <property name="x_options">GTK_FILL</property> 1141 <property name="x_options">GTK_FILL</property>
1163 <property name="x_padding">5</property> 1142 <property name="x_padding">5</property>
1164 </packing> 1143 </packing>
1165 </child> 1144 </child>
1145 <child>
1146 <widget class="GtkScrolledWindow" id="scrolledwindow10">
1147 <property name="visible">True</property>
1148 <property name="can_focus">True</property>
1149 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1150 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1151 <property name="shadow_type">GTK_SHADOW_IN</property>
1152 <child>
1153 <widget class="GtkTreeView" id="activeDownloadsList">
1154 <property name="visible">True</property>
1155 <property name="can_focus">True</property>
1156 <property name="reorderable">True</property>
1157 <property name="rules_hint">True</property>
1158 <signal name="button_press_event" handler="on_activeDownloadsList_button_press_"/>
1159 </widget>
1160 </child>
1161 </widget>
1162 <packing>
1163 <property name="top_attach">1</property>
1164 <property name="bottom_attach">2</property>
1165 </packing>
1166 </child>
1166 </widget> 1167 </widget>
1167 <packing> 1168 <packing>
1168 <property name="position">1</property> 1169 <property name="position">1</property>
@@ -1217,80 +1218,53 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1217 <placeholder/> 1218 <placeholder/>
1218 </child> 1219 </child>
1219 <child> 1220 <child>
1220 <widget class="GtkLabel" id="methodLabel"> 1221 <widget class="GtkAlignment" id="alignment8">
1221 <property name="visible">True</property> 1222 <property name="visible">True</property>
1223 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1222 <property name="xalign">0</property> 1224 <property name="xalign">0</property>
1223 <property name="xpad">5</property> 1225 <property name="xscale">0</property>
1224 <property name="label" translatable="yes">Method:</property> 1226 <child>
1225 <property name="use_underline">True</property> 1227 <widget class="GtkSpinButton" id="contentPrioritySpinButton">
1226 <property name="mnemonic_widget">indexbutton</property> 1228 <property name="width_request">94</property>
1227 </widget> 1229 <property name="visible">True</property>
1228 <packing> 1230 <property name="can_focus">True</property>
1229 <property name="x_options">GTK_FILL</property> 1231 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property>
1230 <property name="y_options"></property> 1232 <property name="adjustment">950 0 100000000 50 500 500</property>
1231 </packing> 1233 <property name="climb_rate">500</property>
1232 </child> 1234 <property name="numeric">True</property>
1233 <child> 1235 </widget>
1234 <widget class="GtkRadioButton" id="indexbutton"> 1236 </child>
1235 <property name="visible">True</property>
1236 <property name="can_focus">True</property>
1237 <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>
1238 <property name="label" translatable="yes">Inde_x</property>
1239 <property name="use_underline">True</property>
1240 <property name="response_id">0</property>
1241 <property name="active">True</property>
1242 <property name="draw_indicator">True</property>
1243 </widget> 1237 </widget>
1244 <packing> 1238 <packing>
1245 <property name="left_attach">1</property> 1239 <property name="left_attach">1</property>
1246 <property name="right_attach">2</property> 1240 <property name="right_attach">2</property>
1241 <property name="top_attach">3</property>
1242 <property name="bottom_attach">4</property>
1247 <property name="x_options">GTK_FILL</property> 1243 <property name="x_options">GTK_FILL</property>
1248 <property name="y_options"></property> 1244 <property name="y_options"></property>
1249 </packing> 1245 </packing>
1250 </child> 1246 </child>
1251 <child> 1247 <child>
1252 <widget class="GtkRadioButton" id="insertButton"> 1248 <widget class="GtkAlignment" id="alignment7">
1253 <property name="visible">True</property>
1254 <property name="can_focus">True</property>
1255 <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>
1256 <property name="label" translatable="yes">I_nsert</property>
1257 <property name="use_underline">True</property>
1258 <property name="response_id">0</property>
1259 <property name="draw_indicator">True</property>
1260 <property name="group">indexbutton</property>
1261 </widget>
1262 <packing>
1263 <property name="left_attach">2</property>
1264 <property name="right_attach">3</property>
1265 <property name="x_options">GTK_FILL</property>
1266 <property name="y_options"></property>
1267 </packing>
1268 </child>
1269 <child>
1270 <widget class="GtkLabel" id="scopeLabel">
1271 <property name="visible">True</property>
1272 <property name="xalign">0</property>
1273 <property name="xpad">5</property>
1274 <property name="label" translatable="yes">Scope:</property>
1275 <property name="use_underline">True</property>
1276 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1277 </widget>
1278 <packing>
1279 <property name="top_attach">1</property>
1280 <property name="bottom_attach">2</property>
1281 <property name="x_options">GTK_FILL</property>
1282 <property name="y_options"></property>
1283 </packing>
1284 </child>
1285 <child>
1286 <widget class="GtkLabel" id="anonymityUploadLabel">
1287 <property name="visible">True</property> 1249 <property name="visible">True</property>
1250 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1288 <property name="xalign">0</property> 1251 <property name="xalign">0</property>
1289 <property name="xpad">5</property> 1252 <property name="xscale">0</property>
1290 <property name="label" translatable="yes">_Anonymity:</property> 1253 <child>
1291 <property name="use_underline">True</property> 1254 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton">
1255 <property name="visible">True</property>
1256 <property name="can_focus">True</property>
1257 <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>
1258 <property name="adjustment">1 0 10000 1 10 10</property>
1259 <property name="climb_rate">1</property>
1260 <property name="numeric">True</property>
1261 <signal name="value_changed" handler="on_anonymity_spin_changed_"/>
1262 </widget>
1263 </child>
1292 </widget> 1264 </widget>
1293 <packing> 1265 <packing>
1266 <property name="left_attach">1</property>
1267 <property name="right_attach">2</property>
1294 <property name="top_attach">2</property> 1268 <property name="top_attach">2</property>
1295 <property name="bottom_attach">3</property> 1269 <property name="bottom_attach">3</property>
1296 <property name="x_options">GTK_FILL</property> 1270 <property name="x_options">GTK_FILL</property>
@@ -1298,43 +1272,24 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1298 </packing> 1272 </packing>
1299 </child> 1273 </child>
1300 <child> 1274 <child>
1301 <widget class="GtkRadioButton" id="scopeRecursiveButton"> 1275 <widget class="GtkCheckButton" id="doExtractCheckButton">
1302 <property name="visible">True</property>
1303 <property name="can_focus">True</property>
1304 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1305 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1306 <property name="use_underline">True</property>
1307 <property name="response_id">0</property>
1308 <property name="draw_indicator">True</property>
1309 </widget>
1310 <packing>
1311 <property name="left_attach">2</property>
1312 <property name="right_attach">3</property>
1313 <property name="top_attach">1</property>
1314 <property name="bottom_attach">2</property>
1315 <property name="x_options">GTK_FILL</property>
1316 <property name="y_options"></property>
1317 </packing>
1318 </child>
1319 <child>
1320 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1321 <property name="visible">True</property> 1276 <property name="visible">True</property>
1322 <property name="can_focus">True</property> 1277 <property name="can_focus">True</property>
1323 <property name="tooltip" translatable="yes">Should it be possible to directly find files in the directory? If unchecked, it will only be possible for the directory itself to be found with a normal keyword search. This option only really makes a difference for uploads of directories.</property> 1278 <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>
1324 <property name="response_id">0</property> 1279 <property name="response_id">0</property>
1325 <property name="active">True</property> 1280 <property name="active">True</property>
1326 <property name="draw_indicator">True</property> 1281 <property name="draw_indicator">True</property>
1327 <child> 1282 <child>
1328 <widget class="GtkAlignment" id="alignment15"> 1283 <widget class="GtkAlignment" id="alignment24">
1329 <property name="visible">True</property> 1284 <property name="visible">True</property>
1330 <property name="xscale">0</property> 1285 <property name="xscale">0</property>
1331 <property name="yscale">0</property> 1286 <property name="yscale">0</property>
1332 <child> 1287 <child>
1333 <widget class="GtkHBox" id="hbox52"> 1288 <widget class="GtkHBox" id="hbox66">
1334 <property name="visible">True</property> 1289 <property name="visible">True</property>
1335 <property name="spacing">2</property> 1290 <property name="spacing">2</property>
1336 <child> 1291 <child>
1337 <widget class="GtkImage" id="image40"> 1292 <widget class="GtkImage" id="image49">
1338 <property name="visible">True</property> 1293 <property name="visible">True</property>
1339 <property name="stock">gtk-index</property> 1294 <property name="stock">gtk-index</property>
1340 </widget> 1295 </widget>
@@ -1344,9 +1299,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1344 </packing> 1299 </packing>
1345 </child> 1300 </child>
1346 <child> 1301 <child>
1347 <widget class="GtkLabel" id="label128"> 1302 <widget class="GtkLabel" id="label151">
1348 <property name="visible">True</property> 1303 <property name="visible">True</property>
1349 <property name="label" translatable="yes">Add keywords for files in directories</property> 1304 <property name="label" translatable="yes">Use libextractor for files in directories</property>
1350 <property name="use_underline">True</property> 1305 <property name="use_underline">True</property>
1351 </widget> 1306 </widget>
1352 <packing> 1307 <packing>
@@ -1363,28 +1318,48 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1363 <packing> 1318 <packing>
1364 <property name="left_attach">2</property> 1319 <property name="left_attach">2</property>
1365 <property name="right_attach">3</property> 1320 <property name="right_attach">3</property>
1366 <property name="top_attach">2</property> 1321 <property name="top_attach">3</property>
1367 <property name="bottom_attach">3</property> 1322 <property name="bottom_attach">4</property>
1368 <property name="x_options">GTK_FILL</property> 1323 <property name="x_options">GTK_FILL</property>
1369 <property name="y_options"></property> 1324 <property name="y_options"></property>
1370 </packing> 1325 </packing>
1371 </child> 1326 </child>
1372 <child> 1327 <child>
1373 <widget class="GtkButton" id="fsinsertuploadbutton"> 1328 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1374 <property name="visible">True</property> 1329 <property name="visible">True</property>
1375 <property name="sensitive">False</property>
1376 <property name="can_focus">True</property> 1330 <property name="can_focus">True</property>
1377 <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> 1331 <property name="tooltip" translatable="yes">Only publish a single file</property>
1332 <property name="label" translatable="yes">File onl_y</property>
1333 <property name="use_underline">True</property>
1378 <property name="response_id">0</property> 1334 <property name="response_id">0</property>
1379 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/> 1335 <property name="active">True</property>
1336 <property name="draw_indicator">True</property>
1337 <property name="group">scopeRecursiveButton</property>
1338 </widget>
1339 <packing>
1340 <property name="left_attach">1</property>
1341 <property name="right_attach">2</property>
1342 <property name="top_attach">1</property>
1343 <property name="bottom_attach">2</property>
1344 <property name="x_options">GTK_FILL</property>
1345 <property name="y_options"></property>
1346 </packing>
1347 </child>
1348 <child>
1349 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton">
1350 <property name="visible">True</property>
1351 <property name="can_focus">True</property>
1352 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property>
1353 <property name="response_id">0</property>
1354 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/>
1380 <child> 1355 <child>
1381 <widget class="GtkHBox" id="hbox55"> 1356 <widget class="GtkHBox" id="hbox60">
1382 <property name="visible">True</property> 1357 <property name="visible">True</property>
1383 <property name="spacing">2</property> 1358 <property name="spacing">2</property>
1384 <child> 1359 <child>
1385 <widget class="GtkImage" id="image42"> 1360 <widget class="GtkImage" id="image46">
1386 <property name="visible">True</property> 1361 <property name="visible">True</property>
1387 <property name="stock">gtk-go-up</property> 1362 <property name="stock">gtk-open</property>
1388 </widget> 1363 </widget>
1389 <packing> 1364 <packing>
1390 <property name="expand">False</property> 1365 <property name="expand">False</property>
@@ -1392,9 +1367,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1392 </packing> 1367 </packing>
1393 </child> 1368 </child>
1394 <child> 1369 <child>
1395 <widget class="GtkLabel" id="label137"> 1370 <widget class="GtkLabel" id="label143">
1396 <property name="visible">True</property> 1371 <property name="visible">True</property>
1397 <property name="label" translatable="yes">Pub_lish</property> 1372 <property name="label" translatable="yes">_Browse</property>
1398 <property name="use_underline">True</property> 1373 <property name="use_underline">True</property>
1399 </widget> 1374 </widget>
1400 <packing> 1375 <packing>
@@ -1409,26 +1384,32 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1409 <packing> 1384 <packing>
1410 <property name="left_attach">2</property> 1385 <property name="left_attach">2</property>
1411 <property name="right_attach">3</property> 1386 <property name="right_attach">3</property>
1412 <property name="top_attach">5</property> 1387 <property name="top_attach">4</property>
1413 <property name="bottom_attach">6</property> 1388 <property name="bottom_attach">5</property>
1414 <property name="x_options">GTK_FILL</property> 1389 <property name="x_options">GTK_FILL</property>
1415 <property name="y_options"></property> 1390 <property name="y_options"></property>
1416 </packing> 1391 </packing>
1417 </child> 1392 </child>
1418 <child> 1393 <child>
1419 <widget class="GtkLabel" id="uploadFilenameLabel"> 1394 <widget class="GtkAlignment" id="uploadFilenameAlignment">
1420 <property name="visible">True</property> 1395 <property name="visible">True</property>
1421 <property name="xalign">0</property> 1396 <child>
1422 <property name="xpad">5</property> 1397 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry">
1423 <property name="label" translatable="yes">_Filename:</property> 1398 <property name="visible">True</property>
1424 <property name="use_underline">True</property> 1399 <property name="can_focus">True</property>
1425 <property name="justify">GTK_JUSTIFY_CENTER</property> 1400 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/>
1426 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property> 1401 <child internal-child="entry">
1402 <widget class="GtkEntry" id="comboboxentry-entry3">
1403 </widget>
1404 </child>
1405 </widget>
1406 </child>
1427 </widget> 1407 </widget>
1428 <packing> 1408 <packing>
1409 <property name="left_attach">1</property>
1410 <property name="right_attach">2</property>
1429 <property name="top_attach">4</property> 1411 <property name="top_attach">4</property>
1430 <property name="bottom_attach">5</property> 1412 <property name="bottom_attach">5</property>
1431 <property name="x_options">GTK_FILL</property>
1432 <property name="y_options"></property> 1413 <property name="y_options"></property>
1433 </packing> 1414 </packing>
1434 </child> 1415 </child>
@@ -1448,43 +1429,38 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1448 </packing> 1429 </packing>
1449 </child> 1430 </child>
1450 <child> 1431 <child>
1451 <widget class="GtkAlignment" id="uploadFilenameAlignment"> 1432 <widget class="GtkLabel" id="uploadFilenameLabel">
1452 <property name="visible">True</property> 1433 <property name="visible">True</property>
1453 <child> 1434 <property name="xalign">0</property>
1454 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry"> 1435 <property name="xpad">5</property>
1455 <property name="visible">True</property> 1436 <property name="label" translatable="yes">_Filename:</property>
1456 <property name="can_focus">True</property> 1437 <property name="use_underline">True</property>
1457 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/> 1438 <property name="justify">GTK_JUSTIFY_CENTER</property>
1458 <child internal-child="entry"> 1439 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
1459 <widget class="GtkEntry" id="comboboxentry-entry3">
1460 </widget>
1461 </child>
1462 </widget>
1463 </child>
1464 </widget> 1440 </widget>
1465 <packing> 1441 <packing>
1466 <property name="left_attach">1</property>
1467 <property name="right_attach">2</property>
1468 <property name="top_attach">4</property> 1442 <property name="top_attach">4</property>
1469 <property name="bottom_attach">5</property> 1443 <property name="bottom_attach">5</property>
1444 <property name="x_options">GTK_FILL</property>
1470 <property name="y_options"></property> 1445 <property name="y_options"></property>
1471 </packing> 1446 </packing>
1472 </child> 1447 </child>
1473 <child> 1448 <child>
1474 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton"> 1449 <widget class="GtkButton" id="fsinsertuploadbutton">
1475 <property name="visible">True</property> 1450 <property name="visible">True</property>
1451 <property name="sensitive">False</property>
1476 <property name="can_focus">True</property> 1452 <property name="can_focus">True</property>
1477 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property> 1453 <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>
1478 <property name="response_id">0</property> 1454 <property name="response_id">0</property>
1479 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/> 1455 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/>
1480 <child> 1456 <child>
1481 <widget class="GtkHBox" id="hbox60"> 1457 <widget class="GtkHBox" id="hbox55">
1482 <property name="visible">True</property> 1458 <property name="visible">True</property>
1483 <property name="spacing">2</property> 1459 <property name="spacing">2</property>
1484 <child> 1460 <child>
1485 <widget class="GtkImage" id="image46"> 1461 <widget class="GtkImage" id="image42">
1486 <property name="visible">True</property> 1462 <property name="visible">True</property>
1487 <property name="stock">gtk-open</property> 1463 <property name="stock">gtk-go-up</property>
1488 </widget> 1464 </widget>
1489 <packing> 1465 <packing>
1490 <property name="expand">False</property> 1466 <property name="expand">False</property>
@@ -1492,9 +1468,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1492 </packing> 1468 </packing>
1493 </child> 1469 </child>
1494 <child> 1470 <child>
1495 <widget class="GtkLabel" id="label143"> 1471 <widget class="GtkLabel" id="label137">
1496 <property name="visible">True</property> 1472 <property name="visible">True</property>
1497 <property name="label" translatable="yes">_Browse</property> 1473 <property name="label" translatable="yes">Pub_lish</property>
1498 <property name="use_underline">True</property> 1474 <property name="use_underline">True</property>
1499 </widget> 1475 </widget>
1500 <packing> 1476 <packing>
@@ -1509,52 +1485,31 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1509 <packing> 1485 <packing>
1510 <property name="left_attach">2</property> 1486 <property name="left_attach">2</property>
1511 <property name="right_attach">3</property> 1487 <property name="right_attach">3</property>
1512 <property name="top_attach">4</property> 1488 <property name="top_attach">5</property>
1513 <property name="bottom_attach">5</property> 1489 <property name="bottom_attach">6</property>
1514 <property name="x_options">GTK_FILL</property>
1515 <property name="y_options"></property>
1516 </packing>
1517 </child>
1518 <child>
1519 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1520 <property name="visible">True</property>
1521 <property name="can_focus">True</property>
1522 <property name="tooltip" translatable="yes">Only publish a single file</property>
1523 <property name="label" translatable="yes">File onl_y</property>
1524 <property name="use_underline">True</property>
1525 <property name="response_id">0</property>
1526 <property name="active">True</property>
1527 <property name="draw_indicator">True</property>
1528 <property name="group">scopeRecursiveButton</property>
1529 </widget>
1530 <packing>
1531 <property name="left_attach">1</property>
1532 <property name="right_attach">2</property>
1533 <property name="top_attach">1</property>
1534 <property name="bottom_attach">2</property>
1535 <property name="x_options">GTK_FILL</property> 1490 <property name="x_options">GTK_FILL</property>
1536 <property name="y_options"></property> 1491 <property name="y_options"></property>
1537 </packing> 1492 </packing>
1538 </child> 1493 </child>
1539 <child> 1494 <child>
1540 <widget class="GtkCheckButton" id="doExtractCheckButton"> 1495 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1541 <property name="visible">True</property> 1496 <property name="visible">True</property>
1542 <property name="can_focus">True</property> 1497 <property name="can_focus">True</property>
1543 <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> 1498 <property name="tooltip" translatable="yes">Should it be possible to directly find files in the directory? If unchecked, it will only be possible for the directory itself to be found with a normal keyword search. This option only really makes a difference for uploads of directories.</property>
1544 <property name="response_id">0</property> 1499 <property name="response_id">0</property>
1545 <property name="active">True</property> 1500 <property name="active">True</property>
1546 <property name="draw_indicator">True</property> 1501 <property name="draw_indicator">True</property>
1547 <child> 1502 <child>
1548 <widget class="GtkAlignment" id="alignment24"> 1503 <widget class="GtkAlignment" id="alignment15">
1549 <property name="visible">True</property> 1504 <property name="visible">True</property>
1550 <property name="xscale">0</property> 1505 <property name="xscale">0</property>
1551 <property name="yscale">0</property> 1506 <property name="yscale">0</property>
1552 <child> 1507 <child>
1553 <widget class="GtkHBox" id="hbox66"> 1508 <widget class="GtkHBox" id="hbox52">
1554 <property name="visible">True</property> 1509 <property name="visible">True</property>
1555 <property name="spacing">2</property> 1510 <property name="spacing">2</property>
1556 <child> 1511 <child>
1557 <widget class="GtkImage" id="image49"> 1512 <widget class="GtkImage" id="image40">
1558 <property name="visible">True</property> 1513 <property name="visible">True</property>
1559 <property name="stock">gtk-index</property> 1514 <property name="stock">gtk-index</property>
1560 </widget> 1515 </widget>
@@ -1564,9 +1519,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1564 </packing> 1519 </packing>
1565 </child> 1520 </child>
1566 <child> 1521 <child>
1567 <widget class="GtkLabel" id="label151"> 1522 <widget class="GtkLabel" id="label128">
1568 <property name="visible">True</property> 1523 <property name="visible">True</property>
1569 <property name="label" translatable="yes">Use libextractor for files in directories</property> 1524 <property name="label" translatable="yes">Add keywords for files in directories</property>
1570 <property name="use_underline">True</property> 1525 <property name="use_underline">True</property>
1571 </widget> 1526 </widget>
1572 <packing> 1527 <packing>
@@ -1583,33 +1538,40 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1583 <packing> 1538 <packing>
1584 <property name="left_attach">2</property> 1539 <property name="left_attach">2</property>
1585 <property name="right_attach">3</property> 1540 <property name="right_attach">3</property>
1586 <property name="top_attach">3</property> 1541 <property name="top_attach">2</property>
1587 <property name="bottom_attach">4</property> 1542 <property name="bottom_attach">3</property>
1588 <property name="x_options">GTK_FILL</property> 1543 <property name="x_options">GTK_FILL</property>
1589 <property name="y_options"></property> 1544 <property name="y_options"></property>
1590 </packing> 1545 </packing>
1591 </child> 1546 </child>
1592 <child> 1547 <child>
1593 <widget class="GtkAlignment" id="alignment7"> 1548 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1549 <property name="visible">True</property>
1550 <property name="can_focus">True</property>
1551 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1552 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1553 <property name="use_underline">True</property>
1554 <property name="response_id">0</property>
1555 <property name="draw_indicator">True</property>
1556 </widget>
1557 <packing>
1558 <property name="left_attach">2</property>
1559 <property name="right_attach">3</property>
1560 <property name="top_attach">1</property>
1561 <property name="bottom_attach">2</property>
1562 <property name="x_options">GTK_FILL</property>
1563 <property name="y_options"></property>
1564 </packing>
1565 </child>
1566 <child>
1567 <widget class="GtkLabel" id="anonymityUploadLabel">
1594 <property name="visible">True</property> 1568 <property name="visible">True</property>
1595 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1596 <property name="xalign">0</property> 1569 <property name="xalign">0</property>
1597 <property name="xscale">0</property> 1570 <property name="xpad">5</property>
1598 <child> 1571 <property name="label" translatable="yes">_Anonymity:</property>
1599 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton"> 1572 <property name="use_underline">True</property>
1600 <property name="visible">True</property>
1601 <property name="can_focus">True</property>
1602 <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>
1603 <property name="adjustment">1 0 10000 1 10 10</property>
1604 <property name="climb_rate">1</property>
1605 <property name="numeric">True</property>
1606 <signal name="value_changed" handler="on_anonymity_spin_changed_"/>
1607 </widget>
1608 </child>
1609 </widget> 1573 </widget>
1610 <packing> 1574 <packing>
1611 <property name="left_attach">1</property>
1612 <property name="right_attach">2</property>
1613 <property name="top_attach">2</property> 1575 <property name="top_attach">2</property>
1614 <property name="bottom_attach">3</property> 1576 <property name="bottom_attach">3</property>
1615 <property name="x_options">GTK_FILL</property> 1577 <property name="x_options">GTK_FILL</property>
@@ -1617,28 +1579,67 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1617 </packing> 1579 </packing>
1618 </child> 1580 </child>
1619 <child> 1581 <child>
1620 <widget class="GtkAlignment" id="alignment8"> 1582 <widget class="GtkLabel" id="scopeLabel">
1621 <property name="visible">True</property> 1583 <property name="visible">True</property>
1622 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1623 <property name="xalign">0</property> 1584 <property name="xalign">0</property>
1624 <property name="xscale">0</property> 1585 <property name="xpad">5</property>
1625 <child> 1586 <property name="label" translatable="yes">Scope:</property>
1626 <widget class="GtkSpinButton" id="contentPrioritySpinButton"> 1587 <property name="use_underline">True</property>
1627 <property name="width_request">94</property> 1588 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1628 <property name="visible">True</property> 1589 </widget>
1629 <property name="can_focus">True</property> 1590 <packing>
1630 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property> 1591 <property name="top_attach">1</property>
1631 <property name="adjustment">950 0 100000000 50 500 500</property> 1592 <property name="bottom_attach">2</property>
1632 <property name="climb_rate">500</property> 1593 <property name="x_options">GTK_FILL</property>
1633 <property name="numeric">True</property> 1594 <property name="y_options"></property>
1634 </widget> 1595 </packing>
1635 </child> 1596 </child>
1597 <child>
1598 <widget class="GtkRadioButton" id="insertButton">
1599 <property name="visible">True</property>
1600 <property name="can_focus">True</property>
1601 <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>
1602 <property name="label" translatable="yes">I_nsert</property>
1603 <property name="use_underline">True</property>
1604 <property name="response_id">0</property>
1605 <property name="draw_indicator">True</property>
1606 <property name="group">indexbutton</property>
1607 </widget>
1608 <packing>
1609 <property name="left_attach">2</property>
1610 <property name="right_attach">3</property>
1611 <property name="x_options">GTK_FILL</property>
1612 <property name="y_options"></property>
1613 </packing>
1614 </child>
1615 <child>
1616 <widget class="GtkRadioButton" id="indexbutton">
1617 <property name="visible">True</property>
1618 <property name="can_focus">True</property>
1619 <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>
1620 <property name="label" translatable="yes">Inde_x</property>
1621 <property name="use_underline">True</property>
1622 <property name="response_id">0</property>
1623 <property name="active">True</property>
1624 <property name="draw_indicator">True</property>
1636 </widget> 1625 </widget>
1637 <packing> 1626 <packing>
1638 <property name="left_attach">1</property> 1627 <property name="left_attach">1</property>
1639 <property name="right_attach">2</property> 1628 <property name="right_attach">2</property>
1640 <property name="top_attach">3</property> 1629 <property name="x_options">GTK_FILL</property>
1641 <property name="bottom_attach">4</property> 1630 <property name="y_options"></property>
1631 </packing>
1632 </child>
1633 <child>
1634 <widget class="GtkLabel" id="methodLabel">
1635 <property name="visible">True</property>
1636 <property name="xalign">0</property>
1637 <property name="xpad">5</property>
1638 <property name="label" translatable="yes">Method:</property>
1639 <property name="use_underline">True</property>
1640 <property name="mnemonic_widget">indexbutton</property>
1641 </widget>
1642 <packing>
1642 <property name="x_options">GTK_FILL</property> 1643 <property name="x_options">GTK_FILL</property>
1643 <property name="y_options"></property> 1644 <property name="y_options"></property>
1644 </packing> 1645 </packing>
@@ -2009,6 +2010,51 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2009 <placeholder/> 2010 <placeholder/>
2010 </child> 2011 </child>
2011 <child> 2012 <child>
2013 <widget class="GtkLabel" id="label1">
2014 <property name="visible">True</property>
2015 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2016 <property name="label" translatable="yes">_Room Name</property>
2017 <property name="use_underline">True</property>
2018 <property name="mnemonic_widget">chatRoomNameEntry</property>
2019 </widget>
2020 </child>
2021 <child>
2022 <widget class="GtkLabel" id="label4">
2023 <property name="visible">True</property>
2024 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2025 <property name="label" translatable="yes">_Moniker</property>
2026 <property name="use_underline">True</property>
2027 </widget>
2028 <packing>
2029 <property name="left_attach">1</property>
2030 <property name="right_attach">2</property>
2031 </packing>
2032 </child>
2033 <child>
2034 <widget class="GtkEntry" id="chatRoomNameEntry">
2035 <property name="visible">True</property>
2036 <property name="can_focus">True</property>
2037 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2038 </widget>
2039 <packing>
2040 <property name="top_attach">1</property>
2041 <property name="bottom_attach">2</property>
2042 </packing>
2043 </child>
2044 <child>
2045 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2046 <property name="visible">True</property>
2047 <property name="can_focus">True</property>
2048 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2049 </widget>
2050 <packing>
2051 <property name="left_attach">1</property>
2052 <property name="right_attach">2</property>
2053 <property name="top_attach">1</property>
2054 <property name="bottom_attach">2</property>
2055 </packing>
2056 </child>
2057 <child>
2012 <widget class="GtkButton" id="on_chat_room_name_button"> 2058 <widget class="GtkButton" id="on_chat_room_name_button">
2013 <property name="visible">True</property> 2059 <property name="visible">True</property>
2014 <property name="can_focus">True</property> 2060 <property name="can_focus">True</property>
@@ -2055,51 +2101,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2055 <property name="y_options"></property> 2101 <property name="y_options"></property>
2056 </packing> 2102 </packing>
2057 </child> 2103 </child>
2058 <child>
2059 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2060 <property name="visible">True</property>
2061 <property name="can_focus">True</property>
2062 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2063 </widget>
2064 <packing>
2065 <property name="left_attach">1</property>
2066 <property name="right_attach">2</property>
2067 <property name="top_attach">1</property>
2068 <property name="bottom_attach">2</property>
2069 </packing>
2070 </child>
2071 <child>
2072 <widget class="GtkEntry" id="chatRoomNameEntry">
2073 <property name="visible">True</property>
2074 <property name="can_focus">True</property>
2075 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2076 </widget>
2077 <packing>
2078 <property name="top_attach">1</property>
2079 <property name="bottom_attach">2</property>
2080 </packing>
2081 </child>
2082 <child>
2083 <widget class="GtkLabel" id="label4">
2084 <property name="visible">True</property>
2085 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2086 <property name="label" translatable="yes">_Moniker</property>
2087 <property name="use_underline">True</property>
2088 </widget>
2089 <packing>
2090 <property name="left_attach">1</property>
2091 <property name="right_attach">2</property>
2092 </packing>
2093 </child>
2094 <child>
2095 <widget class="GtkLabel" id="label1">
2096 <property name="visible">True</property>
2097 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2098 <property name="label" translatable="yes">_Room Name</property>
2099 <property name="use_underline">True</property>
2100 <property name="mnemonic_widget">chatRoomNameEntry</property>
2101 </widget>
2102 </child>
2103 </widget> 2104 </widget>
2104 <packing> 2105 <packing>
2105 <property name="expand">False</property> 2106 <property name="expand">False</property>
@@ -4811,9 +4812,9 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
4811 <property name="modal">True</property> 4812 <property name="modal">True</property>
4812 <property name="icon_name">gtk-save-as</property> 4813 <property name="icon_name">gtk-save-as</property>
4813 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> 4814 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4815 <property name="do_overwrite_confirmation">True</property>
4814 <property name="show_hidden">True</property> 4816 <property name="show_hidden">True</property>
4815 <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property> 4817 <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
4816 <property name="do_overwrite_confirmation">True</property>
4817 <child internal-child="vbox"> 4818 <child internal-child="vbox">
4818 <widget class="GtkVBox" id="dialog-vbox7"> 4819 <widget class="GtkVBox" id="dialog-vbox7">
4819 <property name="visible">True</property> 4820 <property name="visible">True</property>
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index b9506106..93a173be 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -343,6 +343,7 @@ fs_summary_start ()
343 GtkTreeViewColumn *column; 343 GtkTreeViewColumn *column;
344 int col; 344 int col;
345 GladeXML *contextMenuXML; 345 GladeXML *contextMenuXML;
346 GtkTreeIter iter;
346 347
347 /* keyword list setup */ 348 /* keyword list setup */
348 searchCB 349 searchCB
@@ -365,6 +366,13 @@ fs_summary_start ()
365 G_TYPE_STRING, /* GNUNET_EncName of namespace */ 366 G_TYPE_STRING, /* GNUNET_EncName of namespace */
366 G_TYPE_POINTER, /* ECRS MetaData */ 367 G_TYPE_POINTER, /* ECRS MetaData */
367 G_TYPE_INT); /* Meta-data about namespace */ 368 G_TYPE_INT); /* Meta-data about namespace */
369 gtk_list_store_append (model, &iter);
370 gtk_list_store_set (model,
371 &iter,
372 NS_SEARCH_DESCRIPTION, _("globally"),
373 NS_SEARCH_NAME, _("globally"),
374 NS_SEARCH_METADATA, NULL,
375 NS_SEARCH_RATING, 0, -1);
368 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model)); 376 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
369 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION); 377 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
370 378
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 0385a68b..5ac91a80 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -71,9 +71,11 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
71 NS_SEARCH_DESCRIPTION, &description, 71 NS_SEARCH_DESCRIPTION, &description,
72 NS_SEARCH_NAME, &nsName, 72 NS_SEARCH_NAME, &nsName,
73 NS_SEARCH_RATING, &rating, -1); 73 NS_SEARCH_RATING, &rating, -1);
74 if ((description != NULL) && (0 == strcmp (description, ""))) 74 if ((description != NULL) &&
75 ( (0 == strcmp (description, "")) ||
76 (0 == strcmp (description, _("globally")))))
75 { 77 {
76 /* just to be sure */ 78 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
77 gtk_widget_set_sensitive (spin, FALSE); 79 gtk_widget_set_sensitive (spin, FALSE);
78 } 80 }
79 else 81 else
@@ -100,8 +102,6 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
100 } 102 }
101 else 103 else
102 { 104 {
103 /* FIXME: if GNUNET_enc_to_hash succeeds, we may want to keep this
104 active */
105 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0); 105 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
106 gtk_widget_set_sensitive (spin, FALSE); 106 gtk_widget_set_sensitive (spin, FALSE);
107 } 107 }
@@ -150,7 +150,9 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
150 NS_SEARCH_DESCRIPTION, &descStr, 150 NS_SEARCH_DESCRIPTION, &descStr,
151 NS_SEARCH_NAME, &nsName, 151 NS_SEARCH_NAME, &nsName,
152 NS_SEARCH_RATING, &rating, -1); 152 NS_SEARCH_RATING, &rating, -1);
153 if ((descStr != NULL) && (0 == strcmp (descStr, ""))) 153 if ((descStr != NULL) &&
154 ( (0 == strcmp (descStr, "")) ||
155 (0 == strcmp (descStr, _("globally"))) ) )
154 { 156 {
155 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0); 157 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
156 gtk_widget_set_sensitive (spin, FALSE); 158 gtk_widget_set_sensitive (spin, FALSE);
@@ -184,8 +186,6 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
184 } 186 }
185 else 187 else
186 { 188 {
187 /* FIXME: may still be namespace selected --
188 where user manually entered NS name! */
189 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0); 189 gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
190 gtk_widget_set_sensitive (spin, FALSE); 190 gtk_widget_set_sensitive (spin, FALSE);
191 } 191 }
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index deff31da..f789e43f 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1119,7 +1119,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
1119 NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME, 1119 NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME,
1120 &nsName, -1); 1120 &nsName, -1);
1121 1121
1122 if ((descStr != NULL) && (0 == strcmp (descStr, ""))) 1122 if ((descStr != NULL) &&
1123 ( (0 == strcmp (descStr, "")) ||
1124 (0 == strcmp (descStr, _("globally")))))
1123 { 1125 {
1124 nsName = NULL; 1126 nsName = NULL;
1125 } 1127 }
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-20 04:41:43 +0000