From 54cc845793276d8ec5d7aa667810f42178eb1504 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Thu, 17 Sep 2009 11:24:18 -0400 Subject: [PATCH] Update new VM status icons. Previous round didn't convey state very well, and looked too much like buttons. --- pixmaps/state_paused.png | Bin 379 -> 921 bytes pixmaps/state_running.png | Bin 452 -> 1112 bytes pixmaps/state_shutoff.png | Bin 366 -> 828 bytes src/virtManager/config.py | 14 +++++++++++++- src/virtManager/domain.py | 2 ++ src/virtManager/manager.py | 5 ++--- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pixmaps/state_paused.png b/pixmaps/state_paused.png index cc1a0ae8e1101992501a3cb3711ca422048ad31f..1d2966d96cdff589d5b082f6be108be37ccdcc8a 100644 GIT binary patch delta 897 zcmV-{1AhGb0+|OPiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPae*-&7 zL_t(|+T2&YP8&fGp1mIv(o%x`3PwsvW06p% zV|VfTl;nB7xv}wLZDpkn3k$WGe;^MAcW`;xTRS=V0tq@{Yk7GY(pn1EAr&uDVDP7$ zbd9ErTcPld>kUhplO5%9Z_8ZseYy#HU5xtj|mLQ5EG{-^#=C?^Iwt7bEyq+%_hf2U@rfS(D=*jI3L zbi`q3($g9CzOC?Cg&HV=_s@+nd|=>S_}fSD!9I4J+BSR)aJ}iTx;v zA;!=on^R3e9~ml0hId2weRBin=jUxaVtNH$Z*4t6(fM|E)}GSNokyGCzyEXkM}PqU X0s=TVMG;Pe00000NkvXXu0mjfheel; delta 351 zcmV-l0igbw2m1mciBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyxe*qmy zL_t(|+N6`OZ^A$n$FJowMXHuyu{G$Wwn_U>Ob>&j7Bxk})Mn=QPk?VNk_3gFL!kPT z@AvXbE)B3XyyTPDzTW%ZUGIBN7>2475r{zme5vg~2G(F>57u>Ex6flR15+^Uh`tDK z;2V5_gApjpvTc3`uj+nKcn(Hje?bvlRh5#N|7x~_V}C*77DW+(DNrOy5|yT@$@gl~ z6LAZ%z2~NBE?KsBwI)5WhDu_Knk$^ZCs=|5YYqh-xz1++1^}6gLGc~;Mq~g0002ovPDHLkV1mI(mCyhH diff --git a/pixmaps/state_running.png b/pixmaps/state_running.png index 53373581763c21a3bdaf1b837a4ba5ff25e092d6..bbee3814add70090949fd5b46fe4653ece787076 100644 GIT binary patch delta 1090 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 M07*qoM6N<$f?o2bga7~l diff --git a/src/virtManager/config.py b/src/virtManager/config.py index 6309fb218..29c8396f0 100644 --- a/src/virtManager/config.py +++ b/src/virtManager/config.py @@ -90,7 +90,16 @@ class vmmConfig: libvirt.VIR_DOMAIN_SHUTOFF: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 18, 18), libvirt.VIR_DOMAIN_NOSTATE: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 18, 18), } - #initialize the help stuff + self.status_icons_large = { + libvirt.VIR_DOMAIN_BLOCKED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32), + libvirt.VIR_DOMAIN_CRASHED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_crashed.png", 32, 32), + libvirt.VIR_DOMAIN_PAUSED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_paused.png", 32, 32), + libvirt.VIR_DOMAIN_RUNNING: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32), + libvirt.VIR_DOMAIN_SHUTDOWN: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 32, 32), + libvirt.VIR_DOMAIN_SHUTOFF: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 32, 32), + libvirt.VIR_DOMAIN_NOSTATE: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 32, 32), + } + props = { gnome.PARAM_APP_DATADIR : self.get_data_dir()} gnome.program_init(self.get_appname(), self.get_appversion(), \ properties=props) @@ -100,6 +109,9 @@ class vmmConfig: def get_vm_status_icon(self, state): return self.status_icons[state] + def get_vm_status_icon_large(self, state): + return self.status_icons_large[state] + def get_shutdown_icon_name(self): theme = gtk.icon_theme_get_default() if theme.has_icon("system-shutdown"): diff --git a/src/virtManager/domain.py b/src/virtManager/domain.py index 5219ee304..731b5e67e 100644 --- a/src/virtManager/domain.py +++ b/src/virtManager/domain.py @@ -728,6 +728,8 @@ class vmmDomain(gobject.GObject): def run_status_icon(self): return self.config.get_vm_status_icon(self.status()) + def run_status_icon_large(self): + return self.config.get_vm_status_icon_large(self.status()) def _is_serial_console_tty_accessible(self, path): # pty serial scheme doesn't work over remote diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index 806bdf360..b16e46a1c 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -493,7 +493,7 @@ class vmmManager(gobject.GObject): row.insert(ROW_NAME, vm.get_name()) row.insert(ROW_MARKUP, row[ROW_NAME]) row.insert(ROW_STATUS, vm.run_status()) - row.insert(ROW_STATUS_ICON, vm.run_status_icon()) + row.insert(ROW_STATUS_ICON, vm.run_status_icon_large()) row.insert(ROW_KEY, vm.get_uuid()) row.insert(ROW_HINT, None) row.insert(ROW_IS_CONN, False) @@ -575,7 +575,7 @@ class vmmManager(gobject.GObject): row = self.rows[self.vm_row_key(vm)] row[ROW_STATUS] = vm.run_status() - row[ROW_STATUS_ICON] = vm.run_status_icon() + row[ROW_STATUS_ICON] = vm.run_status_icon_large() row[ROW_IS_VM_RUNNING] = vm.is_active() model.row_changed(row.path, row.iter) @@ -850,7 +850,6 @@ class vmmManager(gobject.GObject): statusCol.add_attribute(status_icon, 'cell-background', ROW_COLOR) statusCol.add_attribute(status_icon, 'pixbuf', ROW_STATUS_ICON) statusCol.add_attribute(status_icon, 'visible', ROW_IS_VM) - statusCol.add_attribute(status_icon, 'sensitive', ROW_IS_VM_RUNNING) name_txt = gtk.CellRendererText() nameCol.pack_start(name_txt, True)