diff options
author | LRN <lrn1986@gmail.com> | 2012-11-12 15:57:32 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2012-11-12 15:57:32 +0000 |
commit | f83763e1fd3082128e22a407fb4255c35487d747 (patch) | |
tree | c64f23fa67ad366ca0efe83374024ba9804222c9 /contrib/gnunet_fs_gtk_main_window.glade | |
parent | 0c8188c23093de4946d4a65d51baf4d0e705004a (diff) | |
download | gnunet-gtk-f83763e1fd3082128e22a407fb4255c35487d747.tar.gz gnunet-gtk-f83763e1fd3082128e22a407fb4255c35487d747.zip |
Lots of stuff
1) A couple of docfixes
2) More widgets in main window context
3) Main window context is easily gettable from a static variable
(2) and (3) fix a crash where widgets are being fetched via "ml" pointer
when it's already freed. Main window context lives longer.
4) New download panel
This takes most of the new code. Specifically, it gets its own filename
suggestion routine.
5) Fix for step-by-step manual directory trees' download (sets de->pde for
such cases; without that children can't be properly linked to parents for
things like cleanup)
Diffstat (limited to 'contrib/gnunet_fs_gtk_main_window.glade')
-rw-r--r-- | contrib/gnunet_fs_gtk_main_window.glade | 223 |
1 files changed, 217 insertions, 6 deletions
diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade index de888ffb..d2bc993f 100644 --- a/contrib/gnunet_fs_gtk_main_window.glade +++ b/contrib/gnunet_fs_gtk_main_window.glade | |||
@@ -710,11 +710,217 @@ | |||
710 | <property name="visible">True</property> | 710 | <property name="visible">True</property> |
711 | <property name="can_focus">True</property> | 711 | <property name="can_focus">True</property> |
712 | <child> | 712 | <child> |
713 | <object class="GtkNotebook" id="GNUNET_GTK_main_window_notebook"> | 713 | <object class="GtkVBox" id="GNUNET_GTK_main_window_left_vbox"> |
714 | <property name="visible">True</property> | 714 | <property name="visible">True</property> |
715 | <property name="can_focus">True</property> | 715 | <property name="can_focus">False</property> |
716 | <property name="scrollable">True</property> | 716 | <child> |
717 | <signal name="switch-page" handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" swapped="no"/> | 717 | <object class="GtkNotebook" id="GNUNET_GTK_main_window_notebook"> |
718 | <property name="visible">True</property> | ||
719 | <property name="can_focus">True</property> | ||
720 | <property name="scrollable">True</property> | ||
721 | <signal name="switch-page" handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes" swapped="no"/> | ||
722 | </object> | ||
723 | <packing> | ||
724 | <property name="expand">True</property> | ||
725 | <property name="fill">True</property> | ||
726 | <property name="position">0</property> | ||
727 | </packing> | ||
728 | </child> | ||
729 | <child> | ||
730 | <object class="GtkVBox" id="GNUNET_GTK_search_frame_download_vbox"> | ||
731 | <property name="visible">False</property> | ||
732 | <property name="can_focus">False</property> | ||
733 | <child> | ||
734 | <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_into_hbox"> | ||
735 | <property name="visible">True</property> | ||
736 | <property name="can_focus">False</property> | ||
737 | <property name="spacing">4</property> | ||
738 | <child> | ||
739 | <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_location_label"> | ||
740 | <property name="visible">True</property> | ||
741 | <property name="can_focus">False</property> | ||
742 | <property name="xalign">1</property> | ||
743 | <property name="yalign">0.43999999761581421</property> | ||
744 | <property name="label" translatable="yes">Download into:</property> | ||
745 | <property name="single_line_mode">True</property> | ||
746 | </object> | ||
747 | <packing> | ||
748 | <property name="expand">False</property> | ||
749 | <property name="fill">False</property> | ||
750 | <property name="position">0</property> | ||
751 | </packing> | ||
752 | </child> | ||
753 | <child> | ||
754 | <object class="GtkFileChooserButton" id="GNUNET_GTK_search_frame_download_location_chooser"> | ||
755 | <property name="visible">True</property> | ||
756 | <property name="can_focus">False</property> | ||
757 | <property name="action">select-folder</property> | ||
758 | <property name="title" translatable="yes">Select a directory to download into</property> | ||
759 | </object> | ||
760 | <packing> | ||
761 | <property name="expand">True</property> | ||
762 | <property name="fill">True</property> | ||
763 | <property name="position">1</property> | ||
764 | </packing> | ||
765 | </child> | ||
766 | </object> | ||
767 | <packing> | ||
768 | <property name="expand">False</property> | ||
769 | <property name="fill">False</property> | ||
770 | <property name="position">0</property> | ||
771 | </packing> | ||
772 | </child> | ||
773 | <child> | ||
774 | <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_filename_hbox"> | ||
775 | <property name="visible">True</property> | ||
776 | <property name="can_focus">False</property> | ||
777 | <property name="spacing">4</property> | ||
778 | <child> | ||
779 | <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_filename_label"> | ||
780 | <property name="visible">True</property> | ||
781 | <property name="can_focus">False</property> | ||
782 | <property name="xalign">1</property> | ||
783 | <property name="yalign">0.43999999761581421</property> | ||
784 | <property name="label" translatable="yes">Download as:</property> | ||
785 | <property name="single_line_mode">True</property> | ||
786 | </object> | ||
787 | <packing> | ||
788 | <property name="expand">False</property> | ||
789 | <property name="fill">False</property> | ||
790 | <property name="position">0</property> | ||
791 | </packing> | ||
792 | </child> | ||
793 | <child> | ||
794 | <object class="GtkEntry" id="GNUNET_GTK_search_frame_download_filename_entry"> | ||
795 | <property name="visible">True</property> | ||
796 | <property name="can_focus">True</property> | ||
797 | <property name="invisible_char">●</property> | ||
798 | <property name="invisible_char_set">True</property> | ||
799 | <property name="primary_icon_activatable">False</property> | ||
800 | <property name="secondary_icon_activatable">False</property> | ||
801 | <property name="primary_icon_sensitive">True</property> | ||
802 | <property name="secondary_icon_sensitive">True</property> | ||
803 | </object> | ||
804 | <packing> | ||
805 | <property name="expand">True</property> | ||
806 | <property name="fill">True</property> | ||
807 | <property name="position">1</property> | ||
808 | </packing> | ||
809 | </child> | ||
810 | </object> | ||
811 | <packing> | ||
812 | <property name="expand">False</property> | ||
813 | <property name="fill">False</property> | ||
814 | <property name="position">1</property> | ||
815 | </packing> | ||
816 | </child> | ||
817 | <child> | ||
818 | <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_misc_hbox"> | ||
819 | <property name="visible">True</property> | ||
820 | <property name="can_focus">False</property> | ||
821 | <property name="spacing">4</property> | ||
822 | <child> | ||
823 | <object class="GtkLabel" id="GNUNET_GTK_search_frame_download_anonymity_label"> | ||
824 | <property name="visible">True</property> | ||
825 | <property name="can_focus">False</property> | ||
826 | <property name="xalign">1</property> | ||
827 | <property name="label" translatable="yes">Anonymity:</property> | ||
828 | </object> | ||
829 | <packing> | ||
830 | <property name="expand">False</property> | ||
831 | <property name="fill">False</property> | ||
832 | <property name="position">0</property> | ||
833 | </packing> | ||
834 | </child> | ||
835 | <child> | ||
836 | <object class="GtkAlignment" id="main_window_download_anonymity_combobox_alignment"> | ||
837 | <property name="visible">True</property> | ||
838 | <property name="can_focus">False</property> | ||
839 | <property name="yscale">0</property> | ||
840 | <child> | ||
841 | <object class="GtkComboBox" id="main_window_download_anonymity_combobox"> | ||
842 | <property name="visible">True</property> | ||
843 | <property name="can_focus">False</property> | ||
844 | <property name="model">anonymity_level_liststore</property> | ||
845 | <property name="active">1</property> | ||
846 | <child> | ||
847 | <object class="GtkCellRendererText" id="main_window_download_anonymity_combobox_renderer"/> | ||
848 | <attributes> | ||
849 | <attribute name="foreground">2</attribute> | ||
850 | <attribute name="text">0</attribute> | ||
851 | </attributes> | ||
852 | </child> | ||
853 | <child> | ||
854 | <object class="GtkCellRendererText" id="main_window_download_anonymity_combobox_renerer_level"/> | ||
855 | <attributes> | ||
856 | <attribute name="text">1</attribute> | ||
857 | </attributes> | ||
858 | </child> | ||
859 | </object> | ||
860 | </child> | ||
861 | </object> | ||
862 | <packing> | ||
863 | <property name="expand">False</property> | ||
864 | <property name="fill">False</property> | ||
865 | <property name="position">1</property> | ||
866 | </packing> | ||
867 | </child> | ||
868 | <child> | ||
869 | <object class="GtkCheckButton" id="GNUNET_GTK_search_frame_download_recursive_checkbox"> | ||
870 | <property name="label" translatable="yes">Recursive</property> | ||
871 | <property name="use_action_appearance">False</property> | ||
872 | <property name="visible">True</property> | ||
873 | <property name="can_focus">True</property> | ||
874 | <property name="receives_default">False</property> | ||
875 | <property name="draw_indicator">True</property> | ||
876 | </object> | ||
877 | <packing> | ||
878 | <property name="expand">False</property> | ||
879 | <property name="fill">False</property> | ||
880 | <property name="pack_type">end</property> | ||
881 | <property name="position">2</property> | ||
882 | </packing> | ||
883 | </child> | ||
884 | </object> | ||
885 | <packing> | ||
886 | <property name="expand">False</property> | ||
887 | <property name="fill">False</property> | ||
888 | <property name="position">2</property> | ||
889 | </packing> | ||
890 | </child> | ||
891 | <child> | ||
892 | <object class="GtkHBox" id="GNUNET_GTK_search_frame_download_download_hbox"> | ||
893 | <property name="visible">True</property> | ||
894 | <property name="can_focus">False</property> | ||
895 | <child> | ||
896 | <object class="GtkButton" id="GNUNET_GTK_search_frame_download_download_button"> | ||
897 | <property name="label" translatable="yes">Download!</property> | ||
898 | <property name="use_action_appearance">False</property> | ||
899 | <property name="visible">True</property> | ||
900 | <property name="can_focus">True</property> | ||
901 | <property name="receives_default">True</property> | ||
902 | <signal name="clicked" handler="GNUNET_GTK_search_frame_download_download_button_clicked_cb" swapped="no"/> | ||
903 | </object> | ||
904 | <packing> | ||
905 | <property name="expand">True</property> | ||
906 | <property name="fill">True</property> | ||
907 | <property name="position">0</property> | ||
908 | </packing> | ||
909 | </child> | ||
910 | </object> | ||
911 | <packing> | ||
912 | <property name="expand">False</property> | ||
913 | <property name="fill">False</property> | ||
914 | <property name="position">3</property> | ||
915 | </packing> | ||
916 | </child> | ||
917 | </object> | ||
918 | <packing> | ||
919 | <property name="expand">False</property> | ||
920 | <property name="fill">True</property> | ||
921 | <property name="position">1</property> | ||
922 | </packing> | ||
923 | </child> | ||
718 | </object> | 924 | </object> |
719 | <packing> | 925 | <packing> |
720 | <property name="resize">True</property> | 926 | <property name="resize">True</property> |
@@ -942,6 +1148,13 @@ | |||
942 | <property name="can_focus">False</property> | 1148 | <property name="can_focus">False</property> |
943 | <property name="stock">gtk-open</property> | 1149 | <property name="stock">gtk-open</property> |
944 | </object> | 1150 | </object> |
1151 | <object class="GtkSizeGroup" id="GNUNET_GTK_download_frame_labels_size_group"> | ||
1152 | <widgets> | ||
1153 | <widget name="GNUNET_GTK_search_frame_download_location_label"/> | ||
1154 | <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/> | ||
1155 | <widget name="GNUNET_GTK_search_frame_download_filename_label"/> | ||
1156 | </widgets> | ||
1157 | </object> | ||
945 | <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup"> | 1158 | <object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup"> |
946 | <property name="mode">vertical</property> | 1159 | <property name="mode">vertical</property> |
947 | <widgets> | 1160 | <widgets> |
@@ -971,6 +1184,4 @@ | |||
971 | <property name="can_focus">False</property> | 1184 | <property name="can_focus">False</property> |
972 | <property name="stock">gtk-go-up</property> | 1185 | <property name="stock">gtk-go-up</property> |
973 | </object> | 1186 | </object> |
974 | <object class="GtkSizeGroup" id="sizegroup4"/> | ||
975 | <object class="GtkSizeGroup" id="sizegroup5"/> | ||
976 | </interface> | 1187 | </interface> |