diff --git a/pixmaps/device_cpu.png b/pixmaps/device_cpu.png new file mode 100644 index 000000000..ff3cce25e Binary files /dev/null and b/pixmaps/device_cpu.png differ diff --git a/pixmaps/device_mem.png b/pixmaps/device_mem.png new file mode 100644 index 000000000..41d5027e5 Binary files /dev/null and b/pixmaps/device_mem.png differ diff --git a/pixmaps/device_pci.png b/pixmaps/device_pci.png new file mode 100644 index 000000000..3e41b15bb Binary files /dev/null and b/pixmaps/device_pci.png differ diff --git a/pixmaps/device_serial.png b/pixmaps/device_serial.png new file mode 100644 index 000000000..772b7d1cd Binary files /dev/null and b/pixmaps/device_serial.png differ diff --git a/pixmaps/device_usb.png b/pixmaps/device_usb.png new file mode 100644 index 000000000..14d9fbe87 Binary files /dev/null and b/pixmaps/device_usb.png differ diff --git a/pixmaps/icon_console.png b/pixmaps/icon_console.png new file mode 100644 index 000000000..c7719fece Binary files /dev/null and b/pixmaps/icon_console.png differ diff --git a/pixmaps/icon_cpu.png b/pixmaps/icon_cpu.png deleted file mode 100644 index 321625a2c..000000000 Binary files a/pixmaps/icon_cpu.png and /dev/null differ diff --git a/pixmaps/icon_details.png b/pixmaps/icon_details.png new file mode 100644 index 000000000..b2b134ea8 Binary files /dev/null and b/pixmaps/icon_details.png differ diff --git a/pixmaps/icon_shutdown.png b/pixmaps/icon_shutdown.png deleted file mode 100644 index 370830bd3..000000000 Binary files a/pixmaps/icon_shutdown.png and /dev/null differ diff --git a/pixmaps/state_blocked.png b/pixmaps/state_blocked.png deleted file mode 100644 index 4a9246fb8..000000000 Binary files a/pixmaps/state_blocked.png and /dev/null differ diff --git a/pixmaps/state_crashed.png b/pixmaps/state_crashed.png index 7924ae825..cbf6251db 100644 Binary files a/pixmaps/state_crashed.png and b/pixmaps/state_crashed.png differ diff --git a/pixmaps/state_idle.png b/pixmaps/state_idle.png deleted file mode 100644 index 6166d5210..000000000 Binary files a/pixmaps/state_idle.png and /dev/null differ diff --git a/pixmaps/state_paused.png b/pixmaps/state_paused.png index fae9ae0cf..cc1a0ae8e 100644 Binary files a/pixmaps/state_paused.png and b/pixmaps/state_paused.png differ diff --git a/pixmaps/state_progress.png b/pixmaps/state_progress.png new file mode 100644 index 000000000..ce4b6ea2b Binary files /dev/null and b/pixmaps/state_progress.png differ diff --git a/pixmaps/state_running.png b/pixmaps/state_running.png index 6166d5210..533735817 100644 Binary files a/pixmaps/state_running.png and b/pixmaps/state_running.png differ diff --git a/pixmaps/state_shutdown.png b/pixmaps/state_shutdown.png deleted file mode 100644 index 0aad0affa..000000000 Binary files a/pixmaps/state_shutdown.png and /dev/null differ diff --git a/pixmaps/state_shutoff.png b/pixmaps/state_shutoff.png index b38316d2d..10ab72c6e 100644 Binary files a/pixmaps/state_shutoff.png and b/pixmaps/state_shutoff.png differ diff --git a/pixmaps/state_unknown.png b/pixmaps/state_unknown.png new file mode 100644 index 000000000..522164dc9 Binary files /dev/null and b/pixmaps/state_unknown.png differ diff --git a/pixmaps/vm_large.png b/pixmaps/vm_large.png new file mode 100644 index 000000000..a0a6f677d Binary files /dev/null and b/pixmaps/vm_large.png differ diff --git a/pixmaps/vm_medium.png b/pixmaps/vm_medium.png new file mode 100644 index 000000000..c30d1c98f Binary files /dev/null and b/pixmaps/vm_medium.png differ diff --git a/pixmaps/vm_new.png b/pixmaps/vm_new.png new file mode 100644 index 000000000..78d32245a Binary files /dev/null and b/pixmaps/vm_new.png differ diff --git a/pixmaps/vm_new_large.png b/pixmaps/vm_new_large.png new file mode 100644 index 000000000..0906dd102 Binary files /dev/null and b/pixmaps/vm_new_large.png differ diff --git a/pixmaps/vm_small.png b/pixmaps/vm_small.png new file mode 100644 index 000000000..da76944d4 Binary files /dev/null and b/pixmaps/vm_small.png differ diff --git a/pixmaps/vm_tiny.png b/pixmaps/vm_tiny.png new file mode 100644 index 000000000..033b63e4d Binary files /dev/null and b/pixmaps/vm_tiny.png differ diff --git a/src/virtManager/config.py b/src/virtManager/config.py index 68778c6da..a0a4cb21c 100644 --- a/src/virtManager/config.py +++ b/src/virtManager/config.py @@ -78,13 +78,13 @@ class vmmConfig: self.keyring = None self.status_icons = { - libvirt.VIR_DOMAIN_BLOCKED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_blocked.png", 18, 18), + libvirt.VIR_DOMAIN_BLOCKED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 18, 18), libvirt.VIR_DOMAIN_CRASHED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_crashed.png", 18, 18), libvirt.VIR_DOMAIN_PAUSED: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_paused.png", 18, 18), libvirt.VIR_DOMAIN_RUNNING: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_running.png", 18, 18), - libvirt.VIR_DOMAIN_SHUTDOWN: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutdown.png", 18, 18), + libvirt.VIR_DOMAIN_SHUTDOWN: gtk.gdk.pixbuf_new_from_file_at_size(self.get_icon_dir() + "/state_shutoff.png", 18, 18), 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_idle.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 props = { gnome.PARAM_APP_DATADIR : self.get_data_dir()} diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 30cc856c5..f840178a0 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -337,8 +337,6 @@ class vmmDetails(gobject.GObject): self.update_widget_states(self.vm, self.vm.status()) - self.pixbuf_processor = gtk.gdk.pixbuf_new_from_file(config.get_icon_dir() + "/icon_cpu.png") - self.pixbuf_memory = gtk.gdk.pixbuf_new_from_file(config.get_icon_dir() + "/icon_cpu.png") self.prepare_hw_list() self.hw_selected(page=0) self.refresh_vm_info() @@ -1757,10 +1755,12 @@ class vmmDetails(gobject.GObject): "computer") self.add_hw_list_option("Performance", HW_LIST_TYPE_STATS, [], "utilities-system-monitor") - self.add_hw_list_option("Processor", HW_LIST_TYPE_CPU, [], "icon_cpu") - self.add_hw_list_option("Memory", HW_LIST_TYPE_MEMORY, [], "icon_cpu") + self.add_hw_list_option("Processor", HW_LIST_TYPE_CPU, [], + "device_cpu") + self.add_hw_list_option("Memory", HW_LIST_TYPE_MEMORY, [], + "device_mem") self.add_hw_list_option("Boot Options", HW_LIST_TYPE_BOOT, [], - "icon_cpu") + "system-run") self.repopulate_hw_list() @@ -1855,13 +1855,17 @@ class vmmDetails(gobject.GObject): label += " %s" % charinfo[3] # Don't show port for console update_hwlist(HW_LIST_TYPE_CHAR, charinfo, label, - gtk.STOCK_CONNECT) + "device_serial") # Populate host devices for hostdevinfo in self.vm.get_hostdev_devices(): currentHostdevs[hostdevinfo[2]] = 1 + if hostdevinfo[4] == "usb": + icon = "device_usb" + else: + icon = "device_pci" update_hwlist(HW_LIST_TYPE_HOSTDEV, hostdevinfo, hostdevinfo[2], - "system-run") + icon) # Populate video devices for vidinfo in self.vm.get_video_devices():