Module: deluge
Branch: master
Commit: a701fddbe8e903130ae4acc991f9fd01df71f07f
Author: Calum Lind <calumlind+del...@gmail.com>
Date: Tue Jul 5 18:30:11 2011 +0100
Fix #948: New Release Dialog does not show server version
---
deluge/ui/gtkui/glade/main_window.glade | 38 +++++++++++++++++++++++++-----
deluge/ui/gtkui/new_release_dialog.py | 15 ++++++++++-
2 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/deluge/ui/gtkui/glade/main_window.glade
b/deluge/ui/gtkui/glade/main_window.glade
index 8085282..829d240 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -1231,13 +1231,13 @@ This will filter torrents for the current selection on
the sidebar.</property>
<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="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label25">
+ <widget class="GtkLabel"
id="label_available_version_text">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1245,13 +1245,13 @@ This will filter torrents for the current selection on
the sidebar.</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">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_current_version">
+ <widget class="GtkLabel" id="label_client_version">
<property name="visible">True</property>
<property name="can_focus">False</property>
</widget>
@@ -1262,7 +1262,7 @@ This will filter torrents for the current selection on
the sidebar.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label24">
+ <widget class="GtkLabel" id="label_client_version_text">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1273,6 +1273,30 @@ This will filter torrents for the current selection on
the sidebar.</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label_server_version_text">
+ <property name="visible">False</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes"><i>Server Version</i></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_server_version">
+ <property name="visible">False</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>
</widget>
</child>
</widget>
diff --git a/deluge/ui/gtkui/new_release_dialog.py
b/deluge/ui/gtkui/new_release_dialog.py
index 5561edf..e93ba68 100644
--- a/deluge/ui/gtkui/new_release_dialog.py
+++ b/deluge/ui/gtkui/new_release_dialog.py
@@ -37,6 +37,7 @@
import deluge.component as component
import deluge.common
from deluge.configmanager import ConfigManager
+from deluge.ui.client import client
class NewReleaseDialog:
def __init__(self):
@@ -53,15 +54,25 @@ class NewReleaseDialog:
else:
glade.get_widget("image_new_release").set_from_icon_name("deluge",
4)
glade.get_widget("label_available_version").set_text(available_version)
- glade.get_widget("label_current_version").set_text(
+ glade.get_widget("label_client_version").set_text(
deluge.common.get_version())
self.chk_not_show_dialog =
glade.get_widget("chk_do_not_show_new_release")
glade.get_widget("button_goto_downloads").connect(
"clicked", self._on_button_goto_downloads)
glade.get_widget("button_close_new_release").connect(
"clicked", self._on_button_close_new_release)
+
+ if client.connected():
+ def on_info(version):
+ glade.get_widget("label_server_version").set_text(version)
+ glade.get_widget("label_server_version").show()
+ glade.get_widget("label_server_version_text").show()
- self.dialog.show_all()
+ if not client.is_classicmode():
+
glade.get_widget("label_client_version_text").set_label(_("<i>Client
Version</i>"))
+ client.daemon.info().addCallback(on_info)
+
+ self.dialog.show()
def _on_button_goto_downloads(self, widget):
deluge.common.open_url_in_browser("http://deluge-torrent.org";)
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to deluge-commit@googlegroups.com.
To unsubscribe from this group, send email to
deluge-commit+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
