- Fix 'opertaing' typo in 'New VM' dialog (#495128)

- Allow details window to resize again (#491683)
- Handle collecting username for vnc authentication (#499589)
- Actually handle arch config when creating a VM (#499145)
- Log libvirt capabilities at startup to aid debugging (#500337)
This commit is contained in:
Mark McLoughlin 2009-05-21 14:56:09 +00:00
parent f671e787af
commit 14a09e350e
7 changed files with 955 additions and 1 deletions

View File

@ -0,0 +1,19 @@
# HG changeset patch
# User "Daniel P. Berrange <berrange@redhat.com>"
# Date 1241624815 -3600
# Node ID dcae615e91996e3caae5a9026c48d2cc5e82b555
# Parent 3cc05aaac68819ae7eef54fa858134f85ef7772f
Fix console window resize
diff -r 3cc05aaac688 -r dcae615e9199 src/vmm-details.glade
--- a/src/vmm-details.glade Mon Apr 27 09:33:56 2009 -0400
+++ b/src/vmm-details.glade Wed May 06 16:46:55 2009 +0100
@@ -3,8 +3,6 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="vmm-details">
- <property name="width_request">800</property>
- <property name="height_request">600</property>
<property name="title" translatable="yes">Virtual Machine</property>
<property name="default_width">800</property>
<property name="default_height">600</property>

View File

@ -0,0 +1,43 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1242062294 14400
# Node ID c299f80bbc9f484f27b5ba5415800f52e0b5275c
# Parent da615f51dcfbe0b89aa4c9c1243c2d9f3426cd16
Fix changing 'arch' in VM create wizard.
Previously it never did anything :(
diff -r da615f51dcfb -r c299f80bbc9f src/virtManager/create.py
--- a/src/virtManager/create.py Mon May 11 12:24:15 2009 -0400
+++ b/src/virtManager/create.py Mon May 11 13:18:14 2009 -0400
@@ -698,7 +698,7 @@
net_list.set_active(default)
- def change_caps(self, gtype=None, dtype=None):
+ def change_caps(self, gtype=None, dtype=None, arch=None):
if gtype == None:
# If none specified, prefer HVM. This way, the default install
@@ -714,7 +714,8 @@
caps=self.caps,
os_type = gtype,
type = dtype,
- accelerated=True)
+ accelerated=True,
+ arch=arch)
if (self.capsguest and self.capsdomain and
(newg.arch == self.capsguest.arch and
@@ -938,6 +939,11 @@
if idx < 0:
return
+ arch = src.get_model()[idx][0]
+ self.change_caps(self.capsguest.os_type,
+ self.capsdomain.hypervisor_type,
+ arch)
+
def url_box_changed(self, ignore):
# If the url_entry has focus, don't fire detect_media_os, it means
# the user is probably typing

View File

@ -0,0 +1,19 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1242141157 14400
# Node ID 48b62193630869193e8193f85ffe87ea4842de79
# Parent 4736f0f543369ae41d6caa1188e8c71d0f6e326a
Log capabilities XML at connection startup.
diff -r 4736f0f54336 -r 48b621936308 src/virtManager/connection.py
--- a/src/virtManager/connection.py Tue May 12 10:35:43 2009 -0400
+++ b/src/virtManager/connection.py Tue May 12 11:12:37 2009 -0400
@@ -633,6 +633,8 @@ class vmmConnection(gobject.GObject):
gtk.gdk.threads_enter()
try:
if self.state == self.STATE_ACTIVE:
+ logging.debug("%s capabilities:\n%s" %
+ (self.get_uri(), self.vmm.getCapabilities()))
self.tick()
self.emit("state-changed")

View File

@ -0,0 +1,19 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1240333404 14400
# Node ID 1cfb9a961d2dbc3ca6d14fad46de3264e7480104
# Parent c5ecf4a3c7badaf3ec16103ad9c53c2e8bf91a5a
Fix 'operating' typo in create wizard.
diff -r c5ecf4a3c7ba -r 1cfb9a961d2d src/vmm-create.glade
--- a/src/vmm-create.glade Mon Apr 20 13:51:15 2009 -0400
+++ b/src/vmm-create.glade Tue Apr 21 13:03:24 2009 -0400
@@ -202,7 +202,7 @@
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Choose how you would like to install the opertaing system</property>
+ <property name="label" translatable="yes">Choose how you would like to install the operating system</property>
</widget>
<packing>
<property name="expand">False</property>

View File

@ -0,0 +1,481 @@
diff -up virt-manager-0.7.0/po/as.po.operating-typo virt-manager-0.7.0/po/as.po
diff -up virt-manager-0.7.0/po/bg.po.operating-typo virt-manager-0.7.0/po/bg.po
--- virt-manager-0.7.0/po/bg.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/bg.po 2009-05-21 15:49:52.000000000 +0100
@@ -2468,7 +2468,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Моля укажете как бихте искали да свържете новата виртуална система с мрежата "
"на физическата машина."
diff -up virt-manager-0.7.0/po/bn_IN.po.operating-typo virt-manager-0.7.0/po/bn_IN.po
--- virt-manager-0.7.0/po/bn_IN.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/bn_IN.po 2009-05-21 15:49:52.000000000 +0100
@@ -2430,7 +2430,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "অনুগ্রহ করে ভার্চুয়াল ডিসপ্লে প্রদর্শনের প্রণালী উল্লেখ করুন।"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/bs.po.operating-typo virt-manager-0.7.0/po/bs.po
--- virt-manager-0.7.0/po/bs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/bs.po 2009-05-21 15:49:52.000000000 +0100
@@ -2460,7 +2460,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ca.po.operating-typo virt-manager-0.7.0/po/ca.po
--- virt-manager-0.7.0/po/ca.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/ca.po 2009-05-21 15:49:52.000000000 +0100
@@ -2476,7 +2476,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Si us plau indiqueu com voleu veure la pantalla del convidat."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/cs.po.operating-typo virt-manager-0.7.0/po/cs.po
--- virt-manager-0.7.0/po/cs.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/cs.po 2009-05-21 15:49:52.000000000 +0100
@@ -2464,7 +2464,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/da.po.operating-typo virt-manager-0.7.0/po/da.po
--- virt-manager-0.7.0/po/da.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/da.po 2009-05-21 15:49:52.000000000 +0100
@@ -2472,7 +2472,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/de.po.operating-typo virt-manager-0.7.0/po/de.po
--- virt-manager-0.7.0/po/de.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/de.po 2009-05-21 15:49:52.000000000 +0100
@@ -2501,7 +2501,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Bitte geben Sie an, wie Sie die Gast-Anzeige sehen möchten."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/es.po.operating-typo virt-manager-0.7.0/po/es.po
--- virt-manager-0.7.0/po/es.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/es.po 2009-05-21 15:49:52.000000000 +0100
@@ -2546,7 +2546,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Por favor, indique cómo le gustaría visualizar su pantalla virtual."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/fi.po.operating-typo virt-manager-0.7.0/po/fi.po
--- virt-manager-0.7.0/po/fi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/fi.po 2009-05-21 15:49:52.000000000 +0100
@@ -2463,7 +2463,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Kuinka haluat katsoa vierasjärjestelmän näyttöä?"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/fr.po.operating-typo virt-manager-0.7.0/po/fr.po
--- virt-manager-0.7.0/po/fr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/fr.po 2009-05-21 15:49:52.000000000 +0100
@@ -2501,7 +2501,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Veuillez indiquer comment vous souhaiteriez visualiser l'affichage de "
"l'invité."
diff -up virt-manager-0.7.0/po/gu.po.operating-typo virt-manager-0.7.0/po/gu.po
--- virt-manager-0.7.0/po/gu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/gu.po 2009-05-21 15:49:52.000000000 +0100
@@ -2406,7 +2406,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "મહેરબાની કરીને સૂચિત કરો કે કેટલા વર્ચ્યુઅલ દેખાવને દર્શાવાનું ગમે છે."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/hi.po.operating-typo virt-manager-0.7.0/po/hi.po
--- virt-manager-0.7.0/po/hi.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/hi.po 2009-05-21 15:49:52.000000000 +0100
@@ -2459,7 +2459,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "कृपया बताएँ कि कैसे आप अतिथि प्रदर्शन को दिखाना चाहेंगे."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/hr.po.operating-typo virt-manager-0.7.0/po/hr.po
--- virt-manager-0.7.0/po/hr.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/hr.po 2009-05-21 15:49:52.000000000 +0100
@@ -2462,7 +2462,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Naznačite na koji biste način željeli svoj novi virtualni sustav povezati s "
"mrežom udomitelja."
diff -up virt-manager-0.7.0/po/hu.po.operating-typo virt-manager-0.7.0/po/hu.po
--- virt-manager-0.7.0/po/hu.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/hu.po 2009-05-21 15:49:52.000000000 +0100
@@ -2479,7 +2479,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/is.po.operating-typo virt-manager-0.7.0/po/is.po
--- virt-manager-0.7.0/po/is.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/is.po 2009-05-21 15:49:52.000000000 +0100
@@ -2317,7 +2317,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/it.po.operating-typo virt-manager-0.7.0/po/it.po
--- virt-manager-0.7.0/po/it.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/it.po 2009-05-21 15:49:52.000000000 +0100
@@ -2496,7 +2496,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Si prega di indicare come si desidera visualizzare lo schermo ospite."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ja.po.operating-typo virt-manager-0.7.0/po/ja.po
--- virt-manager-0.7.0/po/ja.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/ja.po 2009-05-21 15:49:52.000000000 +0100
@@ -2424,7 +2424,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "仮想ディスプレイをどのように表示するかを示してください。"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/kn.po.operating-typo virt-manager-0.7.0/po/kn.po
--- virt-manager-0.7.0/po/kn.po.operating-typo 2009-05-21 15:49:46.000000000 +0100
+++ virt-manager-0.7.0/po/kn.po 2009-05-21 15:49:53.000000000 +0100
@@ -2418,7 +2418,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "ವರ್ಚುವಲ್ ಪ್ರದರ್ಶಕವು ನಿಮಗೆ ಹೇಗೆ ಕಾಣಿಸಬೇಕು ಎಂದು ದಯವಿಟ್ಟು ಸೂಚಿಸಿ."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ko.po.operating-typo virt-manager-0.7.0/po/ko.po
--- virt-manager-0.7.0/po/ko.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ko.po 2009-05-21 15:49:53.000000000 +0100
@@ -2454,7 +2454,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ml.po.operating-typo virt-manager-0.7.0/po/ml.po
--- virt-manager-0.7.0/po/ml.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ml.po 2009-05-21 15:49:53.000000000 +0100
@@ -2361,7 +2361,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/mr.po.operating-typo virt-manager-0.7.0/po/mr.po
--- virt-manager-0.7.0/po/mr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/mr.po 2009-05-21 15:49:53.000000000 +0100
@@ -2452,7 +2452,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "अतिथी प्रदर्शन कुठल्या रिती नुरूप पहायचे ते कृपया निश्चित करा."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ms.po.operating-typo virt-manager-0.7.0/po/ms.po
--- virt-manager-0.7.0/po/ms.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ms.po 2009-05-21 15:49:53.000000000 +0100
@@ -2448,7 +2448,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/nb.po.operating-typo virt-manager-0.7.0/po/nb.po
--- virt-manager-0.7.0/po/nb.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/nb.po 2009-05-21 15:49:53.000000000 +0100
@@ -2397,7 +2397,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/nl.po.operating-typo virt-manager-0.7.0/po/nl.po
--- virt-manager-0.7.0/po/nl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/nl.po 2009-05-21 15:49:53.000000000 +0100
@@ -2275,7 +2275,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/or.po.operating-typo virt-manager-0.7.0/po/or.po
--- virt-manager-0.7.0/po/or.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/or.po 2009-05-21 15:49:53.000000000 +0100
@@ -2424,7 +2424,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "ଆପଣ ଆପଣଙ୍କର ଆଭାସୀ ପ୍ରଦର୍ଶକକୁ କିପରି ଦର୍ଶାଇବେ ଦୟାକରି ତାହା ସୂଚିତ କରନ୍ତୁ।"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/pa.po.operating-typo virt-manager-0.7.0/po/pa.po
--- virt-manager-0.7.0/po/pa.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/pa.po 2009-05-21 15:49:53.000000000 +0100
@@ -2363,7 +2363,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/pl.po.operating-typo virt-manager-0.7.0/po/pl.po
--- virt-manager-0.7.0/po/pl.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/pl.po 2009-05-21 15:49:53.000000000 +0100
@@ -2405,7 +2405,7 @@ msgid "Choose an operating systen type a
msgstr "Wybierz typ i wersję systemu operacyjnego"
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Wskaż, jak chcesz zainstalować system operacyjny"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/pt_BR.po.operating-typo virt-manager-0.7.0/po/pt_BR.po
--- virt-manager-0.7.0/po/pt_BR.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/pt_BR.po 2009-05-21 15:49:53.000000000 +0100
@@ -2501,7 +2501,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Por favor, indique como você gostaria de ver a tela do convidado."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/pt.po.operating-typo virt-manager-0.7.0/po/pt.po
--- virt-manager-0.7.0/po/pt.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/pt.po 2009-05-21 15:49:53.000000000 +0100
@@ -2476,7 +2476,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Indique por favor como deseja ligar o seu novo sistema virtual à rede "
"anfitriã."
diff -up virt-manager-0.7.0/po/ro.po.operating-typo virt-manager-0.7.0/po/ro.po
--- virt-manager-0.7.0/po/ro.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ro.po 2009-05-21 15:49:53.000000000 +0100
@@ -2483,7 +2483,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ru.po.operating-typo virt-manager-0.7.0/po/ru.po
--- virt-manager-0.7.0/po/ru.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ru.po 2009-05-21 15:49:53.000000000 +0100
@@ -2468,7 +2468,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Укажите способ связи новой виртуальной системы с сетью."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/sr@latin.po.operating-typo virt-manager-0.7.0/po/sr@latin.po
--- virt-manager-0.7.0/po/sr@latin.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/sr@latin.po 2009-05-21 15:49:53.000000000 +0100
@@ -2469,7 +2469,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Naznačite kako želite da povežete novi virtuelni sistem sa mrežom domaćina."
diff -up virt-manager-0.7.0/po/sr.po.operating-typo virt-manager-0.7.0/po/sr.po
--- virt-manager-0.7.0/po/sr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/sr.po 2009-05-21 15:49:53.000000000 +0100
@@ -2468,7 +2468,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
"Назначите како желите да повежете нови виртуелни систем са мрежом домаћина."
diff -up virt-manager-0.7.0/po/sv.po.operating-typo virt-manager-0.7.0/po/sv.po
--- virt-manager-0.7.0/po/sv.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/sv.po 2009-05-21 15:49:53.000000000 +0100
@@ -2448,7 +2448,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "Välj hur du vill ansluta ditt nya virtuella system till värdnätverket."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/ta.po.operating-typo virt-manager-0.7.0/po/ta.po
--- virt-manager-0.7.0/po/ta.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/ta.po 2009-05-21 15:49:53.000000000 +0100
@@ -2428,7 +2428,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "மெய்நிகர் காட்சியினை காட்ட நீங்கள் எவ்வளவு விரும்புகிறீர்கள் என சுட்டிக் காட்டவும்."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/te.po.operating-typo virt-manager-0.7.0/po/te.po
--- virt-manager-0.7.0/po/te.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/te.po 2009-05-21 15:49:53.000000000 +0100
@@ -2403,7 +2403,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "మీరు వర్చ్యువల్ ప్రదర్శనను యెలా దర్శించుటకు యిష్టపడతారో దయచేసి సూచించండి."
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/tr.po.operating-typo virt-manager-0.7.0/po/tr.po
--- virt-manager-0.7.0/po/tr.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/tr.po 2009-05-21 15:49:53.000000000 +0100
@@ -2341,7 +2341,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/uk.po.operating-typo virt-manager-0.7.0/po/uk.po
--- virt-manager-0.7.0/po/uk.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/uk.po 2009-05-21 15:49:53.000000000 +0100
@@ -2476,7 +2476,7 @@ msgid "Choose an operating systen type a
msgstr ""
#: ../src/vmm-create.glade.h:16
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr ""
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/zh_CN.po.operating-typo virt-manager-0.7.0/po/zh_CN.po
--- virt-manager-0.7.0/po/zh_CN.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/zh_CN.po 2009-05-21 15:49:53.000000000 +0100
@@ -2374,7 +2374,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "请指出您希望如何查看虚拟显示。"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13
diff -up virt-manager-0.7.0/po/zh_TW.po.operating-typo virt-manager-0.7.0/po/zh_TW.po
--- virt-manager-0.7.0/po/zh_TW.po.operating-typo 2009-05-21 15:49:47.000000000 +0100
+++ virt-manager-0.7.0/po/zh_TW.po 2009-05-21 15:49:53.000000000 +0100
@@ -2433,7 +2433,7 @@ msgstr ""
#: ../src/vmm-create.glade.h:16
#, fuzzy
-msgid "Choose how you would like to install the opertaing system"
+msgid "Choose how you would like to install the operating system"
msgstr "請指定您希望如何檢視客座端畫面。"
#: ../src/vmm-create.glade.h:17 ../src/vmm-host.glade.h:13

View File

@ -0,0 +1,354 @@
# HG changeset patch
# User "Daniel P. Berrange <berrange@redhat.com>"
# Date 1241720553 -3600
# Node ID 5b61bd10a66b91d40ad5652a8f39b14273175292
# Parent 6082392f2279e21a66482c58e230c2fc695eb66e
Extend VNC auth handling to cope with fetching a username too & record username in gconf
diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/config.py
--- a/src/virtManager/config.py Wed May 06 16:47:10 2009 +0100
+++ b/src/virtManager/config.py Thu May 07 19:22:33 2009 +0100
@@ -23,6 +23,7 @@
import gtk.gdk
import libvirt
+import logging
from virtManager.keyring import vmmKeyring
from virtManager.secret import vmmSecret
@@ -299,6 +300,7 @@
def has_keyring(self):
if self.keyring == None:
+ logging.warning("Initializing keyring")
self.keyring = vmmKeyring()
return self.keyring.is_available()
@@ -314,26 +316,30 @@
def get_console_password(self, vm):
_id = self.conf.get_int(self.conf_dir + "/console/passwords/" + vm.get_uuid())
+ username = self.conf.get_string(self.conf_dir + "/console/usernames/" + vm.get_uuid())
+
+ if username is None:
+ username = ""
if _id != None:
if not(self.has_keyring()):
- return ""
+ return ("", "")
secret = self.keyring.get_secret(_id)
if secret != None and secret.get_name() == self.get_secret_name(vm):
if not(secret.has_attribute("hvuri")):
- return ""
+ return ("", "")
if secret.get_attribute("hvuri") != vm.get_connection().get_uri():
- return ""
+ return ("", "")
if not(secret.has_attribute("uuid")):
- return ""
+ return ("", "")
if secret.get_attribute("uuid") != vm.get_uuid():
- return ""
+ return ("", "")
- return secret.get_secret()
- return ""
+ return (secret.get_secret(), username)
+ return ("", username)
- def set_console_password(self, vm, password):
+ def set_console_password(self, vm, password, username=""):
if not(self.has_keyring()):
return
@@ -346,6 +352,7 @@
_id = self.keyring.add_secret(secret)
if _id != None:
self.conf.set_int(self.conf_dir + "/console/passwords/" + vm.get_uuid(), _id)
+ self.conf.set_string(self.conf_dir + "/console/usernames/" + vm.get_uuid(), username)
def get_url_list_length(self):
length = self.conf.get_int(self.conf_dir + "/urls/url-list-length")
diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/details.py
--- a/src/virtManager/details.py Wed May 06 16:47:10 2009 +0100
+++ b/src/virtManager/details.py Thu May 07 19:22:33 2009 +0100
@@ -500,7 +500,7 @@
self.update_scaling()
def auth_login(self, ignore):
- self.set_password()
+ self.set_credentials()
self.activate_viewer_page()
def toggle_toolbar(self, src):
@@ -1302,23 +1302,44 @@
traceback.format_exc (stacktrace))
logging.error(details)
- def set_password(self, src=None):
- txt = self.window.get_widget("console-auth-password")
- self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD,
- txt.get_text())
+ def set_credentials(self, src=None):
+ passwd = self.window.get_widget("console-auth-password")
+ if passwd.flags() & gtk.VISIBLE:
+ self.vncViewer.set_credential(gtkvnc.CREDENTIAL_PASSWORD,
+ passwd.get_text())
+ username = self.window.get_widget("console-auth-username")
+ if username.flags() & gtk.VISIBLE:
+ self.vncViewer.set_credential(gtkvnc.CREDENTIAL_USERNAME,
+ username.get_text())
+
+ if self.window.get_widget("console-auth-remember").get_active():
+ self.config.set_console_password(self.vm, passwd.get_text(), username.get_text())
def _vnc_auth_credential(self, src, credList):
for i in range(len(credList)):
- logging.debug("Got credential request %s", str(credList[i]))
- if credList[i] == gtkvnc.CREDENTIAL_PASSWORD:
- self.activate_auth_page()
- elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME:
- self.vncViewer.set_credential(credList[i], "libvirt-vnc")
- else:
- # Force it to stop re-trying
+ if credList[i] not in (gtkvnc.CREDENTIAL_PASSWORD, gtkvnc.CREDENTIAL_USERNAME, gtkvnc.CREDENTIAL_CLIENTNAME):
+ self.err.show_err(summary=_("Unable to provide requested credentials to the VNC server"),
+ details=_("The credential type %s is not supported") % (str(credList[i])),
+ title=_("Unable to authenticate"),
+ async=True)
self.vncViewerRetriesScheduled = 10
self.vncViewer.close()
self.activate_unavailable_page(_("Unsupported console authentication type"))
+ return
+
+ withUsername = False
+ withPassword = False
+ for i in range(len(credList)):
+ logging.debug("Got credential request %s", str(credList[i]))
+ if credList[i] == gtkvnc.CREDENTIAL_PASSWORD:
+ withPassword = True
+ elif credList[i] == gtkvnc.CREDENTIAL_USERNAME:
+ withUsername = True
+ elif credList[i] == gtkvnc.CREDENTIAL_CLIENTNAME:
+ self.vncViewer.set_credential(credList[i], "libvirt-vnc")
+
+ if withUsername or withPassword:
+ self.activate_auth_page(withPassword, withUsername)
def activate_unavailable_page(self, msg):
self.window.get_widget("console-pages").set_current_page(PAGE_UNAVAILABLE)
@@ -1329,20 +1350,41 @@
self.window.get_widget("console-pages").set_current_page(PAGE_SCREENSHOT)
self.window.get_widget("details-menu-vm-screenshot").set_sensitive(True)
- def activate_auth_page(self):
- pw = self.config.get_console_password(self.vm)
+ def activate_auth_page(self, withPassword=True, withUsername=False):
+ (pw, username) = self.config.get_console_password(self.vm)
self.window.get_widget("details-menu-vm-screenshot").set_sensitive(False)
+
+ if withPassword:
+ self.window.get_widget("console-auth-password").show()
+ self.window.get_widget("label-auth-password").show()
+ else:
+ self.window.get_widget("console-auth-password").hide()
+ self.window.get_widget("label-auth-password").hide()
+
+ if withUsername:
+ self.window.get_widget("console-auth-username").show()
+ self.window.get_widget("label-auth-username").show()
+ else:
+ self.window.get_widget("console-auth-username").hide()
+ self.window.get_widget("label-auth-username").hide()
+
+ self.window.get_widget("console-auth-username").set_text(username)
self.window.get_widget("console-auth-password").set_text(pw)
- self.window.get_widget("console-auth-password").grab_focus()
+
if self.config.has_keyring():
self.window.get_widget("console-auth-remember").set_sensitive(True)
- if pw != None and pw != "":
+ if pw != "" or username != "":
self.window.get_widget("console-auth-remember").set_active(True)
else:
self.window.get_widget("console-auth-remember").set_active(False)
else:
self.window.get_widget("console-auth-remember").set_sensitive(False)
self.window.get_widget("console-pages").set_current_page(PAGE_AUTHENTICATE)
+ if withUsername:
+ self.window.get_widget("console-auth-username").grab_focus()
+ else:
+ self.window.get_widget("console-auth-password").grab_focus()
+
def activate_viewer_page(self):
self.window.get_widget("console-pages").set_current_page(PAGE_VNCVIEWER)
diff -r 6082392f2279 -r 5b61bd10a66b src/virtManager/keyring.py
--- a/src/virtManager/keyring.py Wed May 06 16:47:10 2009 +0100
+++ b/src/virtManager/keyring.py Thu May 07 19:22:33 2009 +0100
@@ -38,6 +38,8 @@
if not("default" in gnomekeyring.list_keyring_names_sync()):
gnomekeyring.create_sync("default", None)
self.keyring = gnomekeyring.get_default_keyring_sync()
+ if self.keyring == None:
+ logging.warning("Failed to create default keyring")
except:
logging.warning(("Keyring unavailable: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1])))
self.keyring = None
@@ -61,6 +63,7 @@
return _id
except:
+ logging.warning(("Failed to add secret: '%s'") % (str((sys.exc_info())[0]) + " " + str((sys.exc_info())[1])))
return None
def get_secret(self, _id):
diff -r 6082392f2279 -r 5b61bd10a66b src/vmm-details.glade
--- a/src/vmm-details.glade Wed May 06 16:47:10 2009 +0100
+++ b/src/vmm-details.glade Thu May 07 19:22:33 2009 +0100
@@ -553,7 +553,7 @@
<widget class="GtkTable" id="console-auth">
<property name="visible">True</property>
<property name="border_width">3</property>
- <property name="n_rows">2</property>
+ <property name="n_rows">3</property>
<property name="n_columns">3</property>
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
@@ -564,6 +564,80 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label-auth-password">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Password:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="console-auth-password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">*</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="console-auth-remember">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Save this password in your keyring</property>
+ <property name="use_underline">True</property>
+ <property name="yalign">0</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label-auth-username">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Username:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="console-auth-username">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">*</property>
+ <signal name="activate" handler="on_console_auth_password_activate"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkButton" id="console-auth-login">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -608,53 +682,12 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="console-auth-password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">*</property>
- <signal name="activate" handler="on_console_auth_password_activate"/>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="console-auth-remember">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Save this password in your keyring</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label436">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Password:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
</widget>
<packing>
<property name="position">2</property>

View File

@ -8,7 +8,7 @@
Name: virt-manager
Version: 0.7.0
Release: 4%{_extra_release}
Release: 5%{_extra_release}
Summary: Virtual Machine Manager
Group: Applications/Emulators
@ -21,6 +21,12 @@ Patch3: %{name}-%{version}-fix-button-ordering.patch
Patch4: %{name}-%{version}-fix-vcpu-cap.patch
Patch5: %{name}-%{version}-delete-dup-conn.patch
Patch6: %{name}-%{version}-update-translations.patch
Patch7: %{name}-%{version}-operating-typo.patch
Patch8: %{name}-%{version}-update-translations-for-operating-typo.patch
Patch9: %{name}-%{version}-fix-window-resize.patch
Patch10: %{name}-%{version}-vnc-auth-get-username.patch
Patch11: %{name}-%{version}-handle-arch-config.patch
Patch12: %{name}-%{version}-log-capabilities-at-startup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# These two are just the oldest version tested
@ -99,6 +105,12 @@ management API.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%build
%configure
@ -176,6 +188,13 @@ fi
%{_datadir}/dbus-1/services/%{name}.service
%changelog
* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-5.fc12
- Fix 'opertaing' typo in 'New VM' dialog (#495128)
- Allow details window to resize again (#491683)
- Handle collecting username for vnc authentication (#499589)
- Actually handle arch config when creating a VM (#499145)
- Log libvirt capabilities at startup to aid debugging (#500337)
* Tue Apr 14 2009 Cole Robinson <crobinso@redhat.com> - 0.7.0-4.fc11
- More translation updates