Author: loonycyborg
Date: Sat Jul 2 20:06:03 2011
New Revision: 50113
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50113&view=rev
Log:
GUI2 network transmission dialog improvements:
Added feedback on whether it's connecting/downloading and
made strings translatable.
Modified:
trunk/data/gui/default/window/network_transmission.cfg
trunk/src/addon/manager.cpp
trunk/src/gui/dialogs/network_transmission.cpp
trunk/src/gui/dialogs/network_transmission.hpp
Modified: trunk/data/gui/default/window/network_transmission.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/network_transmission.cfg?rev=50113&r1=50112&r2=50113&view=diff
==============================================================================
--- trunk/data/gui/default/window/network_transmission.cfg (original)
+++ trunk/data/gui/default/window/network_transmission.cfg Sat Jul 2 20:06:03
2011
@@ -33,6 +33,23 @@
[label]
id = "title"
definition = "title"
+ [/label]
+
+ [/column]
+
+ [/row]
+
+ [row]
+
+ [column]
+
+ border = "all"
+ border_size = 5
+ horizontal_alignment = "left"
+
+ [label]
+ id = "subtitle"
+ definition = "default"
[/label]
[/column]
Modified: trunk/src/addon/manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/manager.cpp?rev=50113&r1=50112&r2=50113&view=diff
==============================================================================
--- trunk/src/addon/manager.cpp (original)
+++ trunk/src/addon/manager.cpp Sat Jul 2 20:06:03 2011
@@ -1126,13 +1126,14 @@
try {
if(gui2::new_widgets) {
network_asio::connection
connection(remote_host, lexical_cast<std::string>(remote_port));
- gui2::tnetwork_transmission
network_connect(connection, "WIP network transmission dialog");
+ gui2::tnetwork_transmission
network_connect(connection, _("Requesting list of add-ons"),
_("Connecting..."));
bool result =
network_connect.show(disp.video());
if(!result)
return;
config cfg, response;
cfg.add_child("request_campaign_list");
connection.transfer(cfg, response);
+
network_connect.set_subtitle(_("Downloading..."));
result = network_connect.show(disp.video());
if(!result)
return;
Modified: trunk/src/gui/dialogs/network_transmission.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/network_transmission.cpp?rev=50113&r1=50112&r2=50113&view=diff
==============================================================================
--- trunk/src/gui/dialogs/network_transmission.cpp (original)
+++ trunk/src/gui/dialogs/network_transmission.cpp Sat Jul 2 20:06:03 2011
@@ -52,11 +52,19 @@
}
}
+void tnetwork_transmission::set_subtitle(const std::string& subtitle)
+{
+ subtitle_ = subtitle;
+}
+
void tnetwork_transmission::pre_show(CVideo& /*video*/, twindow& window)
{
// ***** ***** ***** ***** Set up the widgets ***** ***** ***** *****
if(!title_.empty()) {
find_widget<tlabel>(&window, "title", false).set_label(title_);
+ }
+ if(!subtitle_.empty()) {
+ find_widget<tlabel>(&window, "subtitle",
false).set_label(subtitle_);
}
pump_monitor.window_ = window;
Modified: trunk/src/gui/dialogs/network_transmission.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/network_transmission.hpp?rev=50113&r1=50112&r2=50113&view=diff
==============================================================================
--- trunk/src/gui/dialogs/network_transmission.hpp (original)
+++ trunk/src/gui/dialogs/network_transmission.hpp Sat Jul 2 20:06:03 2011
@@ -49,9 +49,11 @@
boost::optional<twindow&> window_;
} pump_monitor;
public:
- tnetwork_transmission(network_asio::connection& connection, const
std::string& title)
- : connection_(connection), pump_monitor(connection),
title_(title)
+ tnetwork_transmission(network_asio::connection& connection, const
std::string& title, const std::string& subtitle)
+ : connection_(connection), pump_monitor(connection),
title_(title), subtitle_(subtitle)
{}
+
+ void set_subtitle(const std::string&);
protected:
/** Inherited from tdialog. */
@@ -63,6 +65,7 @@
private:
/** The title for the dialog. */
std::string title_;
+ std::string subtitle_;
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
