Add a "Displays" submenu, and warn when closing last display

1 files changed, 107 insertions, 31 deletions

diff --git a/src/virt-viewer.xml b/src/virt-viewer.xml
index d3b1b86..b701c2c 100644
--- a/src/virt-viewer.xml
+++ b/src/virt-viewer.xml
@@ -1,47 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
-  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="viewer">
+    <property name="can_focus">False</property>
     <property name="default_width">400</property>
     <property name="default_height">400</property>
-    <signal name="delete_event" handler="virt_viewer_window_delete"/>
+    <signal name="delete-event" handler="virt_viewer_window_delete" swapped="no"/>
     <child>
       <object class="GtkVBox" id="viewer-box">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="GtkMenuBar" id="top-menu">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="menu-file">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_File</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="menu-file-screenshot">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Screenshot</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_file_screenshot"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_file_screenshot" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem5">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_file_quit"/>
-                        <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
+                        <accelerator key="q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_file_quit" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -51,61 +60,76 @@
             <child>
               <object class="GtkMenuItem" id="menu-view">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_View</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkCheckMenuItem" id="menu-view-fullscreen">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Full screen</property>
                         <property name="use_underline">True</property>
                         <accelerator key="F11" signal="activate"/>
-                        <signal name="toggled" handler="virt_viewer_window_menu_view_fullscreen"/>
+                        <signal name="toggled" handler="virt_viewer_window_menu_view_fullscreen" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-view-zoom">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_Zoom</property>
                         <property name="use_underline">True</property>
                         <child type="submenu">
                           <object class="GtkMenu" id="menu4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkImageMenuItem" id="menu-view-zoom-in">
-                                <property name="visible">True</property>
                                 <property name="label">gtk-zoom-in</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_in"/>
+                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_in" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkImageMenuItem" id="menu-view-zoom-out">
-                                <property name="visible">True</property>
                                 <property name="label">gtk-zoom-out</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_out"/>
+                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_out" swapped="no"/>
                               </object>
                             </child>
                             <child>
                               <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                               </object>
                             </child>
                             <child>
                               <object class="GtkImageMenuItem" id="menu-view-zoom-reset">
-                                <property name="visible">True</property>
                                 <property name="label">gtk-zoom-100</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="use_stock">True</property>
                                 <accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_reset"/>
+                                <signal name="activate" handler="virt_viewer_window_menu_view_zoom_reset" swapped="no"/>
                               </object>
                             </child>
                           </object>
@@ -115,9 +139,20 @@
                     <child>
                       <object class="GtkCheckMenuItem" id="menu-view-resize">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Automatically resize</property>
                         <property name="use_underline">True</property>
-                        <signal name="toggled" handler="virt_viewer_window_menu_view_resize"/>
+                        <signal name="toggled" handler="virt_viewer_window_menu_view_resize" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="menu-displays">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="label" translatable="yes">Displays</property>
+                        <property name="use_underline">True</property>
                       </object>
                     </child>
                   </object>
@@ -127,139 +162,174 @@
             <child>
               <object class="GtkMenuItem" id="menu-send">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Send key</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-cad">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+_Del</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-cab">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+_Backspace</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_1</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_2</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_3</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_4</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_5</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf6">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_6</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf7">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_7</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_8</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F_9</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F1_0</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf11">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F11</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-caf12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Ctrl+Alt+F12</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                     <child>
                       <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkMenuItem" id="menu-send-print">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">_PrintScreen</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_send"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_send" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -269,18 +339,23 @@
             <child>
               <object class="GtkMenuItem" id="menu-help">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
                 <property name="label" translatable="yes">_Help</property>
                 <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="menu3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem10">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="virt_viewer_window_menu_help_about"/>
+                        <signal name="activate" handler="virt_viewer_window_menu_help_about" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -290,6 +365,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>