Add Reopen option to the menu.

[guestfs-browser.git] / window.ml

diff --git a/window.ml b/window.ml
index d9dd7a6..7f35b04 100644 (file)
--- a/window.ml
+++ b/window.ml
@@ -30,6 +30,7 @@ type connect_menu = {
   connect_none_item : GMenu.menu_item;
   connect_uri_item : GMenu.menu_item;
   open_disk_item : GMenu.menu_item;
+  reopen_item : GMenu.menu_item;
   quit_item : GMenu.menu_item;
 }
 
@@ -57,13 +58,15 @@ class window =
     let none = factory#add_item "_Connect to default hypervisor" in
     let uri = factory#add_item "Connect to a _libvirt URI ..." in
     ignore (factory#add_separator ());
-    let opend =
-      factory#add_item "_Open disk image ..." ~key:GdkKeysyms._O in
+    let opend = factory#add_item "_Open disk image ..." ~key:GdkKeysyms._O in
+    ignore (factory#add_separator ());
+    let reopen = factory#add_item "Reopen current guest" in
     ignore (factory#add_separator ());
     let quit = factory#add_item "E_xit" ~key:GdkKeysyms._Q in
     { connect_menu = menu; connect_kvm_item = kvm;
       connect_xen_item = xen; connect_none_item = none;
-      connect_uri_item = uri; open_disk_item = opend; quit_item = quit } in
+      connect_uri_item = uri;
+      open_disk_item = opend; reopen_item = reopen; quit_item = quit } in
 
   let guest_menu =
     let menu = factory#add_submenu "_Guest" in
@@ -115,6 +118,7 @@ class window =
   let connect_xen_signal = new GUtil.signal () in
   let connect_none_signal = new GUtil.signal () in
   let connect_uri_signal = new GUtil.signal () in
+  let reopen_signal = new GUtil.signal () in
   let inspection_signal = new GUtil.signal () in
 
 object (self)
@@ -122,12 +126,14 @@ object (self)
                             connect_xen_signal#disconnect;
                             connect_none_signal#disconnect;
                             connect_uri_signal#disconnect;
+                            reopen_signal#disconnect;
                             inspection_signal#disconnect]
 
   method connect_kvm_signal = connect_kvm_signal#connect ~after
   method connect_xen_signal = connect_xen_signal#connect ~after
   method connect_none_signal = connect_none_signal#connect ~after
   method connect_uri_signal = connect_uri_signal#connect ~after
+  method reopen_signal = reopen_signal#connect ~after
   method inspection_signal = inspection_signal#connect ~after
 
   initializer
@@ -153,6 +159,8 @@ object (self)
               ~callback:connect_none_signal#call);
     ignore (connect_menu.connect_uri_item#connect#activate
               ~callback:connect_uri_signal#call);
+    ignore (connect_menu.reopen_item#connect#activate
+              ~callback:reopen_signal#call);
     ignore (guest_menu.guest_inspection_item#connect#activate
               ~callback:inspection_signal#call);
 
@@ -235,6 +243,16 @@ object (self)
         debug "when_opened_disk_images callback";
         self#when_opened_common image data
 
+  (* Called to reopen the handle. *)
+  method reopen () =
+    tree#clear ();
+    Slave.discard_command_queue ();
+    Slave.reopen self#when_reopened
+
+  method private when_reopened data =
+    debug "when_reopened callback";
+    self#when_opened_common "Reopened"(*XXX we lost the original name*) data
+
   (* Common code for when_opened_domain/when_opened_disk_images. *)
   method private when_opened_common name data =
     (* Dump some of the inspection data in debug messages. *)