summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivano@gnu.org>2013-08-01 01:14:17 +0200
committerCole Robinson <crobinso@redhat.com>2013-08-01 11:42:08 -0400
commit2a67ec9ed6a4c08e0d505cf692c6e7770720d613 (patch)
treec65565edcc2c774351e8e77c87157a4c48330cba /ui
parent00e005786810dffa2585f3c252f60bf2365437b8 (diff)
downloadvirt-manager-2a67ec9ed6a4c08e0d505cf692c6e7770720d613.tar.gz
ui: allow to set an empty password for graphics
Now when a password is used a check box must be explicitely selected. This enable the possibility to set an empty password "". Solves: https://bugzilla.redhat.com/show_bug.cgi?id=749718 Signed-off-by: Giuseppe Scrivano <gscrivano@gnu.org> (crobinso: fix minor pylint violation)
Diffstat (limited to 'ui')
-rw-r--r--ui/vmm-add-hardware.ui60
-rw-r--r--ui/vmm-details.ui38
2 files changed, 76 insertions, 22 deletions
diff --git a/ui/vmm-add-hardware.ui b/ui/vmm-add-hardware.ui
index 88438af7..ea4c3a95 100644
--- a/ui/vmm-add-hardware.ui
+++ b/ui/vmm-add-hardware.ui
@@ -1094,22 +1094,6 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="graphics-password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<object class="GtkAlignment" id="alignment160">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1402,12 +1386,54 @@
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="graphics-password-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="graphics-password-chk">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_graphics_use_password" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="graphics-password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ </packing>
+ </child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/ui/vmm-details.ui b/ui/vmm-details.ui
index ee5bc45a..a04be18c 100644
--- a/ui/vmm-details.ui
+++ b/ui/vmm-details.ui
@@ -5419,12 +5419,40 @@ I/O:</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="gfx-password">
+ <object class="GtkHBox" id="gfx-password-box">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">●</property>
- <signal name="changed" handler="on_vnc_password_changed" swapped="no"/>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="gfx-use-password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_vnc_use_password_toggled" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="gfx-password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <signal name="changed" handler="on_vnc_password_changed" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>