aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2008-06-07 22:08:54 +0000
committerChristian Grothoff <christian@grothoff.org>2008-06-07 22:08:54 +0000
commitae0b112946f553ab84f8ae4b94d04de52cf1d697 (patch)
treeedd207d72df74de40cb500fc4822b126f84d9c25
parent44b20e435e8f396585ab2eedf17d4005c7cddea9 (diff)
downloadgnunet-gtk-ae0b112946f553ab84f8ae4b94d04de52cf1d697.tar.gz
gnunet-gtk-ae0b112946f553ab84f8ae4b94d04de52cf1d697.zip
duplicate menu
-rw-r--r--gnunet-gtk.glade871
-rw-r--r--src/plugins/fs/namespace.c14
2 files changed, 429 insertions, 456 deletions
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 86604556..d004360c 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -575,115 +575,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
575 <placeholder/> 575 <placeholder/>
576 </child> 576 </child>
577 <child> 577 <child>
578 <widget class="GtkScrolledWindow" id="scrolledwindow9"> 578 <widget class="GtkVBox" id="vbox21">
579 <property name="visible">True</property>
580 <property name="can_focus">False</property>
581 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
582 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
583 <property name="shadow_type">GTK_SHADOW_IN</property>
584 <child>
585 <widget class="GtkTreeView" id="activeSearchesSummary">
586 <property name="visible">True</property>
587 <property name="can_focus">True</property>
588 <property name="reorderable">True</property>
589 <property name="rules_hint">True</property>
590 </widget>
591 </child>
592 </widget>
593 <packing>
594 <property name="top_attach">1</property>
595 <property name="bottom_attach">2</property>
596 </packing>
597 </child>
598 <child>
599 <widget class="GtkLabel" id="label16">
600 <property name="visible">True</property>
601 <property name="xalign">0</property>
602 <property name="yalign">1</property>
603 <property name="xpad">5</property>
604 <property name="ypad">5</property>
605 <property name="label" translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
606 <property name="use_markup">True</property>
607 </widget>
608 <packing>
609 <property name="right_attach">2</property>
610 <property name="y_options">GTK_FILL</property>
611 </packing>
612 </child>
613 <child>
614 <widget class="GtkScrolledWindow" id="scrolledwindow10">
615 <property name="visible">True</property>
616 <property name="can_focus">True</property>
617 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
618 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
619 <property name="shadow_type">GTK_SHADOW_IN</property>
620 <child>
621 <widget class="GtkTreeView" id="activeDownloadsList">
622 <property name="visible">True</property>
623 <property name="can_focus">True</property>
624 <property name="reorderable">True</property>
625 <property name="rules_hint">True</property>
626 </widget>
627 </child>
628 </widget>
629 <packing>
630 <property name="top_attach">3</property>
631 <property name="bottom_attach">4</property>
632 </packing>
633 </child>
634 <child>
635 <widget class="GtkVBox" id="vbox8">
636 <property name="visible">True</property> 579 <property name="visible">True</property>
637 <property name="homogeneous">True</property> 580 <property name="homogeneous">True</property>
638 <child> 581 <child>
639 <widget class="GtkButton" id="abortDownloadButton"> 582 <widget class="GtkButton" id="stopUploadButton">
640 <property name="visible">True</property>
641 <property name="sensitive">False</property>
642 <property name="can_focus">True</property>
643 <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and delete incomplete downloads</property>
644 <property name="label">gtk-delete</property>
645 <property name="use_stock">True</property>
646 <property name="response_id">0</property>
647 <signal name="clicked" handler="on_abortDownloadButton_clicked_"/>
648 </widget>
649 <packing>
650 <property name="fill">False</property>
651 </packing>
652 </child>
653 <child>
654 <widget class="GtkButton" id="stopDownloadButton">
655 <property name="visible">True</property> 583 <property name="visible">True</property>
656 <property name="sensitive">False</property> 584 <property name="sensitive">False</property>
657 <property name="can_focus">True</property> 585 <property name="can_focus">True</property>
658 <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> 586 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property>
659 <property name="label">gtk-stop</property> 587 <property name="label">gtk-stop</property>
660 <property name="use_stock">True</property> 588 <property name="use_stock">True</property>
661 <property name="response_id">0</property> 589 <property name="response_id">0</property>
662 <signal name="clicked" handler="on_stopDownloadButton_clicked_"/> 590 <signal name="clicked" handler="on_stopUploadButton_clicked_" object="activeUploadsList"/>
663 </widget> 591 </widget>
664 <packing> 592 <packing>
593 <property name="expand">False</property>
665 <property name="fill">False</property> 594 <property name="fill">False</property>
666 <property name="position">1</property>
667 </packing> 595 </packing>
668 </child> 596 </child>
669 <child> 597 <child>
670 <widget class="GtkButton" id="clearCompletedDownloadsButton"> 598 <widget class="GtkButton" id="clearCompletedUploadsButton">
671 <property name="visible">True</property> 599 <property name="visible">True</property>
672 <property name="can_focus">True</property> 600 <property name="can_focus">True</property>
673 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property> 601 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property>
674 <property name="response_id">0</property> 602 <property name="response_id">0</property>
675 <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked_"/> 603 <signal name="clicked" handler="on_clearCompletedUploadsButton_clicked_"/>
676 <child> 604 <child>
677 <widget class="GtkAlignment" id="alignment3"> 605 <widget class="GtkAlignment" id="alignment4">
678 <property name="visible">True</property> 606 <property name="visible">True</property>
679 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 607 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
680 <property name="xscale">0</property> 608 <property name="xscale">0</property>
681 <child> 609 <child>
682 <widget class="GtkHBox" id="hbox4"> 610 <widget class="GtkHBox" id="hbox5">
683 <property name="visible">True</property> 611 <property name="visible">True</property>
684 <property name="spacing">2</property> 612 <property name="spacing">2</property>
685 <child> 613 <child>
686 <widget class="GtkImage" id="image3"> 614 <widget class="GtkImage" id="image4">
687 <property name="visible">True</property> 615 <property name="visible">True</property>
688 <property name="stock">gtk-clear</property> 616 <property name="stock">gtk-clear</property>
689 </widget> 617 </widget>
@@ -693,7 +621,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
693 </packing> 621 </packing>
694 </child> 622 </child>
695 <child> 623 <child>
696 <widget class="GtkLabel" id="label5"> 624 <widget class="GtkLabel" id="label2">
697 <property name="visible">True</property> 625 <property name="visible">True</property>
698 <property name="label" translatable="yes">_Clean</property> 626 <property name="label" translatable="yes">_Clean</property>
699 <property name="use_underline">True</property> 627 <property name="use_underline">True</property>
@@ -710,22 +638,107 @@ This release adds context-menus (right-click) which allow copying the URI of sea
710 </child> 638 </child>
711 </widget> 639 </widget>
712 <packing> 640 <packing>
713 <property name="expand">False</property>
714 <property name="fill">False</property> 641 <property name="fill">False</property>
715 <property name="position">2</property> 642 <property name="position">1</property>
716 </packing> 643 </packing>
717 </child> 644 </child>
718 </widget> 645 </widget>
719 <packing> 646 <packing>
720 <property name="left_attach">1</property> 647 <property name="left_attach">1</property>
721 <property name="right_attach">2</property> 648 <property name="right_attach">2</property>
722 <property name="top_attach">3</property> 649 <property name="top_attach">6</property>
723 <property name="bottom_attach">4</property> 650 <property name="bottom_attach">7</property>
724 <property name="x_options">GTK_FILL</property> 651 <property name="x_options">GTK_FILL</property>
725 <property name="x_padding">5</property> 652 <property name="x_padding">5</property>
726 </packing> 653 </packing>
727 </child> 654 </child>
728 <child> 655 <child>
656 <widget class="GtkButton" id="stopSearchButton">
657 <property name="visible">True</property>
658 <property name="sensitive">False</property>
659 <property name="can_focus">True</property>
660 <property name="tooltip" translatable="yes">Cancel the selected search and remove it from the list</property>
661 <property name="border_width">4</property>
662 <property name="label">gtk-stop</property>
663 <property name="use_stock">True</property>
664 <property name="response_id">0</property>
665 <signal name="clicked" handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
666 </widget>
667 <packing>
668 <property name="left_attach">1</property>
669 <property name="right_attach">2</property>
670 <property name="top_attach">1</property>
671 <property name="bottom_attach">2</property>
672 <property name="x_options">GTK_FILL</property>
673 <property name="y_options"></property>
674 </packing>
675 </child>
676 <child>
677 <widget class="GtkAlignment" id="alignment14">
678 <property name="visible">True</property>
679 <property name="top_padding">5</property>
680 <child>
681 <widget class="GtkLabel" id="label46">
682 <property name="visible">True</property>
683 <property name="xalign">0</property>
684 <property name="xpad">5</property>
685 <property name="ypad">5</property>
686 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
687 <property name="use_markup">True</property>
688 </widget>
689 </child>
690 </widget>
691 <packing>
692 <property name="right_attach">2</property>
693 <property name="top_attach">5</property>
694 <property name="bottom_attach">6</property>
695 <property name="y_options">GTK_FILL</property>
696 </packing>
697 </child>
698 <child>
699 <widget class="GtkAlignment" id="alignment11">
700 <property name="visible">True</property>
701 <property name="top_padding">5</property>
702 <child>
703 <widget class="GtkLabel" id="label45">
704 <property name="visible">True</property>
705 <property name="xalign">0</property>
706 <property name="xpad">5</property>
707 <property name="ypad">5</property>
708 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
709 <property name="use_markup">True</property>
710 </widget>
711 </child>
712 </widget>
713 <packing>
714 <property name="right_attach">2</property>
715 <property name="top_attach">2</property>
716 <property name="bottom_attach">3</property>
717 <property name="y_options">GTK_FILL</property>
718 </packing>
719 </child>
720 <child>
721 <widget class="GtkScrolledWindow" id="scrolledwindow8">
722 <property name="visible">True</property>
723 <property name="can_focus">False</property>
724 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
725 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
726 <property name="shadow_type">GTK_SHADOW_IN</property>
727 <child>
728 <widget class="GtkTreeView" id="activeUploadsList">
729 <property name="visible">True</property>
730 <property name="can_focus">True</property>
731 <property name="reorderable">True</property>
732 <property name="rules_hint">True</property>
733 </widget>
734 </child>
735 </widget>
736 <packing>
737 <property name="top_attach">6</property>
738 <property name="bottom_attach">7</property>
739 </packing>
740 </child>
741 <child>
729 <widget class="GtkHBox" id="hbox1"> 742 <widget class="GtkHBox" id="hbox1">
730 <property name="visible">True</property> 743 <property name="visible">True</property>
731 <child> 744 <child>
@@ -840,129 +853,58 @@ This release adds context-menus (right-click) which allow copying the URI of sea
840 </packing> 853 </packing>
841 </child> 854 </child>
842 <child> 855 <child>
843 <widget class="GtkScrolledWindow" id="scrolledwindow8"> 856 <widget class="GtkVBox" id="vbox8">
844 <property name="visible">True</property> 857 <property name="visible">True</property>
845 <property name="can_focus">False</property> 858 <property name="homogeneous">True</property>
846 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
847 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
848 <property name="shadow_type">GTK_SHADOW_IN</property>
849 <child> 859 <child>
850 <widget class="GtkTreeView" id="activeUploadsList"> 860 <widget class="GtkButton" id="abortDownloadButton">
851 <property name="visible">True</property> 861 <property name="visible">True</property>
862 <property name="sensitive">False</property>
852 <property name="can_focus">True</property> 863 <property name="can_focus">True</property>
853 <property name="reorderable">True</property> 864 <property name="tooltip" translatable="yes">Cancel the selected download (and all sub-downloads) and delete incomplete downloads</property>
854 <property name="rules_hint">True</property> 865 <property name="label">gtk-delete</property>
855 </widget> 866 <property name="use_stock">True</property>
856 </child> 867 <property name="response_id">0</property>
857 </widget> 868 <signal name="clicked" handler="on_abortDownloadButton_clicked_"/>
858 <packing>
859 <property name="top_attach">6</property>
860 <property name="bottom_attach">7</property>
861 </packing>
862 </child>
863 <child>
864 <widget class="GtkAlignment" id="alignment11">
865 <property name="visible">True</property>
866 <property name="top_padding">5</property>
867 <child>
868 <widget class="GtkLabel" id="label45">
869 <property name="visible">True</property>
870 <property name="xalign">0</property>
871 <property name="xpad">5</property>
872 <property name="ypad">5</property>
873 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
874 <property name="use_markup">True</property>
875 </widget>
876 </child>
877 </widget>
878 <packing>
879 <property name="right_attach">2</property>
880 <property name="top_attach">2</property>
881 <property name="bottom_attach">3</property>
882 <property name="y_options">GTK_FILL</property>
883 </packing>
884 </child>
885 <child>
886 <widget class="GtkAlignment" id="alignment14">
887 <property name="visible">True</property>
888 <property name="top_padding">5</property>
889 <child>
890 <widget class="GtkLabel" id="label46">
891 <property name="visible">True</property>
892 <property name="xalign">0</property>
893 <property name="xpad">5</property>
894 <property name="ypad">5</property>
895 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
896 <property name="use_markup">True</property>
897 </widget> 869 </widget>
870 <packing>
871 <property name="fill">False</property>
872 </packing>
898 </child> 873 </child>
899 </widget>
900 <packing>
901 <property name="right_attach">2</property>
902 <property name="top_attach">5</property>
903 <property name="bottom_attach">6</property>
904 <property name="y_options">GTK_FILL</property>
905 </packing>
906 </child>
907 <child>
908 <widget class="GtkButton" id="stopSearchButton">
909 <property name="visible">True</property>
910 <property name="sensitive">False</property>
911 <property name="can_focus">True</property>
912 <property name="tooltip" translatable="yes">Cancel the selected search and remove it from the list</property>
913 <property name="border_width">4</property>
914 <property name="label">gtk-stop</property>
915 <property name="use_stock">True</property>
916 <property name="response_id">0</property>
917 <signal name="clicked" handler="on_closeSearchSummaryButton_clicked_" object="activeSearchesSummary"/>
918 </widget>
919 <packing>
920 <property name="left_attach">1</property>
921 <property name="right_attach">2</property>
922 <property name="top_attach">1</property>
923 <property name="bottom_attach">2</property>
924 <property name="x_options">GTK_FILL</property>
925 <property name="y_options"></property>
926 </packing>
927 </child>
928 <child>
929 <widget class="GtkVBox" id="vbox21">
930 <property name="visible">True</property>
931 <property name="homogeneous">True</property>
932 <child> 874 <child>
933 <widget class="GtkButton" id="stopUploadButton"> 875 <widget class="GtkButton" id="stopDownloadButton">
934 <property name="visible">True</property> 876 <property name="visible">True</property>
935 <property name="sensitive">False</property> 877 <property name="sensitive">False</property>
936 <property name="can_focus">True</property> 878 <property name="can_focus">True</property>
937 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property> 879 <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>
938 <property name="label">gtk-stop</property> 880 <property name="label">gtk-stop</property>
939 <property name="use_stock">True</property> 881 <property name="use_stock">True</property>
940 <property name="response_id">0</property> 882 <property name="response_id">0</property>
941 <signal name="clicked" handler="on_stopUploadButton_clicked_" object="activeUploadsList"/> 883 <signal name="clicked" handler="on_stopDownloadButton_clicked_"/>
942 </widget> 884 </widget>
943 <packing> 885 <packing>
944 <property name="expand">False</property>
945 <property name="fill">False</property> 886 <property name="fill">False</property>
887 <property name="position">1</property>
946 </packing> 888 </packing>
947 </child> 889 </child>
948 <child> 890 <child>
949 <widget class="GtkButton" id="clearCompletedUploadsButton"> 891 <widget class="GtkButton" id="clearCompletedDownloadsButton">
950 <property name="visible">True</property> 892 <property name="visible">True</property>
951 <property name="can_focus">True</property> 893 <property name="can_focus">True</property>
952 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property> 894 <property name="tooltip" translatable="yes">Clear completed downloads from the list</property>
953 <property name="response_id">0</property> 895 <property name="response_id">0</property>
954 <signal name="clicked" handler="on_clearCompletedUploadsButton_clicked_"/> 896 <signal name="clicked" handler="on_clearCompletedDownloadsButton_clicked_"/>
955 <child> 897 <child>
956 <widget class="GtkAlignment" id="alignment4"> 898 <widget class="GtkAlignment" id="alignment3">
957 <property name="visible">True</property> 899 <property name="visible">True</property>
958 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 900 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
959 <property name="xscale">0</property> 901 <property name="xscale">0</property>
960 <child> 902 <child>
961 <widget class="GtkHBox" id="hbox5"> 903 <widget class="GtkHBox" id="hbox4">
962 <property name="visible">True</property> 904 <property name="visible">True</property>
963 <property name="spacing">2</property> 905 <property name="spacing">2</property>
964 <child> 906 <child>
965 <widget class="GtkImage" id="image4"> 907 <widget class="GtkImage" id="image3">
966 <property name="visible">True</property> 908 <property name="visible">True</property>
967 <property name="stock">gtk-clear</property> 909 <property name="stock">gtk-clear</property>
968 </widget> 910 </widget>
@@ -972,7 +914,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
972 </packing> 914 </packing>
973 </child> 915 </child>
974 <child> 916 <child>
975 <widget class="GtkLabel" id="label2"> 917 <widget class="GtkLabel" id="label5">
976 <property name="visible">True</property> 918 <property name="visible">True</property>
977 <property name="label" translatable="yes">_Clean</property> 919 <property name="label" translatable="yes">_Clean</property>
978 <property name="use_underline">True</property> 920 <property name="use_underline">True</property>
@@ -989,20 +931,78 @@ This release adds context-menus (right-click) which allow copying the URI of sea
989 </child> 931 </child>
990 </widget> 932 </widget>
991 <packing> 933 <packing>
934 <property name="expand">False</property>
992 <property name="fill">False</property> 935 <property name="fill">False</property>
993 <property name="position">1</property> 936 <property name="position">2</property>
994 </packing> 937 </packing>
995 </child> 938 </child>
996 </widget> 939 </widget>
997 <packing> 940 <packing>
998 <property name="left_attach">1</property> 941 <property name="left_attach">1</property>
999 <property name="right_attach">2</property> 942 <property name="right_attach">2</property>
1000 <property name="top_attach">6</property> 943 <property name="top_attach">3</property>
1001 <property name="bottom_attach">7</property> 944 <property name="bottom_attach">4</property>
1002 <property name="x_options">GTK_FILL</property> 945 <property name="x_options">GTK_FILL</property>
1003 <property name="x_padding">5</property> 946 <property name="x_padding">5</property>
1004 </packing> 947 </packing>
1005 </child> 948 </child>
949 <child>
950 <widget class="GtkScrolledWindow" id="scrolledwindow10">
951 <property name="visible">True</property>
952 <property name="can_focus">True</property>
953 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
954 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
955 <property name="shadow_type">GTK_SHADOW_IN</property>
956 <child>
957 <widget class="GtkTreeView" id="activeDownloadsList">
958 <property name="visible">True</property>
959 <property name="can_focus">True</property>
960 <property name="reorderable">True</property>
961 <property name="rules_hint">True</property>
962 </widget>
963 </child>
964 </widget>
965 <packing>
966 <property name="top_attach">3</property>
967 <property name="bottom_attach">4</property>
968 </packing>
969 </child>
970 <child>
971 <widget class="GtkLabel" id="label16">
972 <property name="visible">True</property>
973 <property name="xalign">0</property>
974 <property name="yalign">1</property>
975 <property name="xpad">5</property>
976 <property name="ypad">5</property>
977 <property name="label" translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
978 <property name="use_markup">True</property>
979 </widget>
980 <packing>
981 <property name="right_attach">2</property>
982 <property name="y_options">GTK_FILL</property>
983 </packing>
984 </child>
985 <child>
986 <widget class="GtkScrolledWindow" id="scrolledwindow9">
987 <property name="visible">True</property>
988 <property name="can_focus">False</property>
989 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
990 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
991 <property name="shadow_type">GTK_SHADOW_IN</property>
992 <child>
993 <widget class="GtkTreeView" id="activeSearchesSummary">
994 <property name="visible">True</property>
995 <property name="can_focus">True</property>
996 <property name="reorderable">True</property>
997 <property name="rules_hint">True</property>
998 </widget>
999 </child>
1000 </widget>
1001 <packing>
1002 <property name="top_attach">1</property>
1003 <property name="bottom_attach">2</property>
1004 </packing>
1005 </child>
1006 </widget> 1006 </widget>
1007 </child> 1007 </child>
1008 <child> 1008 <child>
@@ -1289,80 +1289,52 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1289 <placeholder/> 1289 <placeholder/>
1290 </child> 1290 </child>
1291 <child> 1291 <child>
1292 <widget class="GtkLabel" id="methodLabel"> 1292 <widget class="GtkAlignment" id="alignment8">
1293 <property name="visible">True</property> 1293 <property name="visible">True</property>
1294 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1294 <property name="xalign">0</property> 1295 <property name="xalign">0</property>
1295 <property name="xpad">5</property> 1296 <property name="xscale">0</property>
1296 <property name="label" translatable="yes">Method:</property> 1297 <child>
1297 <property name="use_underline">True</property> 1298 <widget class="GtkSpinButton" id="contentPrioritySpinButton">
1298 <property name="mnemonic_widget">indexbutton</property> 1299 <property name="width_request">94</property>
1299 </widget> 1300 <property name="visible">True</property>
1300 <packing> 1301 <property name="can_focus">True</property>
1301 <property name="x_options">GTK_FILL</property> 1302 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property>
1302 <property name="y_options"></property> 1303 <property name="adjustment">950 0 100000000 50 500 500</property>
1303 </packing> 1304 <property name="climb_rate">500</property>
1304 </child> 1305 <property name="numeric">True</property>
1305 <child> 1306 </widget>
1306 <widget class="GtkRadioButton" id="indexbutton"> 1307 </child>
1307 <property name="visible">True</property>
1308 <property name="can_focus">True</property>
1309 <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>
1310 <property name="label" translatable="yes">Inde_x</property>
1311 <property name="use_underline">True</property>
1312 <property name="response_id">0</property>
1313 <property name="active">True</property>
1314 <property name="draw_indicator">True</property>
1315 </widget> 1308 </widget>
1316 <packing> 1309 <packing>
1317 <property name="left_attach">1</property> 1310 <property name="left_attach">1</property>
1318 <property name="right_attach">2</property> 1311 <property name="right_attach">2</property>
1312 <property name="top_attach">3</property>
1313 <property name="bottom_attach">4</property>
1319 <property name="x_options">GTK_FILL</property> 1314 <property name="x_options">GTK_FILL</property>
1320 <property name="y_options"></property> 1315 <property name="y_options"></property>
1321 </packing> 1316 </packing>
1322 </child> 1317 </child>
1323 <child> 1318 <child>
1324 <widget class="GtkRadioButton" id="insertButton"> 1319 <widget class="GtkAlignment" id="alignment7">
1325 <property name="visible">True</property>
1326 <property name="can_focus">True</property>
1327 <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>
1328 <property name="label" translatable="yes">I_nsert</property>
1329 <property name="use_underline">True</property>
1330 <property name="response_id">0</property>
1331 <property name="draw_indicator">True</property>
1332 <property name="group">indexbutton</property>
1333 </widget>
1334 <packing>
1335 <property name="left_attach">2</property>
1336 <property name="right_attach">3</property>
1337 <property name="x_options">GTK_FILL</property>
1338 <property name="y_options"></property>
1339 </packing>
1340 </child>
1341 <child>
1342 <widget class="GtkLabel" id="scopeLabel">
1343 <property name="visible">True</property>
1344 <property name="xalign">0</property>
1345 <property name="xpad">5</property>
1346 <property name="label" translatable="yes">Scope:</property>
1347 <property name="use_underline">True</property>
1348 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1349 </widget>
1350 <packing>
1351 <property name="top_attach">1</property>
1352 <property name="bottom_attach">2</property>
1353 <property name="x_options">GTK_FILL</property>
1354 <property name="y_options"></property>
1355 </packing>
1356 </child>
1357 <child>
1358 <widget class="GtkLabel" id="anonymityUploadLabel">
1359 <property name="visible">True</property> 1320 <property name="visible">True</property>
1321 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1360 <property name="xalign">0</property> 1322 <property name="xalign">0</property>
1361 <property name="xpad">5</property> 1323 <property name="xscale">0</property>
1362 <property name="label" translatable="yes">_Anonymity:</property> 1324 <child>
1363 <property name="use_underline">True</property> 1325 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton">
1326 <property name="visible">True</property>
1327 <property name="can_focus">True</property>
1328 <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>
1329 <property name="adjustment">1 0 10000 1 10 10</property>
1330 <property name="climb_rate">1</property>
1331 <property name="numeric">True</property>
1332 </widget>
1333 </child>
1364 </widget> 1334 </widget>
1365 <packing> 1335 <packing>
1336 <property name="left_attach">1</property>
1337 <property name="right_attach">2</property>
1366 <property name="top_attach">2</property> 1338 <property name="top_attach">2</property>
1367 <property name="bottom_attach">3</property> 1339 <property name="bottom_attach">3</property>
1368 <property name="x_options">GTK_FILL</property> 1340 <property name="x_options">GTK_FILL</property>
@@ -1370,43 +1342,24 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1370 </packing> 1342 </packing>
1371 </child> 1343 </child>
1372 <child> 1344 <child>
1373 <widget class="GtkRadioButton" id="scopeRecursiveButton"> 1345 <widget class="GtkCheckButton" id="doExtractCheckButton">
1374 <property name="visible">True</property>
1375 <property name="can_focus">True</property>
1376 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1377 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1378 <property name="use_underline">True</property>
1379 <property name="response_id">0</property>
1380 <property name="draw_indicator">True</property>
1381 </widget>
1382 <packing>
1383 <property name="left_attach">2</property>
1384 <property name="right_attach">3</property>
1385 <property name="top_attach">1</property>
1386 <property name="bottom_attach">2</property>
1387 <property name="x_options">GTK_FILL</property>
1388 <property name="y_options"></property>
1389 </packing>
1390 </child>
1391 <child>
1392 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1393 <property name="visible">True</property> 1346 <property name="visible">True</property>
1394 <property name="can_focus">True</property> 1347 <property name="can_focus">True</property>
1395 <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> 1348 <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>
1396 <property name="response_id">0</property> 1349 <property name="response_id">0</property>
1397 <property name="active">True</property> 1350 <property name="active">True</property>
1398 <property name="draw_indicator">True</property> 1351 <property name="draw_indicator">True</property>
1399 <child> 1352 <child>
1400 <widget class="GtkAlignment" id="alignment15"> 1353 <widget class="GtkAlignment" id="alignment24">
1401 <property name="visible">True</property> 1354 <property name="visible">True</property>
1402 <property name="xscale">0</property> 1355 <property name="xscale">0</property>
1403 <property name="yscale">0</property> 1356 <property name="yscale">0</property>
1404 <child> 1357 <child>
1405 <widget class="GtkHBox" id="hbox52"> 1358 <widget class="GtkHBox" id="hbox66">
1406 <property name="visible">True</property> 1359 <property name="visible">True</property>
1407 <property name="spacing">2</property> 1360 <property name="spacing">2</property>
1408 <child> 1361 <child>
1409 <widget class="GtkImage" id="image40"> 1362 <widget class="GtkImage" id="image49">
1410 <property name="visible">True</property> 1363 <property name="visible">True</property>
1411 <property name="stock">gtk-index</property> 1364 <property name="stock">gtk-index</property>
1412 </widget> 1365 </widget>
@@ -1416,9 +1369,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1416 </packing> 1369 </packing>
1417 </child> 1370 </child>
1418 <child> 1371 <child>
1419 <widget class="GtkLabel" id="label128"> 1372 <widget class="GtkLabel" id="label151">
1420 <property name="visible">True</property> 1373 <property name="visible">True</property>
1421 <property name="label" translatable="yes">Add keywords for files in directories</property> 1374 <property name="label" translatable="yes">Use libextractor for files in directories</property>
1422 <property name="use_underline">True</property> 1375 <property name="use_underline">True</property>
1423 </widget> 1376 </widget>
1424 <packing> 1377 <packing>
@@ -1435,28 +1388,48 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1435 <packing> 1388 <packing>
1436 <property name="left_attach">2</property> 1389 <property name="left_attach">2</property>
1437 <property name="right_attach">3</property> 1390 <property name="right_attach">3</property>
1438 <property name="top_attach">2</property> 1391 <property name="top_attach">3</property>
1439 <property name="bottom_attach">3</property> 1392 <property name="bottom_attach">4</property>
1440 <property name="x_options">GTK_FILL</property> 1393 <property name="x_options">GTK_FILL</property>
1441 <property name="y_options"></property> 1394 <property name="y_options"></property>
1442 </packing> 1395 </packing>
1443 </child> 1396 </child>
1444 <child> 1397 <child>
1445 <widget class="GtkButton" id="fsinsertuploadbutton"> 1398 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1446 <property name="visible">True</property> 1399 <property name="visible">True</property>
1447 <property name="sensitive">False</property>
1448 <property name="can_focus">True</property> 1400 <property name="can_focus">True</property>
1449 <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> 1401 <property name="tooltip" translatable="yes">Only publish a single file</property>
1402 <property name="label" translatable="yes">File onl_y</property>
1403 <property name="use_underline">True</property>
1450 <property name="response_id">0</property> 1404 <property name="response_id">0</property>
1451 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/> 1405 <property name="active">True</property>
1406 <property name="draw_indicator">True</property>
1407 <property name="group">scopeRecursiveButton</property>
1408 </widget>
1409 <packing>
1410 <property name="left_attach">1</property>
1411 <property name="right_attach">2</property>
1412 <property name="top_attach">1</property>
1413 <property name="bottom_attach">2</property>
1414 <property name="x_options">GTK_FILL</property>
1415 <property name="y_options"></property>
1416 </packing>
1417 </child>
1418 <child>
1419 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton">
1420 <property name="visible">True</property>
1421 <property name="can_focus">True</property>
1422 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property>
1423 <property name="response_id">0</property>
1424 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/>
1452 <child> 1425 <child>
1453 <widget class="GtkHBox" id="hbox55"> 1426 <widget class="GtkHBox" id="hbox60">
1454 <property name="visible">True</property> 1427 <property name="visible">True</property>
1455 <property name="spacing">2</property> 1428 <property name="spacing">2</property>
1456 <child> 1429 <child>
1457 <widget class="GtkImage" id="image42"> 1430 <widget class="GtkImage" id="image46">
1458 <property name="visible">True</property> 1431 <property name="visible">True</property>
1459 <property name="stock">gtk-go-up</property> 1432 <property name="stock">gtk-open</property>
1460 </widget> 1433 </widget>
1461 <packing> 1434 <packing>
1462 <property name="expand">False</property> 1435 <property name="expand">False</property>
@@ -1464,9 +1437,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1464 </packing> 1437 </packing>
1465 </child> 1438 </child>
1466 <child> 1439 <child>
1467 <widget class="GtkLabel" id="label137"> 1440 <widget class="GtkLabel" id="label143">
1468 <property name="visible">True</property> 1441 <property name="visible">True</property>
1469 <property name="label" translatable="yes">Pub_lish</property> 1442 <property name="label" translatable="yes">_Browse</property>
1470 <property name="use_underline">True</property> 1443 <property name="use_underline">True</property>
1471 </widget> 1444 </widget>
1472 <packing> 1445 <packing>
@@ -1481,26 +1454,32 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1481 <packing> 1454 <packing>
1482 <property name="left_attach">2</property> 1455 <property name="left_attach">2</property>
1483 <property name="right_attach">3</property> 1456 <property name="right_attach">3</property>
1484 <property name="top_attach">5</property> 1457 <property name="top_attach">4</property>
1485 <property name="bottom_attach">6</property> 1458 <property name="bottom_attach">5</property>
1486 <property name="x_options">GTK_FILL</property> 1459 <property name="x_options">GTK_FILL</property>
1487 <property name="y_options"></property> 1460 <property name="y_options"></property>
1488 </packing> 1461 </packing>
1489 </child> 1462 </child>
1490 <child> 1463 <child>
1491 <widget class="GtkLabel" id="uploadFilenameLabel"> 1464 <widget class="GtkAlignment" id="uploadFilenameAlignment">
1492 <property name="visible">True</property> 1465 <property name="visible">True</property>
1493 <property name="xalign">0</property> 1466 <child>
1494 <property name="xpad">5</property> 1467 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry">
1495 <property name="label" translatable="yes">_Filename:</property> 1468 <property name="visible">True</property>
1496 <property name="use_underline">True</property> 1469 <property name="can_focus">True</property>
1497 <property name="justify">GTK_JUSTIFY_CENTER</property> 1470 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/>
1498 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property> 1471 <child internal-child="entry">
1472 <widget class="GtkEntry" id="comboboxentry-entry3">
1473 </widget>
1474 </child>
1475 </widget>
1476 </child>
1499 </widget> 1477 </widget>
1500 <packing> 1478 <packing>
1479 <property name="left_attach">1</property>
1480 <property name="right_attach">2</property>
1501 <property name="top_attach">4</property> 1481 <property name="top_attach">4</property>
1502 <property name="bottom_attach">5</property> 1482 <property name="bottom_attach">5</property>
1503 <property name="x_options">GTK_FILL</property>
1504 <property name="y_options"></property> 1483 <property name="y_options"></property>
1505 </packing> 1484 </packing>
1506 </child> 1485 </child>
@@ -1520,43 +1499,38 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1520 </packing> 1499 </packing>
1521 </child> 1500 </child>
1522 <child> 1501 <child>
1523 <widget class="GtkAlignment" id="uploadFilenameAlignment"> 1502 <widget class="GtkLabel" id="uploadFilenameLabel">
1524 <property name="visible">True</property> 1503 <property name="visible">True</property>
1525 <child> 1504 <property name="xalign">0</property>
1526 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry"> 1505 <property name="xpad">5</property>
1527 <property name="visible">True</property> 1506 <property name="label" translatable="yes">_Filename:</property>
1528 <property name="can_focus">True</property> 1507 <property name="use_underline">True</property>
1529 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/> 1508 <property name="justify">GTK_JUSTIFY_CENTER</property>
1530 <child internal-child="entry"> 1509 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
1531 <widget class="GtkEntry" id="comboboxentry-entry3">
1532 </widget>
1533 </child>
1534 </widget>
1535 </child>
1536 </widget> 1510 </widget>
1537 <packing> 1511 <packing>
1538 <property name="left_attach">1</property>
1539 <property name="right_attach">2</property>
1540 <property name="top_attach">4</property> 1512 <property name="top_attach">4</property>
1541 <property name="bottom_attach">5</property> 1513 <property name="bottom_attach">5</property>
1514 <property name="x_options">GTK_FILL</property>
1542 <property name="y_options"></property> 1515 <property name="y_options"></property>
1543 </packing> 1516 </packing>
1544 </child> 1517 </child>
1545 <child> 1518 <child>
1546 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton"> 1519 <widget class="GtkButton" id="fsinsertuploadbutton">
1547 <property name="visible">True</property> 1520 <property name="visible">True</property>
1521 <property name="sensitive">False</property>
1548 <property name="can_focus">True</property> 1522 <property name="can_focus">True</property>
1549 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property> 1523 <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>
1550 <property name="response_id">0</property> 1524 <property name="response_id">0</property>
1551 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/> 1525 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/>
1552 <child> 1526 <child>
1553 <widget class="GtkHBox" id="hbox60"> 1527 <widget class="GtkHBox" id="hbox55">
1554 <property name="visible">True</property> 1528 <property name="visible">True</property>
1555 <property name="spacing">2</property> 1529 <property name="spacing">2</property>
1556 <child> 1530 <child>
1557 <widget class="GtkImage" id="image46"> 1531 <widget class="GtkImage" id="image42">
1558 <property name="visible">True</property> 1532 <property name="visible">True</property>
1559 <property name="stock">gtk-open</property> 1533 <property name="stock">gtk-go-up</property>
1560 </widget> 1534 </widget>
1561 <packing> 1535 <packing>
1562 <property name="expand">False</property> 1536 <property name="expand">False</property>
@@ -1564,9 +1538,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1564 </packing> 1538 </packing>
1565 </child> 1539 </child>
1566 <child> 1540 <child>
1567 <widget class="GtkLabel" id="label143"> 1541 <widget class="GtkLabel" id="label137">
1568 <property name="visible">True</property> 1542 <property name="visible">True</property>
1569 <property name="label" translatable="yes">_Browse</property> 1543 <property name="label" translatable="yes">Pub_lish</property>
1570 <property name="use_underline">True</property> 1544 <property name="use_underline">True</property>
1571 </widget> 1545 </widget>
1572 <packing> 1546 <packing>
@@ -1581,52 +1555,31 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1581 <packing> 1555 <packing>
1582 <property name="left_attach">2</property> 1556 <property name="left_attach">2</property>
1583 <property name="right_attach">3</property> 1557 <property name="right_attach">3</property>
1584 <property name="top_attach">4</property> 1558 <property name="top_attach">5</property>
1585 <property name="bottom_attach">5</property> 1559 <property name="bottom_attach">6</property>
1586 <property name="x_options">GTK_FILL</property>
1587 <property name="y_options"></property>
1588 </packing>
1589 </child>
1590 <child>
1591 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1592 <property name="visible">True</property>
1593 <property name="can_focus">True</property>
1594 <property name="tooltip" translatable="yes">Only publish a single file</property>
1595 <property name="label" translatable="yes">File onl_y</property>
1596 <property name="use_underline">True</property>
1597 <property name="response_id">0</property>
1598 <property name="active">True</property>
1599 <property name="draw_indicator">True</property>
1600 <property name="group">scopeRecursiveButton</property>
1601 </widget>
1602 <packing>
1603 <property name="left_attach">1</property>
1604 <property name="right_attach">2</property>
1605 <property name="top_attach">1</property>
1606 <property name="bottom_attach">2</property>
1607 <property name="x_options">GTK_FILL</property> 1560 <property name="x_options">GTK_FILL</property>
1608 <property name="y_options"></property> 1561 <property name="y_options"></property>
1609 </packing> 1562 </packing>
1610 </child> 1563 </child>
1611 <child> 1564 <child>
1612 <widget class="GtkCheckButton" id="doExtractCheckButton"> 1565 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1613 <property name="visible">True</property> 1566 <property name="visible">True</property>
1614 <property name="can_focus">True</property> 1567 <property name="can_focus">True</property>
1615 <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> 1568 <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>
1616 <property name="response_id">0</property> 1569 <property name="response_id">0</property>
1617 <property name="active">True</property> 1570 <property name="active">True</property>
1618 <property name="draw_indicator">True</property> 1571 <property name="draw_indicator">True</property>
1619 <child> 1572 <child>
1620 <widget class="GtkAlignment" id="alignment24"> 1573 <widget class="GtkAlignment" id="alignment15">
1621 <property name="visible">True</property> 1574 <property name="visible">True</property>
1622 <property name="xscale">0</property> 1575 <property name="xscale">0</property>
1623 <property name="yscale">0</property> 1576 <property name="yscale">0</property>
1624 <child> 1577 <child>
1625 <widget class="GtkHBox" id="hbox66"> 1578 <widget class="GtkHBox" id="hbox52">
1626 <property name="visible">True</property> 1579 <property name="visible">True</property>
1627 <property name="spacing">2</property> 1580 <property name="spacing">2</property>
1628 <child> 1581 <child>
1629 <widget class="GtkImage" id="image49"> 1582 <widget class="GtkImage" id="image40">
1630 <property name="visible">True</property> 1583 <property name="visible">True</property>
1631 <property name="stock">gtk-index</property> 1584 <property name="stock">gtk-index</property>
1632 </widget> 1585 </widget>
@@ -1636,9 +1589,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1636 </packing> 1589 </packing>
1637 </child> 1590 </child>
1638 <child> 1591 <child>
1639 <widget class="GtkLabel" id="label151"> 1592 <widget class="GtkLabel" id="label128">
1640 <property name="visible">True</property> 1593 <property name="visible">True</property>
1641 <property name="label" translatable="yes">Use libextractor for files in directories</property> 1594 <property name="label" translatable="yes">Add keywords for files in directories</property>
1642 <property name="use_underline">True</property> 1595 <property name="use_underline">True</property>
1643 </widget> 1596 </widget>
1644 <packing> 1597 <packing>
@@ -1655,32 +1608,40 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1655 <packing> 1608 <packing>
1656 <property name="left_attach">2</property> 1609 <property name="left_attach">2</property>
1657 <property name="right_attach">3</property> 1610 <property name="right_attach">3</property>
1658 <property name="top_attach">3</property> 1611 <property name="top_attach">2</property>
1659 <property name="bottom_attach">4</property> 1612 <property name="bottom_attach">3</property>
1660 <property name="x_options">GTK_FILL</property> 1613 <property name="x_options">GTK_FILL</property>
1661 <property name="y_options"></property> 1614 <property name="y_options"></property>
1662 </packing> 1615 </packing>
1663 </child> 1616 </child>
1664 <child> 1617 <child>
1665 <widget class="GtkAlignment" id="alignment7"> 1618 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1619 <property name="visible">True</property>
1620 <property name="can_focus">True</property>
1621 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1622 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1623 <property name="use_underline">True</property>
1624 <property name="response_id">0</property>
1625 <property name="draw_indicator">True</property>
1626 </widget>
1627 <packing>
1628 <property name="left_attach">2</property>
1629 <property name="right_attach">3</property>
1630 <property name="top_attach">1</property>
1631 <property name="bottom_attach">2</property>
1632 <property name="x_options">GTK_FILL</property>
1633 <property name="y_options"></property>
1634 </packing>
1635 </child>
1636 <child>
1637 <widget class="GtkLabel" id="anonymityUploadLabel">
1666 <property name="visible">True</property> 1638 <property name="visible">True</property>
1667 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1668 <property name="xalign">0</property> 1639 <property name="xalign">0</property>
1669 <property name="xscale">0</property> 1640 <property name="xpad">5</property>
1670 <child> 1641 <property name="label" translatable="yes">_Anonymity:</property>
1671 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton"> 1642 <property name="use_underline">True</property>
1672 <property name="visible">True</property>
1673 <property name="can_focus">True</property>
1674 <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>
1675 <property name="adjustment">1 0 10000 1 10 10</property>
1676 <property name="climb_rate">1</property>
1677 <property name="numeric">True</property>
1678 </widget>
1679 </child>
1680 </widget> 1643 </widget>
1681 <packing> 1644 <packing>
1682 <property name="left_attach">1</property>
1683 <property name="right_attach">2</property>
1684 <property name="top_attach">2</property> 1645 <property name="top_attach">2</property>
1685 <property name="bottom_attach">3</property> 1646 <property name="bottom_attach">3</property>
1686 <property name="x_options">GTK_FILL</property> 1647 <property name="x_options">GTK_FILL</property>
@@ -1688,28 +1649,67 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1688 </packing> 1649 </packing>
1689 </child> 1650 </child>
1690 <child> 1651 <child>
1691 <widget class="GtkAlignment" id="alignment8"> 1652 <widget class="GtkLabel" id="scopeLabel">
1692 <property name="visible">True</property> 1653 <property name="visible">True</property>
1693 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1694 <property name="xalign">0</property> 1654 <property name="xalign">0</property>
1695 <property name="xscale">0</property> 1655 <property name="xpad">5</property>
1696 <child> 1656 <property name="label" translatable="yes">Scope:</property>
1697 <widget class="GtkSpinButton" id="contentPrioritySpinButton"> 1657 <property name="use_underline">True</property>
1698 <property name="width_request">94</property> 1658 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1699 <property name="visible">True</property> 1659 </widget>
1700 <property name="can_focus">True</property> 1660 <packing>
1701 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property> 1661 <property name="top_attach">1</property>
1702 <property name="adjustment">950 0 100000000 50 500 500</property> 1662 <property name="bottom_attach">2</property>
1703 <property name="climb_rate">500</property> 1663 <property name="x_options">GTK_FILL</property>
1704 <property name="numeric">True</property> 1664 <property name="y_options"></property>
1705 </widget> 1665 </packing>
1706 </child> 1666 </child>
1667 <child>
1668 <widget class="GtkRadioButton" id="insertButton">
1669 <property name="visible">True</property>
1670 <property name="can_focus">True</property>
1671 <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>
1672 <property name="label" translatable="yes">I_nsert</property>
1673 <property name="use_underline">True</property>
1674 <property name="response_id">0</property>
1675 <property name="draw_indicator">True</property>
1676 <property name="group">indexbutton</property>
1677 </widget>
1678 <packing>
1679 <property name="left_attach">2</property>
1680 <property name="right_attach">3</property>
1681 <property name="x_options">GTK_FILL</property>
1682 <property name="y_options"></property>
1683 </packing>
1684 </child>
1685 <child>
1686 <widget class="GtkRadioButton" id="indexbutton">
1687 <property name="visible">True</property>
1688 <property name="can_focus">True</property>
1689 <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>
1690 <property name="label" translatable="yes">Inde_x</property>
1691 <property name="use_underline">True</property>
1692 <property name="response_id">0</property>
1693 <property name="active">True</property>
1694 <property name="draw_indicator">True</property>
1707 </widget> 1695 </widget>
1708 <packing> 1696 <packing>
1709 <property name="left_attach">1</property> 1697 <property name="left_attach">1</property>
1710 <property name="right_attach">2</property> 1698 <property name="right_attach">2</property>
1711 <property name="top_attach">3</property> 1699 <property name="x_options">GTK_FILL</property>
1712 <property name="bottom_attach">4</property> 1700 <property name="y_options"></property>
1701 </packing>
1702 </child>
1703 <child>
1704 <widget class="GtkLabel" id="methodLabel">
1705 <property name="visible">True</property>
1706 <property name="xalign">0</property>
1707 <property name="xpad">5</property>
1708 <property name="label" translatable="yes">Method:</property>
1709 <property name="use_underline">True</property>
1710 <property name="mnemonic_widget">indexbutton</property>
1711 </widget>
1712 <packing>
1713 <property name="x_options">GTK_FILL</property> 1713 <property name="x_options">GTK_FILL</property>
1714 <property name="y_options"></property> 1714 <property name="y_options"></property>
1715 </packing> 1715 </packing>
@@ -1758,33 +1758,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1758 <widget class="GtkMenuBar" id="advanced_fs_menubar"> 1758 <widget class="GtkMenuBar" id="advanced_fs_menubar">
1759 <property name="visible">True</property> 1759 <property name="visible">True</property>
1760 <child> 1760 <child>
1761 <widget class="GtkImageMenuItem" id="open1">
1762 <property name="visible">True</property>
1763 <property name="label">gtk-open</property>
1764 <property name="use_underline">True</property>
1765 <property name="use_stock">True</property>
1766 <child>
1767 <widget class="GtkMenu" id="open1_menu">
1768 <child>
1769 <widget class="GtkImageMenuItem" id="directory1">
1770 <property name="visible">True</property>
1771 <property name="label" translatable="yes">_Directory</property>
1772 <property name="use_underline">True</property>
1773 <signal name="activate" handler="on_open_menu_activate_"/>
1774 <child internal-child="image">
1775 <widget class="GtkImage" id="image61">
1776 <property name="visible">True</property>
1777 <property name="stock">gtk-open</property>
1778 <property name="icon_size">1</property>
1779 </widget>
1780 </child>
1781 </widget>
1782 </child>
1783 </widget>
1784 </child>
1785 </widget>
1786 </child>
1787 <child>
1788 <widget class="GtkImageMenuItem" id="createNamespace"> 1761 <widget class="GtkImageMenuItem" id="createNamespace">
1789 <property name="visible">True</property> 1762 <property name="visible">True</property>
1790 <property name="label" translatable="yes">gtk-new</property> 1763 <property name="label" translatable="yes">gtk-new</property>
@@ -2107,6 +2080,51 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2107 <placeholder/> 2080 <placeholder/>
2108 </child> 2081 </child>
2109 <child> 2082 <child>
2083 <widget class="GtkLabel" id="label1">
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">_Room Name</property>
2087 <property name="use_underline">True</property>
2088 <property name="mnemonic_widget">chatRoomNameEntry</property>
2089 </widget>
2090 </child>
2091 <child>
2092 <widget class="GtkLabel" id="label4">
2093 <property name="visible">True</property>
2094 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2095 <property name="label" translatable="yes">_Moniker</property>
2096 <property name="use_underline">True</property>
2097 </widget>
2098 <packing>
2099 <property name="left_attach">1</property>
2100 <property name="right_attach">2</property>
2101 </packing>
2102 </child>
2103 <child>
2104 <widget class="GtkEntry" id="chatRoomNameEntry">
2105 <property name="visible">True</property>
2106 <property name="can_focus">True</property>
2107 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2108 </widget>
2109 <packing>
2110 <property name="top_attach">1</property>
2111 <property name="bottom_attach">2</property>
2112 </packing>
2113 </child>
2114 <child>
2115 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2116 <property name="visible">True</property>
2117 <property name="can_focus">True</property>
2118 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2119 </widget>
2120 <packing>
2121 <property name="left_attach">1</property>
2122 <property name="right_attach">2</property>
2123 <property name="top_attach">1</property>
2124 <property name="bottom_attach">2</property>
2125 </packing>
2126 </child>
2127 <child>
2110 <widget class="GtkButton" id="on_chat_room_name_button"> 2128 <widget class="GtkButton" id="on_chat_room_name_button">
2111 <property name="visible">True</property> 2129 <property name="visible">True</property>
2112 <property name="can_focus">True</property> 2130 <property name="can_focus">True</property>
@@ -2153,51 +2171,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2153 <property name="y_options"></property> 2171 <property name="y_options"></property>
2154 </packing> 2172 </packing>
2155 </child> 2173 </child>
2156 <child>
2157 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2158 <property name="visible">True</property>
2159 <property name="can_focus">True</property>
2160 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2161 </widget>
2162 <packing>
2163 <property name="left_attach">1</property>
2164 <property name="right_attach">2</property>
2165 <property name="top_attach">1</property>
2166 <property name="bottom_attach">2</property>
2167 </packing>
2168 </child>
2169 <child>
2170 <widget class="GtkEntry" id="chatRoomNameEntry">
2171 <property name="visible">True</property>
2172 <property name="can_focus">True</property>
2173 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2174 </widget>
2175 <packing>
2176 <property name="top_attach">1</property>
2177 <property name="bottom_attach">2</property>
2178 </packing>
2179 </child>
2180 <child>
2181 <widget class="GtkLabel" id="label4">
2182 <property name="visible">True</property>
2183 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2184 <property name="label" translatable="yes">_Moniker</property>
2185 <property name="use_underline">True</property>
2186 </widget>
2187 <packing>
2188 <property name="left_attach">1</property>
2189 <property name="right_attach">2</property>
2190 </packing>
2191 </child>
2192 <child>
2193 <widget class="GtkLabel" id="label1">
2194 <property name="visible">True</property>
2195 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2196 <property name="label" translatable="yes">_Room Name</property>
2197 <property name="use_underline">True</property>
2198 <property name="mnemonic_widget">chatRoomNameEntry</property>
2199 </widget>
2200 </child>
2201 </widget> 2174 </widget>
2202 <packing> 2175 <packing>
2203 <property name="expand">False</property> 2176 <property name="expand">False</property>
@@ -2924,8 +2897,8 @@ Press ENTER to add the data.</atkproperty>
2924 <property name="response_id">-5</property> 2897 <property name="response_id">-5</property>
2925 <signal name="clicked" handler="gtk_widget_destroy" object="metaDisplayDialog"/> 2898 <signal name="clicked" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2926 <signal name="activate" handler="gtk_widget_destroy" object="metaDisplayDialog"/> 2899 <signal name="activate" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2927 <accelerator key="Escape" modifiers="" signal="activate"/>
2928 <accelerator key="Return" modifiers="" signal="activate"/> 2900 <accelerator key="Return" modifiers="" signal="activate"/>
2901 <accelerator key="Escape" modifiers="" signal="activate"/>
2929 </widget> 2902 </widget>
2930 </child> 2903 </child>
2931 </widget> 2904 </widget>
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 3e7108f1..603a4269 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -217,7 +217,7 @@ makeNamespaceFrame (NamespaceList * entry)
217 renderer = gtk_cell_renderer_text_new (); 217 renderer = gtk_cell_renderer_text_new ();
218 col = 218 col =
219 gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList), 219 gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
220 -1, _("Last ID"), renderer, 220 -1, _("Identifier"), renderer,
221 "text", 221 "text",
222 IN_NAMESPACE_LAST_STRING, 222 IN_NAMESPACE_LAST_STRING,
223 NULL); 223 NULL);
@@ -230,7 +230,7 @@ makeNamespaceFrame (NamespaceList * entry)
230 renderer = gtk_cell_renderer_text_new (); 230 renderer = gtk_cell_renderer_text_new ();
231 col = 231 col =
232 gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList), 232 gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
233 -1, _("Next ID"), renderer, 233 -1, _("Next Identifier"), renderer,
234 "text", 234 "text",
235 IN_NAMESPACE_NEXT_STRING, 235 IN_NAMESPACE_NEXT_STRING,
236 NULL); 236 NULL);
@@ -325,8 +325,8 @@ addNamespaceContentToModel (void *cls,
325 IN_NAMESPACE_HSIZE, size_h, 325 IN_NAMESPACE_HSIZE, size_h,
326 IN_NAMESPACE_DESCRIPTION, desc, 326 IN_NAMESPACE_DESCRIPTION, desc,
327 IN_NAMESPACE_MIMETYPE, mime, 327 IN_NAMESPACE_MIMETYPE, mime,
328 IN_NAMESPACE_LAST_STRING, &lastId, 328 IN_NAMESPACE_LAST_STRING, lastId,
329 IN_NAMESPACE_NEXT_STRING, &nextId, 329 IN_NAMESPACE_NEXT_STRING, nextId,
330 IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri), 330 IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
331 IN_NAMESPACE_META, 331 IN_NAMESPACE_META,
332 GNUNET_meta_data_duplicate (fi->meta), -1); 332 GNUNET_meta_data_duplicate (fi->meta), -1);
@@ -655,7 +655,6 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
655 GtkTreeIter iter; 655 GtkTreeIter iter;
656 GtkTreeSelection *selection; 656 GtkTreeSelection *selection;
657 IUC cls; 657 IUC cls;
658 char *last;
659 char *next; 658 char *next;
660 GtkWidget *nextEntryLine; 659 GtkWidget *nextEntryLine;
661 GtkWidget *identifierLabel; 660 GtkWidget *identifierLabel;
@@ -692,7 +691,7 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
692 } 691 }
693 gtk_tree_model_get (list->model, 692 gtk_tree_model_get (list->model,
694 &iter, IN_NAMESPACE_NEXT_STRING, &next, -1); 693 &iter, IN_NAMESPACE_NEXT_STRING, &next, -1);
695 if ((last == NULL) || (next == NULL)) 694 if (next == NULL)
696 { 695 {
697 GNUNET_GE_BREAK (NULL, 0); 696 GNUNET_GE_BREAK (NULL, 0);
698 return; 697 return;
@@ -715,6 +714,8 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
715 714
716 /* get data from update dialog */ 715 /* get data from update dialog */
717 cls.nextId = gtk_entry_get_text (GTK_ENTRY (nextEntryLine)); 716 cls.nextId = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
717 if (cls.nextId == NULL)
718 cls.nextId = "";
718 cls.anonymityLevel 719 cls.anonymityLevel
719 = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton"); 720 = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
720 721
@@ -725,7 +726,6 @@ CLEANUP:
725 gtk_widget_destroy (dialog); 726 gtk_widget_destroy (dialog);
726 UNREF (metaXML); 727 UNREF (metaXML);
727 metaXML = NULL; 728 metaXML = NULL;
728 free (last);
729 free (next); 729 free (next);
730 GNUNET_GTK_DEBUG_END (); 730 GNUNET_GTK_DEBUG_END ();
731} 731}