On Thu, 2013-02-07 at 10:08 -0500, Chris Lumens wrote:
The idea here is that it makes things like "swap" more
discoverable because
the user can pick them, plus it gets rid of the tooltip that is not at all
accessible.
---
pyanaconda/ui/gui/spokes/custom.glade | 38 +++++++++++++++++++++--------------
pyanaconda/ui/gui/spokes/custom.py | 8 +++++---
2 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/custom.glade
b/pyanaconda/ui/gui/spokes/custom.glade
index 39e3866..6319a50 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -205,21 +205,6 @@ after creating the mount point below.</property>
</packing>
</child>
<child>
- <object class="GtkEntry"
id="addMountPointEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text"
translatable="yes">eg: "/", "/home", "swap"
(minus the quotation marks)</property>
- <property name="invisible_char">●</property>
- <property
name="completion">mountPointCompletion</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="addLabelWarningBox">
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -278,6 +263,28 @@ use. Try something else?</property>
</packing>
</child>
<child>
+ <object class="GtkComboBoxText"
id="addMountPointEntry">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <child internal-child="entry">
+ <object class="GtkEntry"
id="comboboxtext-entry">
+ <property name="can_focus">True</property>
+ <property
name="buffer">mountPointEntryBuffer</property>
+ <property
name="completion">mountPointCompletion</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>
@@ -1981,6 +1988,7 @@ use. Try something else?</property>
<object class="GtkEntryCompletion"
id="mountPointCompletion">
<property name="model">mountPointStore</property>
</object>
+ <object class="GtkEntryBuffer" id="mountPointEntryBuffer"/>
What is this mountPointEntryBuffer good for? It isn't used anywhere.
Maybe I am missing something here that should also be fixed in my
patches for city and region entry and completion patches.
--
Vratislav Podzimek
Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic