Commit f5fabcf3 authored by Lubomir Rintel's avatar Lubomir Rintel
Browse files

all: make the labelling style consistent

There were some ommissions in the commits below:

Fixes: 004ac2a2
Fixes: e1a0b880
parent 7e02bc08
......@@ -106,15 +106,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="network_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Network name:</property>
<property name="label" translatable="yes">_Network name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">network_name_entry</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
......@@ -247,11 +247,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title)
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->key_button), text);
g_free (text);
text = g_strdup_printf (_("%s private _key:"), title);
text = g_strdup_printf (_("%s private _key"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text);
g_free (text);
text = g_strdup_printf (_("%s key _password:"), title);
text = g_strdup_printf (_("%s key _password"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text);
g_free (text);
......@@ -259,7 +259,7 @@ set_title (NMACertChooser *cert_chooser, const gchar *title)
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (priv->cert_button), text);
g_free (text);
text = g_strdup_printf (_("%s _certificate:"), title);
text = g_strdup_printf (_("%s _certificate"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text);
g_free (text);
}
......@@ -293,7 +293,7 @@ init (NMACertChooser *cert_chooser)
gtk_grid_insert_column (GTK_GRID (cert_chooser), 2);
gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6);
gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 12);
gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6);
/* The key chooser */
gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
......@@ -313,7 +313,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (key_changed_cb), cert_chooser);
priv->key_button_label = gtk_label_new (NULL);
g_object_set (priv->key_button_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1);
gtk_widget_set_sensitive (priv->key_button_label, FALSE);
......@@ -335,7 +335,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (key_password_changed_cb), cert_chooser);
priv->key_password_label = gtk_label_new (NULL);
g_object_set (priv->key_password_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1);
gtk_widget_set_sensitive (priv->key_password_label, FALSE);
......@@ -377,7 +377,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (cert_changed_cb), cert_chooser);
priv->cert_button_label = gtk_label_new (NULL);
g_object_set (priv->cert_button_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1);
gtk_widget_show (priv->cert_button_label);
......
......@@ -371,11 +371,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title)
nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->key_button), text);
g_free (text);
text = g_strdup_printf (_("%s private _key:"), title);
text = g_strdup_printf (_("%s private _key"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_button_label), text);
g_free (text);
text = g_strdup_printf (_("%s key _password:"), title);
text = g_strdup_printf (_("%s key _password"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->key_password_label), text);
g_free (text);
......@@ -383,11 +383,11 @@ set_title (NMACertChooser *cert_chooser, const gchar *title)
nma_cert_chooser_button_set_title (NMA_CERT_CHOOSER_BUTTON (priv->cert_button), text);
g_free (text);
text = g_strdup_printf (_("%s _certificate:"), title);
text = g_strdup_printf (_("%s _certificate"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_button_label), text);
g_free (text);
text = g_strdup_printf (_("%s certificate _password:"), title);
text = g_strdup_printf (_("%s certificate _password"), title);
gtk_label_set_text_with_mnemonic (GTK_LABEL (priv->cert_password_label), text);
g_free (text);
}
......@@ -420,7 +420,7 @@ init (NMACertChooser *cert_chooser)
gtk_grid_insert_column (GTK_GRID (cert_chooser), 2);
gtk_grid_set_row_spacing (GTK_GRID (cert_chooser), 6);
gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 12);
gtk_grid_set_column_spacing (GTK_GRID (cert_chooser), 6);
/* Show password */
gtk_grid_insert_row (GTK_GRID (cert_chooser), 0);
......@@ -446,7 +446,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (key_changed_cb), cert_chooser);
priv->key_button_label = gtk_label_new (NULL);
g_object_set (priv->key_button_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->key_button_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_button_label), priv->key_button);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_button_label, 0, 0, 1, 1);
gtk_widget_set_sensitive (priv->key_button_label, FALSE);
......@@ -468,7 +468,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (key_password_changed_cb), cert_chooser);
priv->key_password_label = gtk_label_new (NULL);
g_object_set (priv->key_password_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->key_password_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->key_password_label), priv->key_password);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->key_password_label, 0, 1, 1, 1);
gtk_widget_set_sensitive (priv->key_password_label, FALSE);
......@@ -489,7 +489,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (cert_changed_cb), cert_chooser);
priv->cert_button_label = gtk_label_new (NULL);
g_object_set (priv->cert_button_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->cert_button_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_button_label), priv->cert_button);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_button_label, 0, 0, 1, 1);
gtk_widget_show (priv->cert_button_label);
......@@ -510,7 +510,7 @@ init (NMACertChooser *cert_chooser)
G_CALLBACK (cert_password_changed_cb), cert_chooser);
priv->cert_password_label = gtk_label_new (NULL);
g_object_set (priv->cert_password_label, "xalign", (gfloat) 0, NULL);
g_object_set (priv->cert_password_label, "xalign", (gfloat) 1, NULL);
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->cert_password_label), priv->cert_password);
gtk_grid_attach (GTK_GRID (cert_chooser), priv->cert_password_label, 0, 1, 1, 1);
gtk_widget_set_sensitive (priv->cert_password_label, FALSE);
......
......@@ -68,7 +68,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkVBox" id="security_vbox">
<property name="visible">True</property>
......@@ -88,10 +88,10 @@
<object class="GtkLabel" id="security_combo_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Wi-Fi _security:</property>
<property name="label" translatable="yes">Wi-Fi _security</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">security_combo</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -120,10 +120,10 @@
<object class="GtkLabel" id="network_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Network name:</property>
<property name="label" translatable="yes">_Network name</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">network_name_entry</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -145,10 +145,10 @@
<object class="GtkLabel" id="connection_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">C_onnection:</property>
<property name="label" translatable="yes">C_onnection</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">connection_combo</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......@@ -170,10 +170,10 @@
<object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Wi-Fi _adapter:</property>
<property name="label" translatable="yes">Wi-Fi _adapter</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">device_combo</property>
<property name="xalign">0</property>
<property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment