Fix incorrect max vcpu setting in New VM wizard (bz 490466) Fix some

OK/Cancel button ordering issues (bz 490207) Use openAuth when
    duplicating a connection when deleting a VM Updated translations (bz
    493795)
This commit is contained in:
Cole Robinson 2009-04-09 19:19:07 +00:00
parent b64c012d09
commit 6cfa3bb050
5 changed files with 123015 additions and 1 deletions

View File

@ -0,0 +1,34 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1238782522 14400
# Node ID 218ecc7495319b70960c5e3685e8597700c29bfb
# Parent 5abfbc44b41efc4fae9b154bb515044c32ffc0f4
Use dup_conn in delete dialog.
diff -r 5abfbc44b41e -r 218ecc749531 src/virtManager/delete.py
--- a/src/virtManager/delete.py Fri Apr 03 14:15:15 2009 -0400
+++ b/src/virtManager/delete.py Fri Apr 03 14:15:22 2009 -0400
@@ -25,9 +25,9 @@
import traceback
import logging
-import libvirt
import virtinst
+from virtManager import util
from virtManager.error import vmmErrorDialog
from virtManager.asyncjob import vmmAsyncJob
from virtManager.createmeter import vmmCreateMeter
@@ -159,11 +159,7 @@
try:
# Open a seperate connection to install on since this is async
logging.debug("Threading off connection to delete vol.")
- #newconn = vmmConnection(self.config, self.conn.get_uri(),
- # self.conn.is_read_only())
- #newconn.open()
- #newconn.connectThreadEvent.wait()
- newconn = libvirt.open(self.conn.get_uri())
+ newconn = util.dup_conn(self.config, self.conn)
meter = vmmCreateMeter(asyncjob)
for path in paths:

View File

@ -0,0 +1,305 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1238787321 14400
# Node ID 71d9208d322631118bbdc110388c333bd1f784eb
# Parent 9b4b6eb8de8d9e7b0e906715fb503a0b1ab0f30d
Reorder buttons in the delete dialog.
diff -r 9b4b6eb8de8d -r 71d9208d3226 src/vmm-delete.glade
--- a/src/vmm-delete.glade Fri Apr 03 14:58:51 2009 -0400
+++ b/src/vmm-delete.glade Fri Apr 03 15:35:21 2009 -0400
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Feb 25 17:45:14 2009 -->
+<!--Generated with glade3 3.4.5 on Fri Apr 3 15:34:40 2009 -->
<glade-interface>
<widget class="GtkDialog" id="vmm-delete">
<property name="width_request">500</property>
@@ -115,6 +115,17 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
+ <widget class="GtkButton" id="delete-cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_delete_cancel_clicked"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkButton" id="delete-ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -124,17 +135,6 @@
<property name="response_id">0</property>
<signal name="clicked" handler="on_delete_ok_clicked"/>
</widget>
- </child>
- <child>
- <widget class="GtkButton" id="delete-cancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_delete_cancel_clicked"/>
- </widget>
<packing>
<property name="position">1</property>
</packing>
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1238787521 14400
# Node ID 6f0170f9d551ff54dcedca188bbf84313c551a30
# Parent 71d9208d322631118bbdc110388c333bd1f784eb
Change 'choose cd' button ordering.
diff -r 71d9208d3226 -r 6f0170f9d551 src/vmm-choose-cd.glade
--- a/src/vmm-choose-cd.glade Fri Apr 03 15:35:21 2009 -0400
+++ b/src/vmm-choose-cd.glade Fri Apr 03 15:38:41 2009 -0400
@@ -40,97 +40,19 @@
<placeholder/>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">_Path to install media:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">cd-path</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="cd-path">
- <property name="visible">True</property>
- <signal name="changed" handler="on_cd_path_changed"/>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkAlignment" id="alignment5">
+ <widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkRadioButton" id="iso-image">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_ISO Image Location:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">physical-media</property>
- <signal name="toggled" handler="on_media_toggled"/>
- </widget>
+ <placeholder/>
</child>
</widget>
<packing>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="physical-media">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_CD-ROM or DVD:</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_media_toggled"/>
- </widget>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">ISO _Location:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">iso-path</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>
- <property name="x_padding">3</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -168,21 +90,99 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <widget class="GtkLabel" id="label36">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">ISO _Location:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">iso-path</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>
+ <property name="x_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="physical-media">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_CD-ROM or DVD:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_media_toggled"/>
+ </widget>
+ <packing>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="yscale">0</property>
<child>
- <placeholder/>
+ <widget class="GtkRadioButton" id="iso-image">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_ISO Image Location:</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">physical-media</property>
+ <signal name="toggled" handler="on_media_toggled"/>
+ </widget>
</child>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="right_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">_Path to install media:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">cd-path</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="cd-path">
+ <property name="visible">True</property>
+ <signal name="changed" handler="on_cd_path_changed"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -209,6 +209,17 @@
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
+ <widget class="GtkButton" id="Cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">-6</property>
+ <signal name="clicked" handler="on_cancel_clicked"/>
+ </widget>
+ </child>
+ <child>
<widget class="GtkButton" id="OK">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -218,17 +229,6 @@
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_clicked"/>
</widget>
- </child>
- <child>
- <widget class="GtkButton" id="Cancel">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- <signal name="clicked" handler="on_cancel_clicked"/>
- </widget>
<packing>
<property name="position">1</property>
</packing>

