---
pyanaconda/ui/gui/spokes/keyboard.glade | 24 +++++++++++++++++++-----
pyanaconda/ui/gui/spokes/keyboard.py | 6 ++++++
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade
index 1243e22..e0c0888 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.glade
+++ b/pyanaconda/ui/gui/spokes/keyboard.glade
@@ -25,6 +25,7 @@
<child>
<object class="GtkButton" id="cancelButton">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -41,6 +42,7 @@
<child>
<object class="GtkButton" id="confirmAddButton">
<property name="label">gtk-add</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -192,8 +194,6 @@
<child internal-child="nav_area">
<object class="GtkGrid" id="AnacondaSpokeWindow-nav_area1">
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
</object>
<packing>
<property name="expand">False</property>
@@ -287,6 +287,7 @@ any layout to the top of the list to select it as the default.</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="addLayoutButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -302,6 +303,7 @@ any layout to the top of the list to select it as the default.</property>
</child>
<child>
<object class="GtkButton" id="removeLayoutButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -317,6 +319,7 @@ any layout to the top of the list to select it as the default.</property>
</child>
<child>
<object class="GtkButton" id="upButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -332,6 +335,7 @@ any layout to the top of the list to select it as the default.</property>
</child>
<child>
<object class="GtkButton" id="downButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -347,6 +351,7 @@ any layout to the top of the list to select it as the default.</property>
</child>
<child>
<object class="GtkButton" id="previewButton">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -394,11 +399,18 @@ any layout to the top of the list to select it as the default.</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="layoutTestEntry">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="height_request">100</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="layoutTextView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="buffer">layoutTestBuffer</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -425,6 +437,7 @@ any layout to the top of the list to select it as the default.</property>
<child>
<object class="GtkButton" id="optionsButton">
<property name="label" translatable="yes">_Options...</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -465,6 +478,7 @@ any layout to the top of the list to select it as the default.</property>
</object>
</child>
</object>
+ <object class="GtkTextBuffer" id="layoutTestBuffer"/>
<object class="GtkListStore" id="newLayoutStore">
<columns>
<!-- column-name name -->
diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py
index 9ca60d6..48d8f8c 100644
--- a/pyanaconda/ui/gui/spokes/keyboard.py
+++ b/pyanaconda/ui/gui/spokes/keyboard.py
@@ -138,6 +138,7 @@ class AddLayoutDialog(UIObject):
class KeyboardSpoke(NormalSpoke):
builderObjects = ["addedLayoutStore", "keyboardWindow",
+ "layoutTestBuffer",
"addImage", "removeImage", "upImage", "downImage", "previewImage"]
mainWidgetName = "keyboardWindow"
uiFile = "spokes/keyboard.glade"
@@ -186,6 +187,11 @@ class KeyboardSpoke(NormalSpoke):
def refresh(self):
NormalSpoke.refresh(self)
+ # Clear out the layout testing box every time the spoke is loaded. It
+ # doesn't make sense to leave temporary data laying around.
+ buf = self.builder.get_object("layoutTestBuffer")
+ buf.set_text("")
+
# Clear and repopulate addedLayoutStore with values from self.data
self._store.clear()
self._add_data_layouts()
--
1.7.8.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
