Add gnome-python2-gnome requirement. Allow seeing connection details if

disconnected. Updated catalan translation. Update dutch translation.
    Update german translation. (bug 438136) Fix showing domain console when
    connecting to hypervisor. Update POTFILES to reflect reality (bug
    466835)
This commit is contained in:
Cole Robinson 2008-10-14 20:52:33 +00:00
parent 855b44aa69
commit f5616ca65b
8 changed files with 11232 additions and 1 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,98 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1221748433 14400
# Node ID 7bedb4d693bdc674392ca334e7ee94f1b818b8f8
# Parent 4148e2986cc51b01937b8bed2e103ac50e4d882a
Allow seeing connection details when conn disconnected, just desensitive all the add wizards.
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/engine.py
--- a/src/virtManager/engine.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/engine.py Thu Sep 18 10:33:53 2008 -0400
@@ -118,7 +118,8 @@
def _do_connection_changed(self, connection):
- if connection.get_state() == connection.STATE_ACTIVE:
+ if connection.get_state() == connection.STATE_ACTIVE or \
+ connection.get_state() == connection.STATE_CONNECTING:
return
hvuri = connection.get_uri()
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/host.py
--- a/src/virtManager/host.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/host.py Thu Sep 18 10:33:53 2008 -0400
@@ -29,6 +29,7 @@
from virtinst import Storage
+from virtManager.connection import vmmConnection
from virtManager.createnet import vmmCreateNetwork
from virtManager.createpool import vmmCreatePool
from virtManager.createvol import vmmCreateVolume
@@ -158,6 +159,8 @@
self.conn.connect("pool-started", self.refresh_storage_pool)
self.conn.connect("pool-stopped", self.refresh_storage_pool)
+ self.conn.connect("state-changed", self.conn_state_changed)
+
self.window.signal_autoconnect({
"on_menu_file_close_activate": self.close,
"on_vmm_host_delete_event": self.close,
@@ -181,9 +184,7 @@
})
self.conn.connect("resources-sampled", self.refresh_resources)
- self.refresh_resources()
- self.reset_pool_state()
- self.reset_net_state()
+ self.reset_state()
def show(self):
# Update autostart value
@@ -208,6 +209,12 @@
self.window.get_widget("config-autoconnect").get_active():
self.conn.toggle_autoconnect()
+ def reset_state(self):
+ self.refresh_resources()
+ self.reset_pool_state()
+ self.reset_net_state()
+ self.conn_state_changed()
+
def refresh_resources(self, ignore=None):
self.window.get_widget("performance-cpu").set_text("%d %%" % self.conn.cpu_time_percentage())
vm_memory = self.conn.pretty_current_memory()
@@ -221,6 +228,11 @@
memory_vector = self.conn.current_memory_vector()
memory_vector.reverse()
self.memory_usage_graph.set_property("data_array", memory_vector)
+
+ def conn_state_changed(self, ignore1=None):
+ state = (self.conn.get_state() == vmmConnection.STATE_ACTIVE)
+ self.window.get_widget("net-add").set_sensitive(state)
+ self.window.get_widget("pool-add").set_sensitive(state)
# -------------------------
# Virtual Network functions
diff -r 4148e2986cc5 -r 7bedb4d693bd src/virtManager/manager.py
--- a/src/virtManager/manager.py Wed Sep 17 07:53:00 2008 -0400
+++ b/src/virtManager/manager.py Thu Sep 18 10:33:53 2008 -0400
@@ -668,10 +668,8 @@
self.window.get_widget("vm-open").set_sensitive(False)
if conn.get_state() == vmmConnection.STATE_DISCONNECTED:
self.window.get_widget("vm-delete").set_sensitive(True)
- self.window.get_widget("menu_host_details").set_sensitive(False)
else:
self.window.get_widget("vm-delete").set_sensitive(False)
- self.window.get_widget("menu_host_details").set_sensitive(True)
if conn.get_state() == vmmConnection.STATE_ACTIVE:
self.window.get_widget("vm-new").set_sensitive(True)
self.window.get_widget("menu_file_restore_saved").set_sensitive(True)
@@ -680,6 +678,7 @@
self.window.get_widget("menu_file_restore_saved").set_sensitive(False)
self.window.get_widget("menu_edit_details").set_sensitive(False)
self.window.get_widget("menu_edit_delete").set_sensitive(False)
+ self.window.get_widget("menu_host_details").set_sensitive(True)
def popup_vm_menu(self, widget, event):
tuple = widget.get_path_at_pos(int(event.x), int(event.y))

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,30 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1223313666 14400
# Node ID 270e1697b81ac143df54e111e2e1bed5006ad49c
# Parent 9f5d5b6940c5a266f7b3a087f41face4713feec2
populate hostinfo earlier in tick function so it isn't accessed uninitialized.
diff -r 9f5d5b6940c5 -r 270e1697b81a src/virtManager/connection.py
--- a/src/virtManager/connection.py Mon Oct 06 12:56:11 2008 -0400
+++ b/src/virtManager/connection.py Mon Oct 06 13:21:06 2008 -0400
@@ -869,6 +869,8 @@
if self.state != self.STATE_ACTIVE:
return
+ self.hostinfo = self.vmm.getInfo()
+
# Poll for new virtual network objects
(startNets, stopNets, newNets,
oldNets, self.nets) = self._update_nets()
@@ -911,10 +913,6 @@
# Finally, we sample each domain
now = time()
- try:
- self.hostinfo = self.vmm.getInfo()
- except:
- logging.warn("Unable to get host information")
updateVMs = self.vms
if noStatsUpdate:

View File

@ -0,0 +1,97 @@
# HG changeset patch
# User "Cole Robinson <crobinso@redhat.com>"
# Date 1224004952 14400
# Node ID ba26f6f584144bce5f33fdc19b5e6d09adbba8d2
# Parent 7442ab043062ab4270b2de7ec23007866c7d5158
Update POTFILES to reflect reality.
diff -r 7442ab043062 -r ba26f6f58414 po/POTFILES.in
--- a/po/POTFILES.in Tue Oct 07 10:09:03 2008 -0400
+++ b/po/POTFILES.in Tue Oct 14 13:22:32 2008 -0400
@@ -1,45 +1,47 @@
src/virt-manager.desktop.in.in
-src/vmm-about.glade
-src/vmm-details.glade
-src/vmm-add-hardware.glade
-src/vmm-host.glade
-src/vmm-choose-cd.glade
-src/vmm-manager.glade
-src/vmm-create.glade
-src/vmm-open-connection.glade
-src/vmm-create-net.glade
-src/vmm-preferences.glade
-src/vmm-create-pool.glade
-src/vmm-progress.glade
-src/vmm-create-vol.glade
src/virt-manager.py.in
src/virt-manager.schemas.in
+src/virtManager/IPy.py
+src/virtManager/__init__.py
src/virtManager/about.py
+src/virtManager/addhardware.py
+src/virtManager/asyncjob.py
+src/virtManager/choosecd.py
+src/virtManager/config.py
+src/virtManager/connect.py
src/virtManager/connection.py
+src/virtManager/create.py
+src/virtManager/createmeter.py
src/virtManager/createnet.py
+src/virtManager/createpool.py
+src/virtManager/createvol.py
+src/virtManager/details.py
+src/virtManager/domain.py
src/virtManager/engine.py
-src/virtManager/IPy.py
+src/virtManager/error.py
+src/virtManager/host.py
+src/virtManager/keyring.py
+src/virtManager/manager.py
src/virtManager/netdev.py
+src/virtManager/network.py
+src/virtManager/opticalhelper.py
+src/virtManager/preferences.py
+src/virtManager/remote.py
src/virtManager/secret.py
-src/virtManager/addhardware.py
-src/virtManager/connect.py
-src/virtManager/create.py
-src/virtManager/createvol.py
-src/virtManager/createpool.py
+src/virtManager/serialcon.py
+src/virtManager/storagepool.py
src/virtManager/storagevol.py
-src/virtManager/storagepool.py
-src/virtManager/error.py
-src/virtManager/keyring.py
-src/virtManager/network.py
-src/virtManager/serialcon.py
-src/virtManager/asyncjob.py
-src/virtManager/details.py
-src/virtManager/host.py
-src/virtManager/preferences.py
-src/virtManager/config.py
-src/virtManager/createmeter.py
-src/virtManager/domain.py
-src/virtManager/__init__.py
-src/virtManager/manager.py
-src/virtManager/remote.py
src/virtManager/util.py
+src/vmm-about.glade
+src/vmm-add-hardware.glade
+src/vmm-choose-cd.glade
+src/vmm-create-net.glade
+src/vmm-create-pool.glade
+src/vmm-create-vol.glade
+src/vmm-create.glade
+src/vmm-details.glade
+src/vmm-host.glade
+src/vmm-manager.glade
+src/vmm-open-connection.glade
+src/vmm-preferences.glade
+src/vmm-progress.glade
diff -r 7442ab043062 -r ba26f6f58414 po/POTFILES.skip
--- a/po/POTFILES.skip Tue Oct 07 10:09:03 2008 -0400
+++ b/po/POTFILES.skip Tue Oct 14 13:22:32 2008 -0400
@@ -1,1 +0,0 @@
-src/virt-manager.desktop.in

View File

@ -8,7 +8,7 @@
Name: virt-manager
Version: 0.6.0
Release: 1%{_extra_release}
Release: 2%{_extra_release}
Summary: Virtual Machine Manager
Group: Applications/Emulators
@ -18,6 +18,12 @@ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar
Source1: %{name}.pam
Source2: %{name}.console
Patch1: %{name}-%{version}-polkit-root.patch
Patch2: %{name}-%{version}-conn-details-sensitivity.patch
Patch3: %{name}-%{version}-catalan-translation.patch
Patch4: %{name}-%{version}-dutch-translation.patch
Patch5: %{name}-%{version}-german-update.patch
Patch6: %{name}-%{version}-populate-hostinfo-early.patch
Patch7: %{name}-%{version}-update-potfiles.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# These two are just the oldest version tested
@ -35,6 +41,7 @@ Requires: gnome-keyring >= 0.4.9
# disabled
Requires: gnome-python2-gnomekeyring >= 2.15.4
Requires: gnome-python2-gnomevfs >= 2.15.4
Requires: gnome-python2-gnome
# Minimum we've tested with
Requires: libxml2-python >= 2.6.23
# Required to install Xen & QEMU guests
@ -82,6 +89,12 @@ management API.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
%configure
@ -171,6 +184,15 @@ fi
%{_datadir}/dbus-1/services/%{name}.service
%changelog
* Tue Oct 14 2008 Cole Robinson <crobinso@redhat.com> - 0.6.0-2.fc10
- Add gnome-python2-gnome requirement.
- Allow seeing connection details if disconnected.
- Updated catalan translation.
- Update dutch translation.
- Update german translation. (bug 438136)
- Fix showing domain console when connecting to hypervisor.
- Update POTFILES to reflect reality (bug 466835)
* Wed Sep 10 2008 Cole Robinson <crobinso@redhat.com> - 0.6.0-1.fc10
- Update to 0.6.0 release
- Add libvirt storage management support