aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoon <moon@140774ce-b5e7-0310-ab8b-a85725594a96>2008-06-10 13:44:54 +0000
committerMoon <moon@140774ce-b5e7-0310-ab8b-a85725594a96>2008-06-10 13:44:54 +0000
commit7290a6b7818ed49c8253ccfddeb3006f6a448845 (patch)
tree7395495e384b0d6b3cc56e26e240dde8a5f818bd
parentd9f6702f81ed8a1845d6ad7ae9ba302a9718ab29 (diff)
downloadgnunet-gtk-7290a6b7818ed49c8253ccfddeb3006f6a448845.tar.gz
gnunet-gtk-7290a6b7818ed49c8253ccfddeb3006f6a448845.zip
remove searches summary
reorganize FS tabs
Diffstat
-rw-r--r--gnunet-gtk.glade1239
-rw-r--r--src/plugins/fs/fs.c76
-rw-r--r--src/plugins/fs/fs.h18
-rw-r--r--src/plugins/fs/search.c164
4 files changed, 600 insertions, 897 deletions
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index b8570032..a2ab14dc 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -565,29 +565,19 @@ This release adds context-menus (right-click) which allow copying the URI of sea
565 <widget class="GtkNotebook" id="fsnotebook"> 565 <widget class="GtkNotebook" id="fsnotebook">
566 <property name="scrollable">True</property> 566 <property name="scrollable">True</property>
567 <child> 567 <child>
568 <widget class="GtkTable" id="fsstatustable"> 568 <widget class="GtkVBox" id="fsdownloadvbox">
569 <property name="visible">True</property> 569 <property name="visible">True</property>
570 <property name="border_width">5</property> 570 <property name="border_width">5</property>
571 <property name="n_rows">7</property>
572 <property name="n_columns">2</property>
573 <property name="column_spacing">5</property>
574 <child>
575 <placeholder/>
576 </child>
577 <child> 571 <child>
578 <widget class="GtkVBox" id="vbox21"> 572 <widget class="GtkHBox" id="fssearchhbox">
579 <property name="visible">True</property> 573 <property name="visible">True</property>
580 <property name="homogeneous">True</property>
581 <child> 574 <child>
582 <widget class="GtkButton" id="stopUploadButton"> 575 <widget class="GtkLabel" id="searchkeywordlabel">
583 <property name="visible">True</property> 576 <property name="visible">True</property>
584 <property name="sensitive">False</property> 577 <property name="xpad">5</property>
585 <property name="can_focus">True</property> 578 <property name="label" translatable="yes">_Keyword:</property>
586 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property> 579 <property name="use_underline">True</property>
587 <property name="label">gtk-stop</property> 580 <property name="mnemonic_widget">fssearchKeywordComboBoxEntry</property>
588 <property name="use_stock">True</property>
589 <property name="response_id">0</property>
590 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/>
591 </widget> 581 </widget>
592 <packing> 582 <packing>
593 <property name="expand">False</property> 583 <property name="expand">False</property>
@@ -595,162 +585,116 @@ This release adds context-menus (right-click) which allow copying the URI of sea
595 </packing> 585 </packing>
596 </child> 586 </child>
597 <child> 587 <child>
598 <widget class="GtkButton" id="clearCompletedUploadsButton"> 588 <widget class="GtkAlignment" id="fssearchKeywordAlignment">
599 <property name="visible">True</property> 589 <property name="visible">True</property>
600 <property name="can_focus">True</property> 590 <property name="border_width">3</property>
601 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property>
602 <property name="response_id">0</property>
603 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/>
604 <child> 591 <child>
605 <widget class="GtkAlignment" id="alignment4"> 592 <widget class="GtkComboBoxEntry" id="fssearchKeywordComboBoxEntry">
606 <property name="visible">True</property> 593 <property name="visible">True</property>
607 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 594 <property name="can_focus">True</property>
608 <property name="xscale">0</property> 595 <property name="can_default">True</property>
609 <child> 596 <signal name="changed" handler="on_fssearchKeywordComboBoxEntry_changed_"/>
610 <widget class="GtkHBox" id="hbox5"> 597 <child internal-child="entry">
611 <property name="visible">True</property> 598 <widget class="GtkEntry" id="comboboxentry-entry1">
612 <property name="spacing">2</property>
613 <child>
614 <widget class="GtkImage" id="image4">
615 <property name="visible">True</property>
616 <property name="stock">gtk-clear</property>
617 </widget>
618 <packing>
619 <property name="expand">False</property>
620 <property name="fill">False</property>
621 </packing>
622 </child>
623 <child>
624 <widget class="GtkLabel" id="label2">
625 <property name="visible">True</property>
626 <property name="label" translatable="yes">_Clean</property>
627 <property name="use_underline">True</property>
628 </widget>
629 <packing>
630 <property name="expand">False</property>
631 <property name="fill">False</property>
632 <property name="position">1</property>
633 </packing>
634 </child>
635 </widget> 599 </widget>
636 </child> 600 </child>
637 </widget> 601 </widget>
638 </child> 602 </child>
639 </widget> 603 </widget>
640 <packing> 604 <packing>
641 <property name="fill">False</property>
642 <property name="position">1</property> 605 <property name="position">1</property>
643 </packing> 606 </packing>
644 </child> 607 </child>
645 </widget>
646 <packing>
647 <property name="left_attach">1</property>
648 <property name="right_attach">2</property>
649 <property name="top_attach">6</property>
650 <property name="bottom_attach">7</property>
651 <property name="x_options">GTK_FILL</property>
652 <property name="x_padding">5</property>
653 </packing>
654 </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> 608 <child>
681 <widget class="GtkLabel" id="label46"> 609 <widget class="GtkButton" id="fssearchbutton">
682 <property name="visible">True</property> 610 <property name="visible">True</property>
683 <property name="xalign">0</property> 611 <property name="sensitive">False</property>
684 <property name="xpad">5</property> 612 <property name="can_focus">True</property>
685 <property name="ypad">5</property> 613 <property name="tooltip" translatable="yes">Search GNUnet for content under the specified keyword (and, if applicable, restrict the search to the given namespace)</property>
686 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property> 614 <property name="label" translatable="yes">gtk-find</property>
687 <property name="use_markup">True</property> 615 <property name="use_stock">True</property>
616 <property name="response_id">0</property>
617 <signal name="clicked" handler="on_fssearchbutton_clicked_"/>
618 <accelerator key="Return" modifiers="" signal="activate"/>
688 </widget> 619 </widget>
620 <packing>
621 <property name="expand">False</property>
622 <property name="fill">False</property>
623 <property name="position">2</property>
624 </packing>
689 </child> 625 </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> 626 <child>
703 <widget class="GtkLabel" id="label45"> 627 <widget class="GtkLabel" id="searchAnonymityLabel">
704 <property name="visible">True</property> 628 <property name="visible">True</property>
705 <property name="xalign">0</property>
706 <property name="xpad">5</property> 629 <property name="xpad">5</property>
707 <property name="ypad">5</property> 630 <property name="label" translatable="yes">with _anonymity</property>
708 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property> 631 <property name="use_underline">True</property>
709 <property name="use_markup">True</property> 632 <property name="mnemonic_widget">searchAnonymitySelectionSpinButton</property>
710 </widget> 633 </widget>
634 <packing>
635 <property name="expand">False</property>
636 <property name="fill">False</property>
637 <property name="position">3</property>
638 </packing>
711 </child> 639 </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> 640 <child>
728 <widget class="GtkTreeView" id="activeUploadsList"> 641 <widget class="GtkSpinButton" id="searchAnonymitySelectionSpinButton">
729 <property name="visible">True</property> 642 <property name="visible">True</property>
730 <property name="can_focus">True</property> 643 <property name="can_focus">True</property>
731 <property name="reorderable">True</property> 644 <property name="tooltip" translatable="yes">Specify the anonymity level for the search, 0 for no anonymity. Higher values provide more privacy but also less performance.</property>
732 <property name="rules_hint">True</property> 645 <property name="adjustment">1 0 100000 1 10 10</property>
733 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/> 646 <property name="climb_rate">1</property>
647 <property name="numeric">True</property>
648 <signal name="value_changed" handler="on_anonymity_spin_changed_"/>
649 </widget>
650 <packing>
651 <property name="expand">False</property>
652 <property name="position">4</property>
653 </packing>
654 </child>
655 <child>
656 <widget class="GtkVSeparator" id="vseparator3">
657 <property name="visible">True</property>
658 </widget>
659 <packing>
660 <property name="expand">False</property>
661 <property name="fill">False</property>
662 <property name="padding">9</property>
663 <property name="position">5</property>
664 </packing>
665 </child>
666 <child>
667 <widget class="GtkButton" id="openDirectoryButton">
668 <property name="visible">True</property>
669 <property name="can_focus">True</property>
670 <property name="tooltip" translatable="yes">Open a GNUnet directory from a file</property>
671 <property name="label">gtk-open</property>
672 <property name="use_stock">True</property>
673 <property name="response_id">0</property>
674 <signal name="clicked" handler="on_open_menu_activate_"/>
734 </widget> 675 </widget>
676 <packing>
677 <property name="expand">False</property>
678 <property name="fill">False</property>
679 <property name="position">6</property>
680 </packing>
735 </child> 681 </child>
736 </widget> 682 </widget>
737 <packing> 683 <packing>
738 <property name="top_attach">6</property> 684 <property name="expand">False</property>
739 <property name="bottom_attach">7</property> 685 <property name="fill">False</property>
740 </packing> 686 </packing>
741 </child> 687 </child>
742 <child> 688 <child>
743 <widget class="GtkHBox" id="hbox1"> 689 <widget class="GtkHBox" id="hbox53">
744 <property name="visible">True</property> 690 <property name="visible">True</property>
745 <child> 691 <child>
746 <widget class="GtkLabel" id="fs_status_URI_label"> 692 <widget class="GtkLabel" id="label132">
747 <property name="visible">True</property> 693 <property name="visible">True</property>
748 <property name="can_focus">True</property> 694 <property name="xpad">8</property>
749 <property name="xpad">5</property> 695 <property name="label" translatable="yes">in _namespace</property>
750 <property name="label" translatable="yes">_Enter URI:</property>
751 <property name="use_underline">True</property> 696 <property name="use_underline">True</property>
752 <property name="selectable">True</property> 697 <property name="justify">GTK_JUSTIFY_CENTER</property>
753 <property name="mnemonic_widget">statusDownloadURIEntry</property>
754 </widget> 698 </widget>
755 <packing> 699 <packing>
756 <property name="expand">False</property> 700 <property name="expand">False</property>
@@ -758,58 +702,34 @@ This release adds context-menus (right-click) which allow copying the URI of sea
758 </packing> 702 </packing>
759 </child> 703 </child>
760 <child> 704 <child>
761 <widget class="GtkEntry" id="statusDownloadURIEntry"> 705 <widget class="GtkAlignment" id="alignment18">
762 <property name="visible">True</property> 706 <property name="visible">True</property>
763 <property name="can_focus">True</property> 707 <property name="border_width">3</property>
764 <property name="activates_default">True</property> 708 <child>
765 <property name="text">gnunet://ecrs/</property> 709 <widget class="GtkComboBoxEntry" id="searchNamespaceComboBoxEntry">
710 <property name="visible">True</property>
711 <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed_"/>
712 <child internal-child="entry">
713 <widget class="GtkEntry" id="comboboxentry-entry2">
714 </widget>
715 </child>
716 </widget>
717 </child>
766 </widget> 718 </widget>
767 <packing> 719 <packing>
768 <property name="padding">5</property>
769 <property name="position">1</property> 720 <property name="position">1</property>
770 </packing> 721 </packing>
771 </child> 722 </child>
772 <child> 723 <child>
773 <widget class="GtkButton" id="fs_status_download_button"> 724 <widget class="GtkSpinButton" id="namespaceRatingSpinButton">
774 <property name="visible">True</property> 725 <property name="visible">True</property>
726 <property name="sensitive">False</property>
775 <property name="can_focus">True</property> 727 <property name="can_focus">True</property>
776 <property name="tooltip" translatable="yes">Download the content specified by the URI</property> 728 <property name="tooltip" translatable="yes">This is the rating that you have given this namespace so far. Ratings are private and not shared with other users in any way. They are supposed to help each user remember which namespace is worthwile for him.</property>
777 <property name="response_id">0</property> 729 <property name="adjustment">0 -100000 100000 1 10 10</property>
778 <child> 730 <property name="climb_rate">1</property>
779 <widget class="GtkAlignment" id="alignment9"> 731 <property name="numeric">True</property>
780 <property name="visible">True</property> 732 <signal name="changed" handler="on_namespaceRatingSpinButton_changed_"/>
781 <property name="xscale">0</property>
782 <property name="yscale">0</property>
783 <child>
784 <widget class="GtkHBox" id="hbox25">
785 <property name="visible">True</property>
786 <property name="spacing">2</property>
787 <child>
788 <widget class="GtkImage" id="image14">
789 <property name="visible">True</property>
790 <property name="stock">gtk-go-down</property>
791 </widget>
792 <packing>
793 <property name="expand">False</property>
794 <property name="fill">False</property>
795 </packing>
796 </child>
797 <child>
798 <widget class="GtkLabel" id="label12">
799 <property name="visible">True</property>
800 <property name="label" translatable="yes">D_ownload</property>
801 <property name="use_underline">True</property>
802 </widget>
803 <packing>
804 <property name="expand">False</property>
805 <property name="fill">False</property>
806 <property name="position">1</property>
807 </packing>
808 </child>
809 </widget>
810 </child>
811 </widget>
812 </child>
813 </widget> 733 </widget>
814 <packing> 734 <packing>
815 <property name="expand">False</property> 735 <property name="expand">False</property>
@@ -817,40 +737,95 @@ This release adds context-menus (right-click) which allow copying the URI of sea
817 <property name="position">2</property> 737 <property name="position">2</property>
818 </packing> 738 </packing>
819 </child> 739 </child>
740 </widget>
741 <packing>
742 <property name="expand">False</property>
743 <property name="position">1</property>
744 </packing>
745 </child>
746 <child>
747 <widget class="GtkNotebook" id="downloadNotebook">
748 <property name="can_focus">True</property>
749 <property name="scrollable">True</property>
820 <child> 750 <child>
821 <widget class="GtkLabel" id="label13"> 751 <widget class="GtkLabel" id="label95">
822 <property name="visible">True</property> 752 <property name="label">label95</property>
823 <property name="xpad">3</property> 753 </widget>
824 <property name="label" translatable="yes">with _anonymity</property> 754 </child>
825 <property name="use_underline">True</property> 755 <child>
826 <property name="mnemonic_widget">fsstatusAnonymitySpin</property> 756 <widget class="GtkLabel" id="label94">
757 <property name="label">label94</property>
827 </widget> 758 </widget>
828 <packing> 759 <packing>
829 <property name="expand">False</property> 760 <property name="type">tab</property>
830 <property name="fill">False</property> 761 <property name="tab_fill">False</property>
831 <property name="position">3</property>
832 </packing> 762 </packing>
833 </child> 763 </child>
764 </widget>
765 <packing>
766 <property name="position">2</property>
767 </packing>
768 </child>
769 </widget>
770 </child>
771 <child>
772 <widget class="GtkHBox" id="hbox42">
773 <property name="visible">True</property>
774 <child>
775 <widget class="GtkImage" id="image25">
776 <property name="visible">True</property>
777 <property name="stock">gtk-find</property>
778 </widget>
779 </child>
780 <child>
781 <widget class="GtkLabel" id="downloadfstab">
782 <property name="visible">True</property>
783 <property name="label" translatable="yes">S_earch</property>
784 <property name="use_underline">True</property>
785 <property name="justify">GTK_JUSTIFY_CENTER</property>
786 </widget>
787 <packing>
788 <property name="expand">False</property>
789 <property name="fill">False</property>
790 <property name="position">1</property>
791 </packing>
792 </child>
793 </widget>
794 <packing>
795 <property name="type">tab</property>
796 <property name="tab_fill">False</property>
797 </packing>
798 </child>
799 <child>
800 <widget class="GtkTable" id="fsstatustable">
801 <property name="visible">True</property>
802 <property name="border_width">5</property>
803 <property name="n_rows">5</property>
804 <property name="n_columns">2</property>
805 <property name="column_spacing">5</property>
806 <child>
807 <placeholder/>
808 </child>
809 <child>
810 <widget class="GtkScrolledWindow" id="scrolledwindow10">
811 <property name="visible">True</property>
812 <property name="can_focus">True</property>
813 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
814 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
815 <property name="shadow_type">GTK_SHADOW_IN</property>
834 <child> 816 <child>
835 <widget class="GtkSpinButton" id="fsstatusAnonymitySpin"> 817 <widget class="GtkTreeView" id="activeDownloadsList">
836 <property name="visible">True</property> 818 <property name="visible">True</property>
837 <property name="can_focus">True</property> 819 <property name="can_focus">True</property>
838 <property name="adjustment">1 0 999999 1 10 10</property> 820 <property name="reorderable">True</property>
839 <property name="climb_rate">1</property> 821 <property name="rules_hint">True</property>
840 <property name="numeric">True</property> 822 <signal name="button_press_event" handler="on_activeDownloadsList_button_press_"/>
841 </widget> 823 </widget>
842 <packing>
843 <property name="expand">False</property>
844 <property name="fill">False</property>
845 <property name="position">4</property>
846 </packing>
847 </child> 824 </child>
848 </widget> 825 </widget>
849 <packing> 826 <packing>
850 <property name="top_attach">4</property> 827 <property name="top_attach">1</property>
851 <property name="bottom_attach">5</property> 828 <property name="bottom_attach">2</property>
852 <property name="y_options"></property>
853 <property name="y_padding">5</property>
854 </packing> 829 </packing>
855 </child> 830 </child>
856 <child> 831 <child>
@@ -941,115 +916,24 @@ This release adds context-menus (right-click) which allow copying the URI of sea
941 <packing> 916 <packing>
942 <property name="left_attach">1</property> 917 <property name="left_attach">1</property>
943 <property name="right_attach">2</property> 918 <property name="right_attach">2</property>
944 <property name="top_attach">3</property> 919 <property name="top_attach">1</property>
945 <property name="bottom_attach">4</property> 920 <property name="bottom_attach">2</property>
946 <property name="x_options">GTK_FILL</property> 921 <property name="x_options">GTK_FILL</property>
947 <property name="x_padding">5</property> 922 <property name="x_padding">5</property>
948 </packing> 923 </packing>
949 </child> 924 </child>
950 <child> 925 <child>
951 <widget class="GtkScrolledWindow" id="scrolledwindow10"> 926 <widget class="GtkHBox" id="hbox1">
952 <property name="visible">True</property>
953 <property name="can_focus">True</property>
954 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
955 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
956 <property name="shadow_type">GTK_SHADOW_IN</property>
957 <child>
958 <widget class="GtkTreeView" id="activeDownloadsList">
959 <property name="visible">True</property>
960 <property name="can_focus">True</property>
961 <property name="reorderable">True</property>
962 <property name="rules_hint">True</property>
963 <signal name="button_press_event" handler="on_activeDownloadsList_button_press_"/>
964 </widget>
965 </child>
966 </widget>
967 <packing>
968 <property name="top_attach">3</property>
969 <property name="bottom_attach">4</property>
970 </packing>
971 </child>
972 <child>
973 <widget class="GtkLabel" id="label16">
974 <property name="visible">True</property>
975 <property name="xalign">0</property>
976 <property name="yalign">1</property>
977 <property name="xpad">5</property>
978 <property name="ypad">5</property>
979 <property name="label" translatable="yes">&lt;b&gt;Search Overview&lt;/b&gt;</property>
980 <property name="use_markup">True</property>
981 </widget>
982 <packing>
983 <property name="right_attach">2</property>
984 <property name="y_options">GTK_FILL</property>
985 </packing>
986 </child>
987 <child>
988 <widget class="GtkScrolledWindow" id="scrolledwindow9">
989 <property name="visible">True</property> 927 <property name="visible">True</property>
990 <property name="can_focus">False</property>
991 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
992 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
993 <property name="shadow_type">GTK_SHADOW_IN</property>
994 <child> 928 <child>
995 <widget class="GtkTreeView" id="activeSearchesSummary"> 929 <widget class="GtkLabel" id="fs_status_URI_label">
996 <property name="visible">True</property> 930 <property name="visible">True</property>
997 <property name="can_focus">True</property> 931 <property name="can_focus">True</property>
998 <property name="reorderable">True</property>
999 <property name="rules_hint">True</property>
1000 </widget>
1001 </child>
1002 </widget>
1003 <packing>
1004 <property name="top_attach">1</property>
1005 <property name="bottom_attach">2</property>
1006 </packing>
1007 </child>
1008 </widget>
1009 </child>
1010 <child>
1011 <widget class="GtkHBox" id="hbox44">
1012 <property name="visible">True</property>
1013 <property name="can_focus">True</property>
1014 <child>
1015 <widget class="GtkImage" id="image27">
1016 <property name="visible">True</property>
1017 <property name="stock">gtk-dialog-info</property>
1018 </widget>
1019 </child>
1020 <child>
1021 <widget class="GtkLabel" id="statusfstab">
1022 <property name="visible">True</property>
1023 <property name="label" translatable="yes">Stat_us</property>
1024 <property name="use_underline">True</property>
1025 <property name="justify">GTK_JUSTIFY_CENTER</property>
1026 </widget>
1027 <packing>
1028 <property name="expand">False</property>
1029 <property name="fill">False</property>
1030 <property name="position">1</property>
1031 </packing>
1032 </child>
1033 </widget>
1034 <packing>
1035 <property name="type">tab</property>
1036 <property name="tab_fill">False</property>
1037 </packing>
1038 </child>
1039 <child>
1040 <widget class="GtkVBox" id="fsdownloadvbox">
1041 <property name="visible">True</property>
1042 <property name="border_width">5</property>
1043 <child>
1044 <widget class="GtkHBox" id="fssearchhbox">
1045 <property name="visible">True</property>
1046 <child>
1047 <widget class="GtkLabel" id="searchkeywordlabel">
1048 <property name="visible">True</property>
1049 <property name="xpad">5</property> 932 <property name="xpad">5</property>
1050 <property name="label" translatable="yes">_Keyword:</property> 933 <property name="label" translatable="yes">_Enter URI:</property>
1051 <property name="use_underline">True</property> 934 <property name="use_underline">True</property>
1052 <property name="mnemonic_widget">fssearchKeywordComboBoxEntry</property> 935 <property name="selectable">True</property>
936 <property name="mnemonic_widget">statusDownloadURIEntry</property>
1053 </widget> 937 </widget>
1054 <packing> 938 <packing>
1055 <property name="expand">False</property> 939 <property name="expand">False</property>
@@ -1057,37 +941,58 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1057 </packing> 941 </packing>
1058 </child> 942 </child>
1059 <child> 943 <child>
1060 <widget class="GtkAlignment" id="fssearchKeywordAlignment"> 944 <widget class="GtkEntry" id="statusDownloadURIEntry">
1061 <property name="visible">True</property> 945 <property name="visible">True</property>
1062 <property name="border_width">3</property> 946 <property name="can_focus">True</property>
1063 <child> 947 <property name="activates_default">True</property>
1064 <widget class="GtkComboBoxEntry" id="fssearchKeywordComboBoxEntry"> 948 <property name="text">gnunet://ecrs/</property>
1065 <property name="visible">True</property>
1066 <property name="can_focus">True</property>
1067 <property name="can_default">True</property>
1068 <signal name="changed" handler="on_fssearchKeywordComboBoxEntry_changed_"/>
1069 <child internal-child="entry">
1070 <widget class="GtkEntry" id="comboboxentry-entry1">
1071 </widget>
1072 </child>
1073 </widget>
1074 </child>
1075 </widget> 949 </widget>
1076 <packing> 950 <packing>
951 <property name="padding">5</property>
1077 <property name="position">1</property> 952 <property name="position">1</property>
1078 </packing> 953 </packing>
1079 </child> 954 </child>
1080 <child> 955 <child>
1081 <widget class="GtkButton" id="fssearchbutton"> 956 <widget class="GtkButton" id="fs_status_download_button">
1082 <property name="visible">True</property> 957 <property name="visible">True</property>
1083 <property name="sensitive">False</property>
1084 <property name="can_focus">True</property> 958 <property name="can_focus">True</property>
1085 <property name="tooltip" translatable="yes">Search GNUnet for content under the specified keyword (and, if applicable, restrict the search to the given namespace)</property> 959 <property name="tooltip" translatable="yes">Download the content specified by the URI</property>
1086 <property name="label" translatable="yes">gtk-find</property>
1087 <property name="use_stock">True</property>
1088 <property name="response_id">0</property> 960 <property name="response_id">0</property>
1089 <signal name="clicked" handler="on_fssearchbutton_clicked_"/> 961 <child>
1090 <accelerator key="Return" modifiers="" signal="activate"/> 962 <widget class="GtkAlignment" id="alignment9">
963 <property name="visible">True</property>
964 <property name="xscale">0</property>
965 <property name="yscale">0</property>
966 <child>
967 <widget class="GtkHBox" id="hbox25">
968 <property name="visible">True</property>
969 <property name="spacing">2</property>
970 <child>
971 <widget class="GtkImage" id="image14">
972 <property name="visible">True</property>
973 <property name="stock">gtk-go-down</property>
974 </widget>
975 <packing>
976 <property name="expand">False</property>
977 <property name="fill">False</property>
978 </packing>
979 </child>
980 <child>
981 <widget class="GtkLabel" id="label12">
982 <property name="visible">True</property>
983 <property name="label" translatable="yes">D_ownload</property>
984 <property name="use_underline">True</property>
985 </widget>
986 <packing>
987 <property name="expand">False</property>
988 <property name="fill">False</property>
989 <property name="position">1</property>
990 </packing>
991 </child>
992 </widget>
993 </child>
994 </widget>
995 </child>
1091 </widget> 996 </widget>
1092 <packing> 997 <packing>
1093 <property name="expand">False</property> 998 <property name="expand">False</property>
@@ -1096,12 +1001,12 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1096 </packing> 1001 </packing>
1097 </child> 1002 </child>
1098 <child> 1003 <child>
1099 <widget class="GtkLabel" id="searchAnonymityLabel"> 1004 <widget class="GtkLabel" id="label13">
1100 <property name="visible">True</property> 1005 <property name="visible">True</property>
1101 <property name="xpad">5</property> 1006 <property name="xpad">3</property>
1102 <property name="label" translatable="yes">with _anonymity</property> 1007 <property name="label" translatable="yes">with _anonymity</property>
1103 <property name="use_underline">True</property> 1008 <property name="use_underline">True</property>
1104 <property name="mnemonic_widget">searchAnonymitySelectionSpinButton</property> 1009 <property name="mnemonic_widget">fsstatusAnonymitySpin</property>
1105 </widget> 1010 </widget>
1106 <packing> 1011 <packing>
1107 <property name="expand">False</property> 1012 <property name="expand">False</property>
@@ -1110,63 +1015,105 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1110 </packing> 1015 </packing>
1111 </child> 1016 </child>
1112 <child> 1017 <child>
1113 <widget class="GtkSpinButton" id="searchAnonymitySelectionSpinButton"> 1018 <widget class="GtkSpinButton" id="fsstatusAnonymitySpin">
1114 <property name="visible">True</property> 1019 <property name="visible">True</property>
1115 <property name="can_focus">True</property> 1020 <property name="can_focus">True</property>
1116 <property name="tooltip" translatable="yes">Specify the anonymity level for the search, 0 for no anonymity. Higher values provide more privacy but also less performance.</property> 1021 <property name="adjustment">1 0 999999 1 10 10</property>
1117 <property name="adjustment">1 0 100000 1 10 10</property>
1118 <property name="climb_rate">1</property> 1022 <property name="climb_rate">1</property>
1119 <property name="numeric">True</property> 1023 <property name="numeric">True</property>
1120 <signal name="value_changed" handler="on_anonymity_spin_changed_"/>
1121 </widget> 1024 </widget>
1122 <packing> 1025 <packing>
1123 <property name="expand">False</property> 1026 <property name="expand">False</property>
1027 <property name="fill">False</property>
1124 <property name="position">4</property> 1028 <property name="position">4</property>
1125 </packing> 1029 </packing>
1126 </child> 1030 </child>
1031 </widget>
1032 <packing>
1033 <property name="top_attach">2</property>
1034 <property name="bottom_attach">3</property>
1035 <property name="y_options"></property>
1036 <property name="y_padding">5</property>
1037 </packing>
1038 </child>
1039 <child>
1040 <widget class="GtkScrolledWindow" id="scrolledwindow8">
1041 <property name="visible">True</property>
1042 <property name="can_focus">False</property>
1043 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1044 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
1045 <property name="shadow_type">GTK_SHADOW_IN</property>
1127 <child> 1046 <child>
1128 <widget class="GtkVSeparator" id="vseparator3"> 1047 <widget class="GtkTreeView" id="activeUploadsList">
1129 <property name="visible">True</property> 1048 <property name="visible">True</property>
1049 <property name="can_focus">True</property>
1050 <property name="reorderable">True</property>
1051 <property name="rules_hint">True</property>
1052 <signal name="button_press_event" handler="on_activeUploadsList_button_press_"/>
1130 </widget> 1053 </widget>
1131 <packing>
1132 <property name="expand">False</property>
1133 <property name="fill">False</property>
1134 <property name="padding">9</property>
1135 <property name="position">5</property>
1136 </packing>
1137 </child> 1054 </child>
1055 </widget>
1056 <packing>
1057 <property name="top_attach">4</property>
1058 <property name="bottom_attach">5</property>
1059 </packing>
1060 </child>
1061 <child>
1062 <widget class="GtkAlignment" id="alignment11">
1063 <property name="visible">True</property>
1064 <property name="top_padding">5</property>
1138 <child> 1065 <child>
1139 <widget class="GtkButton" id="openDirectoryButton"> 1066 <widget class="GtkLabel" id="label45">
1140 <property name="visible">True</property> 1067 <property name="visible">True</property>
1141 <property name="can_focus">True</property> 1068 <property name="xalign">0</property>
1142 <property name="tooltip" translatable="yes">Open a GNUnet directory from a file</property> 1069 <property name="xpad">5</property>
1143 <property name="label">gtk-open</property> 1070 <property name="ypad">5</property>
1144 <property name="use_stock">True</property> 1071 <property name="label" translatable="yes">&lt;b&gt;Downloads&lt;/b&gt;</property>
1145 <property name="response_id">0</property> 1072 <property name="use_markup">True</property>
1146 <signal name="clicked" handler="on_open_menu_activate_"/>
1147 </widget> 1073 </widget>
1148 <packing>
1149 <property name="expand">False</property>
1150 <property name="fill">False</property>
1151 <property name="position">6</property>
1152 </packing>
1153 </child> 1074 </child>
1154 </widget> 1075 </widget>
1155 <packing> 1076 <packing>
1156 <property name="expand">False</property> 1077 <property name="right_attach">2</property>
1157 <property name="fill">False</property> 1078 <property name="y_options">GTK_FILL</property>
1158 </packing> 1079 </packing>
1159 </child> 1080 </child>
1160 <child> 1081 <child>
1161 <widget class="GtkHBox" id="hbox53"> 1082 <widget class="GtkAlignment" id="alignment14">
1162 <property name="visible">True</property> 1083 <property name="visible">True</property>
1084 <property name="top_padding">5</property>
1163 <child> 1085 <child>
1164 <widget class="GtkLabel" id="label132"> 1086 <widget class="GtkLabel" id="label46">
1165 <property name="visible">True</property> 1087 <property name="visible">True</property>
1166 <property name="xpad">8</property> 1088 <property name="xalign">0</property>
1167 <property name="label" translatable="yes">in _namespace</property> 1089 <property name="xpad">5</property>
1168 <property name="use_underline">True</property> 1090 <property name="ypad">5</property>
1169 <property name="justify">GTK_JUSTIFY_CENTER</property> 1091 <property name="label" translatable="yes">&lt;b&gt;Publications&lt;/b&gt;</property>
1092 <property name="use_markup">True</property>
1093 </widget>
1094 </child>
1095 </widget>
1096 <packing>
1097 <property name="right_attach">2</property>
1098 <property name="top_attach">3</property>
1099 <property name="bottom_attach">4</property>
1100 <property name="y_options">GTK_FILL</property>
1101 </packing>
1102 </child>
1103 <child>
1104 <widget class="GtkVBox" id="vbox21">
1105 <property name="visible">True</property>
1106 <property name="homogeneous">True</property>
1107 <child>
1108 <widget class="GtkButton" id="stopUploadButton">
1109 <property name="visible">True</property>
1110 <property name="sensitive">False</property>
1111 <property name="can_focus">True</property>
1112 <property name="tooltip" translatable="yes">Cancel the selected upload (and all sub-uploads) and remove them from the list</property>
1113 <property name="label">gtk-stop</property>
1114 <property name="use_stock">True</property>
1115 <property name="response_id">0</property>
1116 <signal name="clicked" handler="on_stopUpload_clicked_" object="activeUploadsList"/>
1170 </widget> 1117 </widget>
1171 <packing> 1118 <packing>
1172 <property name="expand">False</property> 1119 <property name="expand">False</property>
@@ -1174,68 +1121,61 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1174 </packing> 1121 </packing>
1175 </child> 1122 </child>
1176 <child> 1123 <child>
1177 <widget class="GtkAlignment" id="alignment18"> 1124 <widget class="GtkButton" id="clearCompletedUploadsButton">
1178 <property name="visible">True</property> 1125 <property name="visible">True</property>
1179 <property name="border_width">3</property> 1126 <property name="can_focus">True</property>
1127 <property name="tooltip" translatable="yes">Clear completed uploads from the list</property>
1128 <property name="response_id">0</property>
1129 <signal name="clicked" handler="on_clearCompletedUploads_clicked_"/>
1180 <child> 1130 <child>
1181 <widget class="GtkComboBoxEntry" id="searchNamespaceComboBoxEntry"> 1131 <widget class="GtkAlignment" id="alignment4">
1182 <property name="visible">True</property> 1132 <property name="visible">True</property>
1183 <signal name="changed" handler="on_searchNamespaceComboBoxEntry_changed_"/> 1133 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1184 <child internal-child="entry"> 1134 <property name="xscale">0</property>
1185 <widget class="GtkEntry" id="comboboxentry-entry2"> 1135 <child>
1136 <widget class="GtkHBox" id="hbox5">
1137 <property name="visible">True</property>
1138 <property name="spacing">2</property>
1139 <child>
1140 <widget class="GtkImage" id="image4">
1141 <property name="visible">True</property>
1142 <property name="stock">gtk-clear</property>
1143 </widget>
1144 <packing>
1145 <property name="expand">False</property>
1146 <property name="fill">False</property>
1147 </packing>
1148 </child>
1149 <child>
1150 <widget class="GtkLabel" id="label2">
1151 <property name="visible">True</property>
1152 <property name="label" translatable="yes">_Clean</property>
1153 <property name="use_underline">True</property>
1154 </widget>
1155 <packing>
1156 <property name="expand">False</property>
1157 <property name="fill">False</property>
1158 <property name="position">1</property>
1159 </packing>
1160 </child>
1186 </widget> 1161 </widget>
1187 </child> 1162 </child>
1188 </widget> 1163 </widget>
1189 </child> 1164 </child>
1190 </widget> 1165 </widget>
1191 <packing> 1166 <packing>
1192 <property name="position">1</property>
1193 </packing>
1194 </child>
1195 <child>
1196 <widget class="GtkSpinButton" id="namespaceRatingSpinButton">
1197 <property name="visible">True</property>
1198 <property name="sensitive">False</property>
1199 <property name="can_focus">True</property>
1200 <property name="tooltip" translatable="yes">This is the rating that you have given this namespace so far. Ratings are private and not shared with other users in any way. They are supposed to help each user remember which namespace is worthwile for him.</property>
1201 <property name="adjustment">0 -100000 100000 1 10 10</property>
1202 <property name="climb_rate">1</property>
1203 <property name="numeric">True</property>
1204 <signal name="changed" handler="on_namespaceRatingSpinButton_changed_"/>
1205 </widget>
1206 <packing>
1207 <property name="expand">False</property>
1208 <property name="fill">False</property> 1167 <property name="fill">False</property>
1209 <property name="position">2</property> 1168 <property name="position">1</property>
1210 </packing>
1211 </child>
1212 </widget>
1213 <packing>
1214 <property name="expand">False</property>
1215 <property name="position">1</property>
1216 </packing>
1217 </child>
1218 <child>
1219 <widget class="GtkNotebook" id="downloadNotebook">
1220 <property name="can_focus">True</property>
1221 <property name="scrollable">True</property>
1222 <child>
1223 <widget class="GtkLabel" id="label95">
1224 <property name="label">label95</property>
1225 </widget>
1226 </child>
1227 <child>
1228 <widget class="GtkLabel" id="label94">
1229 <property name="label">label94</property>
1230 </widget>
1231 <packing>
1232 <property name="type">tab</property>
1233 <property name="tab_fill">False</property>
1234 </packing> 1169 </packing>
1235 </child> 1170 </child>
1236 </widget> 1171 </widget>
1237 <packing> 1172 <packing>
1238 <property name="position">2</property> 1173 <property name="left_attach">1</property>
1174 <property name="right_attach">2</property>
1175 <property name="top_attach">4</property>
1176 <property name="bottom_attach">5</property>
1177 <property name="x_options">GTK_FILL</property>
1178 <property name="x_padding">5</property>
1239 </packing> 1179 </packing>
1240 </child> 1180 </child>
1241 </widget> 1181 </widget>
@@ -1244,18 +1184,19 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1244 </packing> 1184 </packing>
1245 </child> 1185 </child>
1246 <child> 1186 <child>
1247 <widget class="GtkHBox" id="hbox42"> 1187 <widget class="GtkHBox" id="hbox44">
1248 <property name="visible">True</property> 1188 <property name="visible">True</property>
1189 <property name="can_focus">True</property>
1249 <child> 1190 <child>
1250 <widget class="GtkImage" id="image25"> 1191 <widget class="GtkImage" id="image27">
1251 <property name="visible">True</property> 1192 <property name="visible">True</property>
1252 <property name="stock">gtk-go-down</property> 1193 <property name="stock">gtk-execute</property>
1253 </widget> 1194 </widget>
1254 </child> 1195 </child>
1255 <child> 1196 <child>
1256 <widget class="GtkLabel" id="downloadfstab"> 1197 <widget class="GtkLabel" id="statusfstab">
1257 <property name="visible">True</property> 1198 <property name="visible">True</property>
1258 <property name="label" translatable="yes">Search and _Download</property> 1199 <property name="label" translatable="yes">Ope_rations</property>
1259 <property name="use_underline">True</property> 1200 <property name="use_underline">True</property>
1260 <property name="justify">GTK_JUSTIFY_CENTER</property> 1201 <property name="justify">GTK_JUSTIFY_CENTER</property>
1261 </widget> 1202 </widget>
@@ -1291,52 +1232,80 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1291 <placeholder/> 1232 <placeholder/>
1292 </child> 1233 </child>
1293 <child> 1234 <child>
1294 <widget class="GtkAlignment" id="alignment8"> 1235 <widget class="GtkLabel" id="methodLabel">
1295 <property name="visible">True</property> 1236 <property name="visible">True</property>
1296 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1297 <property name="xalign">0</property> 1237 <property name="xalign">0</property>
1298 <property name="xscale">0</property> 1238 <property name="xpad">5</property>
1299 <child> 1239 <property name="label" translatable="yes">Method:</property>
1300 <widget class="GtkSpinButton" id="contentPrioritySpinButton"> 1240 <property name="use_underline">True</property>
1301 <property name="width_request">94</property> 1241 <property name="mnemonic_widget">indexbutton</property>
1302 <property name="visible">True</property> 1242 </widget>
1303 <property name="can_focus">True</property> 1243 <packing>
1304 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property> 1244 <property name="x_options">GTK_FILL</property>
1305 <property name="adjustment">950 0 100000000 50 500 500</property> 1245 <property name="y_options"></property>
1306 <property name="climb_rate">500</property> 1246 </packing>
1307 <property name="numeric">True</property> 1247 </child>
1308 </widget> 1248 <child>
1309 </child> 1249 <widget class="GtkRadioButton" id="indexbutton">
1250 <property name="visible">True</property>
1251 <property name="can_focus">True</property>
1252 <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>
1253 <property name="label" translatable="yes">Inde_x</property>
1254 <property name="use_underline">True</property>
1255 <property name="response_id">0</property>
1256 <property name="active">True</property>
1257 <property name="draw_indicator">True</property>
1310 </widget> 1258 </widget>
1311 <packing> 1259 <packing>
1312 <property name="left_attach">1</property> 1260 <property name="left_attach">1</property>
1313 <property name="right_attach">2</property> 1261 <property name="right_attach">2</property>
1314 <property name="top_attach">3</property>
1315 <property name="bottom_attach">4</property>
1316 <property name="x_options">GTK_FILL</property> 1262 <property name="x_options">GTK_FILL</property>
1317 <property name="y_options"></property> 1263 <property name="y_options"></property>
1318 </packing> 1264 </packing>
1319 </child> 1265 </child>
1320 <child> 1266 <child>
1321 <widget class="GtkAlignment" id="alignment7"> 1267 <widget class="GtkRadioButton" id="insertButton">
1268 <property name="visible">True</property>
1269 <property name="can_focus">True</property>
1270 <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>
1271 <property name="label" translatable="yes">I_nsert</property>
1272 <property name="use_underline">True</property>
1273 <property name="response_id">0</property>
1274 <property name="draw_indicator">True</property>
1275 <property name="group">indexbutton</property>
1276 </widget>
1277 <packing>
1278 <property name="left_attach">2</property>
1279 <property name="right_attach">3</property>
1280 <property name="x_options">GTK_FILL</property>
1281 <property name="y_options"></property>
1282 </packing>
1283 </child>
1284 <child>
1285 <widget class="GtkLabel" id="scopeLabel">
1322 <property name="visible">True</property> 1286 <property name="visible">True</property>
1323 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1324 <property name="xalign">0</property> 1287 <property name="xalign">0</property>
1325 <property name="xscale">0</property> 1288 <property name="xpad">5</property>
1326 <child> 1289 <property name="label" translatable="yes">Scope:</property>
1327 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton"> 1290 <property name="use_underline">True</property>
1328 <property name="visible">True</property> 1291 <property name="mnemonic_widget">scopeFileOnlyButton</property>
1329 <property name="can_focus">True</property> 1292 </widget>
1330 <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> 1293 <packing>
1331 <property name="adjustment">1 0 10000 1 10 10</property> 1294 <property name="top_attach">1</property>
1332 <property name="climb_rate">1</property> 1295 <property name="bottom_attach">2</property>
1333 <property name="numeric">True</property> 1296 <property name="x_options">GTK_FILL</property>
1334 </widget> 1297 <property name="y_options"></property>
1335 </child> 1298 </packing>
1299 </child>
1300 <child>
1301 <widget class="GtkLabel" id="anonymityUploadLabel">
1302 <property name="visible">True</property>
1303 <property name="xalign">0</property>
1304 <property name="xpad">5</property>
1305 <property name="label" translatable="yes">_Anonymity:</property>
1306 <property name="use_underline">True</property>
1336 </widget> 1307 </widget>
1337 <packing> 1308 <packing>
1338 <property name="left_attach">1</property>
1339 <property name="right_attach">2</property>
1340 <property name="top_attach">2</property> 1309 <property name="top_attach">2</property>
1341 <property name="bottom_attach">3</property> 1310 <property name="bottom_attach">3</property>
1342 <property name="x_options">GTK_FILL</property> 1311 <property name="x_options">GTK_FILL</property>
@@ -1344,24 +1313,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1344 </packing> 1313 </packing>
1345 </child> 1314 </child>
1346 <child> 1315 <child>
1347 <widget class="GtkCheckButton" id="doExtractCheckButton"> 1316 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1348 <property name="visible">True</property> 1317 <property name="visible">True</property>
1349 <property name="can_focus">True</property> 1318 <property name="can_focus">True</property>
1350 <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> 1319 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1320 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1321 <property name="use_underline">True</property>
1322 <property name="response_id">0</property>
1323 <property name="draw_indicator">True</property>
1324 </widget>
1325 <packing>
1326 <property name="left_attach">2</property>
1327 <property name="right_attach">3</property>
1328 <property name="top_attach">1</property>
1329 <property name="bottom_attach">2</property>
1330 <property name="x_options">GTK_FILL</property>
1331 <property name="y_options"></property>
1332 </packing>
1333 </child>
1334 <child>
1335 <widget class="GtkCheckButton" id="deepIndexCheckButton">
1336 <property name="visible">True</property>
1337 <property name="can_focus">True</property>
1338 <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>
1351 <property name="response_id">0</property> 1339 <property name="response_id">0</property>
1352 <property name="active">True</property> 1340 <property name="active">True</property>
1353 <property name="draw_indicator">True</property> 1341 <property name="draw_indicator">True</property>
1354 <child> 1342 <child>
1355 <widget class="GtkAlignment" id="alignment24"> 1343 <widget class="GtkAlignment" id="alignment15">
1356 <property name="visible">True</property> 1344 <property name="visible">True</property>
1357 <property name="xscale">0</property> 1345 <property name="xscale">0</property>
1358 <property name="yscale">0</property> 1346 <property name="yscale">0</property>
1359 <child> 1347 <child>
1360 <widget class="GtkHBox" id="hbox66"> 1348 <widget class="GtkHBox" id="hbox52">
1361 <property name="visible">True</property> 1349 <property name="visible">True</property>
1362 <property name="spacing">2</property> 1350 <property name="spacing">2</property>
1363 <child> 1351 <child>
1364 <widget class="GtkImage" id="image49"> 1352 <widget class="GtkImage" id="image40">
1365 <property name="visible">True</property> 1353 <property name="visible">True</property>
1366 <property name="stock">gtk-index</property> 1354 <property name="stock">gtk-index</property>
1367 </widget> 1355 </widget>
@@ -1371,9 +1359,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1371 </packing> 1359 </packing>
1372 </child> 1360 </child>
1373 <child> 1361 <child>
1374 <widget class="GtkLabel" id="label151"> 1362 <widget class="GtkLabel" id="label128">
1375 <property name="visible">True</property> 1363 <property name="visible">True</property>
1376 <property name="label" translatable="yes">Use libextractor for files in directories</property> 1364 <property name="label" translatable="yes">Add keywords for files in directories</property>
1377 <property name="use_underline">True</property> 1365 <property name="use_underline">True</property>
1378 </widget> 1366 </widget>
1379 <packing> 1367 <packing>
@@ -1390,48 +1378,28 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1390 <packing> 1378 <packing>
1391 <property name="left_attach">2</property> 1379 <property name="left_attach">2</property>
1392 <property name="right_attach">3</property> 1380 <property name="right_attach">3</property>
1393 <property name="top_attach">3</property> 1381 <property name="top_attach">2</property>
1394 <property name="bottom_attach">4</property> 1382 <property name="bottom_attach">3</property>
1395 <property name="x_options">GTK_FILL</property>
1396 <property name="y_options"></property>
1397 </packing>
1398 </child>
1399 <child>
1400 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1401 <property name="visible">True</property>
1402 <property name="can_focus">True</property>
1403 <property name="tooltip" translatable="yes">Only publish a single file</property>
1404 <property name="label" translatable="yes">File onl_y</property>
1405 <property name="use_underline">True</property>
1406 <property name="response_id">0</property>
1407 <property name="active">True</property>
1408 <property name="draw_indicator">True</property>
1409 <property name="group">scopeRecursiveButton</property>
1410 </widget>
1411 <packing>
1412 <property name="left_attach">1</property>
1413 <property name="right_attach">2</property>
1414 <property name="top_attach">1</property>
1415 <property name="bottom_attach">2</property>
1416 <property name="x_options">GTK_FILL</property> 1383 <property name="x_options">GTK_FILL</property>
1417 <property name="y_options"></property> 1384 <property name="y_options"></property>
1418 </packing> 1385 </packing>
1419 </child> 1386 </child>
1420 <child> 1387 <child>
1421 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton"> 1388 <widget class="GtkButton" id="fsinsertuploadbutton">
1422 <property name="visible">True</property> 1389 <property name="visible">True</property>
1390 <property name="sensitive">False</property>
1423 <property name="can_focus">True</property> 1391 <property name="can_focus">True</property>
1424 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property> 1392 <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>
1425 <property name="response_id">0</property> 1393 <property name="response_id">0</property>
1426 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/> 1394 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/>
1427 <child> 1395 <child>
1428 <widget class="GtkHBox" id="hbox60"> 1396 <widget class="GtkHBox" id="hbox55">
1429 <property name="visible">True</property> 1397 <property name="visible">True</property>
1430 <property name="spacing">2</property> 1398 <property name="spacing">2</property>
1431 <child> 1399 <child>
1432 <widget class="GtkImage" id="image46"> 1400 <widget class="GtkImage" id="image42">
1433 <property name="visible">True</property> 1401 <property name="visible">True</property>
1434 <property name="stock">gtk-open</property> 1402 <property name="stock">gtk-go-up</property>
1435 </widget> 1403 </widget>
1436 <packing> 1404 <packing>
1437 <property name="expand">False</property> 1405 <property name="expand">False</property>
@@ -1439,9 +1407,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1439 </packing> 1407 </packing>
1440 </child> 1408 </child>
1441 <child> 1409 <child>
1442 <widget class="GtkLabel" id="label143"> 1410 <widget class="GtkLabel" id="label137">
1443 <property name="visible">True</property> 1411 <property name="visible">True</property>
1444 <property name="label" translatable="yes">_Browse</property> 1412 <property name="label" translatable="yes">Pub_lish</property>
1445 <property name="use_underline">True</property> 1413 <property name="use_underline">True</property>
1446 </widget> 1414 </widget>
1447 <packing> 1415 <packing>
@@ -1456,32 +1424,26 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1456 <packing> 1424 <packing>
1457 <property name="left_attach">2</property> 1425 <property name="left_attach">2</property>
1458 <property name="right_attach">3</property> 1426 <property name="right_attach">3</property>
1459 <property name="top_attach">4</property> 1427 <property name="top_attach">5</property>
1460 <property name="bottom_attach">5</property> 1428 <property name="bottom_attach">6</property>
1461 <property name="x_options">GTK_FILL</property> 1429 <property name="x_options">GTK_FILL</property>
1462 <property name="y_options"></property> 1430 <property name="y_options"></property>
1463 </packing> 1431 </packing>
1464 </child> 1432 </child>
1465 <child> 1433 <child>
1466 <widget class="GtkAlignment" id="uploadFilenameAlignment"> 1434 <widget class="GtkLabel" id="uploadFilenameLabel">
1467 <property name="visible">True</property> 1435 <property name="visible">True</property>
1468 <child> 1436 <property name="xalign">0</property>
1469 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry"> 1437 <property name="xpad">5</property>
1470 <property name="visible">True</property> 1438 <property name="label" translatable="yes">_Filename:</property>
1471 <property name="can_focus">True</property> 1439 <property name="use_underline">True</property>
1472 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/> 1440 <property name="justify">GTK_JUSTIFY_CENTER</property>
1473 <child internal-child="entry"> 1441 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property>
1474 <widget class="GtkEntry" id="comboboxentry-entry3">
1475 </widget>
1476 </child>
1477 </widget>
1478 </child>
1479 </widget> 1442 </widget>
1480 <packing> 1443 <packing>
1481 <property name="left_attach">1</property>
1482 <property name="right_attach">2</property>
1483 <property name="top_attach">4</property> 1444 <property name="top_attach">4</property>
1484 <property name="bottom_attach">5</property> 1445 <property name="bottom_attach">5</property>
1446 <property name="x_options">GTK_FILL</property>
1485 <property name="y_options"></property> 1447 <property name="y_options"></property>
1486 </packing> 1448 </packing>
1487 </child> 1449 </child>
@@ -1501,38 +1463,43 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1501 </packing> 1463 </packing>
1502 </child> 1464 </child>
1503 <child> 1465 <child>
1504 <widget class="GtkLabel" id="uploadFilenameLabel"> 1466 <widget class="GtkAlignment" id="uploadFilenameAlignment">
1505 <property name="visible">True</property> 1467 <property name="visible">True</property>
1506 <property name="xalign">0</property> 1468 <child>
1507 <property name="xpad">5</property> 1469 <widget class="GtkComboBoxEntry" id="uploadFilenameComboBoxEntry">
1508 <property name="label" translatable="yes">_Filename:</property> 1470 <property name="visible">True</property>
1509 <property name="use_underline">True</property> 1471 <property name="can_focus">True</property>
1510 <property name="justify">GTK_JUSTIFY_CENTER</property> 1472 <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_"/>
1511 <property name="mnemonic_widget">uploadFilenameComboBoxEntry</property> 1473 <child internal-child="entry">
1474 <widget class="GtkEntry" id="comboboxentry-entry3">
1475 </widget>
1476 </child>
1477 </widget>
1478 </child>
1512 </widget> 1479 </widget>
1513 <packing> 1480 <packing>
1481 <property name="left_attach">1</property>
1482 <property name="right_attach">2</property>
1514 <property name="top_attach">4</property> 1483 <property name="top_attach">4</property>
1515 <property name="bottom_attach">5</property> 1484 <property name="bottom_attach">5</property>
1516 <property name="x_options">GTK_FILL</property>
1517 <property name="y_options"></property> 1485 <property name="y_options"></property>
1518 </packing> 1486 </packing>
1519 </child> 1487 </child>
1520 <child> 1488 <child>
1521 <widget class="GtkButton" id="fsinsertuploadbutton"> 1489 <widget class="GtkButton" id="mainFileSharingInsertBrowseButton">
1522 <property name="visible">True</property> 1490 <property name="visible">True</property>
1523 <property name="sensitive">False</property>
1524 <property name="can_focus">True</property> 1491 <property name="can_focus">True</property>
1525 <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> 1492 <property name="tooltip" translatable="yes">Browse local computer for files (or directories) to publish</property>
1526 <property name="response_id">0</property> 1493 <property name="response_id">0</property>
1527 <signal name="clicked" handler="on_fsinsertuploadbutton_clicked_"/> 1494 <signal name="clicked" handler="on_mainFileSharingInsertBrowseButton_clicked_" object="fsinsertfilenamecombo"/>
1528 <child> 1495 <child>
1529 <widget class="GtkHBox" id="hbox55"> 1496 <widget class="GtkHBox" id="hbox60">
1530 <property name="visible">True</property> 1497 <property name="visible">True</property>
1531 <property name="spacing">2</property> 1498 <property name="spacing">2</property>
1532 <child> 1499 <child>
1533 <widget class="GtkImage" id="image42"> 1500 <widget class="GtkImage" id="image46">
1534 <property name="visible">True</property> 1501 <property name="visible">True</property>
1535 <property name="stock">gtk-go-up</property> 1502 <property name="stock">gtk-open</property>
1536 </widget> 1503 </widget>
1537 <packing> 1504 <packing>
1538 <property name="expand">False</property> 1505 <property name="expand">False</property>
@@ -1540,9 +1507,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1540 </packing> 1507 </packing>
1541 </child> 1508 </child>
1542 <child> 1509 <child>
1543 <widget class="GtkLabel" id="label137"> 1510 <widget class="GtkLabel" id="label143">
1544 <property name="visible">True</property> 1511 <property name="visible">True</property>
1545 <property name="label" translatable="yes">Pub_lish</property> 1512 <property name="label" translatable="yes">_Browse</property>
1546 <property name="use_underline">True</property> 1513 <property name="use_underline">True</property>
1547 </widget> 1514 </widget>
1548 <packing> 1515 <packing>
@@ -1557,31 +1524,52 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1557 <packing> 1524 <packing>
1558 <property name="left_attach">2</property> 1525 <property name="left_attach">2</property>
1559 <property name="right_attach">3</property> 1526 <property name="right_attach">3</property>
1560 <property name="top_attach">5</property> 1527 <property name="top_attach">4</property>
1561 <property name="bottom_attach">6</property> 1528 <property name="bottom_attach">5</property>
1562 <property name="x_options">GTK_FILL</property> 1529 <property name="x_options">GTK_FILL</property>
1563 <property name="y_options"></property> 1530 <property name="y_options"></property>
1564 </packing> 1531 </packing>
1565 </child> 1532 </child>
1566 <child> 1533 <child>
1567 <widget class="GtkCheckButton" id="deepIndexCheckButton"> 1534 <widget class="GtkRadioButton" id="scopeFileOnlyButton">
1568 <property name="visible">True</property> 1535 <property name="visible">True</property>
1569 <property name="can_focus">True</property> 1536 <property name="can_focus">True</property>
1570 <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> 1537 <property name="tooltip" translatable="yes">Only publish a single file</property>
1538 <property name="label" translatable="yes">File onl_y</property>
1539 <property name="use_underline">True</property>
1540 <property name="response_id">0</property>
1541 <property name="active">True</property>
1542 <property name="draw_indicator">True</property>
1543 <property name="group">scopeRecursiveButton</property>
1544 </widget>
1545 <packing>
1546 <property name="left_attach">1</property>
1547 <property name="right_attach">2</property>
1548 <property name="top_attach">1</property>
1549 <property name="bottom_attach">2</property>
1550 <property name="x_options">GTK_FILL</property>
1551 <property name="y_options"></property>
1552 </packing>
1553 </child>
1554 <child>
1555 <widget class="GtkCheckButton" id="doExtractCheckButton">
1556 <property name="visible">True</property>
1557 <property name="can_focus">True</property>
1558 <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>
1571 <property name="response_id">0</property> 1559 <property name="response_id">0</property>
1572 <property name="active">True</property> 1560 <property name="active">True</property>
1573 <property name="draw_indicator">True</property> 1561 <property name="draw_indicator">True</property>
1574 <child> 1562 <child>
1575 <widget class="GtkAlignment" id="alignment15"> 1563 <widget class="GtkAlignment" id="alignment24">
1576 <property name="visible">True</property> 1564 <property name="visible">True</property>
1577 <property name="xscale">0</property> 1565 <property name="xscale">0</property>
1578 <property name="yscale">0</property> 1566 <property name="yscale">0</property>
1579 <child> 1567 <child>
1580 <widget class="GtkHBox" id="hbox52"> 1568 <widget class="GtkHBox" id="hbox66">
1581 <property name="visible">True</property> 1569 <property name="visible">True</property>
1582 <property name="spacing">2</property> 1570 <property name="spacing">2</property>
1583 <child> 1571 <child>
1584 <widget class="GtkImage" id="image40"> 1572 <widget class="GtkImage" id="image49">
1585 <property name="visible">True</property> 1573 <property name="visible">True</property>
1586 <property name="stock">gtk-index</property> 1574 <property name="stock">gtk-index</property>
1587 </widget> 1575 </widget>
@@ -1591,9 +1579,9 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1591 </packing> 1579 </packing>
1592 </child> 1580 </child>
1593 <child> 1581 <child>
1594 <widget class="GtkLabel" id="label128"> 1582 <widget class="GtkLabel" id="label151">
1595 <property name="visible">True</property> 1583 <property name="visible">True</property>
1596 <property name="label" translatable="yes">Add keywords for files in directories</property> 1584 <property name="label" translatable="yes">Use libextractor for files in directories</property>
1597 <property name="use_underline">True</property> 1585 <property name="use_underline">True</property>
1598 </widget> 1586 </widget>
1599 <packing> 1587 <packing>
@@ -1610,40 +1598,32 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1610 <packing> 1598 <packing>
1611 <property name="left_attach">2</property> 1599 <property name="left_attach">2</property>
1612 <property name="right_attach">3</property> 1600 <property name="right_attach">3</property>
1613 <property name="top_attach">2</property> 1601 <property name="top_attach">3</property>
1614 <property name="bottom_attach">3</property> 1602 <property name="bottom_attach">4</property>
1615 <property name="x_options">GTK_FILL</property>
1616 <property name="y_options"></property>
1617 </packing>
1618 </child>
1619 <child>
1620 <widget class="GtkRadioButton" id="scopeRecursiveButton">
1621 <property name="visible">True</property>
1622 <property name="can_focus">True</property>
1623 <property name="tooltip" translatable="yes">Recursively publish an entire directory tree</property>
1624 <property name="label" translatable="yes">_Recursive (for entire directories)</property>
1625 <property name="use_underline">True</property>
1626 <property name="response_id">0</property>
1627 <property name="draw_indicator">True</property>
1628 </widget>
1629 <packing>
1630 <property name="left_attach">2</property>
1631 <property name="right_attach">3</property>
1632 <property name="top_attach">1</property>
1633 <property name="bottom_attach">2</property>
1634 <property name="x_options">GTK_FILL</property> 1603 <property name="x_options">GTK_FILL</property>
1635 <property name="y_options"></property> 1604 <property name="y_options"></property>
1636 </packing> 1605 </packing>
1637 </child> 1606 </child>
1638 <child> 1607 <child>
1639 <widget class="GtkLabel" id="anonymityUploadLabel"> 1608 <widget class="GtkAlignment" id="alignment7">
1640 <property name="visible">True</property> 1609 <property name="visible">True</property>
1610 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1641 <property name="xalign">0</property> 1611 <property name="xalign">0</property>
1642 <property name="xpad">5</property> 1612 <property name="xscale">0</property>
1643 <property name="label" translatable="yes">_Anonymity:</property> 1613 <child>
1644 <property name="use_underline">True</property> 1614 <widget class="GtkSpinButton" id="uploadAnonymityLevelSpinButton">
1615 <property name="visible">True</property>
1616 <property name="can_focus">True</property>
1617 <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>
1618 <property name="adjustment">1 0 10000 1 10 10</property>
1619 <property name="climb_rate">1</property>
1620 <property name="numeric">True</property>
1621 </widget>
1622 </child>
1645 </widget> 1623 </widget>
1646 <packing> 1624 <packing>
1625 <property name="left_attach">1</property>
1626 <property name="right_attach">2</property>
1647 <property name="top_attach">2</property> 1627 <property name="top_attach">2</property>
1648 <property name="bottom_attach">3</property> 1628 <property name="bottom_attach">3</property>
1649 <property name="x_options">GTK_FILL</property> 1629 <property name="x_options">GTK_FILL</property>
@@ -1651,67 +1631,28 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1651 </packing> 1631 </packing>
1652 </child> 1632 </child>
1653 <child> 1633 <child>
1654 <widget class="GtkLabel" id="scopeLabel"> 1634 <widget class="GtkAlignment" id="alignment8">
1655 <property name="visible">True</property> 1635 <property name="visible">True</property>
1636 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
1656 <property name="xalign">0</property> 1637 <property name="xalign">0</property>
1657 <property name="xpad">5</property> 1638 <property name="xscale">0</property>
1658 <property name="label" translatable="yes">Scope:</property> 1639 <child>
1659 <property name="use_underline">True</property> 1640 <widget class="GtkSpinButton" id="contentPrioritySpinButton">
1660 <property name="mnemonic_widget">scopeFileOnlyButton</property> 1641 <property name="width_request">94</property>
1661 </widget> 1642 <property name="visible">True</property>
1662 <packing> 1643 <property name="can_focus">True</property>
1663 <property name="top_attach">1</property> 1644 <property name="tooltip" translatable="yes">How important is the file (used to prioritize data in the local datastore).</property>
1664 <property name="bottom_attach">2</property> 1645 <property name="adjustment">950 0 100000000 50 500 500</property>
1665 <property name="x_options">GTK_FILL</property> 1646 <property name="climb_rate">500</property>
1666 <property name="y_options"></property> 1647 <property name="numeric">True</property>
1667 </packing> 1648 </widget>
1668 </child> 1649 </child>
1669 <child>
1670 <widget class="GtkRadioButton" id="insertButton">
1671 <property name="visible">True</property>
1672 <property name="can_focus">True</property>
1673 <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>
1674 <property name="label" translatable="yes">I_nsert</property>
1675 <property name="use_underline">True</property>
1676 <property name="response_id">0</property>
1677 <property name="draw_indicator">True</property>
1678 <property name="group">indexbutton</property>
1679 </widget>
1680 <packing>
1681 <property name="left_attach">2</property>
1682 <property name="right_attach">3</property>
1683 <property name="x_options">GTK_FILL</property>
1684 <property name="y_options"></property>
1685 </packing>
1686 </child>
1687 <child>
1688 <widget class="GtkRadioButton" id="indexbutton">
1689 <property name="visible">True</property>
1690 <property name="can_focus">True</property>
1691 <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>
1692 <property name="label" translatable="yes">Inde_x</property>
1693 <property name="use_underline">True</property>
1694 <property name="response_id">0</property>
1695 <property name="active">True</property>
1696 <property name="draw_indicator">True</property>
1697 </widget> 1650 </widget>
1698 <packing> 1651 <packing>
1699 <property name="left_attach">1</property> 1652 <property name="left_attach">1</property>
1700 <property name="right_attach">2</property> 1653 <property name="right_attach">2</property>
1701 <property name="x_options">GTK_FILL</property> 1654 <property name="top_attach">3</property>
1702 <property name="y_options"></property> 1655 <property name="bottom_attach">4</property>
1703 </packing>
1704 </child>
1705 <child>
1706 <widget class="GtkLabel" id="methodLabel">
1707 <property name="visible">True</property>
1708 <property name="xalign">0</property>
1709 <property name="xpad">5</property>
1710 <property name="label" translatable="yes">Method:</property>
1711 <property name="use_underline">True</property>
1712 <property name="mnemonic_widget">indexbutton</property>
1713 </widget>
1714 <packing>
1715 <property name="x_options">GTK_FILL</property> 1656 <property name="x_options">GTK_FILL</property>
1716 <property name="y_options"></property> 1657 <property name="y_options"></property>
1717 </packing> 1658 </packing>
@@ -1989,7 +1930,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
1989 <child> 1930 <child>
1990 <widget class="GtkImage" id="image28"> 1931 <widget class="GtkImage" id="image28">
1991 <property name="visible">True</property> 1932 <property name="visible">True</property>
1992 <property name="stock">gtk-execute</property> 1933 <property name="stock">gtk-properties</property>
1993 </widget> 1934 </widget>
1994 </child> 1935 </child>
1995 <child> 1936 <child>
@@ -2082,51 +2023,6 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2082 <placeholder/> 2023 <placeholder/>
2083 </child> 2024 </child>
2084 <child> 2025 <child>
2085 <widget class="GtkLabel" id="label1">
2086 <property name="visible">True</property>
2087 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2088 <property name="label" translatable="yes">_Room Name</property>
2089 <property name="use_underline">True</property>
2090 <property name="mnemonic_widget">chatRoomNameEntry</property>
2091 </widget>
2092 </child>
2093 <child>
2094 <widget class="GtkLabel" id="label4">
2095 <property name="visible">True</property>
2096 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2097 <property name="label" translatable="yes">_Moniker</property>
2098 <property name="use_underline">True</property>
2099 </widget>
2100 <packing>
2101 <property name="left_attach">1</property>
2102 <property name="right_attach">2</property>
2103 </packing>
2104 </child>
2105 <child>
2106 <widget class="GtkEntry" id="chatRoomNameEntry">
2107 <property name="visible">True</property>
2108 <property name="can_focus">True</property>
2109 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2110 </widget>
2111 <packing>
2112 <property name="top_attach">1</property>
2113 <property name="bottom_attach">2</property>
2114 </packing>
2115 </child>
2116 <child>
2117 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2118 <property name="visible">True</property>
2119 <property name="can_focus">True</property>
2120 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2121 </widget>
2122 <packing>
2123 <property name="left_attach">1</property>
2124 <property name="right_attach">2</property>
2125 <property name="top_attach">1</property>
2126 <property name="bottom_attach">2</property>
2127 </packing>
2128 </child>
2129 <child>
2130 <widget class="GtkButton" id="on_chat_room_name_button"> 2026 <widget class="GtkButton" id="on_chat_room_name_button">
2131 <property name="visible">True</property> 2027 <property name="visible">True</property>
2132 <property name="can_focus">True</property> 2028 <property name="can_focus">True</property>
@@ -2173,6 +2069,51 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2173 <property name="y_options"></property> 2069 <property name="y_options"></property>
2174 </packing> 2070 </packing>
2175 </child> 2071 </child>
2072 <child>
2073 <widget class="GtkEntry" id="chatRoomMonikerEntry">
2074 <property name="visible">True</property>
2075 <property name="can_focus">True</property>
2076 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2077 </widget>
2078 <packing>
2079 <property name="left_attach">1</property>
2080 <property name="right_attach">2</property>
2081 <property name="top_attach">1</property>
2082 <property name="bottom_attach">2</property>
2083 </packing>
2084 </child>
2085 <child>
2086 <widget class="GtkEntry" id="chatRoomNameEntry">
2087 <property name="visible">True</property>
2088 <property name="can_focus">True</property>
2089 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2090 </widget>
2091 <packing>
2092 <property name="top_attach">1</property>
2093 <property name="bottom_attach">2</property>
2094 </packing>
2095 </child>
2096 <child>
2097 <widget class="GtkLabel" id="label4">
2098 <property name="visible">True</property>
2099 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2100 <property name="label" translatable="yes">_Moniker</property>
2101 <property name="use_underline">True</property>
2102 </widget>
2103 <packing>
2104 <property name="left_attach">1</property>
2105 <property name="right_attach">2</property>
2106 </packing>
2107 </child>
2108 <child>
2109 <widget class="GtkLabel" id="label1">
2110 <property name="visible">True</property>
2111 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
2112 <property name="label" translatable="yes">_Room Name</property>
2113 <property name="use_underline">True</property>
2114 <property name="mnemonic_widget">chatRoomNameEntry</property>
2115 </widget>
2116 </child>
2176 </widget> 2117 </widget>
2177 <packing> 2118 <packing>
2178 <property name="expand">False</property> 2119 <property name="expand">False</property>
@@ -2354,7 +2295,7 @@ This release adds context-menus (right-click) which allow copying the URI of sea
2354 <child> 2295 <child>
2355 <widget class="GtkImage" id="image8"> 2296 <widget class="GtkImage" id="image8">
2356 <property name="visible">True</property> 2297 <property name="visible">True</property>
2357 <property name="stock">gtk-justify-fill</property> 2298 <property name="pixbuf">gnunet-gtk-logs.png</property>
2358 </widget> 2299 </widget>
2359 </child> 2300 </child>
2360 <child> 2301 <child>
@@ -2903,8 +2844,8 @@ Press ENTER to add the data.</atkproperty>
2903 <property name="response_id">-5</property> 2844 <property name="response_id">-5</property>
2904 <signal name="clicked" handler="gtk_widget_destroy" object="metaDisplayDialog"/> 2845 <signal name="clicked" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2905 <signal name="activate" handler="gtk_widget_destroy" object="metaDisplayDialog"/> 2846 <signal name="activate" handler="gtk_widget_destroy" object="metaDisplayDialog"/>
2906 <accelerator key="Return" modifiers="" signal="activate"/>
2907 <accelerator key="Escape" modifiers="" signal="activate"/> 2847 <accelerator key="Escape" modifiers="" signal="activate"/>
2848 <accelerator key="Return" modifiers="" signal="activate"/>
2908 </widget> 2849 </widget>
2909 </child> 2850 </child>
2910 </widget> 2851 </widget>
@@ -4905,9 +4846,9 @@ Alex Jones &lt;alexrjones@ntlworld.com&gt;</property>
4905 <property name="modal">True</property> 4846 <property name="modal">True</property>
4906 <property name="icon_name">gtk-save-as</property> 4847 <property name="icon_name">gtk-save-as</property>
4907 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> 4848 <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
4908 <property name="do_overwrite_confirmation">True</property>
4909 <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property> 4849 <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
4910 <property name="show_hidden">True</property> 4850 <property name="show_hidden">True</property>
4851 <property name="do_overwrite_confirmation">True</property>
4911 <child internal-child="vbox"> 4852 <child internal-child="vbox">
4912 <widget class="GtkVBox" id="dialog-vbox7"> 4853 <widget class="GtkVBox" id="dialog-vbox7">
4913 <property name="visible">True</property> 4854 <property name="visible">True</property>
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 9219bf8e..8118b96a 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -329,35 +329,6 @@ on_download_summary_selection_changed (gpointer signal, gpointer cls)
329 > 0); 329 > 0);
330} 330}
331 331
332/**
333 * The selection of the download summary changed.
334 * Update button status.
335 */
336static void
337on_search_summary_selection_changed (gpointer signal, gpointer cls)
338{
339 GtkTreeSelection *selection;
340 GtkWidget *button;
341
342 selection =
343 gtk_tree_view_get_selection (GTK_TREE_VIEW
344 (glade_xml_get_widget
345 (GNUNET_GTK_get_main_glade_XML (),
346 "activeSearchesSummary")));
347 button =
348 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
349 "cancelSearchButton");
350 gtk_widget_set_sensitive (button,
351 gtk_tree_selection_count_selected_rows (selection)
352 > 0);
353 button =
354 glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
355 "stopSearchButton");
356 gtk_widget_set_sensitive (button,
357 gtk_tree_selection_count_selected_rows (selection)
358 > 0);
359}
360
361int 332int
362on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget *dummy2) 333on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget *dummy2)
363{ 334{
@@ -405,7 +376,6 @@ fs_summary_start ()
405{ 376{
406 GtkComboBoxEntry *searchCB; 377 GtkComboBoxEntry *searchCB;
407 GtkWidget *uploadEntry; 378 GtkWidget *uploadEntry;
408 GtkTreeView *searchList;
409 GtkTreeView *downloadList; 379 GtkTreeView *downloadList;
410 GtkTreeView *uploadList; 380 GtkTreeView *uploadList;
411 GtkListStore *model; 381 GtkListStore *model;
@@ -438,52 +408,6 @@ fs_summary_start ()
438 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model)); 408 gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
439 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION); 409 gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
440 410
441 /* search summary setup */
442 searchList =
443 GTK_TREE_VIEW (glade_xml_get_widget
444 (GNUNET_GTK_get_main_glade_XML (),
445 "activeSearchesSummary"));
446 search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING, /* name */
447 G_TYPE_INT, /* # results */
448 G_TYPE_POINTER); /* internal: search list */
449 gtk_tree_view_set_model (searchList, GTK_TREE_MODEL (search_summary));
450 gtk_tree_selection_set_mode (gtk_tree_view_get_selection (searchList),
451 GTK_SELECTION_MULTIPLE);
452 g_signal_connect_data (gtk_tree_view_get_selection (searchList),
453 "changed",
454 G_CALLBACK (&on_search_summary_selection_changed),
455 NULL, NULL, 0);
456
457 renderer = gtk_cell_renderer_text_new ();
458 col = gtk_tree_view_insert_column_with_attributes (searchList,
459 -1,
460 _("Query"),
461 renderer,
462 "text",
463 SEARCH_SUMMARY_NAME,
464 NULL);
465 column = gtk_tree_view_get_column (searchList, col - 1);
466 gtk_tree_view_column_set_resizable (column, TRUE);
467 gtk_tree_view_column_set_clickable (column, TRUE);
468 gtk_tree_view_column_set_reorderable (column, TRUE);
469 gtk_tree_view_column_set_sort_column_id (column, SEARCH_SUMMARY_NAME);
470 gtk_tree_view_column_set_resizable (column, TRUE);
471 renderer = gtk_cell_renderer_text_new ();
472 col = gtk_tree_view_insert_column_with_attributes (searchList,
473 -1,
474 _("Results"),
475 renderer,
476 "text",
477 SEARCH_SUMMARY_RESULT_COUNT,
478 NULL);
479 column = gtk_tree_view_get_column (searchList, col - 1);
480 gtk_tree_view_column_set_resizable (column, TRUE);
481 gtk_tree_view_column_set_clickable (column, TRUE);
482 gtk_tree_view_column_set_reorderable (column, TRUE);
483 gtk_tree_view_column_set_sort_column_id (column,
484 SEARCH_SUMMARY_RESULT_COUNT);
485 gtk_tree_view_column_set_resizable (column, TRUE);
486
487 /* download summary setup */ 411 /* download summary setup */
488 downloadList = 412 downloadList =
489 GTK_TREE_VIEW (glade_xml_get_widget 413 GTK_TREE_VIEW (glade_xml_get_widget
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index fc321480..cc36108b 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -77,18 +77,6 @@ enum
77}; 77};
78 78
79/** 79/**
80 * Search entry in search summary list.
81 * Represents a search process.
82 */
83enum
84{
85 SEARCH_SUMMARY_NAME = 0,
86 SEARCH_SUMMARY_RESULT_COUNT,
87 SEARCH_SUMMARY_INTERNAL,
88 SEARCH_SUMMARY_NUM
89};
90
91/**
92 * Entry in download summary. 80 * Entry in download summary.
93 */ 81 */
94enum 82enum
@@ -197,12 +185,6 @@ typedef struct SL
197 GtkWidget *searchpage; 185 GtkWidget *searchpage;
198 186
199 /** 187 /**
200 * Path to the entry in the summary list
201 * for this search.
202 */
203 GtkTreeRowReference *summaryViewRowReference;
204
205 /**
206 * URI for this search. 188 * URI for this search.
207 */ 189 */
208 struct GNUNET_ECRS_URI *uri; 190 struct GNUNET_ECRS_URI *uri;
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index f1d7e325..ab78d844 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -61,33 +61,14 @@ on_fssearchSelectionChanged (gpointer signal, gpointer cls)
61/* **************** FSUI event handling ****************** */ 61/* **************** FSUI event handling ****************** */
62 62
63/** 63/**
64 * Update the number of results received for the given 64 * Update the number of results received in the label of the tab.
65 * search in the summary and in the label of the tab.
66 */ 65 */
67static void 66static void
68updateSearchSummary (SearchList * searchContext) 67updateResultsCount (SearchList * searchContext)
69{ 68{
70 GtkTreePath *path;
71 GtkTreeIter iter;
72 char *new_title; 69 char *new_title;
73 GtkLabel *label; 70 GtkLabel *label;
74 71
75 path =
76 gtk_tree_row_reference_get_path (searchContext->summaryViewRowReference);
77 if (TRUE !=
78 gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
79 {
80 GNUNET_GE_BREAK (ectx, 0);
81 return;
82 }
83 gtk_tree_path_free (path);
84 gtk_list_store_set (search_summary,
85 &iter,
86 SEARCH_SUMMARY_RESULT_COUNT,
87 searchContext->resultsReceived, -1);
88
89
90
91 /* update tab title with the number of results */ 72 /* update tab title with the number of results */
92 new_title = 73 new_title =
93 g_strdup_printf ("%.*s%s (%u)", 74 g_strdup_printf ("%.*s%s (%u)",
@@ -336,7 +317,7 @@ fs_search_result_received (SearchList * searchContext,
336 gtk_tree_store_append (model, &iter, NULL); 317 gtk_tree_store_append (model, &iter, NULL);
337 addEntryToSearchTree (searchContext, NULL, info, &iter); 318 addEntryToSearchTree (searchContext, NULL, info, &iter);
338 searchContext->resultsReceived++; 319 searchContext->resultsReceived++;
339 updateSearchSummary (searchContext); 320 updateResultsCount (searchContext);
340} 321}
341 322
342/** 323/**
@@ -644,8 +625,7 @@ search_click_handler (void *cls, GdkEvent * event)
644} 625}
645 626
646/** 627/**
647 * FSUI event: a search was started; create the 628 * FSUI event: a search was started; create the tab
648 * tab and add an entry to the summary.
649 */ 629 */
650SearchList * 630SearchList *
651fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list, 631fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
@@ -661,8 +641,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
661 GtkTreeViewColumn *column; 641 GtkTreeViewColumn *column;
662 GtkCellRenderer *renderer; 642 GtkCellRenderer *renderer;
663 GtkNotebook *notebook; 643 GtkNotebook *notebook;
664 GtkTreePath *path;
665 GtkTreeIter iter;
666 int col; 644 int col;
667 unsigned int i; 645 unsigned int i;
668 646
@@ -680,7 +658,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
680 for (i = 0; i < resultCount; i++) 658 for (i = 0; i < resultCount; i++)
681 fs_search_result_received (list, &results[i], uri); 659 fs_search_result_received (list, &results[i], uri);
682 if (resultCount == 0) /* otherwise already done! */ 660 if (resultCount == 0) /* otherwise already done! */
683 updateSearchSummary (list); 661 updateResultsCount (list);
684 return list; 662 return list;
685 } 663 }
686 list = list->next; 664 list = list->next;
@@ -888,18 +866,6 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
888 gtk_tree_view_column_set_reorderable (column, TRUE); 866 gtk_tree_view_column_set_reorderable (column, TRUE);
889 gtk_tree_view_column_set_sort_column_id (column, SEARCH_DESC); 867 gtk_tree_view_column_set_sort_column_id (column, SEARCH_DESC);
890 868
891 /* add entry in search summary */
892 gtk_list_store_append (search_summary, &iter);
893 gtk_list_store_set (search_summary,
894 &iter,
895 SEARCH_SUMMARY_NAME, description,
896 SEARCH_SUMMARY_RESULT_COUNT, 0,
897 SEARCH_SUMMARY_INTERNAL, list, -1);
898 path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
899 list->summaryViewRowReference
900 = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
901 gtk_tree_path_free (path);
902
903 /* load label */ 869 /* load label */
904 list->labelXML 870 list->labelXML
905 = glade_xml_new (GNUNET_GTK_get_glade_filename (), 871 = glade_xml_new (GNUNET_GTK_get_glade_filename (),
@@ -913,7 +879,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
913 for (i = 0; i < resultCount; i++) 879 for (i = 0; i < resultCount; i++)
914 fs_search_result_received (list, &results[i], uri); 880 fs_search_result_received (list, &results[i], uri);
915 if (resultCount == 0) /* otherwise already done! */ 881 if (resultCount == 0) /* otherwise already done! */
916 updateSearchSummary (list); 882 updateResultsCount (list);
917 883
918 /* insert new page into search notebook */ 884 /* insert new page into search notebook */
919 notebook 885 notebook
@@ -983,17 +949,15 @@ fs_search_restarted (SearchList * list)
983} 949}
984 950
985/** 951/**
986 * FSUI event: a search was stopped. Remove the 952 * FSUI event: a search was stopped.
987 * respective tab and its entry in the summary. 953 * Remove the respective tab.
988 */ 954 */
989void 955void
990fs_search_stopped (SearchList * list) 956fs_search_stopped (SearchList * list)
991{ 957{
992 GtkNotebook *notebook; 958 GtkNotebook *notebook;
993 GtkTreeIter iter;
994 SearchList *prev; 959 SearchList *prev;
995 DownloadList *downloads; 960 DownloadList *downloads;
996 GtkTreePath *path;
997 int index; 961 int index;
998 int i; 962 int i;
999 963
@@ -1034,19 +998,9 @@ fs_search_stopped (SearchList * list)
1034 index = i; 998 index = i;
1035 GNUNET_GE_BREAK (ectx, index != -1); 999 GNUNET_GE_BREAK (ectx, index != -1);
1036 gtk_notebook_remove_page (notebook, index); 1000 gtk_notebook_remove_page (notebook, index);
1037 /* recursively free search model */
1038 if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
1039 freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
1040
1041 /* destroy entry in summary */
1042 path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
1043 gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path);
1044 gtk_tree_path_free (path);
1045 gtk_list_store_remove (search_summary, &iter);
1046 /* free list state itself */ 1001 /* free list state itself */
1047 UNREF (list->searchXML); 1002 UNREF (list->searchXML);
1048 UNREF (list->labelXML); 1003 UNREF (list->labelXML);
1049 gtk_tree_row_reference_free (list->summaryViewRowReference);
1050 GNUNET_free (list->searchString); 1004 GNUNET_free (list->searchString);
1051 GNUNET_ECRS_uri_destroy (list->uri); 1005 GNUNET_ECRS_uri_destroy (list->uri);
1052 GNUNET_free (list); 1006 GNUNET_free (list);
@@ -1286,7 +1240,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
1286 1240
1287 1241
1288/** 1242/**
1289 * The abort button in the search summary was clicked. 1243 * The pause button in a search results tab was clicked.
1290 */ 1244 */
1291void 1245void
1292on_searchPauseButton_clicked_fs (GtkWidget * searchPage, 1246on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
@@ -1315,7 +1269,7 @@ on_searchPauseButton_clicked_fs (GtkWidget * searchPage,
1315} 1269}
1316 1270
1317/** 1271/**
1318 * The abort button in the search summary was clicked. 1272 * The resume button in a search results tab was clicked.
1319 */ 1273 */
1320void 1274void
1321on_searchResumeButton_clicked_fs (GtkWidget * searchPage, 1275on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
@@ -1343,102 +1297,4 @@ on_searchResumeButton_clicked_fs (GtkWidget * searchPage,
1343 } 1297 }
1344} 1298}
1345 1299
1346/**
1347 * The abort button was clicked. Abort the search.
1348 */
1349void
1350on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
1351 GtkWidget * abortButton)
1352{
1353 SearchList *list;
1354 struct FCBC fcbc;
1355
1356 list = search_head;
1357 while (list != NULL)
1358 {
1359 if (list->searchpage == searchPage)
1360 break;
1361 list = list->next;
1362 }
1363 GNUNET_GE_ASSERT (ectx, list != NULL);
1364 gtk_widget_hide (abortButton);
1365 if (list->fsui_list != NULL)
1366 {
1367 fcbc.method = &GNUNET_FSUI_search_abort;
1368 fcbc.argument = list->fsui_list;
1369 GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
1370 }
1371}
1372
1373static void
1374stopSearch (GtkTreeModel * model,
1375 GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
1376{
1377 SearchList *s;
1378 struct FCBC fcbc;
1379
1380 s = NULL;
1381 gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
1382 if (s != NULL)
1383 {
1384 if (s->fsui_list == NULL)
1385 {
1386 /* open directory - close directly */
1387 fs_search_stopped (s);
1388 }
1389 else
1390 {
1391 fcbc.method = &GNUNET_FSUI_search_abort;
1392 fcbc.argument = s->fsui_list;
1393 GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
1394 fcbc.method = &GNUNET_FSUI_search_stop;
1395 GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
1396 }
1397 }
1398}
1399
1400/**
1401 * The stop button in the search summary was clicked.
1402 */
1403void
1404on_closeSearchSummaryButton_clicked_fs (GtkWidget * treeview,
1405 GtkWidget * closeButton)
1406{
1407 GtkTreeSelection *selection;
1408
1409 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
1410 GNUNET_GTK_tree_selection_selected_foreach (selection, &stopSearch, NULL);
1411}
1412
1413static void
1414abortSearch (GtkTreeModel * model,
1415 GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
1416{
1417 SearchList *s;
1418 struct FCBC fcbc;
1419
1420 s = NULL;
1421 gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
1422 if ((s != NULL) && (s->fsui_list != NULL))
1423 {
1424 fcbc.method = &GNUNET_FSUI_search_abort;
1425 fcbc.argument = s->fsui_list;
1426 GNUNET_GTK_run_with_save_calls (&fsui_callback, &fcbc);
1427 }
1428}
1429
1430/**
1431 * The abort button in the search summary was clicked.
1432 */
1433void
1434on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
1435 GtkWidget * closeButton)
1436{
1437 GtkTreeSelection *selection;
1438
1439 selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
1440 GNUNET_GTK_tree_selection_selected_foreach (selection, &abortSearch, NULL);
1441}
1442
1443
1444/* end of search.c */ 1300/* end of search.c */
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 21:33:57 +0000