Ticket #378: pieces_bar_2.patch
File pieces_bar_2.patch, 96.3 KB (added by James_Kern, 14 years ago) |
---|
-
deluge/core/torrent.py
diff -urp deluge-1.2.1-original/deluge/core/torrent.py deluge-1.2.1/deluge/core/torrent.py
old new class Torrent: 479 479 """Returns the torrents queue position""" 480 480 return self.handle.queue_position() 481 481 482 def get_pieces_status(self): 483 if not self.handle.has_metadata(): 484 return None 485 486 return self.handle.status().pieces 487 482 488 def get_file_progress(self): 483 489 """Returns the file progress as a list of floats.. 0.0 -> 1.0""" 484 490 if not self.handle.has_metadata(): … … class Torrent: 642 648 "num_pieces": ti_num_pieces, 643 649 "peers": self.get_peers, 644 650 "piece_length": ti_piece_length, 651 "pieces": self.get_pieces_status, 645 652 "private": ti_priv, 646 653 "queue": self.handle.queue_position, 647 654 "ratio": self.get_ratio, -
deluge/ui/gtkui/glade/main_window.glade
diff -urp deluge-1.2.1-original/deluge/ui/gtkui/glade/main_window.glade deluge-1.2.1/deluge/ui/gtkui/glade/main_window.glade
old new 634 634 <widget class="GtkAlignment" id="alignment43"> 635 635 <property name="visible">True</property> 636 636 <property name="top_padding">10</property> 637 <property name="bottom_padding"> 10</property>637 <property name="bottom_padding">2</property> 638 638 <property name="left_padding">15</property> 639 639 <property name="right_padding">15</property> 640 640 <child> 641 641 <widget class="GtkVBox" id="vbox3"> 642 642 <property name="visible">True</property> 643 643 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 644 <property name="spacing"> 5</property>644 <property name="spacing">4</property> 645 645 <child> 646 <widget class="Gtk ProgressBar" id="progressbar">646 <widget class="GtkVBox" id="vbox8"> 647 647 <property name="visible">True</property> 648 <property name="show_text">True</property> 649 <property name="pulse_step">0.10000000149</property> 648 <child> 649 <widget class="GtkLabel" id="label28"> 650 <property name="visible">True</property> 651 <property name="xalign">0</property> 652 <property name="label" translatable="yes"><b>Completed Pieces:</b></property> 653 <property name="use_markup">True</property> 654 <property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property> 655 </widget> 656 <packing> 657 <property name="expand">False</property> 658 </packing> 659 </child> 660 <child> 661 <widget class="GtkAlignment" id="alignment12"> 662 <property name="height_request">35</property> 663 <property name="visible">True</property> 664 <property name="top_padding">3</property> 665 <property name="left_padding">12</property> 666 <child> 667 <placeholder/> 668 </child> 669 </widget> 670 <packing> 671 <property name="position">1</property> 672 </packing> 673 </child> 650 674 </widget> 651 675 <packing> 652 676 <property name="expand">False</property> 653 <property name="fill">False</property>654 677 </packing> 655 678 </child> 656 679 <child> … … 661 684 <property name="column_spacing">10</property> 662 685 <property name="row_spacing">5</property> 663 686 <child> 664 <widget class="GtkLabel" id="summary_ auto_managed">687 <widget class="GtkLabel" id="summary_date_added"> 665 688 <property name="visible">True</property> 666 689 <property name="xalign">0</property> 667 690 </widget> 668 691 <packing> 669 <property name="left_attach"> 5</property>670 <property name="right_attach"> 6</property>692 <property name="left_attach">7</property> 693 <property name="right_attach">8</property> 671 694 <property name="top_attach">3</property> 672 695 <property name="bottom_attach">4</property> 673 696 <property name="x_options">GTK_FILL</property> 674 697 </packing> 675 698 </child> 676 699 <child> 677 <widget class="GtkLabel" id="label2 2">700 <widget class="GtkLabel" id="label26"> 678 701 <property name="visible">True</property> 679 702 <property name="xalign">0</property> 680 <property name="label" translatable="yes"><b> Auto Managed:</b></property>703 <property name="label" translatable="yes"><b>Date Added:</b></property> 681 704 <property name="use_markup">True</property> 682 705 </widget> 683 706 <packing> 684 <property name="left_attach"> 4</property>685 <property name="right_attach"> 5</property>707 <property name="left_attach">6</property> 708 <property name="right_attach">7</property> 686 709 <property name="top_attach">3</property> 687 710 <property name="bottom_attach">4</property> 688 711 <property name="x_options">GTK_FILL</property> 689 712 </packing> 690 713 </child> 691 714 <child> 692 <widget class="GtkLabel" id="summary_ seed_rank">715 <widget class="GtkLabel" id="summary_total_downloaded"> 693 716 <property name="visible">True</property> 694 717 <property name="xalign">0</property> 695 718 </widget> 696 719 <packing> 697 <property name="left_attach">7</property> 698 <property name="right_attach">8</property> 699 <property name="top_attach">2</property> 700 <property name="bottom_attach">3</property> 720 <property name="left_attach">1</property> 721 <property name="right_attach">2</property> 701 722 <property name="x_options">GTK_FILL</property> 702 723 </packing> 703 724 </child> 704 725 <child> 705 <widget class="GtkLabel" id="summary_ seed_time">726 <widget class="GtkLabel" id="summary_download_speed"> 706 727 <property name="visible">True</property> 707 728 <property name="xalign">0</property> 708 729 </widget> 709 730 <packing> 710 <property name="left_attach">7</property> 711 <property name="right_attach">8</property> 712 <property name="top_attach">1</property> 713 <property name="bottom_attach">2</property> 731 <property name="left_attach">3</property> 732 <property name="right_attach">4</property> 714 733 <property name="x_options">GTK_FILL</property> 715 734 </packing> 716 735 </child> 717 736 <child> 718 <widget class="GtkLabel" id=" label20">737 <widget class="GtkLabel" id="summary_total_uploaded"> 719 738 <property name="visible">True</property> 720 739 <property name="xalign">0</property> 721 <property name="label" translatable="yes"><b>Seed Rank:</b></property>722 <property name="use_markup">True</property>723 740 </widget> 724 741 <packing> 725 <property name="left_attach"> 6</property>726 <property name="right_attach"> 7</property>727 <property name="top_attach"> 2</property>728 <property name="bottom_attach"> 3</property>742 <property name="left_attach">1</property> 743 <property name="right_attach">2</property> 744 <property name="top_attach">1</property> 745 <property name="bottom_attach">2</property> 729 746 <property name="x_options">GTK_FILL</property> 730 747 </packing> 731 748 </child> 732 749 <child> 733 <widget class="GtkLabel" id=" label19">750 <widget class="GtkLabel" id="summary_upload_speed"> 734 751 <property name="visible">True</property> 735 752 <property name="xalign">0</property> 736 <property name="label" translatable="yes"><b>Seeding Time:</b></property>737 <property name="use_markup">True</property>738 753 </widget> 739 754 <packing> 740 <property name="left_attach"> 6</property>741 <property name="right_attach"> 7</property>755 <property name="left_attach">3</property> 756 <property name="right_attach">4</property> 742 757 <property name="top_attach">1</property> 743 758 <property name="bottom_attach">2</property> 744 759 <property name="x_options">GTK_FILL</property> 745 760 </packing> 746 761 </child> 747 762 <child> 748 <widget class="Gtk Label" id="summary_active_time">763 <widget class="GtkAlignment" id="alignment44"> 749 764 <property name="visible">True</property> 750 <property name="xalign">0</property> 765 <property name="right_padding">5</property> 766 <child> 767 <widget class="GtkLabel" id="label38"> 768 <property name="visible">True</property> 769 <property name="xalign">0</property> 770 <property name="label" translatable="yes"><b>Downloaded:</b></property> 771 <property name="use_markup">True</property> 772 </widget> 773 </child> 751 774 </widget> 752 775 <packing> 753 <property name="left_attach">7</property>754 <property name="right_attach">8</property>755 776 <property name="x_options">GTK_FILL</property> 756 777 </packing> 757 778 </child> 758 779 <child> 759 <widget class="Gtk Label" id="label7">780 <widget class="GtkAlignment" id="alignment45"> 760 781 <property name="visible">True</property> 761 <property name="xalign">0</property> 762 <property name="label" translatable="yes"><b>Active Time:</b></property> 763 <property name="use_markup">True</property> 782 <property name="right_padding">5</property> 783 <child> 784 <widget class="GtkLabel" id="label39"> 785 <property name="visible">True</property> 786 <property name="xalign">0</property> 787 <property name="label" translatable="yes"><b>Uploaded:</b></property> 788 <property name="use_markup">True</property> 789 </widget> 790 </child> 764 791 </widget> 765 792 <packing> 766 <property name=" left_attach">6</property>767 <property name=" right_attach">7</property>793 <property name="top_attach">1</property> 794 <property name="bottom_attach">2</property> 768 795 <property name="x_options">GTK_FILL</property> 769 796 </packing> 770 797 </child> 771 798 <child> 772 <widget class="Gtk Label" id="summary_next_announce">799 <widget class="GtkAlignment" id="alignment46"> 773 800 <property name="visible">True</property> 774 <property name="xalign">0</property> 775 <property name="wrap">True</property> 801 <property name="right_padding">5</property> 802 <child> 803 <widget class="GtkLabel" id="label41"> 804 <property name="visible">True</property> 805 <property name="xalign">0</property> 806 <property name="label" translatable="yes"><b>Share Ratio:</b></property> 807 <property name="use_markup">True</property> 808 </widget> 809 </child> 776 810 </widget> 777 811 <packing> 778 <property name="left_attach">1</property> 779 <property name="right_attach">2</property> 780 <property name="top_attach">3</property> 781 <property name="bottom_attach">4</property> 812 <property name="top_attach">2</property> 813 <property name="bottom_attach">3</property> 782 814 <property name="x_options">GTK_FILL</property> 783 815 </packing> 784 816 </child> 785 817 <child> 786 <widget class="Gtk Label" id="summary_pieces">818 <widget class="GtkAlignment" id="alignment47"> 787 819 <property name="visible">True</property> 788 <property name="xalign">0</property> 820 <property name="right_padding">5</property> 821 <child> 822 <widget class="GtkLabel" id="label53"> 823 <property name="visible">True</property> 824 <property name="xalign">0</property> 825 <property name="label" translatable="yes"><b>Next Announce:</b></property> 826 <property name="use_markup">True</property> 827 </widget> 828 </child> 789 829 </widget> 790 830 <packing> 791 <property name="left_attach">3</property>792 <property name="right_attach">4</property>793 831 <property name="top_attach">3</property> 794 832 <property name="bottom_attach">4</property> 795 833 <property name="x_options">GTK_FILL</property> 796 834 </packing> 797 835 </child> 798 836 <child> 799 <widget class="GtkLabel" id="summary_tracker_status"> 800 <property name="visible">True</property> 801 <property name="xalign">0</property> 802 <property name="wrap">True</property> 803 <property name="wrap_mode">PANGO_WRAP_CHAR</property> 804 <property name="selectable">True</property> 805 </widget> 806 <packing> 807 <property name="left_attach">1</property> 808 <property name="right_attach">8</property> 809 <property name="top_attach">4</property> 810 <property name="bottom_attach">5</property> 811 <property name="y_options">GTK_FILL</property> 812 </packing> 813 </child> 814 <child> 815 <widget class="GtkLabel" id="label52"> 837 <widget class="GtkAlignment" id="alignment48"> 816 838 <property name="visible">True</property> 817 <property name="xalign">0</property> 818 <property name="yalign">0</property> 819 <property name="label" translatable="yes"><b>Tracker Status:</b></property> 820 <property name="use_markup">True</property> 839 <property name="left_padding">15</property> 840 <property name="right_padding">5</property> 841 <child> 842 <widget class="GtkLabel" id="label42"> 843 <property name="visible">True</property> 844 <property name="xalign">0</property> 845 <property name="label" translatable="yes"><b>Speed:</b></property> 846 <property name="use_markup">True</property> 847 </widget> 848 </child> 821 849 </widget> 822 850 <packing> 823 <property name=" top_attach">4</property>824 <property name=" bottom_attach">5</property>851 <property name="left_attach">2</property> 852 <property name="right_attach">3</property> 825 853 <property name="x_options">GTK_FILL</property> 826 <property name="y_options">GTK_FILL</property>827 854 </packing> 828 855 </child> 829 856 <child> 830 <widget class="Gtk Label" id="summary_availability">857 <widget class="GtkAlignment" id="alignment49"> 831 858 <property name="visible">True</property> 832 <property name="xalign">0</property> 833 <property name="wrap">True</property> 834 <property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property> 859 <property name="left_padding">15</property> 860 <property name="right_padding">5</property> 861 <child> 862 <widget class="GtkLabel" id="label43"> 863 <property name="visible">True</property> 864 <property name="xalign">0</property> 865 <property name="label" translatable="yes"><b>Speed:</b></property> 866 <property name="use_markup">True</property> 867 </widget> 868 </child> 835 869 </widget> 836 870 <packing> 837 <property name="left_attach"> 5</property>838 <property name="right_attach"> 6</property>839 <property name="top_attach"> 2</property>840 <property name="bottom_attach"> 3</property>871 <property name="left_attach">2</property> 872 <property name="right_attach">3</property> 873 <property name="top_attach">1</property> 874 <property name="bottom_attach">2</property> 841 875 <property name="x_options">GTK_FILL</property> 842 876 </packing> 843 877 </child> 844 878 <child> 845 <widget class="Gtk Label" id="label47">879 <widget class="GtkAlignment" id="alignment50"> 846 880 <property name="visible">True</property> 847 <property name="xalign">0</property> 848 <property name="ypad">1</property> 849 <property name="label" translatable="yes"><b>Availability:</b></property> 850 <property name="use_markup">True</property> 881 <property name="left_padding">15</property> 882 <property name="right_padding">5</property> 883 <child> 884 <widget class="GtkLabel" id="label45"> 885 <property name="visible">True</property> 886 <property name="xalign">0</property> 887 <property name="label" translatable="yes"><b>ETA:</b></property> 888 <property name="use_markup">True</property> 889 </widget> 890 </child> 851 891 </widget> 852 892 <packing> 853 <property name="left_attach"> 4</property>854 <property name="right_attach"> 5</property>893 <property name="left_attach">2</property> 894 <property name="right_attach">3</property> 855 895 <property name="top_attach">2</property> 856 896 <property name="bottom_attach">3</property> 857 897 <property name="x_options">GTK_FILL</property> 858 898 </packing> 859 899 </child> 860 900 <child> 861 <widget class="Gtk Label" id="summary_eta">901 <widget class="GtkAlignment" id="alignment51"> 862 902 <property name="visible">True</property> 863 <property name="xalign">0</property> 903 <property name="left_padding">15</property> 904 <property name="right_padding">5</property> 905 <child> 906 <widget class="GtkLabel" id="label46"> 907 <property name="visible">True</property> 908 <property name="xalign">0</property> 909 <property name="label" translatable="yes"><b>Pieces:</b></property> 910 <property name="use_markup">True</property> 911 </widget> 912 </child> 864 913 </widget> 865 914 <packing> 866 <property name="left_attach"> 3</property>867 <property name="right_attach"> 4</property>868 <property name="top_attach"> 2</property>869 <property name="bottom_attach"> 3</property>915 <property name="left_attach">2</property> 916 <property name="right_attach">3</property> 917 <property name="top_attach">3</property> 918 <property name="bottom_attach">4</property> 870 919 <property name="x_options">GTK_FILL</property> 871 920 </packing> 872 921 </child> 873 922 <child> 874 <widget class="GtkLabel" id=" summary_share_ratio">923 <widget class="GtkLabel" id="label40"> 875 924 <property name="visible">True</property> 876 925 <property name="xalign">0</property> 926 <property name="label" translatable="yes"><b>Seeders:</b></property> 927 <property name="use_markup">True</property> 877 928 </widget> 878 929 <packing> 879 <property name="left_attach">1</property> 880 <property name="right_attach">2</property> 881 <property name="top_attach">2</property> 882 <property name="bottom_attach">3</property> 930 <property name="left_attach">4</property> 931 <property name="right_attach">5</property> 883 932 <property name="x_options">GTK_FILL</property> 884 933 </packing> 885 934 </child> 886 935 <child> 887 <widget class="GtkLabel" id="summary_ peers">936 <widget class="GtkLabel" id="summary_seeders"> 888 937 <property name="visible">True</property> 889 938 <property name="xalign">0</property> 890 939 </widget> 891 940 <packing> 892 941 <property name="left_attach">5</property> 893 942 <property name="right_attach">6</property> 894 <property name="top_attach">1</property>895 <property name="bottom_attach">2</property>896 943 <property name="x_options">GTK_FILL</property> 897 944 </packing> 898 945 </child> … … 912 959 </packing> 913 960 </child> 914 961 <child> 915 <widget class="GtkLabel" id="summary_ seeders">962 <widget class="GtkLabel" id="summary_peers"> 916 963 <property name="visible">True</property> 917 964 <property name="xalign">0</property> 918 965 </widget> 919 966 <packing> 920 967 <property name="left_attach">5</property> 921 968 <property name="right_attach">6</property> 969 <property name="top_attach">1</property> 970 <property name="bottom_attach">2</property> 922 971 <property name="x_options">GTK_FILL</property> 923 972 </packing> 924 973 </child> 925 974 <child> 926 <widget class="GtkLabel" id=" label40">975 <widget class="GtkLabel" id="summary_share_ratio"> 927 976 <property name="visible">True</property> 928 977 <property name="xalign">0</property> 929 <property name="label" translatable="yes"><b>Seeders:</b></property>930 <property name="use_markup">True</property>931 978 </widget> 932 979 <packing> 933 <property name="left_attach">4</property> 934 <property name="right_attach">5</property> 980 <property name="left_attach">1</property> 981 <property name="right_attach">2</property> 982 <property name="top_attach">2</property> 983 <property name="bottom_attach">3</property> 935 984 <property name="x_options">GTK_FILL</property> 936 985 </packing> 937 986 </child> 938 987 <child> 939 <widget class="Gtk Alignment" id="alignment51">988 <widget class="GtkLabel" id="summary_eta"> 940 989 <property name="visible">True</property> 941 <property name="left_padding">15</property> 942 <property name="right_padding">5</property> 943 <child> 944 <widget class="GtkLabel" id="label46"> 945 <property name="visible">True</property> 946 <property name="xalign">0</property> 947 <property name="label" translatable="yes"><b>Pieces:</b></property> 948 <property name="use_markup">True</property> 949 </widget> 950 </child> 990 <property name="xalign">0</property> 951 991 </widget> 952 992 <packing> 953 <property name="left_attach"> 2</property>954 <property name="right_attach"> 3</property>955 <property name="top_attach"> 3</property>956 <property name="bottom_attach"> 4</property>993 <property name="left_attach">3</property> 994 <property name="right_attach">4</property> 995 <property name="top_attach">2</property> 996 <property name="bottom_attach">3</property> 957 997 <property name="x_options">GTK_FILL</property> 958 998 </packing> 959 999 </child> 960 1000 <child> 961 <widget class="Gtk Alignment" id="alignment50">1001 <widget class="GtkLabel" id="label47"> 962 1002 <property name="visible">True</property> 963 <property name="left_padding">15</property> 964 <property name="right_padding">5</property> 965 <child> 966 <widget class="GtkLabel" id="label45"> 967 <property name="visible">True</property> 968 <property name="xalign">0</property> 969 <property name="label" translatable="yes"><b>ETA:</b></property> 970 <property name="use_markup">True</property> 971 </widget> 972 </child> 1003 <property name="xalign">0</property> 1004 <property name="ypad">1</property> 1005 <property name="label" translatable="yes"><b>Availability:</b></property> 1006 <property name="use_markup">True</property> 1007 </widget> 1008 <packing> 1009 <property name="left_attach">4</property> 1010 <property name="right_attach">5</property> 1011 <property name="top_attach">2</property> 1012 <property name="bottom_attach">3</property> 1013 <property name="x_options">GTK_FILL</property> 1014 </packing> 1015 </child> 1016 <child> 1017 <widget class="GtkLabel" id="summary_availability"> 1018 <property name="visible">True</property> 1019 <property name="xalign">0</property> 1020 <property name="wrap">True</property> 1021 <property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property> 973 1022 </widget> 974 1023 <packing> 975 <property name="left_attach"> 2</property>976 <property name="right_attach"> 3</property>1024 <property name="left_attach">5</property> 1025 <property name="right_attach">6</property> 977 1026 <property name="top_attach">2</property> 978 1027 <property name="bottom_attach">3</property> 979 1028 <property name="x_options">GTK_FILL</property> 980 1029 </packing> 981 1030 </child> 982 1031 <child> 983 <widget class="Gtk Alignment" id="alignment49">1032 <widget class="GtkLabel" id="label52"> 984 1033 <property name="visible">True</property> 985 <property name="left_padding">15</property> 986 <property name="right_padding">5</property> 987 <child> 988 <widget class="GtkLabel" id="label43"> 989 <property name="visible">True</property> 990 <property name="xalign">0</property> 991 <property name="label" translatable="yes"><b>Speed:</b></property> 992 <property name="use_markup">True</property> 993 </widget> 994 </child> 1034 <property name="xalign">0</property> 1035 <property name="yalign">0</property> 1036 <property name="label" translatable="yes"><b>Tracker Status:</b></property> 1037 <property name="use_markup">True</property> 995 1038 </widget> 996 1039 <packing> 997 <property name="left_attach">2</property> 998 <property name="right_attach">3</property> 999 <property name="top_attach">1</property> 1000 <property name="bottom_attach">2</property> 1040 <property name="top_attach">4</property> 1041 <property name="bottom_attach">5</property> 1001 1042 <property name="x_options">GTK_FILL</property> 1002 1043 </packing> 1003 1044 </child> 1004 1045 <child> 1005 <widget class="Gtk Alignment" id="alignment48">1046 <widget class="GtkLabel" id="summary_tracker_status"> 1006 1047 <property name="visible">True</property> 1007 <property name="left_padding">15</property> 1008 <property name="right_padding">5</property> 1009 <child> 1010 <widget class="GtkLabel" id="label42"> 1011 <property name="visible">True</property> 1012 <property name="xalign">0</property> 1013 <property name="label" translatable="yes"><b>Speed:</b></property> 1014 <property name="use_markup">True</property> 1015 </widget> 1016 </child> 1048 <property name="xalign">0</property> 1049 <property name="wrap">True</property> 1050 <property name="wrap_mode">PANGO_WRAP_CHAR</property> 1051 <property name="selectable">True</property> 1017 1052 </widget> 1018 1053 <packing> 1019 <property name="left_attach">2</property> 1020 <property name="right_attach">3</property> 1021 <property name="x_options">GTK_FILL</property> 1054 <property name="left_attach">1</property> 1055 <property name="right_attach">8</property> 1056 <property name="top_attach">4</property> 1057 <property name="bottom_attach">5</property> 1022 1058 </packing> 1023 1059 </child> 1024 1060 <child> 1025 <widget class="Gtk Alignment" id="alignment47">1061 <widget class="GtkLabel" id="summary_pieces"> 1026 1062 <property name="visible">True</property> 1027 <property name="right_padding">5</property> 1028 <child> 1029 <widget class="GtkLabel" id="label53"> 1030 <property name="visible">True</property> 1031 <property name="xalign">0</property> 1032 <property name="label" translatable="yes"><b>Next Announce:</b></property> 1033 <property name="use_markup">True</property> 1034 </widget> 1035 </child> 1063 <property name="xalign">0</property> 1036 1064 </widget> 1037 1065 <packing> 1066 <property name="left_attach">3</property> 1067 <property name="right_attach">4</property> 1038 1068 <property name="top_attach">3</property> 1039 1069 <property name="bottom_attach">4</property> 1040 1070 <property name="x_options">GTK_FILL</property> 1041 1071 </packing> 1042 1072 </child> 1043 1073 <child> 1044 <widget class="Gtk Alignment" id="alignment46">1074 <widget class="GtkLabel" id="summary_next_announce"> 1045 1075 <property name="visible">True</property> 1046 <property name="right_padding">5</property> 1047 <child> 1048 <widget class="GtkLabel" id="label41"> 1049 <property name="visible">True</property> 1050 <property name="xalign">0</property> 1051 <property name="label" translatable="yes"><b>Share Ratio:</b></property> 1052 <property name="use_markup">True</property> 1053 </widget> 1054 </child> 1076 <property name="xalign">0</property> 1077 <property name="wrap">True</property> 1055 1078 </widget> 1056 1079 <packing> 1057 <property name="top_attach">2</property> 1058 <property name="bottom_attach">3</property> 1080 <property name="left_attach">1</property> 1081 <property name="right_attach">2</property> 1082 <property name="top_attach">3</property> 1083 <property name="bottom_attach">4</property> 1059 1084 <property name="x_options">GTK_FILL</property> 1060 1085 </packing> 1061 1086 </child> 1062 1087 <child> 1063 <widget class="Gtk Alignment" id="alignment45">1088 <widget class="GtkLabel" id="label7"> 1064 1089 <property name="visible">True</property> 1065 <property name="right_padding">5</property> 1066 <child> 1067 <widget class="GtkLabel" id="label39"> 1068 <property name="visible">True</property> 1069 <property name="xalign">0</property> 1070 <property name="label" translatable="yes"><b>Uploaded:</b></property> 1071 <property name="use_markup">True</property> 1072 </widget> 1073 </child> 1090 <property name="xalign">0</property> 1091 <property name="label" translatable="yes"><b>Active Time:</b></property> 1092 <property name="use_markup">True</property> 1074 1093 </widget> 1075 1094 <packing> 1076 <property name=" top_attach">1</property>1077 <property name=" bottom_attach">2</property>1095 <property name="left_attach">6</property> 1096 <property name="right_attach">7</property> 1078 1097 <property name="x_options">GTK_FILL</property> 1079 1098 </packing> 1080 1099 </child> 1081 1100 <child> 1082 <widget class="Gtk Alignment" id="alignment44">1101 <widget class="GtkLabel" id="summary_active_time"> 1083 1102 <property name="visible">True</property> 1084 <property name="right_padding">5</property> 1085 <child> 1086 <widget class="GtkLabel" id="label38"> 1087 <property name="visible">True</property> 1088 <property name="xalign">0</property> 1089 <property name="label" translatable="yes"><b>Downloaded:</b></property> 1090 <property name="use_markup">True</property> 1091 </widget> 1092 </child> 1103 <property name="xalign">0</property> 1093 1104 </widget> 1094 1105 <packing> 1106 <property name="left_attach">7</property> 1107 <property name="right_attach">8</property> 1095 1108 <property name="x_options">GTK_FILL</property> 1096 1109 </packing> 1097 1110 </child> 1098 1111 <child> 1099 <widget class="GtkLabel" id=" summary_upload_speed">1112 <widget class="GtkLabel" id="label19"> 1100 1113 <property name="visible">True</property> 1101 1114 <property name="xalign">0</property> 1115 <property name="label" translatable="yes"><b>Seeding Time:</b></property> 1116 <property name="use_markup">True</property> 1102 1117 </widget> 1103 1118 <packing> 1104 <property name="left_attach"> 3</property>1105 <property name="right_attach"> 4</property>1119 <property name="left_attach">6</property> 1120 <property name="right_attach">7</property> 1106 1121 <property name="top_attach">1</property> 1107 1122 <property name="bottom_attach">2</property> 1108 1123 <property name="x_options">GTK_FILL</property> 1109 1124 </packing> 1110 1125 </child> 1111 1126 <child> 1112 <widget class="GtkLabel" id=" summary_total_uploaded">1127 <widget class="GtkLabel" id="label20"> 1113 1128 <property name="visible">True</property> 1114 1129 <property name="xalign">0</property> 1130 <property name="label" translatable="yes"><b>Seed Rank:</b></property> 1131 <property name="use_markup">True</property> 1115 1132 </widget> 1116 1133 <packing> 1117 <property name="left_attach"> 1</property>1118 <property name="right_attach"> 2</property>1119 <property name="top_attach"> 1</property>1120 <property name="bottom_attach"> 2</property>1134 <property name="left_attach">6</property> 1135 <property name="right_attach">7</property> 1136 <property name="top_attach">2</property> 1137 <property name="bottom_attach">3</property> 1121 1138 <property name="x_options">GTK_FILL</property> 1122 1139 </packing> 1123 1140 </child> 1124 1141 <child> 1125 <widget class="GtkLabel" id="summary_ download_speed">1142 <widget class="GtkLabel" id="summary_seed_time"> 1126 1143 <property name="visible">True</property> 1127 1144 <property name="xalign">0</property> 1128 1145 </widget> 1129 1146 <packing> 1130 <property name="left_attach">3</property> 1131 <property name="right_attach">4</property> 1147 <property name="left_attach">7</property> 1148 <property name="right_attach">8</property> 1149 <property name="top_attach">1</property> 1150 <property name="bottom_attach">2</property> 1132 1151 <property name="x_options">GTK_FILL</property> 1133 1152 </packing> 1134 1153 </child> 1135 1154 <child> 1136 <widget class="GtkLabel" id="summary_ total_downloaded">1155 <widget class="GtkLabel" id="summary_seed_rank"> 1137 1156 <property name="visible">True</property> 1138 1157 <property name="xalign">0</property> 1139 1158 </widget> 1140 1159 <packing> 1141 <property name="left_attach">1</property> 1142 <property name="right_attach">2</property> 1160 <property name="left_attach">7</property> 1161 <property name="right_attach">8</property> 1162 <property name="top_attach">2</property> 1163 <property name="bottom_attach">3</property> 1143 1164 <property name="x_options">GTK_FILL</property> 1144 1165 </packing> 1145 1166 </child> 1146 1167 <child> 1147 <widget class="GtkLabel" id="label2 6">1168 <widget class="GtkLabel" id="label22"> 1148 1169 <property name="visible">True</property> 1149 1170 <property name="xalign">0</property> 1150 <property name="label" translatable="yes"><b> Date Added:</b></property>1171 <property name="label" translatable="yes"><b>Auto Managed:</b></property> 1151 1172 <property name="use_markup">True</property> 1152 1173 </widget> 1153 1174 <packing> 1154 <property name="left_attach"> 6</property>1155 <property name="right_attach"> 7</property>1175 <property name="left_attach">4</property> 1176 <property name="right_attach">5</property> 1156 1177 <property name="top_attach">3</property> 1157 1178 <property name="bottom_attach">4</property> 1158 1179 <property name="x_options">GTK_FILL</property> 1159 1180 </packing> 1160 1181 </child> 1161 1182 <child> 1162 <widget class="GtkLabel" id="summary_ date_added">1183 <widget class="GtkLabel" id="summary_auto_managed"> 1163 1184 <property name="visible">True</property> 1164 1185 <property name="xalign">0</property> 1165 1186 </widget> 1166 1187 <packing> 1167 <property name="left_attach"> 7</property>1168 <property name="right_attach"> 8</property>1188 <property name="left_attach">5</property> 1189 <property name="right_attach">6</property> 1169 1190 <property name="top_attach">3</property> 1170 1191 <property name="bottom_attach">4</property> 1171 1192 <property name="x_options">GTK_FILL</property> … … 1256 1277 <placeholder/> 1257 1278 </child> 1258 1279 <child> 1259 <widget class="GtkLabel" id="summary_ comments">1280 <widget class="GtkLabel" id="summary_total_size"> 1260 1281 <property name="visible">True</property> 1261 1282 <property name="xalign">0</property> 1262 <property name="wrap_mode">PANGO_WRAP_CHAR</property>1263 1283 <property name="selectable">True</property> 1264 1284 </widget> 1265 1285 <packing> 1266 1286 <property name="left_attach">1</property> 1267 <property name="right_attach">4</property> 1268 <property name="top_attach">5</property> 1269 <property name="bottom_attach">6</property> 1270 <property name="y_options"></property> 1271 </packing> 1272 </child> 1273 <child> 1274 <widget class="GtkLabel" id="label27"> 1275 <property name="visible">True</property> 1276 <property name="xalign">0</property> 1277 <property name="ypad">1</property> 1278 <property name="label" translatable="yes"><b>Comments:</b></property> 1279 <property name="use_markup">True</property> 1280 </widget> 1281 <packing> 1282 <property name="top_attach">5</property> 1283 <property name="bottom_attach">6</property> 1284 <property name="x_options">GTK_FILL</property> 1287 <property name="right_attach">2</property> 1288 <property name="top_attach">3</property> 1289 <property name="bottom_attach">4</property> 1285 1290 <property name="y_options"></property> 1286 1291 </packing> 1287 1292 </child> 1288 1293 <child> 1289 <widget class="GtkLabel" id="summary_ num_files">1294 <widget class="GtkLabel" id="summary_message"> 1290 1295 <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> 1291 1297 <property name="xalign">0</property> 1292 1298 <property name="selectable">True</property> 1293 1299 </widget> 1294 1300 <packing> 1295 1301 <property name="left_attach">1</property> 1296 <property name="right_attach"> 2</property>1297 <property name="top_attach"> 4</property>1298 <property name="bottom_attach"> 5</property>1302 <property name="right_attach">4</property> 1303 <property name="top_attach">6</property> 1304 <property name="bottom_attach">7</property> 1299 1305 <property name="y_options"></property> 1300 1306 </packing> 1301 1307 </child> 1302 1308 <child> 1303 <widget class="GtkLabel" id="label 49">1309 <widget class="GtkLabel" id="label8"> 1304 1310 <property name="visible">True</property> 1305 1311 <property name="xalign">0</property> 1306 1312 <property name="ypad">1</property> 1307 <property name="label" translatable="yes"><b> # of files:</b></property>1313 <property name="label" translatable="yes"><b>Status:</b></property> 1308 1314 <property name="use_markup">True</property> 1309 1315 </widget> 1310 1316 <packing> 1311 <property name="top_attach"> 4</property>1312 <property name="bottom_attach"> 5</property>1317 <property name="top_attach">6</property> 1318 <property name="bottom_attach">7</property> 1313 1319 <property name="x_options">GTK_FILL</property> 1314 1320 <property name="y_options"></property> 1315 1321 </packing> 1316 1322 </child> 1317 1323 <child> 1318 <widget class="GtkLabel" id="summary_ hash">1324 <widget class="GtkLabel" id="summary_torrent_path"> 1319 1325 <property name="visible">True</property> 1320 1326 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1321 1327 <property name="xalign">0</property> … … 1326 1332 <packing> 1327 1333 <property name="left_attach">1</property> 1328 1334 <property name="right_attach">4</property> 1329 <property name="top_attach"> 1</property>1330 <property name="bottom_attach"> 2</property>1335 <property name="top_attach">2</property> 1336 <property name="bottom_attach">3</property> 1331 1337 <property name="y_options"></property> 1332 1338 </packing> 1333 1339 </child> 1334 1340 <child> 1335 <widget class="Gtk Label" id="label10">1341 <widget class="GtkAlignment" id="alignment3"> 1336 1342 <property name="visible">True</property> 1337 1343 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1338 <property name="xalign">0</property> 1339 <property name="label" translatable="yes"><b>Hash:</b></property> 1340 <property name="use_markup">True</property> 1341 </widget> 1342 <packing> 1343 <property name="top_attach">1</property> 1344 <property name="bottom_attach">2</property> 1345 <property name="x_options">GTK_FILL</property> 1346 <property name="y_options"></property> 1347 </packing> 1348 </child> 1349 <child> 1350 <widget class="GtkLabel" id="summary_tracker"> 1351 <property name="visible">True</property> 1352 <property name="xalign">0</property> 1353 <property name="wrap_mode">PANGO_WRAP_CHAR</property> 1354 <property name="selectable">True</property> 1355 </widget> 1356 <packing> 1357 <property name="left_attach">1</property> 1358 <property name="right_attach">4</property> 1359 <property name="top_attach">7</property> 1360 <property name="bottom_attach">8</property> 1361 <property name="y_options"></property> 1362 </packing> 1363 </child> 1364 <child> 1365 <widget class="GtkLabel" id="label51"> 1366 <property name="visible">True</property> 1367 <property name="xalign">0</property> 1368 <property name="ypad">1</property> 1369 <property name="label" translatable="yes"><b>Tracker:</b></property> 1370 <property name="use_markup">True</property> 1344 <property name="right_padding">5</property> 1345 <child> 1346 <widget class="GtkLabel" id="label1"> 1347 <property name="visible">True</property> 1348 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1349 <property name="xalign">0</property> 1350 <property name="label" translatable="yes"><b>Path:</b></property> 1351 <property name="use_markup">True</property> 1352 </widget> 1353 </child> 1371 1354 </widget> 1372 1355 <packing> 1373 <property name="top_attach"> 7</property>1374 <property name="bottom_attach"> 8</property>1356 <property name="top_attach">2</property> 1357 <property name="bottom_attach">3</property> 1375 1358 <property name="x_options">GTK_FILL</property> 1376 1359 <property name="y_options"></property> 1377 1360 </packing> 1378 1361 </child> 1379 1362 <child> 1380 <widget class="GtkAlignment" id="alignment 55">1363 <widget class="GtkAlignment" id="alignment62"> 1381 1364 <property name="visible">True</property> 1382 1365 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1383 1366 <property name="right_padding">5</property> 1384 1367 <child> 1385 <widget class="GtkLabel" id="label5 0">1368 <widget class="GtkLabel" id="label54"> 1386 1369 <property name="visible">True</property> 1387 1370 <property name="xalign">0</property> 1371 <property name="yalign">0</property> 1388 1372 <property name="ypad">1</property> 1389 <property name="label" translatable="yes"><b> Total Size:</b></property>1373 <property name="label" translatable="yes"><b>Name:</b></property> 1390 1374 <property name="use_markup">True</property> 1391 1375 </widget> 1392 1376 </child> 1393 1377 </widget> 1394 1378 <packing> 1395 <property name="top_attach">3</property>1396 <property name="bottom_attach">4</property>1397 1379 <property name="x_options">GTK_FILL</property> 1398 1380 <property name="y_options"></property> 1399 1381 </packing> … … 1414 1396 </packing> 1415 1397 </child> 1416 1398 <child> 1417 <widget class="GtkAlignment" id="alignment 62">1399 <widget class="GtkAlignment" id="alignment55"> 1418 1400 <property name="visible">True</property> 1419 1401 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1420 1402 <property name="right_padding">5</property> 1421 1403 <child> 1422 <widget class="GtkLabel" id="label5 4">1404 <widget class="GtkLabel" id="label50"> 1423 1405 <property name="visible">True</property> 1424 1406 <property name="xalign">0</property> 1425 <property name="yalign">0</property>1426 1407 <property name="ypad">1</property> 1427 <property name="label" translatable="yes"><b> Name:</b></property>1408 <property name="label" translatable="yes"><b>Total Size:</b></property> 1428 1409 <property name="use_markup">True</property> 1429 1410 </widget> 1430 1411 </child> 1431 1412 </widget> 1432 1413 <packing> 1414 <property name="top_attach">3</property> 1415 <property name="bottom_attach">4</property> 1433 1416 <property name="x_options">GTK_FILL</property> 1434 1417 <property name="y_options"></property> 1435 1418 </packing> 1436 1419 </child> 1437 1420 <child> 1438 <widget class="GtkAlignment" id="alignment3"> 1421 <widget class="GtkLabel" id="label51"> 1422 <property name="visible">True</property> 1423 <property name="xalign">0</property> 1424 <property name="ypad">1</property> 1425 <property name="label" translatable="yes"><b>Tracker:</b></property> 1426 <property name="use_markup">True</property> 1427 </widget> 1428 <packing> 1429 <property name="top_attach">7</property> 1430 <property name="bottom_attach">8</property> 1431 <property name="x_options">GTK_FILL</property> 1432 <property name="y_options"></property> 1433 </packing> 1434 </child> 1435 <child> 1436 <widget class="GtkLabel" id="summary_tracker"> 1437 <property name="visible">True</property> 1438 <property name="xalign">0</property> 1439 <property name="wrap_mode">PANGO_WRAP_CHAR</property> 1440 <property name="selectable">True</property> 1441 </widget> 1442 <packing> 1443 <property name="left_attach">1</property> 1444 <property name="right_attach">4</property> 1445 <property name="top_attach">7</property> 1446 <property name="bottom_attach">8</property> 1447 <property name="y_options"></property> 1448 </packing> 1449 </child> 1450 <child> 1451 <widget class="GtkLabel" id="label10"> 1439 1452 <property name="visible">True</property> 1440 1453 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1441 <property name="right_padding">5</property> 1442 <child> 1443 <widget class="GtkLabel" id="label1"> 1444 <property name="visible">True</property> 1445 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1446 <property name="xalign">0</property> 1447 <property name="label" translatable="yes"><b>Path:</b></property> 1448 <property name="use_markup">True</property> 1449 </widget> 1450 </child> 1454 <property name="xalign">0</property> 1455 <property name="label" translatable="yes"><b>Hash:</b></property> 1456 <property name="use_markup">True</property> 1451 1457 </widget> 1452 1458 <packing> 1453 <property name="top_attach"> 2</property>1454 <property name="bottom_attach"> 3</property>1459 <property name="top_attach">1</property> 1460 <property name="bottom_attach">2</property> 1455 1461 <property name="x_options">GTK_FILL</property> 1456 1462 <property name="y_options"></property> 1457 1463 </packing> 1458 1464 </child> 1459 1465 <child> 1460 <widget class="GtkLabel" id="summary_ torrent_path">1466 <widget class="GtkLabel" id="summary_hash"> 1461 1467 <property name="visible">True</property> 1462 1468 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 1463 1469 <property name="xalign">0</property> … … 1468 1474 <packing> 1469 1475 <property name="left_attach">1</property> 1470 1476 <property name="right_attach">4</property> 1471 <property name="top_attach"> 2</property>1472 <property name="bottom_attach"> 3</property>1477 <property name="top_attach">1</property> 1478 <property name="bottom_attach">2</property> 1473 1479 <property name="y_options"></property> 1474 1480 </packing> 1475 1481 </child> 1476 1482 <child> 1477 <widget class="GtkLabel" id="label 8">1483 <widget class="GtkLabel" id="label49"> 1478 1484 <property name="visible">True</property> 1479 1485 <property name="xalign">0</property> 1480 1486 <property name="ypad">1</property> 1481 <property name="label" translatable="yes"><b> Status:</b></property>1487 <property name="label" translatable="yes"><b># of files:</b></property> 1482 1488 <property name="use_markup">True</property> 1483 1489 </widget> 1484 1490 <packing> 1485 <property name="top_attach"> 6</property>1486 <property name="bottom_attach"> 7</property>1491 <property name="top_attach">4</property> 1492 <property name="bottom_attach">5</property> 1487 1493 <property name="x_options">GTK_FILL</property> 1488 1494 <property name="y_options"></property> 1489 1495 </packing> 1490 1496 </child> 1491 1497 <child> 1492 <widget class="GtkLabel" id="summary_ message">1498 <widget class="GtkLabel" id="summary_num_files"> 1493 1499 <property name="visible">True</property> 1494 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>1495 1500 <property name="xalign">0</property> 1496 1501 <property name="selectable">True</property> 1497 1502 </widget> 1498 1503 <packing> 1499 1504 <property name="left_attach">1</property> 1500 <property name="right_attach"> 4</property>1501 <property name="top_attach"> 6</property>1502 <property name="bottom_attach"> 7</property>1505 <property name="right_attach">2</property> 1506 <property name="top_attach">4</property> 1507 <property name="bottom_attach">5</property> 1503 1508 <property name="y_options"></property> 1504 1509 </packing> 1505 1510 </child> 1506 1511 <child> 1507 <widget class="GtkLabel" id="summary_total_size"> 1512 <widget class="GtkLabel" id="label27"> 1513 <property name="visible">True</property> 1514 <property name="xalign">0</property> 1515 <property name="ypad">1</property> 1516 <property name="label" translatable="yes"><b>Comments:</b></property> 1517 <property name="use_markup">True</property> 1518 </widget> 1519 <packing> 1520 <property name="top_attach">5</property> 1521 <property name="bottom_attach">6</property> 1522 <property name="x_options">GTK_FILL</property> 1523 <property name="y_options"></property> 1524 </packing> 1525 </child> 1526 <child> 1527 <widget class="GtkLabel" id="summary_comments"> 1508 1528 <property name="visible">True</property> 1509 1529 <property name="xalign">0</property> 1530 <property name="wrap_mode">PANGO_WRAP_CHAR</property> 1510 1531 <property name="selectable">True</property> 1511 1532 </widget> 1512 1533 <packing> 1513 1534 <property name="left_attach">1</property> 1514 <property name="right_attach"> 2</property>1515 <property name="top_attach"> 3</property>1516 <property name="bottom_attach"> 4</property>1535 <property name="right_attach">4</property> 1536 <property name="top_attach">5</property> 1537 <property name="bottom_attach">6</property> 1517 1538 <property name="y_options"></property> 1518 1539 </packing> 1519 1540 </child> … … 1694 1715 <placeholder/> 1695 1716 </child> 1696 1717 <child> 1697 <widget class="GtkSpinButton" id="spin_max_ connections">1718 <widget class="GtkSpinButton" id="spin_max_upload_slots"> 1698 1719 <property name="visible">True</property> 1699 1720 <property name="can_focus">True</property> 1700 1721 <property name="width_chars">6</property> … … 1704 1725 <packing> 1705 1726 <property name="left_attach">1</property> 1706 1727 <property name="right_attach">2</property> 1707 <property name="top_attach"> 2</property>1708 <property name="bottom_attach"> 3</property>1728 <property name="top_attach">3</property> 1729 <property name="bottom_attach">4</property> 1709 1730 <property name="x_options"></property> 1710 1731 <property name="y_options"></property> 1711 1732 </packing> 1712 1733 </child> 1713 1734 <child> 1714 <widget class="Gtk SpinButton" id="spin_max_upload">1735 <widget class="GtkLabel" id="label15"> 1715 1736 <property name="visible">True</property> 1716 <property name="can_focus">True</property> 1717 <property name="width_chars">6</property> 1718 <property name="xalign">1</property> 1719 <property name="adjustment">-1 -1 99999 1 10 0</property> 1720 <property name="digits">1</property> 1737 <property name="xalign">0</property> 1738 <property name="label" translatable="yes">Max Upload Slots:</property> 1721 1739 </widget> 1722 1740 <packing> 1723 <property name="left_attach">1</property> 1724 <property name="right_attach">2</property> 1741 <property name="top_attach">3</property> 1742 <property name="bottom_attach">4</property> 1743 <property name="x_options">GTK_FILL</property> 1744 <property name="y_options"></property> 1745 </packing> 1746 </child> 1747 <child> 1748 <widget class="GtkLabel" id="label14"> 1749 <property name="visible">True</property> 1750 <property name="label" translatable="yes">KiB/s</property> 1751 </widget> 1752 <packing> 1753 <property name="left_attach">2</property> 1754 <property name="right_attach">3</property> 1725 1755 <property name="top_attach">1</property> 1726 1756 <property name="bottom_attach">2</property> 1727 1757 <property name="x_options"></property> … … 1729 1759 </packing> 1730 1760 </child> 1731 1761 <child> 1732 <widget class="Gtk SpinButton" id="spin_max_download">1762 <widget class="GtkLabel" id="label13"> 1733 1763 <property name="visible">True</property> 1734 <property name="can_focus">True</property> 1735 <property name="width_chars">6</property> 1736 <property name="xalign">1</property> 1737 <property name="adjustment">-1 -1 999999 1 10 0</property> 1738 <property name="digits">1</property> 1764 <property name="label" translatable="yes">KiB/s</property> 1739 1765 </widget> 1740 1766 <packing> 1741 <property name="left_attach"> 1</property>1742 <property name="right_attach"> 2</property>1767 <property name="left_attach">2</property> 1768 <property name="right_attach">3</property> 1743 1769 <property name="x_options"></property> 1744 1770 <property name="y_options"></property> 1745 1771 </packing> 1746 1772 </child> 1747 1773 <child> 1748 <widget class="GtkLabel" id="label 12">1774 <widget class="GtkLabel" id="label9"> 1749 1775 <property name="visible">True</property> 1750 1776 <property name="xalign">0</property> 1751 <property name="label" translatable="yes">Max Connections:</property>1777 <property name="label" translatable="yes">Max Download Speed:</property> 1752 1778 </widget> 1753 1779 <packing> 1754 <property name="top_attach">2</property>1755 <property name="bottom_attach">3</property>1756 1780 <property name="x_options">GTK_FILL</property> 1757 1781 <property name="y_options"></property> 1758 1782 </packing> … … 1771 1795 </packing> 1772 1796 </child> 1773 1797 <child> 1774 <widget class="GtkLabel" id="label 9">1798 <widget class="GtkLabel" id="label12"> 1775 1799 <property name="visible">True</property> 1776 1800 <property name="xalign">0</property> 1777 <property name="label" translatable="yes">Max Download Speed:</property>1801 <property name="label" translatable="yes">Max Connections:</property> 1778 1802 </widget> 1779 1803 <packing> 1804 <property name="top_attach">2</property> 1805 <property name="bottom_attach">3</property> 1780 1806 <property name="x_options">GTK_FILL</property> 1781 1807 <property name="y_options"></property> 1782 1808 </packing> 1783 1809 </child> 1784 1810 <child> 1785 <widget class="Gtk Label" id="label13">1811 <widget class="GtkSpinButton" id="spin_max_download"> 1786 1812 <property name="visible">True</property> 1787 <property name="label" translatable="yes">KiB/s</property> 1813 <property name="can_focus">True</property> 1814 <property name="width_chars">6</property> 1815 <property name="xalign">1</property> 1816 <property name="adjustment">-1 -1 999999 1 10 0</property> 1817 <property name="digits">1</property> 1788 1818 </widget> 1789 1819 <packing> 1790 <property name="left_attach"> 2</property>1791 <property name="right_attach"> 3</property>1820 <property name="left_attach">1</property> 1821 <property name="right_attach">2</property> 1792 1822 <property name="x_options"></property> 1793 1823 <property name="y_options"></property> 1794 1824 </packing> 1795 1825 </child> 1796 1826 <child> 1797 <widget class="Gtk Label" id="label14">1827 <widget class="GtkSpinButton" id="spin_max_upload"> 1798 1828 <property name="visible">True</property> 1799 <property name="label" translatable="yes">KiB/s</property> 1829 <property name="can_focus">True</property> 1830 <property name="width_chars">6</property> 1831 <property name="xalign">1</property> 1832 <property name="adjustment">-1 -1 99999 1 10 0</property> 1833 <property name="digits">1</property> 1800 1834 </widget> 1801 1835 <packing> 1802 <property name="left_attach"> 2</property>1803 <property name="right_attach"> 3</property>1836 <property name="left_attach">1</property> 1837 <property name="right_attach">2</property> 1804 1838 <property name="top_attach">1</property> 1805 1839 <property name="bottom_attach">2</property> 1806 1840 <property name="x_options"></property> … … 1808 1842 </packing> 1809 1843 </child> 1810 1844 <child> 1811 <widget class="GtkLabel" id="label15"> 1812 <property name="visible">True</property> 1813 <property name="xalign">0</property> 1814 <property name="label" translatable="yes">Max Upload Slots:</property> 1815 </widget> 1816 <packing> 1817 <property name="top_attach">3</property> 1818 <property name="bottom_attach">4</property> 1819 <property name="x_options">GTK_FILL</property> 1820 <property name="y_options"></property> 1821 </packing> 1822 </child> 1823 <child> 1824 <widget class="GtkSpinButton" id="spin_max_upload_slots"> 1845 <widget class="GtkSpinButton" id="spin_max_connections"> 1825 1846 <property name="visible">True</property> 1826 1847 <property name="can_focus">True</property> 1827 1848 <property name="width_chars">6</property> … … 1831 1852 <packing> 1832 1853 <property name="left_attach">1</property> 1833 1854 <property name="right_attach">2</property> 1834 <property name="top_attach"> 3</property>1835 <property name="bottom_attach"> 4</property>1855 <property name="top_attach">2</property> 1856 <property name="bottom_attach">3</property> 1836 1857 <property name="x_options"></property> 1837 1858 <property name="y_options"></property> 1838 1859 </packing> … … 1967 1988 <widget class="GtkFileChooserButton" id="filechooser_move_completed"> 1968 1989 <property name="visible">True</property> 1969 1990 <property name="sensitive">False</property> 1970 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>1971 1991 <property name="local_only">False</property> 1992 <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property> 1972 1993 <property name="title" translatable="yes">Select A Folder</property> 1973 1994 </widget> 1974 1995 <packing> … … 2471 2492 <property name="column_spacing">10</property> 2472 2493 <property name="row_spacing">2</property> 2473 2494 <child> 2474 <widget class="GtkLabel" id="label_available_version"> 2495 <widget class="GtkLabel" id="label24"> 2496 <property name="visible">True</property> 2497 <property name="xalign">0</property> 2498 <property name="label" translatable="yes"><i>Current Version:</i></property> 2499 <property name="use_markup">True</property> 2500 </widget> 2501 <packing> 2502 <property name="x_options">GTK_FILL</property> 2503 </packing> 2504 </child> 2505 <child> 2506 <widget class="GtkLabel" id="label_current_version"> 2475 2507 <property name="visible">True</property> 2476 2508 </widget> 2477 2509 <packing> 2478 2510 <property name="left_attach">1</property> 2479 2511 <property name="right_attach">2</property> 2480 <property name="top_attach">1</property>2481 <property name="bottom_attach">2</property>2482 2512 <property name="x_options"></property> 2483 2513 </packing> 2484 2514 </child> … … 2496 2526 </packing> 2497 2527 </child> 2498 2528 <child> 2499 <widget class="GtkLabel" id="label_ current_version">2529 <widget class="GtkLabel" id="label_available_version"> 2500 2530 <property name="visible">True</property> 2501 2531 </widget> 2502 2532 <packing> 2503 2533 <property name="left_attach">1</property> 2504 2534 <property name="right_attach">2</property> 2535 <property name="top_attach">1</property> 2536 <property name="bottom_attach">2</property> 2505 2537 <property name="x_options"></property> 2506 2538 </packing> 2507 2539 </child> 2508 <child>2509 <widget class="GtkLabel" id="label24">2510 <property name="visible">True</property>2511 <property name="xalign">0</property>2512 <property name="label" translatable="yes"><i>Current Version:</i></property>2513 <property name="use_markup">True</property>2514 </widget>2515 <packing>2516 <property name="x_options">GTK_FILL</property>2517 </packing>2518 </child>2519 2540 </widget> 2520 2541 </child> 2521 2542 </widget> -
deluge/ui/gtkui/status_tab.py
diff -urp deluge-1.2.1-original/deluge/ui/gtkui/status_tab.py deluge-1.2.1/deluge/ui/gtkui/status_tab.py
old new class StatusTab(Tab): 74 74 self._child_widget = glade.get_widget("status_tab") 75 75 self._tab_label = glade.get_widget("status_tab_label") 76 76 77 self.pieces_bar = PiecesBar() 78 glade.get_widget("alignment12").add(self.pieces_bar) 79 77 80 self.label_widgets = [ 78 81 (glade.get_widget("summary_pieces"), fpeer_size_second, ("num_pieces", "piece_length")), 79 82 (glade.get_widget("summary_availability"), fratio, ("distributed_copies",)), … … class StatusTab(Tab): 91 94 (glade.get_widget("summary_seed_time"), deluge.common.ftime, ("seeding_time",)), 92 95 (glade.get_widget("summary_seed_rank"), str, ("seed_rank",)), 93 96 (glade.get_widget("summary_auto_managed"), str, ("is_auto_managed",)), 94 ( glade.get_widget("progressbar"), fpcnt, ("progress",)),97 (self.pieces_bar, None, ("pieces",)), 95 98 (glade.get_widget("summary_date_added"), deluge.common.fdate, ("time_added",)) 96 99 ] 97 100 … … class StatusTab(Tab): 107 110 return 108 111 109 112 # Get the torrent status 110 status_keys = ["p rogress", "num_pieces", "piece_length",113 status_keys = ["pieces", "num_pieces", "piece_length", 111 114 "distributed_copies", "all_time_download", "total_payload_download", 112 115 "total_uploaded", "total_payload_upload", "download_payload_rate", 113 116 "upload_payload_rate", "num_peers", "num_seeds", "total_peers", … … class StatusTab(Tab): 141 144 142 145 if widget[0].get_text() != txt: 143 146 widget[0].set_text(txt) 144 145 # Do the progress bar because it's a special case (not a label) 146 w = component.get("MainWindow").main_glade.get_widget("progressbar") 147 fraction = status["progress"] / 100 148 if w.get_fraction() != fraction: 149 w.set_fraction(fraction) 150 147 148 # If this is true the torrent should be completely downloaded 149 # so display a full bar 150 if int(status["num_pieces"]) != len(status["pieces"]): 151 self.pieces_bar.pieces = [True] 152 self.pieces_bar.update() 153 # Don't update if the pieces are the same 154 elif status["pieces"] != self.pieces_bar.pieces: 155 self.pieces_bar.pieces = status["pieces"] 156 self.pieces_bar.update() 157 151 158 def clear(self): 152 159 for widget in self.label_widgets: 153 160 widget[0].set_text("") 154 161 155 component.get("MainWindow").main_glade.get_widget("progressbar").set_fraction(0.0) 162 self.pieces_bar.clear() 163 164 class PiecesBar(gtk.DrawingArea): 165 def __init__(self): 166 gtk.DrawingArea.__init__(self) 167 self.gc = None 168 self.width = 0 169 self.height = 0 170 self.pieces = [] 171 172 self.connect('size-allocate', self.on_size_allocate) 173 self.connect('expose-event', self.update) 174 self.connect('realize', self.on_realize) 175 176 self.show() 177 178 def on_realize(self, widget): 179 map = widget.get_colormap() 180 done_color = map.alloc_color("#325891") 181 wait_color = map.alloc_color("#a8a8a9") 182 outline_color = map.alloc_color("#555555") 183 184 self.gc_done = widget.window.new_gc(foreground=done_color) 185 self.gc_wait = widget.window.new_gc(foreground=wait_color) 186 self.gc_outline = widget.window.new_gc(foreground=outline_color) 187 188 def on_size_allocate(self, widget, size): 189 self.width = size.width 190 self.height = size.height 191 192 def update(self, widget=None, event=None): 193 num_pieces = len(self.pieces) 194 195 if num_pieces < 1: 196 self.clear() 197 return None 198 199 self.window.draw_rectangle(self.gc_outline, False, 0, 0, 200 self.width - 1, self.height - 1) 201 202 width = self.width - 2 203 pieces = self.chunk_pieces(width, num_pieces) 204 piece_size = width / len(pieces) 205 padding = (width % len(pieces)) 206 start_pos = 1 207 208 for piece in pieces: 209 if padding > 0: 210 this_piece_size = piece_size + 1 211 padding -= 1 212 else: 213 this_piece_size = piece_size 214 215 self.draw_piece(piece, start_pos, 1, this_piece_size, 216 self.height - 2) 217 start_pos += this_piece_size 218 219 def chunk_pieces(self, width, num_pieces): 220 group_size = num_pieces / width 221 222 padding = num_pieces % width 223 i = 0 224 pieces = [] 225 226 while i < num_pieces: 227 if padding > 0: 228 this_group_size = group_size + 1 229 padding -= 1 230 else: 231 this_group_size = group_size 232 233 pieces.append(self.pieces[i:i+this_group_size]) 234 i += this_group_size 235 return pieces 236 237 def draw_piece(self, piece, start_x, start_y, width, height): 238 """determines the piece's value and draws it in the bar. Piece is 239 actually a list of values""" 240 if any(piece): 241 self.window.draw_rectangle(self.gc_done, True, start_x, start_y, 242 width, height) 243 else: 244 self.window.draw_rectangle(self.gc_wait, True, start_x, start_y, 245 width, height) 246 247 def clear(self): 248 self.window.draw_rectangle(self.gc_wait, True, 0, 0, 249 self.width, self.height) 250 self.window.draw_rectangle(self.gc_outline, False, 0, 0, 251 self.width - 1, self.height - 1) 252 253 def get_text(self): 254 return "" 255 256 def set_text(self, text): 257 pass