aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-07-19 08:46:15 +0000
committerChristian Grothoff <christian@grothoff.org>2008-07-19 08:46:15 +0000
commit82c38ddaa2135df1b29f851a9c4223d6c17ccfb0 (patch)
tree18804c385b17e5a20104dc9d70e0d5db8868f1fa
parent4c1b48d1e8256fbbfed5451bba14c2ab869454a1 (diff)
downloadgnunet-gtk-82c38ddaa2135df1b29f851a9c4223d6c17ccfb0.tar.gz
gnunet-gtk-82c38ddaa2135df1b29f851a9c4223d6c17ccfb0.zip
fixing double-destruction of meta data dialog and adding meta data info entry to download summary menu
-rw-r--r--TODO1
-rw-r--r--gnunet-gtk.glade749
-rw-r--r--src/plugins/fs/meta.c5
3 files changed, 380 insertions, 375 deletions
diff --git a/TODO b/TODO
index c1986a56..1ec89305 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@ This is just the current plan, plans change.
5 * show content of current collection somewhere 5 * show content of current collection somewhere
6 * add 'publish now' button / menu entry 6 * add 'publish now' button / menu entry
7- improved download 7- improved download
8 * show metadata pop-up menu for downloads in summary
9 * copy-URI to clipboard in pop-up menu for downloads in summary 8 * copy-URI to clipboard in pop-up menu for downloads in summary
10 * allow renaming of downloaded files (#914 / #1073) 9 * allow renaming of downloaded files (#914 / #1073)
11 * visualize download progress (#918) 10 * visualize download progress (#918)
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 85bdf175..ffd04bf3 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -790,43 +790,80 @@ This release adds context-menus (right-click) which allow copying the URI of sea
790 <placeholder/> 790 <placeholder/>
791 </child> 791 </child>
792 <child> 792 <child>
793 <widget class="GtkVBox" id="vbox21"> 793 <widget class="GtkScrolledWindow" id="scrolledwindow10">
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">
794 <property name="visible">True</property> 816 <property name="visible">True</property>
795 <property name="homogeneous">True</property> 817 <property name="homogeneous">True</property>
796 <child> 818 <child>
797 <widget class="GtkButton" id="stopUploadButton"> 819 <widget class="GtkButton" id="abortDownloadButton">
798 <property name="visible">True</property> 820 <property name="visible">True</property>
799 <property name="sensitive">False</property> 821 <property name="sensitive">False</property>
800 <property name="can_focus">True</property> 822 <property name="can_focus">True</property>
801 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</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>
836 <property name="sensitive">False</property>
837 <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="label">gtk-stop</property> 839 <property name="label">gtk-stop</property>
803 <property name="use_stock">True</property> 840 <property name="use_stock">True</property>
804 <property name="response_id">0</property> 841 <property name="response_id">0</property>
805 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/> 842 <signal name="clicked" handler="on_stopDownload_clicked_"/>
806 </widget> 843 </widget>
807 <packing> 844 <packing>
808 <property name="expand">False</property>
809 <property name="fill">False</property> 845 <property name="fill">False</property>
846 <property name="position">1</property>
810 </packing> 847 </packing>
811 </child> 848 </child>
812 <child> 849 <child>
813 <widget class="GtkButton" id="clearCompletedUploadsButton"> 850 <widget class="GtkButton" id="clearCompletedDownloadsButton">
814 <property name="visible">True</property> 851 <property name="visible">True</property>
815 <property name="can_focus">True</property> 852 <property name="can_focus">True</property>
816 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property> 853 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property>
817 <property name="response_id">0</property> 854 <property name="response_id">0</property>
818 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/> 855 <signal name="clicked" handler="on_clearCompletedDownloads_clicked_"/>
819 <child> 856 <child>
820 <widget class="GtkAlignment" id="alignment4"> 857 <widget class="GtkAlignment" id="alignment3">
821 <property name="visible">True</property> 858 <property name="visible">True</property>
822 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="xscale">0</property> 860 <property name="xscale">0</property>
824 <child> 861 <child>
825 <widget class="GtkHBox" id="hbox5"> 862 <widget class="GtkHBox" id="hbox4">
826 <property name="visible">True</property> 863 <property name="visible">True</property>
827 <property name="spacing">2</property> 864 <property name="spacing">2</property>
828 <child> 865 <child>
829 <widget class="GtkImage" id="image4"> 866 <widget class="GtkImage" id="image3">
830 <property name="visible">True</property> 867 <property name="visible">True</property>
831 <property name="stock">gtk-clear</property> 868 <property name="stock">gtk-clear</property>
832 </widget> 869 </widget>
@@ -836,7 +873,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
836 </packing> 873 </packing>
837 </child> 874 </child>
838 <child> 875 <child>
839 <widget class="GtkLabel" id="label2"> 876 <widget class="GtkLabel" id="label5">
840 <property name="visible">True</property> 877 <property name="visible">True</property>
841 <property name="label" translatable="yes">_Clean</property> 878 <property name="label" translatable="yes">_Clean</property>
842 <property name="use_underline">True</property> 879 <property name="use_underline">True</property>
@@ -853,85 +890,22 @@ This release adds context-menus (right-click) which allow copying the URI of sea
853 </child> 890 </child>
854 </widget> 891 </widget>
855 <packing> 892 <packing>
893 <property name="expand">False</property>
856 <property name="fill">False</property> 894 <property name="fill">False</property>
857 <property name="position">1</property> 895 <property name="position">2</property>
858 </packing> 896 </packing>
859 </child> 897 </child>
860 </widget> 898 </widget>
861 <packing> 899 <packing>
862 <property name="left_attach">1</property> 900 <property name="left_attach">1</property>
863 <property name="right_attach">2</property> 901 <property name="right_attach">2</property>
864 <property name="top_attach">4</property> 902 <property name="top_attach">1</property>
865 <property name="bottom_attach">5</property> 903 <property name="bottom_attach">2</property>
866 <property name="x_options">GTK_FILL</property> 904 <property name="x_options">GTK_FILL</property>
867 <property name="x_padding">5</property> 905 <property name="x_padding">5</property>
868 </packing> 906 </packing>
869 </child> 907 </child>
870 <child> 908 <child>
871 <widget class="GtkAlignment" id="alignment14">
872 <property name="visible">True</property>
873 <property name="top_padding">5</property>
874 <child>
875 <widget class="GtkLabel" id="label46">
876 <property name="visible">True</property>
877 <property name="xalign">0</property>
878 <property name="xpad">5</property>
879 <property name="ypad">5</property>
880 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
881 <property name="use_markup">True</property>
882 </widget>
883 </child>
884 </widget>
885 <packing>
886 <property name="right_attach">2</property>
887 <property name="top_attach">3</property>
888 <property name="bottom_attach">4</property>
889 <property name="y_options">GTK_FILL</property>
890 </packing>
891 </child>
892 <child>
893 <widget class="GtkAlignment" id="alignment11">
894 <property name="visible">True</property>
895 <property name="top_padding">5</property>
896 <child>
897 <widget class="GtkLabel" id="label45">
898 <property name="visible">True</property>
899 <property name="xalign">0</property>
900 <property name="xpad">5</property>
901 <property name="ypad">5</property>
902 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
903 <property name="use_markup">True</property>
904 </widget>
905 </child>
906 </widget>
907 <packing>
908 <property name="right_attach">2</property>
909 <property name="y_options">GTK_FILL</property>
910 </packing>
911 </child>
912 <child>
913 <widget class="GtkScrolledWindow" id="scrolledwindow8">
914 <property name="visible">True</property>
915 <property name="can_focus">False</property>
916 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
917 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
918 <property name="shadow_type">GTK_SHADOW_IN</property>
919 <child>
920 <widget class="GtkTreeView" id="activeUploadsList">
921 <property name="visible">True</property>
922 <property name="can_focus">True</property>
923 <property name="reorderable">True</property>
924 <property name="rules_hint">True</property>
925 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/>
926 </widget>
927 </child>
928 </widget>
929 <packing>
930 <property name="top_attach">4</property>
931 <property name="bottom_attach">5</property>
932 </packing>
933 </child>
934 <child>
935 <widget class="GtkHBox" id="hbox1"> 909 <widget class="GtkHBox" id="hbox1">
936 <property name="visible">True</property> 910 <property name="visible">True</property>
937 <child> 911 <child>
@@ -1047,58 +1021,107 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1047 </packing> 1021 </packing>
1048 </child> 1022 </child>
1049 <child> 1023 <child>
1050 <widget class="GtkVBox" id="vbox8"> 1024 <widget class="GtkScrolledWindow" id="scrolledwindow8">
1051 <property name="visible">True</property> 1025 <property name="visible">True</property>
1052 <property name="homogeneous">True</property> 1026 <property name="can_focus">False</property>
1027 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1028 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1029 <property name="shadow_type">GTK_SHADOW_IN</property>
1053 <child> 1030 <child>
1054 <widget class="GtkButton" id="abortDownloadButton"> 1031 <widget class="GtkTreeView" id="activeUploadsList">
1055 <property name="visible">True</property> 1032 <property name="visible">True</property>
1056 <property name="sensitive">False</property>
1057 <property name="can_focus">True</property> 1033 <property name="can_focus">True</property>
1058 <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and delete incomplete download files</property> 1034 <property name="reorderable">True</property>
1059 <property name="label">gtk-delete</property> 1035 <property name="rules_hint">True</property>
1060 <property name="use_stock">True</property> 1036 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/>
1061 <property name="response_id">0</property> 1037 </widget>
1062 <signal name="clicked" handler="on_abortDownload_clicked_"/> 1038 </child>
1039 </widget>
1040 <packing>
1041 <property name="top_attach">4</property>
1042 <property name="bottom_attach">5</property>
1043 </packing>
1044 </child>
1045 <child>
1046 <widget class="GtkAlignment" id="alignment11">
1047 <property name="visible">True</property>
1048 <property name="top_padding">5</property>
1049 <child>
1050 <widget class="GtkLabel" id="label45">
1051 <property name="visible">True</property>
1052 <property name="xalign">0</property>
1053 <property name="xpad">5</property>
1054 <property name="ypad">5</property>
1055 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
1056 <property name="use_markup">True</property>
1063 </widget> 1057 </widget>
1064 <packing>
1065 <property name="fill">False</property>
1066 </packing>
1067 </child> 1058 </child>
1059 </widget>
1060 <packing>
1061 <property name="right_attach">2</property>
1062 <property name="y_options">GTK_FILL</property>
1063 </packing>
1064 </child>
1065 <child>
1066 <widget class="GtkAlignment" id="alignment14">
1067 <property name="visible">True</property>
1068 <property name="top_padding">5</property>
1068 <child> 1069 <child>
1069 <widget class="GtkButton" id="stopDownloadButton"> 1070 <widget class="GtkLabel" id="label46">
1071 <property name="visible">True</property>
1072 <property name="xalign">0</property>
1073 <property name="xpad">5</property>
1074 <property name="ypad">5</property>
1075 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
1076 <property name="use_markup">True</property>
1077 </widget>
1078 </child>
1079 </widget>
1080 <packing>
1081 <property name="right_attach">2</property>
1082 <property name="top_attach">3</property>
1083 <property name="bottom_attach">4</property>
1084 <property name="y_options">GTK_FILL</property>
1085 </packing>
1086 </child>
1087 <child>
1088 <widget class="GtkVBox" id="vbox21">
1089 <property name="visible">True</property>
1090 <property name="homogeneous">True</property>
1091 <child>
1092 <widget class="GtkButton" id="stopUploadButton">
1070 <property name="visible">True</property> 1093 <property name="visible">True</property>
1071 <property name="sensitive">False</property> 1094 <property name="sensitive">False</property>
1072 <property name="can_focus">True</property> 1095 <property name="can_focus">True</property>
1073 <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> 1096 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property>
1074 <property name="label">gtk-stop</property> 1097 <property name="label">gtk-stop</property>
1075 <property name="use_stock">True</property> 1098 <property name="use_stock">True</property>
1076 <property name="response_id">0</property> 1099 <property name="response_id">0</property>
1077 <signal name="clicked" handler="on_stopDownload_clicked_"/> 1100 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/>
1078 </widget> 1101 </widget>
1079 <packing> 1102 <packing>
1103 <property name="expand">False</property>
1080 <property name="fill">False</property> 1104 <property name="fill">False</property>
1081 <property name="position">1</property>
1082 </packing> 1105 </packing>
1083 </child> 1106 </child>
1084 <child> 1107 <child>
1085 <widget class="GtkButton" id="clearCompletedDownloadsButton"> 1108 <widget class="GtkButton" id="clearCompletedUploadsButton">
1086 <property name="visible">True</property> 1109 <property name="visible">True</property>
1087 <property name="can_focus">True</property> 1110 <property name="can_focus">True</property>
1088 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property> 1111 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property>
1089 <property name="response_id">0</property> 1112 <property name="response_id">0</property>
1090 <signal name="clicked" handler="on_clearCompletedDownloads_clicked_"/> 1113 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/>
1091 <child> 1114 <child>
1092 <widget class="GtkAlignment" id="alignment3"> 1115 <widget class="GtkAlignment" id="alignment4">
1093 <property name="visible">True</property> 1116 <property name="visible">True</property>
1094 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1117 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1095 <property name="xscale">0</property> 1118 <property name="xscale">0</property>
1096 <child> 1119 <child>
1097 <widget class="GtkHBox" id="hbox4"> 1120 <widget class="GtkHBox" id="hbox5">
1098 <property name="visible">True</property> 1121 <property name="visible">True</property>
1099 <property name="spacing">2</property> 1122 <property name="spacing">2</property>
1100 <child> 1123 <child>
1101 <widget class="GtkImage" id="image3"> 1124 <widget class="GtkImage" id="image4">
1102 <property name="visible">True</property> 1125 <property name="visible">True</property>
1103 <property name="stock">gtk-clear</property> 1126 <property name="stock">gtk-clear</property>
1104 </widget> 1127 </widget>
@@ -1108,7 +1131,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1108 </packing> 1131 </packing>
1109 </child> 1132 </child>
1110 <child> 1133 <child>
1111 <widget class="GtkLabel" id="label5"> 1134 <widget class="GtkLabel" id="label2">
1112 <property name="visible">True</property> 1135 <property name="visible">True</property>
1113 <property name="label" translatable="yes">_Clean</property> 1136 <property name="label" translatable="yes">_Clean</property>
1114 <property name="use_underline">True</property> 1137 <property name="use_underline">True</property>
@@ -1125,43 +1148,20 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1125 </child> 1148 </child>
1126 </widget> 1149 </widget>
1127 <packing> 1150 <packing>
1128 <property name="expand">False</property>
1129 <property name="fill">False</property> 1151 <property name="fill">False</property>
1130 <property name="position">2</property> 1152 <property name="position">1</property>
1131 </packing> 1153 </packing>
1132 </child> 1154 </child>
1133 </widget> 1155 </widget>
1134 <packing> 1156 <packing>
1135 <property name="left_attach">1</property> 1157 <property name="left_attach">1</property>
1136 <property name="right_attach">2</property> 1158 <property name="right_attach">2</property>
1137 <property name="top_attach">1</property> 1159 <property name="top_attach">4</property>
1138 <property name="bottom_attach">2</property> 1160 <property name="bottom_attach">5</property>
1139 <property name="x_options">GTK_FILL</property> 1161 <property name="x_options">GTK_FILL</property>
1140 <property name="x_padding">5</property> 1162 <property name="x_padding">5</property>
1141 </packing> 1163 </packing>
1142 </child> 1164 </child>
1143 <child>
1144 <widget class="GtkScrolledWindow" id="scrolledwindow10">
1145 <property name="visible">True</property>
1146 <property name="can_focus">True</property>
1147 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1148 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1149 <property name="shadow_type">GTK_SHADOW_IN</property>
1150 <child>
1151 <widget class="GtkTreeView" id="activeDownloadsList">
1152 <property name="visible">True</property>
1153 <property name="can_focus">True</property>
1154 <property name="reorderable">True</property>
1155 <property name="rules_hint">True</property>
1156 <signal name="button_press_event" handler="on_activeDownloadsList_button_press_"/>
1157 </widget>
1158 </child>
1159 </widget>
1160 <packing>
1161 <property name="top_attach">1</property>
1162 <property name="bottom_attach">2</property>
1163 </packing>
1164 </child>
1165 </widget> 1165 </widget>
1166 <packing> 1166 <packing>
1167 <property name="position">1</property> 1167 <property name="position">1</property>
@@ -1216,52 +1216,80 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1216 <placeholder/> 1216 <placeholder/>
1217 </child> 1217 </child>
1218 <child> 1218 <child>
1219 <widget class="GtkAlignment" id="alignment8"> 1219 <widget class="GtkLabel" id="methodLabel">
1220 <property name="visible">True</property> 1220 <property name="visible">True</property>
1221 <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> 1221 <property name="xalign">0</property>
1223 <property name="xscale">0</property> 1222 <property name="xpad">5</property>
1224 <child> 1223 <property name="label" translatable="yes">Method:</property>
1225 <widget class="GtkSpinButton" id="contentPrioritySpinButton"> 1224 <property name="use_underline">True</property>
1226 <property name="width_request">94</property> 1225 <property name="mnemonic_widget">indexbutton</property>
1227 <property name="visible">True</property> 1226 </widget>
1228 <property name="can_focus">True</property> 1227 <packing>
1229 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property> 1228 <property name="x_options">GTK_FILL</property>
1230 <property name="adjustment">950 0 100000000 50 500 500</property> 1229 <property name="y_options"></property>
1231 <property name="climb_rate">500</property> 1230 </packing>
1232 <property name="numeric">True</property> 1231 </child>
1233 </widget> 1232 <child>
1234 </child> 1233 <widget class="GtkRadioButton" id="indexbutton">
1234 <property name="visible">True</property>
1235 <property name="can_focus">True</property>
1236 <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>
1237 <property name="label" translatable="yes">Inde_x</property>
1238 <property name="use_underline">True</property>
1239 <property name="response_id">0</property>
1240 <property name="active">True</property>
1241 <property name="draw_indicator">True</property>
1235 </widget> 1242 </widget>
1236 <packing> 1243 <packing>
1237 <property name="left_attach">1</property> 1244 <property name="left_attach">1</property>
1238 <property name="right_attach">2</property> 1245 <property name="right_attach">2</property>
1239 <property name="top_attach">3</property>
1240 <property name="bottom_attach">4</property>
1241 <property name="x_options">GTK_FILL</property> 1246 <property name="x_options">GTK_FILL</property>
1242 <property name="y_options"></property> 1247 <property name="y_options"></property>
1243 </packing> 1248 </packing>
1244 </child> 1249 </child>
1245 <child> 1250 <child>
1246 <widget class="GtkAlignment" id="alignment7"> 1251 <widget class="GtkRadioButton" id="insertButton">
1252 <property name="visible">True</property>
1253 <property name="can_focus">True</property>
1254 <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>
1255 <property name="label" translatable="yes">I_nsert</property>
1256 <property name="use_underline">True</property>
1257 <property name="response_id">0</property>
1258 <property name="draw_indicator">True</property>
1259 <property name="group">indexbutton</property>
1260 </widget>
1261 <packing>
1262 <property name="left_attach">2</property>
1263 <property name="right_attach">3</property>
1264 <property name="x_options">GTK_FILL</property>
1265 <property name="y_options"></property>
1266 </packing>
1267 </child>
1268 <child>
1269 <widget class="GtkLabel" id="scopeLabel">
1247 <property name="visible">True</property> 1270 <property name="visible">True</property>
1248 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1249 <property name="xalign">0</property> 1271 <property name="xalign">0</property>
1250 <property name="xscale">0</property> 1272 <property name="xpad">5</property>
1251 <child> 1273 <property name="label" translatable="yes">Scope:</property>
1252 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton"> 1274 <property name="use_underline">True</property>
1253 <property name="visible">True</property> 1275 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1254 <property name="can_focus">True</property> 1276 </widget>
1255 <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> 1277 <packing>
1256 <property name="adjustment">1 0 10000 1 10 10</property> 1278 <property name="top_attach">1</property>
1257 <property name="climb_rate">1</property> 1279 <property name="bottom_attach">2</property>
1258 <property name="numeric">True</property> 1280 <property name="x_options">GTK_FILL</property>
1259 </widget> 1281 <property name="y_options"></property>
1260 </child> 1282 </packing>
1283 </child>
1284 <child>
1285 <widget class="GtkLabel" id="anonymityUploadLabel">
1286 <property name="visible">True</property>
1287 <property name="xalign">0</property>
1288 <property name="xpad">5</property>
1289 <property name="label" translatable="yes">_Anonymity:</property>
1290 <property name="use_underline">True</property>
1261 </widget> 1291 </widget>
1262 <packing> 1292 <packing>
1263 <property name="left_attach">1</property>
1264 <property name="right_attach">2</property>
1265 <property name="top_attach">2</property> 1293 <property name="top_attach">2</property>
1266 <property name="bottom_attach">3</property> 1294 <property name="bottom_attach">3</property>
1267 <property name="x_options">GTK_FILL</property> 1295 <property name="x_options">GTK_FILL</property>
@@ -1269,24 +1297,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1269 </packing> 1297 </packing>
1270 </child> 1298 </child>
1271 <child> 1299 <child>
1272 <widget class="GtkCheckButton" id="doExtractCheckButton"> 1300 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1273 <property name="visible">True</property> 1301 <property name="visible">True</property>
1274 <property name="can_focus">True</property> 1302 <property name="can_focus">True</property>
1275 <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> 1303 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1304 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1305 <property name="use_underline">True</property>
1306 <property name="response_id">0</property>
1307 <property name="draw_indicator">True</property>
1308 </widget>
1309 <packing>
1310 <property name="left_attach">2</property>
1311 <property name="right_attach">3</property>
1312 <property name="top_attach">1</property>
1313 <property name="bottom_attach">2</property>
1314 <property name="x_options">GTK_FILL</property>
1315 <property name="y_options"></property>
1316 </packing>
1317 </child>
1318 <child>
1319 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1320 <property name="visible">True</property>
1321 <property name="can_focus">True</property>
1322 <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>
1276 <property name="response_id">0</property> 1323 <property name="response_id">0</property>
1277 <property name="active">True</property> 1324 <property name="active">True</property>
1278 <property name="draw_indicator">True</property> 1325 <property name="draw_indicator">True</property>
1279 <child> 1326 <child>
1280 <widget class="GtkAlignment" id="alignment24"> 1327 <widget class="GtkAlignment" id="alignment15">
1281 <property name="visible">True</property> 1328 <property name="visible">True</property>
1282 <property name="xscale">0</property> 1329 <property name="xscale">0</property>
1283 <property name="yscale">0</property> 1330 <property name="yscale">0</property>
1284 <child> 1331 <child>
1285 <widget class="GtkHBox" id="hbox66"> 1332 <widget class="GtkHBox" id="hbox52">
1286 <property name="visible">True</property> 1333 <property name="visible">True</property>
1287 <property name="spacing">2</property> 1334 <property name="spacing">2</property>
1288 <child> 1335 <child>
1289 <widget class="GtkImage" id="image49"> 1336 <widget class="GtkImage" id="image40">
1290 <property name="visible">True</property> 1337 <property name="visible">True</property>
1291 <property name="stock">gtk-index</property> 1338 <property name="stock">gtk-index</property>
1292 </widget> 1339 </widget>
@@ -1296,9 +1343,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1296 </packing> 1343 </packing>
1297 </child> 1344 </child>
1298 <child> 1345 <child>
1299 <widget class="GtkLabel" id="label151"> 1346 <widget class="GtkLabel" id="label128">
1300 <property name="visible">True</property> 1347 <property name="visible">True</property>
1301 <property name="label" translatable="yes">Use libextractor for files in directories</property> 1348 <property name="label" translatable="yes">Add keywords for files in directories</property>
1302 <property name="use_underline">True</property> 1349 <property name="use_underline">True</property>
1303 </widget> 1350 </widget>
1304 <packing> 1351 <packing>
@@ -1315,48 +1362,28 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1315 <packing> 1362 <packing>
1316 <property name="left_attach">2</property> 1363 <property name="left_attach">2</property>
1317 <property name="right_attach">3</property> 1364 <property name="right_attach">3</property>
1318 <property name="top_attach">3</property> 1365 <property name="top_attach">2</property>
1319 <property name="bottom_attach">4</property> 1366 <property name="bottom_attach">3</property>
1320 <property name="x_options">GTK_FILL</property>
1321 <property name="y_options"></property>
1322 </packing>
1323 </child>
1324 <child>
1325 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1326 <property name="visible">True</property>
1327 <property name="can_focus">True</property>
1328 <property name="tooltip" translatable="yes">Only publish a single file</property>
1329 <property name="label" translatable="yes">File onl_y</property>
1330 <property name="use_underline">True</property>
1331 <property name="response_id">0</property>
1332 <property name="active">True</property>
1333 <property name="draw_indicator">True</property>
1334 <property name="group">scopeRecursiveButton</property>
1335 </widget>
1336 <packing>
1337 <property name="left_attach">1</property>
1338 <property name="right_attach">2</property>
1339 <property name="top_attach">1</property>
1340 <property name="bottom_attach">2</property>
1341 <property name="x_options">GTK_FILL</property> 1367 <property name="x_options">GTK_FILL</property>
1342 <property name="y_options"></property> 1368 <property name="y_options"></property>
1343 </packing> 1369 </packing>
1344 </child> 1370 </child>
1345 <child> 1371 <child>
1346 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton"> 1372 <widget class="GtkButton" id="fsinsertuploadbutton">
1347 <property name="visible">True</property> 1373 <property name="visible">True</property>
1374 <property name="sensitive">False</property>
1348 <property name="can_focus">True</property> 1375 <property name="can_focus">True</property>
1349 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property> 1376 <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>
1350 <property name="response_id">0</property> 1377 <property name="response_id">0</property>
1351 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/> 1378 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/>
1352 <child> 1379 <child>
1353 <widget class="GtkHBox" id="hbox60"> 1380 <widget class="GtkHBox" id="hbox55">
1354 <property name="visible">True</property> 1381 <property name="visible">True</property>
1355 <property name="spacing">2</property> 1382 <property name="spacing">2</property>
1356 <child> 1383 <child>
1357 <widget class="GtkImage" id="image46"> 1384 <widget class="GtkImage" id="image42">
1358 <property name="visible">True</property> 1385 <property name="visible">True</property>
1359 <property name="stock">gtk-open</property> 1386 <property name="stock">gtk-go-up</property>
1360 </widget> 1387 </widget>
1361 <packing> 1388 <packing>
1362 <property name="expand">False</property> 1389 <property name="expand">False</property>
@@ -1364,9 +1391,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1364 </packing> 1391 </packing>
1365 </child> 1392 </child>
1366 <child> 1393 <child>
1367 <widget class="GtkLabel" id="label143"> 1394 <widget class="GtkLabel" id="label137">
1368 <property name="visible">True</property> 1395 <property name="visible">True</property>
1369 <property name="label" translatable="yes">_Browse</property> 1396 <property name="label" translatable="yes">Pub_lish</property>
1370 <property name="use_underline">True</property> 1397 <property name="use_underline">True</property>
1371 </widget> 1398 </widget>
1372 <packing> 1399 <packing>
@@ -1381,32 +1408,26 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1381 <packing> 1408 <packing>
1382 <property name="left_attach">2</property> 1409 <property name="left_attach">2</property>
1383 <property name="right_attach">3</property> 1410 <property name="right_attach">3</property>
1384 <property name="top_attach">4</property> 1411 <property name="top_attach">5</property>
1385 <property name="bottom_attach">5</property> 1412 <property name="bottom_attach">6</property>
1386 <property name="x_options">GTK_FILL</property> 1413 <property name="x_options">GTK_FILL</property>
1387 <property name="y_options"></property> 1414 <property name="y_options"></property>
1388 </packing> 1415 </packing>
1389 </child> 1416 </child>
1390 <child> 1417 <child>
1391 <widget class="GtkAlignment" id="uploadFilenameAlignment"> 1418 <widget class="GtkLabel" id="uploadFilenameLabel">
1392 <property name="visible">True</property> 1419 <property name="visible">True</property>
1393 <child> 1420 <property name="xalign">0</property>
1394 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry"> 1421 <property name="xpad">5</property>
1395 <property name="visible">True</property> 1422 <property name="label" translatable="yes">_Filename:</property>
1396 <property name="can_focus">True</property> 1423 <property name="use_underline">True</property>
1397 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/> 1424 <property name="justify">GTK_JUSTIFY_CENTER</property>
1398 <child internal-child="entry"> 1425 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
1399 <widget class="GtkEntry" id="comboboxentry-entry3">
1400 </widget>
1401 </child>
1402 </widget>
1403 </child>
1404 </widget> 1426 </widget>
1405 <packing> 1427 <packing>
1406 <property name="left_attach">1</property>
1407 <property name="right_attach">2</property>
1408 <property name="top_attach">4</property> 1428 <property name="top_attach">4</property>
1409 <property name="bottom_attach">5</property> 1429 <property name="bottom_attach">5</property>
1430 <property name="x_options">GTK_FILL</property>
1410 <property name="y_options"></property> 1431 <property name="y_options"></property>
1411 </packing> 1432 </packing>
1412 </child> 1433 </child>
@@ -1426,38 +1447,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1426 </packing> 1447 </packing>
1427 </child> 1448 </child>
1428 <child> 1449 <child>
1429 <widget class="GtkLabel" id="uploadFilenameLabel"> 1450 <widget class="GtkAlignment" id="uploadFilenameAlignment">
1430 <property name="visible">True</property> 1451 <property name="visible">True</property>
1431 <property name="xalign">0</property> 1452 <child>
1432 <property name="xpad">5</property> 1453 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry">
1433 <property name="label" translatable="yes">_Filename:</property> 1454 <property name="visible">True</property>
1434 <property name="use_underline">True</property> 1455 <property name="can_focus">True</property>
1435 <property name="justify">GTK_JUSTIFY_CENTER</property> 1456 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/>
1436 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property> 1457 <child internal-child="entry">
1458 <widget class="GtkEntry" id="comboboxentry-entry3">
1459 </widget>
1460 </child>
1461 </widget>
1462 </child>
1437 </widget> 1463 </widget>
1438 <packing> 1464 <packing>
1465 <property name="left_attach">1</property>
1466 <property name="right_attach">2</property>
1439 <property name="top_attach">4</property> 1467 <property name="top_attach">4</property>
1440 <property name="bottom_attach">5</property> 1468 <property name="bottom_attach">5</property>
1441 <property name="x_options">GTK_FILL</property>
1442 <property name="y_options"></property> 1469 <property name="y_options"></property>
1443 </packing> 1470 </packing>
1444 </child> 1471 </child>
1445 <child> 1472 <child>
1446 <widget class="GtkButton" id="fsinsertuploadbutton"> 1473 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton">
1447 <property name="visible">True</property> 1474 <property name="visible">True</property>
1448 <property name="sensitive">False</property>
1449 <property name="can_focus">True</property> 1475 <property name="can_focus">True</property>
1450 <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> 1476 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property>
1451 <property name="response_id">0</property> 1477 <property name="response_id">0</property>
1452 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/> 1478 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/>
1453 <child> 1479 <child>
1454 <widget class="GtkHBox" id="hbox55"> 1480 <widget class="GtkHBox" id="hbox60">
1455 <property name="visible">True</property> 1481 <property name="visible">True</property>
1456 <property name="spacing">2</property> 1482 <property name="spacing">2</property>
1457 <child> 1483 <child>
1458 <widget class="GtkImage" id="image42"> 1484 <widget class="GtkImage" id="image46">
1459 <property name="visible">True</property> 1485 <property name="visible">True</property>
1460 <property name="stock">gtk-go-up</property> 1486 <property name="stock">gtk-open</property>
1461 </widget> 1487 </widget>
1462 <packing> 1488 <packing>
1463 <property name="expand">False</property> 1489 <property name="expand">False</property>
@@ -1465,9 +1491,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1465 </packing> 1491 </packing>
1466 </child> 1492 </child>
1467 <child> 1493 <child>
1468 <widget class="GtkLabel" id="label137"> 1494 <widget class="GtkLabel" id="label143">
1469 <property name="visible">True</property> 1495 <property name="visible">True</property>
1470 <property name="label" translatable="yes">Pub_lish</property> 1496 <property name="label" translatable="yes">_Browse</property>
1471 <property name="use_underline">True</property> 1497 <property name="use_underline">True</property>
1472 </widget> 1498 </widget>
1473 <packing> 1499 <packing>
@@ -1482,31 +1508,52 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1482 <packing> 1508 <packing>
1483 <property name="left_attach">2</property> 1509 <property name="left_attach">2</property>
1484 <property name="right_attach">3</property> 1510 <property name="right_attach">3</property>
1485 <property name="top_attach">5</property> 1511 <property name="top_attach">4</property>
1486 <property name="bottom_attach">6</property> 1512 <property name="bottom_attach">5</property>
1487 <property name="x_options">GTK_FILL</property> 1513 <property name="x_options">GTK_FILL</property>
1488 <property name="y_options"></property> 1514 <property name="y_options"></property>
1489 </packing> 1515 </packing>
1490 </child> 1516 </child>
1491 <child> 1517 <child>
1492 <widget class="GtkCheckButton" id="deepIndexCheckButton"> 1518 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1493 <property name="visible">True</property> 1519 <property name="visible">True</property>
1494 <property name="can_focus">True</property> 1520 <property name="can_focus">True</property>
1495 <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> 1521 <property name="tooltip" translatable="yes">Only publish a single file</property>
1522 <property name="label" translatable="yes">File onl_y</property>
1523 <property name="use_underline">True</property>
1524 <property name="response_id">0</property>
1525 <property name="active">True</property>
1526 <property name="draw_indicator">True</property>
1527 <property name="group">scopeRecursiveButton</property>
1528 </widget>
1529 <packing>
1530 <property name="left_attach">1</property>
1531 <property name="right_attach">2</property>
1532 <property name="top_attach">1</property>
1533 <property name="bottom_attach">2</property>
1534 <property name="x_options">GTK_FILL</property>
1535 <property name="y_options"></property>
1536 </packing>
1537 </child>
1538 <child>
1539 <widget class="GtkCheckButton" id="doExtractCheckButton">
1540 <property name="visible">True</property>
1541 <property name="can_focus">True</property>
1542 <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>
1496 <property name="response_id">0</property> 1543 <property name="response_id">0</property>
1497 <property name="active">True</property> 1544 <property name="active">True</property>
1498 <property name="draw_indicator">True</property> 1545 <property name="draw_indicator">True</property>
1499 <child> 1546 <child>
1500 <widget class="GtkAlignment" id="alignment15"> 1547 <widget class="GtkAlignment" id="alignment24">
1501 <property name="visible">True</property> 1548 <property name="visible">True</property>
1502 <property name="xscale">0</property> 1549 <property name="xscale">0</property>
1503 <property name="yscale">0</property> 1550 <property name="yscale">0</property>
1504 <child> 1551 <child>
1505 <widget class="GtkHBox" id="hbox52"> 1552 <widget class="GtkHBox" id="hbox66">
1506 <property name="visible">True</property> 1553 <property name="visible">True</property>
1507 <property name="spacing">2</property> 1554 <property name="spacing">2</property>
1508 <child> 1555 <child>
1509 <widget class="GtkImage" id="image40"> 1556 <widget class="GtkImage" id="image49">
1510 <property name="visible">True</property> 1557 <property name="visible">True</property>
1511 <property name="stock">gtk-index</property> 1558 <property name="stock">gtk-index</property>
1512 </widget> 1559 </widget>
@@ -1516,9 +1563,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1516 </packing> 1563 </packing>
1517 </child> 1564 </child>
1518 <child> 1565 <child>
1519 <widget class="GtkLabel" id="label128"> 1566 <widget class="GtkLabel" id="label151">
1520 <property name="visible">True</property> 1567 <property name="visible">True</property>
1521 <property name="label" translatable="yes">Add keywords for files in directories</property> 1568 <property name="label" translatable="yes">Use libextractor for files in directories</property>
1522 <property name="use_underline">True</property> 1569 <property name="use_underline">True</property>
1523 </widget> 1570 </widget>
1524 <packing> 1571 <packing>
@@ -1535,40 +1582,32 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1535 <packing> 1582 <packing>
1536 <property name="left_attach">2</property> 1583 <property name="left_attach">2</property>
1537 <property name="right_attach">3</property> 1584 <property name="right_attach">3</property>
1538 <property name="top_attach">2</property> 1585 <property name="top_attach">3</property>
1539 <property name="bottom_attach">3</property> 1586 <property name="bottom_attach">4</property>
1540 <property name="x_options">GTK_FILL</property>
1541 <property name="y_options"></property>
1542 </packing>
1543 </child>
1544 <child>
1545 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1546 <property name="visible">True</property>
1547 <property name="can_focus">True</property>
1548 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1549 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1550 <property name="use_underline">True</property>
1551 <property name="response_id">0</property>
1552 <property name="draw_indicator">True</property>
1553 </widget>
1554 <packing>
1555 <property name="left_attach">2</property>
1556 <property name="right_attach">3</property>
1557 <property name="top_attach">1</property>
1558 <property name="bottom_attach">2</property>
1559 <property name="x_options">GTK_FILL</property> 1587 <property name="x_options">GTK_FILL</property>
1560 <property name="y_options"></property> 1588 <property name="y_options"></property>
1561 </packing> 1589 </packing>
1562 </child> 1590 </child>
1563 <child> 1591 <child>
1564 <widget class="GtkLabel" id="anonymityUploadLabel"> 1592 <widget class="GtkAlignment" id="alignment7">
1565 <property name="visible">True</property> 1593 <property name="visible">True</property>
1594 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1566 <property name="xalign">0</property> 1595 <property name="xalign">0</property>
1567 <property name="xpad">5</property> 1596 <property name="xscale">0</property>
1568 <property name="label" translatable="yes">_Anonymity:</property> 1597 <child>
1569 <property name="use_underline">True</property> 1598 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton">
1599 <property name="visible">True</property>
1600 <property name="can_focus">True</property>
1601 <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>
1602 <property name="adjustment">1 0 10000 1 10 10</property>
1603 <property name="climb_rate">1</property>
1604 <property name="numeric">True</property>
1605 </widget>
1606 </child>
1570 </widget> 1607 </widget>
1571 <packing> 1608 <packing>
1609 <property name="left_attach">1</property>
1610 <property name="right_attach">2</property>
1572 <property name="top_attach">2</property> 1611 <property name="top_attach">2</property>
1573 <property name="bottom_attach">3</property> 1612 <property name="bottom_attach">3</property>
1574 <property name="x_options">GTK_FILL</property> 1613 <property name="x_options">GTK_FILL</property>
@@ -1576,67 +1615,28 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1576 </packing> 1615 </packing>
1577 </child> 1616 </child>
1578 <child> 1617 <child>
1579 <widget class="GtkLabel" id="scopeLabel"> 1618 <widget class="GtkAlignment" id="alignment8">
1580 <property name="visible">True</property> 1619 <property name="visible">True</property>
1620 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1581 <property name="xalign">0</property> 1621 <property name="xalign">0</property>
1582 <property name="xpad">5</property> 1622 <property name="xscale">0</property>
1583 <property name="label" translatable="yes">Scope:</property> 1623 <child>
1584 <property name="use_underline">True</property> 1624 <widget class="GtkSpinButton" id="contentPrioritySpinButton">
1585 <property name="mnemonic_widget">scopeFileOnlyButton</property> 1625 <property name="width_request">94</property>
1586 </widget> 1626 <property name="visible">True</property>
1587 <packing> 1627 <property name="can_focus">True</property>
1588 <property name="top_attach">1</property> 1628 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property>
1589 <property name="bottom_attach">2</property> 1629 <property name="adjustment">950 0 100000000 50 500 500</property>
1590 <property name="x_options">GTK_FILL</property> 1630 <property name="climb_rate">500</property>
1591 <property name="y_options"></property> 1631 <property name="numeric">True</property>
1592 </packing> 1632 </widget>
1593 </child> 1633 </child>
1594 <child>
1595 <widget class="GtkRadioButton" id="insertButton">
1596 <property name="visible">True</property>
1597 <property name="can_focus">True</property>
1598 <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>
1599 <property name="label" translatable="yes">I_nsert</property>
1600 <property name="use_underline">True</property>
1601 <property name="response_id">0</property>
1602 <property name="draw_indicator">True</property>
1603 <property name="group">indexbutton</property>
1604 </widget>
1605 <packing>
1606 <property name="left_attach">2</property>
1607 <property name="right_attach">3</property>
1608 <property name="x_options">GTK_FILL</property>
1609 <property name="y_options"></property>
1610 </packing>
1611 </child>
1612 <child>
1613 <widget class="GtkRadioButton" id="indexbutton">
1614 <property name="visible">True</property>
1615 <property name="can_focus">True</property>
1616 <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>
1617 <property name="label" translatable="yes">Inde_x</property>
1618 <property name="use_underline">True</property>
1619 <property name="response_id">0</property>
1620 <property name="active">True</property>
1621 <property name="draw_indicator">True</property>
1622 </widget> 1634 </widget>
1623 <packing> 1635 <packing>
1624 <property name="left_attach">1</property> 1636 <property name="left_attach">1</property>
1625 <property name="right_attach">2</property> 1637 <property name="right_attach">2</property>
1626 <property name="x_options">GTK_FILL</property> 1638 <property name="top_attach">3</property>
1627 <property name="y_options"></property> 1639 <property name="bottom_attach">4</property>
1628 </packing>
1629 </child>
1630 <child>
1631 <widget class="GtkLabel" id="methodLabel">
1632 <property name="visible">True</property>
1633 <property name="xalign">0</property>
1634 <property name="xpad">5</property>
1635 <property name="label" translatable="yes">Method:</property>
1636 <property name="use_underline">True</property>
1637 <property name="mnemonic_widget">indexbutton</property>
1638 </widget>
1639 <packing>
1640 <property name="x_options">GTK_FILL</property> 1640 <property name="x_options">GTK_FILL</property>
1641 <property name="y_options"></property> 1641 <property name="y_options"></property>
1642 </packing> 1642 </packing>
@@ -2007,51 +2007,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2007 <placeholder/> 2007 <placeholder/>
2008 </child> 2008 </child>
2009 <child> 2009 <child>
2010 <widget class="GtkLabel" id="label1">
2011 <property name="visible">True</property>
2012 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2013 <property name="label" translatable="yes">_Room Name</property>
2014 <property name="use_underline">True</property>
2015 <property name="mnemonic_widget">chatRoomNameEntry</property>
2016 </widget>
2017 </child>
2018 <child>
2019 <widget class="GtkLabel" id="label4">
2020 <property name="visible">True</property>
2021 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2022 <property name="label" translatable="yes">_Moniker</property>
2023 <property name="use_underline">True</property>
2024 </widget>
2025 <packing>
2026 <property name="left_attach">1</property>
2027 <property name="right_attach">2</property>
2028 </packing>
2029 </child>
2030 <child>
2031 <widget class="GtkEntry" id="chatRoomNameEntry">
2032 <property name="visible">True</property>
2033 <property name="can_focus">True</property>
2034 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2035 </widget>
2036 <packing>
2037 <property name="top_attach">1</property>
2038 <property name="bottom_attach">2</property>
2039 </packing>
2040 </child>
2041 <child>
2042 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2043 <property name="visible">True</property>
2044 <property name="can_focus">True</property>
2045 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2046 </widget>
2047 <packing>
2048 <property name="left_attach">1</property>
2049 <property name="right_attach">2</property>
2050 <property name="top_attach">1</property>
2051 <property name="bottom_attach">2</property>
2052 </packing>
2053 </child>
2054 <child>
2055 <widget class="GtkButton" id="on_chat_room_name_button"> 2010 <widget class="GtkButton" id="on_chat_room_name_button">
2056 <property name="visible">True</property> 2011 <property name="visible">True</property>
2057 <property name="can_focus">True</property> 2012 <property name="can_focus">True</property>
@@ -2098,6 +2053,51 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2098 <property name="y_options"></property> 2053 <property name="y_options"></property>
2099 </packing> 2054 </packing>
2100 </child> 2055 </child>
2056 <child>
2057 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2058 <property name="visible">True</property>
2059 <property name="can_focus">True</property>
2060 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2061 </widget>
2062 <packing>
2063 <property name="left_attach">1</property>
2064 <property name="right_attach">2</property>
2065 <property name="top_attach">1</property>
2066 <property name="bottom_attach">2</property>
2067 </packing>
2068 </child>
2069 <child>
2070 <widget class="GtkEntry" id="chatRoomNameEntry">
2071 <property name="visible">True</property>
2072 <property name="can_focus">True</property>
2073 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2074 </widget>
2075 <packing>
2076 <property name="top_attach">1</property>
2077 <property name="bottom_attach">2</property>
2078 </packing>
2079 </child>
2080 <child>
2081 <widget class="GtkLabel" id="label4">
2082 <property name="visible">True</property>
2083 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2084 <property name="label" translatable="yes">_Moniker</property>
2085 <property name="use_underline">True</property>
2086 </widget>
2087 <packing>
2088 <property name="left_attach">1</property>
2089 <property name="right_attach">2</property>
2090 </packing>
2091 </child>
2092 <child>
2093 <widget class="GtkLabel" id="label1">
2094 <property name="visible">True</property>
2095 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2096 <property name="label" translatable="yes">_Room Name</property>
2097 <property name="use_underline">True</property>
2098 <property name="mnemonic_widget">chatRoomNameEntry</property>
2099 </widget>
2100 </child>
2101 </widget> 2101 </widget>
2102 <packing> 2102 <packing>
2103 <property name="expand">False</property> 2103 <property name="expand">False</property>
@@ -2820,16 +2820,13 @@ Press ENTER to add the data.</atkproperty>
2820 <property name="visible">True</property> 2820 <property name="visible">True</property>
2821 <property name="layout_style">GTK_BUTTONBOX_END</property> 2821 <property name="layout_style">GTK_BUTTONBOX_END</property>
2822 <child> 2822 <child>
2823 <widget class="GtkButton" id="fileInformationDoneButton"> 2823 <widget class="GtkButton" id="metaDataDisplayDialogCloseButton">
2824 <property name="visible">True</property> 2824 <property name="visible">True</property>
2825 <property name="can_focus">True</property> 2825 <property name="can_focus">True</property>
2826 <property name="label">gtk-close</property> 2826 <property name="receives_default">True</property>
2827 <property name="label" translatable="yes">gtk-close</property>
2827 <property name="use_stock">True</property> 2828 <property name="use_stock">True</property>
2828 <property name="response_id">-5</property> 2829 <property name="response_id">0</property>
2829 <signal name="clicked" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2830 <signal name="activate" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2831 <accelerator key="Return" modifiers="" signal="activate"/>
2832 <accelerator key="Escape" modifiers="" signal="activate"/>
2833 </widget> 2830 </widget>
2834 </child> 2831 </child>
2835 </widget> 2832 </widget>
@@ -4912,6 +4909,16 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
4912 </widget> 4909 </widget>
4913 </child> 4910 </child>
4914 <child> 4911 <child>
4912 <widget class="GtkImageMenuItem" id="show_metadata">
4913 <property name="visible">True</property>
4914 <property name="tooltip" translatable="yes">Display metadata</property>
4915 <property name="label" translatable="yes">gtk-dialog-info</property>
4916 <property name="use_underline">True</property>
4917 <property name="use_stock">True</property>
4918 <signal name="activate" handler="on_showDownloadMetaData_clicked_"/>
4919 </widget>
4920 </child>
4921 <child>
4915 <widget class="GtkImageMenuItem" id="stop_download"> 4922 <widget class="GtkImageMenuItem" id="stop_download">
4916 <property name="visible">True</property> 4923 <property name="visible">True</property>
4917 <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> 4924 <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>
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index a41a1795..12361504 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -543,9 +543,8 @@ open_meta_data_display_dialog(const struct GNUNET_MetaData * meta,
543 dialog = glade_xml_get_widget (xml, "metaDisplayDialog"); 543 dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
544 gtk_window_set_title (GTK_WINDOW (dialog), title); 544 gtk_window_set_title (GTK_WINDOW (dialog), title);
545 createMetaDataListTreeView (xml, "metaDisplayDialogTreeView", NULL, meta); 545 createMetaDataListTreeView (xml, "metaDisplayDialogTreeView", NULL, meta);
546 if (GTK_RESPONSE_NONE 546 gtk_dialog_run (GTK_DIALOG (dialog));
547 != gtk_dialog_run (GTK_DIALOG (dialog))) 547 gtk_widget_destroy (dialog);
548 gtk_widget_destroy (dialog);
549 UNREF (xml); 548 UNREF (xml);
550} 549}
551 550