From ecb202e391a9046195a18a76491663624482a3cd Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Fri, 1 Sep 2006 10:49:46 -0400 Subject: [PATCH] various UI tweaks for the graphical console to match the HIG as well as to be a little cleaner looking --- pixmaps/icon_shutdown.png | Bin 814 -> 792 bytes src/virt-manager.glade | 182 ++++++++++++------------------------- src/virtManager/console.py | 53 ++++------- 3 files changed, 74 insertions(+), 161 deletions(-) diff --git a/pixmaps/icon_shutdown.png b/pixmaps/icon_shutdown.png index db63a186534030c85aeb7cdb45ccd42777225953..370830bd3b19d22a7c7c5ea990620594ec327a43 100644 GIT binary patch delta 757 zcmVInf81pk#$vJi0Nye>C(H8oW#aIcS(MM`CnZUG0bm5c zh$Klb^ZESaE3JT{D193n8+Q*54nFMf@86-6_Wf}Zp4W$mht>Z6{@JOisd6Y3I=)EU zYZpx*5D3if?d@eWO&c*y(|Oizn&$Px!^2yKVMI;SJl@*c`rfk&Kz$u+$ygoKIb}yAm{p?8(luD%;LdXCswJ8X~swj#p0Ga@rqA0Eig0RZ- zJOuzk$Uv!7n(0XsX0zF-uItm5ug~XOFBA%knx^dnXaQ(xnzmag6c&9x-?~*QbDh$K0Xk%$<=?Bx>0FIcn z0f5;W0ALsfR8>9q3WW0<+-^4v!$7;;1_1XdQyIY1Q@RBa00cpR%jN362O^P3$K&yw zFnTkYOuh#IS(Y2JEPr9r0DxpN`3^uI0C+r}b|ez%be(`CNo7jue~!f~mCATL9v?mH z7mvqBE0xMai&IK>BuOgwY7R_pZf>r%S}p4eI)1;uSglsy0D#}`pQ~1@0NX&=B;k4K5 zt#KT8!Zy6YgyT5wOT_E-{tAb~=|mzie`U{cI-P#dY&M_OYPD#+UIzdS4h~{yXy}{M n>0Dc0UjAzTa%|YJ@h|ud5R(Zl?Cc7{00000NkvXXu0mjfrs7#K delta 779 zcmV+m1N8iu2CfDniBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#Me+Lr~ zClOR^KokG~0=r2>K~!ko?N~8u+dvfl8j2lmK4?jmGt_Bu0{sWp+Vj+(5Zb}JNjFua zsxfHx639>Jor%m+ zq5me3W!Z-)ijK6_uNDMeA|izN*6a0-Ip-%EBamg;d*Amz6VdY(6z!TZfA%v7f=|nm zxYvDvh!925#}$JIfGr|=7Ddq!5v_k8P)ezM*_b}2uIr`%rnlGtU`uQLS}CR0N+ADe zo93Elj7@_esCT>FT>#$;Lut3$-3@}E&KR2*?rKV@y;ZBQ5`j35RjxMwWZv_# zy%^{O0E7_mJa5|=0}(lKe;li|5g3g|C8=z;+i4+q6TfaAgb--A+o@TF+~;}-jK|}W zEOt7b=Cc3qbUJ%x6=wK+I09LgnWjbAFCm|s-r{rPy-+gedGoyx=iJPgqqRn{3X8f= ztu>5Z37qrwEuluEVVY`#!C>hu4+et^Qv_!Cd^iHFRx33>!r^e}f8?262(2}S!(mB+ zbD!%W;JU74jFqG?48zGH5?X77VR$uT1591lm1`rw7=x5DnXw_&eBYn+`~9RyL~D(H zzklKT{uL3K9qUv|nXGz7Sh*V|B7|Z1Rcn1PClS+vRKA$gYF`T>&OFb1vkZZI?M4}6 z==FNXjIkd8u4hcCVF7rV|LXJF>DXrZi002ov JPDHLkV1mMiX%zqf diff --git a/src/virt-manager.glade b/src/virt-manager.glade index 161776108..6d518deb7 100644 --- a/src/virt-manager.glade +++ b/src/virt-manager.glade @@ -599,7 +599,7 @@ Inactive virtual machines True - False + True Virtual Machine Manager Copyright (C) 2006 Red Hat Inc. @@ -3090,21 +3090,6 @@ Máirín Duffy <duffy@redhat.com> - - - True - - - - - - True - _Details - True - - - - True @@ -3115,16 +3100,22 @@ Máirín Duffy <duffy@redhat.com> - + True - Launch _Terminal - True - - + + True + _Take Screenshot + True + + + + + + True @@ -3143,20 +3134,55 @@ Máirín Duffy <duffy@redhat.com> - + True - _Help + View True - + - + True - gtk-about - True - + _Details + True + + + + + + + True + _FullScreen + True + False + + + + + + + True + _Serial Console + True + + + + + + + True + + + + + + True + Toolbar + True + True + @@ -3172,7 +3198,7 @@ Máirín Duffy <duffy@redhat.com> - + True GTK_ORIENTATION_HORIZONTAL GTK_TOOLBAR_BOTH @@ -3184,6 +3210,7 @@ Máirín Duffy <duffy@redhat.com> True Run True + gtk-media-play True True False @@ -3200,6 +3227,7 @@ Máirín Duffy <duffy@redhat.com> True Pause True + gtk-media-pause True True False @@ -3227,102 +3255,6 @@ Máirín Duffy <duffy@redhat.com> True - - - - True - True - True - True - - - False - False - - - - - - True - Open terminal - True - True - True - False - - - - False - True - - - - - - True - Save domain - True - True - True - False - - - - False - True - - - - - - True - Machine details - True - gtk-properties - True - True - False - - - - False - True - - - - - - True - Take screenshot - True - True - True - False - - - - False - True - - - - - - True - Full screen - True - gtk-zoom-fit - True - True - False - False - - - - False - True - - 0 diff --git a/src/virtManager/console.py b/src/virtManager/console.py index 350d7457d..74b41a55b 100644 --- a/src/virtManager/console.py +++ b/src/virtManager/console.py @@ -44,24 +44,9 @@ class vmmConsole(gobject.GObject): topwin.hide() topwin.set_title(vm.get_name() + " " + topwin.get_title()) - self.window.get_widget("control-run").set_icon_widget(gtk.Image()) - self.window.get_widget("control-run").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_run.png") - - self.window.get_widget("control-pause").set_icon_widget(gtk.Image()) - self.window.get_widget("control-pause").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_pause.png") - self.window.get_widget("control-shutdown").set_icon_widget(gtk.Image()) self.window.get_widget("control-shutdown").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_shutdown.png") - self.window.get_widget("control-terminal").set_icon_widget(gtk.Image()) - self.window.get_widget("control-terminal").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_launch_term.png") - - self.window.get_widget("control-screenshot").set_icon_widget(gtk.Image()) - self.window.get_widget("control-screenshot").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_screenshot.png") - - self.window.get_widget("control-save").set_icon_widget(gtk.Image()) - self.window.get_widget("control-save").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_save.png") - self.vncViewer = GRFBViewer() scrolledWin = gtk.ScrolledWindow() scrolledWin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) @@ -87,20 +72,16 @@ class vmmConsole(gobject.GObject): "on_control_shutdown_clicked": self.control_vm_shutdown, "on_control_pause_toggled": self.control_vm_pause, - "on_control_fullscreen_toggled": self.toggle_fullscreen, - "on_menu_vm_run_activate": self.control_vm_run, "on_menu_vm_shutdown_activate": self.control_vm_shutdown, "on_menu_vm_pause_activate": self.control_vm_pause, - - "on_control_terminal_clicked": self.control_vm_terminal, - "on_control_screenshot_clicked": self.control_vm_screenshot, - "on_control_save_clicked": self.control_vm_save_domain, - "on_control_details_clicked": self.control_vm_details, - - "on_menu_vm_terminal_activate": self.control_vm_terminal, "on_menu_vm_save_activate": self.control_vm_save_domain, - "on_menu_vm_details_activate": self.control_vm_details, + "on_menu_vm_screenshot_activate": self.control_vm_screenshot, + + "on_menu_view_serial_activate": self.control_vm_terminal, + "on_menu_view_details_activate": self.control_vm_details, + "on_menu_view_fullscreen_activate": self.toggle_fullscreen, + "on_menu_view_toolbar_activate": self.toggle_toolbar, "on_menu_vm_close_activate": self.close, @@ -136,6 +117,11 @@ class vmmConsole(gobject.GObject): self.window.get_widget("vmm-console").unfullscreen() #gtk.gdk.keyboard_ungrab() + def toggle_toolbar(self, src): + if src.get_active(): + self.window.get_widget("console-toolbar").show() + else: + self.window.get_widget("console-toolbar").hide() def show(self): dialog = self.window.get_widget("vmm-console") @@ -201,15 +187,14 @@ class vmmConsole(gobject.GObject): def activate_unavailable_page(self): self.window.get_widget("console-pages").set_current_page(0) - self.window.get_widget("control-screenshot").set_sensitive(False) + self.window.get_widget("menu-vm-screenshot").set_sensitive(False) def activate_screenshot_page(self): self.window.get_widget("console-pages").set_current_page(1) - self.window.get_widget("control-screenshot").set_sensitive(True) - + self.window.get_widget("menu-vm-screenshot").set_sensitive(True) def activate_auth_page(self): pw = self.config.get_console_password(self.vm) - self.window.get_widget("control-screenshot").set_sensitive(False) + self.window.get_widget("menu-vm-screenshot").set_sensitive(False) self.window.get_widget("console-auth-password").set_text(pw) if self.config.has_keyring(): self.window.get_widget("console-auth-remember").set_sensitive(True) @@ -223,7 +208,7 @@ class vmmConsole(gobject.GObject): def activate_viewer_page(self): self.window.get_widget("console-pages").set_current_page(3) - self.window.get_widget("control-screenshot").set_sensitive(True) + self.window.get_widget("menu-vm-screenshot").set_sensitive(True) self.vncViewer.grab_focus() def control_vm_screenshot(self, src): @@ -315,23 +300,19 @@ class vmmConsole(gobject.GObject): self.window.get_widget("menu-vm-run").set_sensitive(False) if vm.is_serial_console_tty_accessible(): - self.window.get_widget("control-terminal").set_sensitive(True) - self.window.get_widget("menu-vm-terminal").set_sensitive(True) + self.window.get_widget("menu-view-serial").set_sensitive(True) else: - self.window.get_widget("control-terminal").set_sensitive(False) - self.window.get_widget("menu-vm-terminal").set_sensitive(False) + self.window.get_widget("menu-view-serial").set_sensitive(False) if status in [ libvirt.VIR_DOMAIN_SHUTDOWN, libvirt.VIR_DOMAIN_SHUTOFF ,libvirt.VIR_DOMAIN_CRASHED ] or vm.is_read_only(): self.window.get_widget("control-pause").set_sensitive(False) self.window.get_widget("control-shutdown").set_sensitive(False) - self.window.get_widget("control-save").set_sensitive(False) self.window.get_widget("menu-vm-pause").set_sensitive(False) self.window.get_widget("menu-vm-shutdown").set_sensitive(False) self.window.get_widget("menu-vm-save").set_sensitive(False) else: self.window.get_widget("control-pause").set_sensitive(True) self.window.get_widget("control-shutdown").set_sensitive(True) - self.window.get_widget("control-save").set_sensitive(True) self.window.get_widget("menu-vm-pause").set_sensitive(True) self.window.get_widget("menu-vm-shutdown").set_sensitive(True) self.window.get_widget("menu-vm-save").set_sensitive(True)