Deluge
diff options
| author | Marcos Pinto <markybob@dipconsultants.com> | 2008-11-29 23:28:11 +0000 |
|---|---|---|
| committer | Marcos Pinto <markybob@dipconsultants.com> | 2008-11-29 23:28:11 +0000 |
| commit | 318b81f62b0ae35e46111d9906e74bb244dfaba9 (patch) | |
| tree | f822f3def605e9f8a9facb442139a304b1741bc8 | |
| parent | 14e34c8f035ad4b3fb07065f380b9998576e71f4 (diff) | |
| download | deluge-318b81f62b0ae35e46111d9906e74bb244dfaba9.tar.gz deluge-318b81f62b0ae35e46111d9906e74bb244dfaba9.tar.bz2 deluge-318b81f62b0ae35e46111d9906e74bb244dfaba9.zip | |
fix icon in new release dialog for windows
| -rw-r--r-- | deluge/ui/gtkui/glade/main_window.glade | 782 | ||||
| -rw-r--r-- | deluge/ui/gtkui/new_release_dialog.py | 5 |
2 files changed, 414 insertions, 373 deletions
diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade index 4c7e8ee56..e62f82a8f 100644 --- a/deluge/ui/gtkui/glade/main_window.glade +++ b/deluge/ui/gtkui/glade/main_window.glade @@ -270,6 +270,9 @@ <property name="stock_id">gtk-add</property> <signal name="clicked" handler="on_toolbutton_add_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkMenuToolButton" id="toolbutton_remove"> @@ -280,11 +283,19 @@ <property name="stock_id">gtk-remove</property> <signal name="clicked" handler="on_toolbutton_remove_clicked"/> </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> </child> <child> <widget class="GtkSeparatorToolItem" id="separatortoolitem1"> <property name="visible">True</property> </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_pause"> @@ -296,6 +307,9 @@ <property name="stock_id">gtk-media-pause</property> <signal name="clicked" handler="on_toolbutton_pause_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_resume"> @@ -307,11 +321,18 @@ <property name="stock_id">gtk-media-play</property> <signal name="clicked" handler="on_toolbutton_resume_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkSeparatorToolItem" id="separatortoolitem2"> <property name="visible">True</property> </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_queue_up"> @@ -323,6 +344,9 @@ <property name="stock_id">gtk-go-up</property> <signal name="clicked" handler="on_toolbutton_queue_up_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_queue_down"> @@ -334,12 +358,19 @@ <property name="stock_id">gtk-go-down</property> <signal name="clicked" handler="on_toolbutton_queue_down_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkSeparatorToolItem" id="toolbutton1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </widget> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_preferences"> @@ -350,6 +381,9 @@ <property name="stock_id">gtk-preferences</property> <signal name="clicked" handler="on_toolbutton_preferences_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> <child> <widget class="GtkToolButton" id="toolbutton_connectionmanager"> @@ -360,6 +394,9 @@ <property name="stock_id">gtk-network</property> <signal name="clicked" handler="on_toolbutton_connectionmanager_clicked"/> </widget> + <packing> + <property name="expand">False</property> + </packing> </child> </widget> <packing> @@ -614,211 +651,262 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="summary_auto_managed"> + <widget class="GtkLabel" id="summary_total_downloaded"> <property name="visible">True</property> + <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">5</property> - <property name="right_attach">6</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label22"> + <widget class="GtkLabel" id="summary_download_speed"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Auto Managed:</b></property> - <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">4</property> - <property name="right_attach">5</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_seed_rank"> + <widget class="GtkLabel" id="summary_total_uploaded"> <property name="visible">True</property> + <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">7</property> - <property name="right_attach">8</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_seed_time"> + <widget class="GtkLabel" id="summary_upload_speed"> <property name="visible">True</property> + <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">7</property> - <property name="right_attach">8</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label20"> + <widget class="GtkAlignment" id="alignment44"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Seed Rank:</b></property> - <property name="use_markup">True</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label38"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Downloaded:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">6</property> - <property name="right_attach">7</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label19"> + <widget class="GtkAlignment" id="alignment45"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Seeding Time:</b></property> - <property name="use_markup">True</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label39"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Uploaded:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">6</property> - <property name="right_attach">7</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_active_time"> + <widget class="GtkAlignment" id="alignment46"> <property name="visible">True</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label41"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Share Ratio:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">7</property> - <property name="right_attach">8</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label7"> + <widget class="GtkAlignment" id="alignment47"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Active Time:</b></property> - <property name="use_markup">True</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label53"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Next Announce:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">6</property> - <property name="right_attach">7</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_next_announce"> + <widget class="GtkAlignment" id="alignment48"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="wrap">True</property> - <property name="selectable">True</property> + <property name="left_padding">15</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label42"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Speed:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_pieces"> + <widget class="GtkAlignment" id="alignment49"> <property name="visible">True</property> - <property name="xalign">0</property> + <property name="left_padding">15</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label43"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Speed:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_tracker_status"> + <widget class="GtkAlignment" id="alignment50"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="wrap">True</property> - <property name="wrap_mode">PANGO_WRAP_CHAR</property> - <property name="selectable">True</property> + <property name="left_padding">15</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label45"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>ETA:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">8</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label52"> + <widget class="GtkAlignment" id="alignment51"> + <property name="visible">True</property> + <property name="left_padding">15</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label46"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Pieces:</b></property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label40"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes"><b>Tracker Status:</b></property> + <property name="label" translatable="yes"><b>Seeders:</b></property> <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_availability"> + <widget class="GtkLabel" id="summary_seeders"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="wrap">True</property> - <property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property> </widget> <packing> <property name="left_attach">5</property> <property name="right_attach">6</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label47"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="ypad">1</property> - <property name="label" translatable="yes"><b>Availability:</b></property> + <property name="label" translatable="yes"><b>Peers:</b></property> <property name="use_markup">True</property> </widget> <packing> <property name="left_attach">4</property> <property name="right_attach">5</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_eta"> + <widget class="GtkLabel" id="summary_peers"> <property name="visible">True</property> <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">5</property> + <property name="right_attach">6</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -836,262 +924,211 @@ </packing> </child> <child> - <widget class="GtkLabel" id="summary_peers"> + <widget class="GtkLabel" id="summary_eta"> <property name="visible">True</property> <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">5</property> - <property name="right_attach">6</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <widget class="GtkLabel" id="label47"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Peers:</b></property> + <property name="ypad">1</property> + <property name="label" translatable="yes"><b>Availability:</b></property> <property name="use_markup">True</property> </widget> <packing> <property name="left_attach">4</property> <property name="right_attach">5</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_seeders"> + <widget class="GtkLabel" id="summary_availability"> <property name="visible">True</property> <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="wrap_mode">PANGO_WRAP_WORD_CHAR</property> </widget> <packing> <property name="left_attach">5</property> <property name="right_attach">6</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label40"> + <widget class="GtkLabel" id="label52"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Seeders:</b></property> + <property name="yalign">0</property> + <property name="label" translatable="yes"><b>Tracker Status:</b></property> <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">4</property> - <property name="right_attach">5</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkAlignment" id="alignment51"> - <property name="visible">True</property> - <property name="left_padding">15</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label46"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Pieces:</b></property> - <property name="use_markup">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment50"> + <widget class="GtkLabel" id="summary_tracker_status"> <property name="visible">True</property> - <property name="left_padding">15</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label45"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>ETA:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="wrap_mode">PANGO_WRAP_CHAR</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">8</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment49"> + <widget class="GtkLabel" id="summary_pieces"> <property name="visible">True</property> - <property name="left_padding">15</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label43"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Speed:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment48"> + <widget class="GtkLabel" id="summary_next_announce"> <property name="visible">True</property> - <property name="left_padding">15</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label42"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Speed:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment47"> + <widget class="GtkLabel" id="label7"> <property name="visible">True</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Next Announce:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Active Time:</b></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">6</property> + <property name="right_attach">7</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment46"> + <widget class="GtkLabel" id="summary_active_time"> <property name="visible">True</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label41"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Share Ratio:</b></property> - <property name="use_markup">True</property> - </widget> - </child> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">7</property> + <property name="right_attach">8</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment45"> + <widget class="GtkLabel" id="label19"> <property name="visible">True</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label39"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Uploaded:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Seeding Time:</b></property> + <property name="use_markup">True</property> </widget> <packing> + <property name="left_attach">6</property> + <property name="right_attach">7</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment44"> + <widget class="GtkLabel" id="label20"> <property name="visible">True</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label38"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Downloaded:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Seed Rank:</b></property> + <property name="use_markup">True</property> </widget> <packing> + <property name="left_attach">6</property> + <property name="right_attach">7</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_upload_speed"> + <widget class="GtkLabel" id="summary_seed_time"> <property name="visible">True</property> - <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">7</property> + <property name="right_attach">8</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_total_uploaded"> + <widget class="GtkLabel" id="summary_seed_rank"> <property name="visible">True</property> - <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">7</property> + <property name="right_attach">8</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_download_speed"> + <widget class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Auto Managed:</b></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_total_downloaded"> + <widget class="GtkLabel" id="summary_auto_managed"> <property name="visible">True</property> - <property name="xalign">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">5</property> + <property name="right_attach">6</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -1178,7 +1215,7 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="summary_num_files"> + <widget class="GtkLabel" id="summary_total_size"> <property name="visible">True</property> <property name="xalign">0</property> <property name="selectable">True</property> @@ -1186,105 +1223,96 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label49"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="ypad">1</property> - <property name="label" translatable="yes"><b># of files:</b></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_hash"> + <widget class="GtkLabel" id="summary_message"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="wrap">True</property> - <property name="wrap_mode">PANGO_WRAP_CHAR</property> - <property name="selectable">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label10"> + <widget class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Hash:</b></property> + <property name="ypad">1</property> + <property name="label" translatable="yes"><b>Status:</b></property> <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_tracker"> + <widget class="GtkLabel" id="summary_torrent_path"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="wrap_mode">PANGO_WRAP_CHAR</property> <property name="selectable">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label51"> + <widget class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="ypad">1</property> - <property name="label" translatable="yes"><b>Tracker:</b></property> - <property name="use_markup">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="right_padding">5</property> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><b>Path:</b></property> + <property name="use_markup">True</property> + </widget> + </child> </widget> <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment55"> + <widget class="GtkAlignment" id="alignment62"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="right_padding">5</property> <child> - <widget class="GtkLabel" id="label50"> + <widget class="GtkLabel" id="label54"> <property name="visible">True</property> <property name="xalign">0</property> + <property name="yalign">0</property> <property name="ypad">1</property> - <property name="label" translatable="yes"><b>Total Size:</b></property> + <property name="label" translatable="yes"><b>Name:</b></property> <property name="use_markup">True</property> </widget> </child> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -1304,96 +1332,105 @@ </packing> </child> <child> - <widget class="GtkAlignment" id="alignment62"> + <widget class="GtkAlignment" id="alignment55"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="right_padding">5</property> <child> - <widget class="GtkLabel" id="label54"> + <widget class="GtkLabel" id="label50"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="yalign">0</property> <property name="ypad">1</property> - <property name="label" translatable="yes"><b>Name:</b></property> + <property name="label" translatable="yes"><b>Total Size:</b></property> <property name="use_markup">True</property> </widget> </child> </widget> <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment3"> + <widget class="GtkLabel" id="label51"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="right_padding">5</property> - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><b>Path:</b></property> - <property name="use_markup">True</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="ypad">1</property> + <property name="label" translatable="yes"><b>Tracker:</b></property> + <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_torrent_path"> + <widget class="GtkLabel" id="summary_tracker"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="wrap">True</property> - <property name="wrap_mode">PANGO_WRAP_CHAR</property> <property name="selectable">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label8"> + <widget class="GtkLabel" id="label10"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="ypad">1</property> - <property name="label" translatable="yes"><b>Status:</b></property> + <property name="label" translatable="yes"><b>Hash:</b></property> <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_message"> + <widget class="GtkLabel" id="summary_hash"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="wrap_mode">PANGO_WRAP_CHAR</property> + <property name="selectable">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">4</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="summary_total_size"> + <widget class="GtkLabel" id="label49"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="ypad">1</property> + <property name="label" translatable="yes"><b># of files:</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="summary_num_files"> <property name="visible">True</property> <property name="xalign">0</property> <property name="selectable">True</property> @@ -1401,8 +1438,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> @@ -1583,7 +1620,7 @@ <placeholder/> </child> <child> - <widget class="GtkSpinButton" id="spin_max_connections"> + <widget class="GtkSpinButton" id="spin_max_upload_slots"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">6</property> @@ -1593,24 +1630,33 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_max_upload"> + <widget class="GtkLabel" id="label15"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">6</property> - <property name="xalign">1</property> - <property name="adjustment">-1 -1 99999 1 10 10</property> - <property name="digits">1</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Max Upload Slots:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="label" translatable="yes">KiB/s</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -1618,30 +1664,24 @@ </packing> </child> <child> - <widget class="GtkSpinButton" id="spin_max_download"> + <widget class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="width_chars">6</property> - <property name="xalign">1</property> - <property name="adjustment">-1 -1 999999 1 10 10</property> - <property name="digits">1</property> + <property name="label" translatable="yes">KiB/s</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label12"> + <widget class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Max Connections:</property> + <property name="label" translatable="yes">Max Download Speed:</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> @@ -1660,36 +1700,46 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label9"> + <widget class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Max Download Speed:</property> + <property name="label" translatable="yes">Max Connections:</property> </widget> <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label13"> + <widget class="GtkSpinButton" id="spin_max_download"> <property name="visible">True</property> - <property name="label" translatable="yes">KiB/s</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <property name="xalign">1</property> + <property name="adjustment">-1 -1 999999 1 10 10</property> + <property name="digits">1</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkSpinButton" id="spin_max_upload"> <property name="visible">True</property> - <property name="label" translatable="yes">KiB/s</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <property name="xalign">1</property> + <property name="adjustment">-1 -1 99999 1 10 10</property> + <property name="digits">1</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options"></property> @@ -1697,20 +1747,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label15"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Max Upload Slots:</property> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkSpinButton" id="spin_max_upload_slots"> + <widget class="GtkSpinButton" id="spin_max_connections"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="width_chars">6</property> @@ -1720,8 +1757,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options"></property> <property name="y_options"></property> </packing> @@ -2259,7 +2296,6 @@ <child> <widget class="GtkImage" id="image_new_release"> <property name="visible">True</property> - <property name="icon_name">deluge</property> </widget> <packing> <property name="expand">False</property> @@ -2305,14 +2341,23 @@ <property name="column_spacing">10</property> <property name="row_spacing">2</property> <child> - <widget class="GtkLabel" id="label_available_version"> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes"><i>Current Version:</i></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label_current_version"> <property name="visible">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options"></property> </packing> </child> @@ -2330,26 +2375,17 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label_current_version"> + <widget class="GtkLabel" id="label_available_version"> <property name="visible">True</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options"></property> </packing> </child> - <child> - <widget class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"><i>Current Version:</i></property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> </widget> </child> </widget> diff --git a/deluge/ui/gtkui/new_release_dialog.py b/deluge/ui/gtkui/new_release_dialog.py index 5b10bd34c..7d7435cca 100644 --- a/deluge/ui/gtkui/new_release_dialog.py +++ b/deluge/ui/gtkui/new_release_dialog.py @@ -35,6 +35,11 @@ class NewReleaseDialog: self.config = ConfigManager("gtkui.conf") glade = component.get("MainWindow").main_glade self.dialog = glade.get_widget("new_release_dialog") + if deluge.common.windows_check(): + glade.get_widget("image_new_release").set_from_file( + deluge.common.get_pixmap("deluge16.png")) + else: + glade.get_widget("image_new_release").set_from_icon_name("deluge", 4) # Set the version labels glade.get_widget("label_available_version").set_text(available_version) glade.get_widget("label_current_version").set_text( |