Author: cazfi
Date: Wed Feb 10 13:08:43 2016
New Revision: 31858
URL: http://svn.gna.org/viewcvs/freeciv?rev=31858&view=rev
Log:
Adjust gtk3 (and gtk3x) client Password label for New Password request
See patch #6927
Modified:
trunk/client/gui-gtk-3.0/pages.c
trunk/client/gui-gtk-3.x/pages.c
Modified: trunk/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.c?rev=31858&r1=31857&r2=31858&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/pages.c (original)
+++ trunk/client/gui-gtk-3.0/pages.c Wed Feb 10 13:08:43 2016
@@ -825,7 +825,7 @@
}
/**************************************************************************
- network connection state defines.
+ Network connection state defines.
**************************************************************************/
enum connection_state {
LOGIN_TYPE,
@@ -837,7 +837,7 @@
static enum connection_state connection_status;
/**************************************************************************
- update statusbar label text.
+ Update statusbar label text.
**************************************************************************/
static gboolean update_network_statusbar(gpointer data)
{
@@ -915,6 +915,7 @@
gtk_widget_set_sensitive(network_port, TRUE);
gtk_widget_set_sensitive(network_login, TRUE);
gtk_widget_set_sensitive(network_password_label, FALSE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, FALSE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
@@ -928,6 +929,7 @@
gtk_widget_set_sensitive(network_port, FALSE);
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, TRUE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("New Pass_word:"));
gtk_widget_set_sensitive(network_password, TRUE);
gtk_widget_set_sensitive(network_confirm_password_label, TRUE);
gtk_widget_set_sensitive(network_confirm_password, TRUE);
@@ -943,6 +945,7 @@
gtk_widget_set_sensitive(network_port, FALSE);
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, TRUE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, TRUE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
@@ -954,6 +957,7 @@
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, FALSE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, FALSE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
Modified: trunk/client/gui-gtk-3.x/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/pages.c?rev=31858&r1=31857&r2=31858&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/pages.c (original)
+++ trunk/client/gui-gtk-3.x/pages.c Wed Feb 10 13:08:43 2016
@@ -827,7 +827,7 @@
}
/**************************************************************************
- network connection state defines.
+ Network connection state defines.
**************************************************************************/
enum connection_state {
LOGIN_TYPE,
@@ -839,7 +839,7 @@
static enum connection_state connection_status;
/**************************************************************************
- update statusbar label text.
+ Update statusbar label text.
**************************************************************************/
static gboolean update_network_statusbar(gpointer data)
{
@@ -920,6 +920,7 @@
gtk_widget_set_sensitive(network_port, TRUE);
gtk_widget_set_sensitive(network_login, TRUE);
gtk_widget_set_sensitive(network_password_label, FALSE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, FALSE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
@@ -933,6 +934,7 @@
gtk_widget_set_sensitive(network_port, FALSE);
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, TRUE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("New Pass_word:"));
gtk_widget_set_sensitive(network_password, TRUE);
gtk_widget_set_sensitive(network_confirm_password_label, TRUE);
gtk_widget_set_sensitive(network_confirm_password, TRUE);
@@ -948,6 +950,7 @@
gtk_widget_set_sensitive(network_port, FALSE);
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, TRUE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, TRUE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
@@ -959,6 +962,7 @@
gtk_widget_set_sensitive(network_login, FALSE);
gtk_widget_set_sensitive(network_password_label, FALSE);
+ gtk_label_set_markup_with_mnemonic(GTK_LABEL(network_password_label),
_("Pass_word:"));
gtk_widget_set_sensitive(network_password, FALSE);
gtk_widget_set_sensitive(network_confirm_password_label, FALSE);
gtk_widget_set_sensitive(network_confirm_password, FALSE);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