View File

@ -0,0 +1,40 @@
# HG changeset patch
# User Cole Robinson <crobinso@redhat.com>
# Date 1239034964 14400
# Node ID c5489151e2e6bd37c41b543efb79186739fb1b3c
# Parent 3cfb5918b1a80b9eea3282244a27f512f566eb2e
Fix incorrect vcpu capping in create wizard.
Cap was always 10 less than we intended. Apparently spinbutton page_size != 0
is deprecated, yet is the default set by glade3? Schweet.
diff -r 3cfb5918b1a8 -r c5489151e2e6 src/vmm-create.glade
--- a/src/vmm-create.glade Mon Apr 06 11:33:46 2009 -0400
+++ b/src/vmm-create.glade Mon Apr 06 12:22:44 2009 -0400
@@ -826,7 +826,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">1</property>
- <property name="adjustment">0 0 8096 1 10 10</property>
+ <property name="adjustment">0 0 8096 1 10 0</property>
<property name="climb_rate">1</property>
</widget>
<packing>
@@ -841,7 +841,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">1</property>
- <property name="adjustment">0 0 128 1 10 10</property>
+ <property name="adjustment">0 0 128 1 10 0</property>
<property name="climb_rate">1</property>
</widget>
<packing>
@@ -1025,7 +1025,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">1</property>
- <property name="adjustment">2 0 1000000 0.10000000000000001 10 10</property>
+ <property name="adjustment">2 0 1000000 0.10000000000000001 10 0</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
</widget>

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@
Name: virt-manager Name: virt-manager
Version: 0.7.0 Version: 0.7.0
Release: 2%{_extra_release} Release: 3%{_extra_release}
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
Group: Applications/Emulators Group: Applications/Emulators
@ -17,6 +17,10 @@ URL: http://virt-manager.org/
Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
Patch1: %{name}-%{version}-old-xen-compat.patch Patch1: %{name}-%{version}-old-xen-compat.patch
Patch2: %{name}-%{version}-vm-migrate-list.patch Patch2: %{name}-%{version}-vm-migrate-list.patch
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# These two are just the oldest version tested # These two are just the oldest version tested
@ -91,6 +95,10 @@ management API.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build %build
%configure %configure
@ -168,6 +176,12 @@ fi
%{_datadir}/dbus-1/services/%{name}.service %{_datadir}/dbus-1/services/%{name}.service
%changelog %changelog
* Thu Apr 09 2009 Cole Robinson <crobinso@redhat.com> - 0.7.0-3.fc11
- Fix incorrect max vcpu setting in New VM wizard (bz 490466)
- Fix some OK/Cancel button ordering issues (bz 490207)
- Use openAuth when duplicating a connection when deleting a VM
- Updated translations (bz 493795)
* Mon Mar 23 2009 Cole Robinson <crobinso@redhat.com> - 0.7.0-2.fc11 * Mon Mar 23 2009 Cole Robinson <crobinso@redhat.com> - 0.7.0-2.fc11
- Back compat fixes for connecting to older xen installations (bz 489885) - Back compat fixes for connecting to older xen installations (bz 489885)
- Don't show harmless NoneType error when launching new VM details window - Don't show harmless NoneType error when launching new VM details window