Author: cazfi
Date: Sat Jul 19 15:50:04 2014
New Revision: 25640
URL: http://svn.gna.org/viewcvs/freeciv?rev=25640&view=rev
Log:
Added tooltip to gtk-clients' turn timeout counter
Requested by Jacob Nevins <jtn>
See bug #21550
Modified:
trunk/client/gui-gtk-2.0/mapview.c
trunk/client/gui-gtk-3.0/mapview.c
Modified: trunk/client/gui-gtk-2.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/mapview.c?rev=25640&r1=25639&r2=25640&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/mapview.c (original)
+++ trunk/client/gui-gtk-2.0/mapview.c Sat Jul 19 15:50:04 2014
@@ -32,6 +32,7 @@
#include "timing.h"
/* common */
+#include "game.h"
#include "government.h" /* government_graphic() */
#include "map.h"
#include "player.h"
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout > 0) {
+ gtk_widget_set_tooltip_text(timeout_label, _("Time to forced turn
change"));
+ } else {
+ gtk_widget_set_tooltip_text(timeout_label, _("Turn timeout disabled"));
+ }
}
/**************************************************************************
Modified: trunk/client/gui-gtk-3.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapview.c?rev=25640&r1=25639&r2=25640&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/mapview.c (original)
+++ trunk/client/gui-gtk-3.0/mapview.c Sat Jul 19 15:50:04 2014
@@ -32,6 +32,7 @@
#include "timing.h"
/* common */
+#include "game.h"
#include "government.h" /* government_graphic() */
#include "map.h"
#include "player.h"
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout > 0) {
+ gtk_widget_set_tooltip_text(timeout_label, _("Time to forced turn
change"));
+ } else {
+ gtk_widget_set_tooltip_text(timeout_label, _("Turn timeout disabled"));
+ }
}
/**************************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
