[gnome-initial-setup/shell/4765: 352/362] keyboard: Change detect button from Add to Select
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/shell/4765: 352/362] keyboard: Change detect button from Add to Select
- Date: Thu, 19 Mar 2015 01:50:41 +0000 (UTC)
commit 9159a2519d08203c55173a2c2791f23d0490d6dc
Author: Roddy Shuler <roddy endlessm com>
Date: Fri Mar 13 16:07:04 2015 -0700
keyboard: Change detect button from Add to Select
With the new implementation, the keyboard detection
allows selection of a layout rather than adding to a list.
[endlessm/eos-shell#3364]
.../pages/keyboard/cc-keyboard-query.c | 6 +++---
.../pages/keyboard/keyboard-detector.ui | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gnome-initial-setup/pages/keyboard/cc-keyboard-query.c
b/gnome-initial-setup/pages/keyboard/cc-keyboard-query.c
index 03c6e7e..365ab68 100644
--- a/gnome-initial-setup/pages/keyboard/cc-keyboard-query.c
+++ b/gnome-initial-setup/pages/keyboard/cc-keyboard-query.c
@@ -39,7 +39,7 @@ typedef struct
GtkWidget *heading;
GtkWidget *keyrow;
GtkWidget *buttons;
- GtkWidget *add_button;
+ GtkWidget *select_button;
GnomeXkbInfo *xkb_data;
} CcKeyboardQueryPrivate;
@@ -192,7 +192,7 @@ cc_keyboard_query_layout_result (CcKeyboardQuery *self,
gtk_label_set_label (GTK_LABEL (priv->heading), result_message);
gtk_widget_hide (priv->buttons);
gtk_widget_hide (priv->keyrow);
- gtk_widget_set_sensitive (priv->add_button, TRUE);
+ gtk_widget_set_sensitive (priv->select_button, TRUE);
g_free (result_message);
}
@@ -283,7 +283,7 @@ cc_keyboard_query_class_init (CcKeyboardQueryClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, CcKeyboardQuery, vbox);
gtk_widget_class_bind_template_child_private (widget_class, CcKeyboardQuery, heading);
gtk_widget_class_bind_template_child_private (widget_class, CcKeyboardQuery, buttons);
- gtk_widget_class_bind_template_child_private (widget_class, CcKeyboardQuery, add_button);
+ gtk_widget_class_bind_template_child_private (widget_class, CcKeyboardQuery, select_button);
gtk_widget_class_bind_template_callback (widget_class, have_key);
gtk_widget_class_bind_template_callback (widget_class, no_have_key);
gtk_widget_class_bind_template_callback (widget_class, key_press_event);
diff --git a/gnome-initial-setup/pages/keyboard/keyboard-detector.ui
b/gnome-initial-setup/pages/keyboard/keyboard-detector.ui
index 4276729..e654a45 100644
--- a/gnome-initial-setup/pages/keyboard/keyboard-detector.ui
+++ b/gnome-initial-setup/pages/keyboard/keyboard-detector.ui
@@ -78,11 +78,10 @@
</object>
</child>
<child>
- <object class="GtkButton" id="add_button">
+ <object class="GtkButton" id="select_button">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
+ <property name="label">Select</property>
<property name="use_underline" >True</property>
</object>
</child>
@@ -91,7 +90,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-5">add_button</action-widget>
+ <action-widget response="-5">select_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
</action-widgets>
</template>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]