Fixes for -safe-string.

[guestfs-browser.git] / window.ml

diff --git a/window.ml b/window.ml
index d9dd7a6..baa63b2 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;
 }
 
@@ -38,6 +39,11 @@ type guest_menu = {
   guest_inspection_item : GMenu.menu_item;
 }
 
+type help_menu = {
+  help_menu : GMenu.menu;
+  about_item : GMenu.menu_item;
+}
+
 class window =
   (* Window. *)
   let title = "Guest Filesystem Browser" in
@@ -57,13 +63,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
@@ -71,6 +79,12 @@ class window =
     let inspection = factory#add_item "Operating system information ..." in
     { guest_menu = menu; guest_inspection_item = inspection } in
 
+  let help_menu =
+    let menu = factory#add_submenu "_Help" in
+    let factory = new GMenu.factory menu ~accel_group in
+    let about = factory#add_item "About guest filesystem browser ..." in
+    { help_menu = menu; about_item = about } in
+
   (* Top toolbar. *)
   let hbox =
     let hbox = GPack.hbox ~border_width:4 ~packing:vbox#pack () in
@@ -115,20 +129,29 @@ 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 open_disk_signal = new GUtil.signal () in
+  let reopen_signal = new GUtil.signal () in
   let inspection_signal = new GUtil.signal () in
+  let about_signal = new GUtil.signal () in
 
 object (self)
   inherit GUtil.ml_signals [connect_kvm_signal#disconnect;
                             connect_xen_signal#disconnect;
                             connect_none_signal#disconnect;
                             connect_uri_signal#disconnect;
-                            inspection_signal#disconnect]
+                            open_disk_signal#disconnect;
+                            reopen_signal#disconnect;
+                            inspection_signal#disconnect;
+                            about_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 open_disk_signal = open_disk_signal#connect ~after
+  method reopen_signal = reopen_signal#connect ~after
   method inspection_signal = inspection_signal#connect ~after
+  method about_signal = about_signal#connect ~after
 
   initializer
     ignore (statusbar_context#push title);
@@ -153,8 +176,14 @@ object (self)
               ~callback:connect_none_signal#call);
     ignore (connect_menu.connect_uri_item#connect#activate
               ~callback:connect_uri_signal#call);
+    ignore (connect_menu.open_disk_item#connect#activate
+              ~callback:open_disk_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);
+    ignore (help_menu.about_item#connect#activate
+              ~callback:about_signal#call);
 
     (* VM combo box when changed by the user.
      * The refresh button acts like changing the VM combo too.
@@ -219,7 +248,7 @@ object (self)
     self#when_opened_common name data
 
   (* When a set of disk images is selected by the user. *)
-  method private open_disk_images images =
+  method open_disk_images images =
     match images with
     | [] -> ()
     | images ->
@@ -235,6 +264,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. *)