[virt-tools-list] [PATCH virt-viewer 07/11] UI: Make 'Change CD' menu item a submenu under 'File' toplevel menu

Eduardo Lima (Etrunko) etrunko at redhat.com
Mon Jul 18 02:13:07 UTC 2016


Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
---
 src/resources/ui/virt-viewer.ui | 57 +++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
index 6e3c5ad..ee23ba5 100644
--- a/src/resources/ui/virt-viewer.ui
+++ b/src/resources/ui/virt-viewer.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 2.6 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAccelGroup" id="accelgroup"/>
   <object class="GtkApplicationWindow" id="viewer">
     <property name="can_focus">False</property>
@@ -23,7 +24,6 @@
                   <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">
@@ -35,7 +35,6 @@
                           <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" swapped="no"/>
@@ -46,7 +45,6 @@
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="label" translatable="yes">_USB device selection</property>
                             <property name="use_underline">True</property>
                             <signal name="activate" handler="virt_viewer_window_menu_file_usb_device_selection" swapped="no"/>
@@ -55,7 +53,6 @@
                         <child>
                           <object class="GtkMenuItem" id="menu-file-smartcard-insert">
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="accel_path"><virt-viewer>/file/smartcard-insert</property>
                             <property name="label" translatable="yes">Smartcard insertion</property>
                             <property name="use_underline">True</property>
@@ -65,7 +62,6 @@
                         <child>
                           <object class="GtkMenuItem" id="menu-file-smartcard-remove">
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="accel_path"><virt-viewer>/file/smartcard-remove</property>
                             <property name="label" translatable="yes">Smartcard removal</property>
                             <property name="use_underline">True</property>
@@ -73,6 +69,13 @@
                           </object>
                         </child>
                         <child>
+                          <object class="GtkMenuItem" id="menu-change-cd">
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">_Change CD</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                        </child>
+                        <child>
                           <object class="GtkMenuItem" id="menu-preferences">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -89,13 +92,12 @@
                         </child>
                         <child>
                           <object class="GtkMenuItem" id="imagemenuitem5">
-                            <property name="label" translatable="yes">_Quit</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
+                            <property name="label" translatable="yes">_Quit</property>
                             <property name="use_underline">True</property>
-                            <accelerator key="q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                             <signal name="activate" handler="virt_viewer_window_menu_file_quit" swapped="no"/>
+                            <accelerator key="q" signal="activate" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
                           </object>
                         </child>
                       </object>
@@ -106,7 +108,6 @@
                   <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">
@@ -118,7 +119,6 @@
                           <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="accel_path"><virt-viewer>/view/toggle-fullscreen</property>
                             <property name="label" translatable="yes">_Full screen</property>
                             <property name="use_underline">True</property>
@@ -129,7 +129,6 @@
                           <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">
@@ -139,22 +138,22 @@
                                 <property name="accel_group">accelgroup</property>
                                 <child>
                                   <object class="GtkMenuItem" id="menu-view-zoom-in">
-                                    <property name="accel_path"><virt-viewer>/view/zoom-in</property>
-                                    <property name="label" translatable="yes">Zoom _In</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="use_action_appearance">False</property>
+                                    <property name="accel_path"><virt-viewer>/view/zoom-in</property>
+                                    <property name="label" translatable="yes">Zoom _In</property>
                                     <property name="use_underline">True</property>
                                     <signal name="activate" handler="virt_viewer_window_menu_view_zoom_in" swapped="no"/>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkMenuItem" id="menu-view-zoom-out">
-                                    <property name="accel_path"><virt-viewer>/view/zoom-out</property>
-                                    <property name="label" translatable="yes">Zoom _Out</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="use_action_appearance">False</property>
+                                    <property name="accel_path"><virt-viewer>/view/zoom-out</property>
+                                    <property name="label" translatable="yes">Zoom _Out</property>
                                     <property name="use_underline">True</property>
                                     <signal name="activate" handler="virt_viewer_window_menu_view_zoom_out" swapped="no"/>
                                   </object>
@@ -167,11 +166,11 @@
                                 </child>
                                 <child>
                                   <object class="GtkMenuItem" id="menu-view-zoom-reset">
-                                    <property name="accel_path"><virt-viewer>/view/zoom-reset</property>
-                                    <property name="label" translatable="yes">_Normal Size</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="use_action_appearance">False</property>
+                                    <property name="accel_path"><virt-viewer>/view/zoom-reset</property>
+                                    <property name="label" translatable="yes">_Normal Size</property>
                                     <property name="use_underline">True</property>
                                     <signal name="activate" handler="virt_viewer_window_menu_view_zoom_reset" swapped="no"/>
                                   </object>
@@ -184,7 +183,6 @@
                           <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>
@@ -192,7 +190,6 @@
                         <child>
                           <object class="GtkMenuItem" id="menu-view-release-cursor">
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="accel_path"><virt-viewer>/view/release-cursor</property>
                             <property name="label" translatable="yes">Release cursor</property>
                             <property name="use_underline">True</property>
@@ -207,7 +204,6 @@
                   <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>
                   </object>
@@ -216,7 +212,6 @@
                   <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">
@@ -227,7 +222,6 @@
                           <object class="GtkMenuItem" id="menu-help-guest-details">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="label" translatable="yes">_Guest Details</property>
                             <property name="use_underline">True</property>
                             <signal name="activate" handler="virt_viewer_window_menu_help_guest_details" swapped="no"/>
@@ -235,10 +229,9 @@
                         </child>
                         <child>
                           <object class="GtkMenuItem" id="imagemenuitem10">
-                            <property name="label" translatable="yes">_About</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="use_action_appearance">False</property>
+                            <property name="label" translatable="yes">_About</property>
                             <property name="use_underline">True</property>
                             <signal name="activate" handler="virt_viewer_window_menu_help_about" swapped="no"/>
                           </object>
@@ -247,14 +240,6 @@
                     </child>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkMenuItem" id="menu-change-cd">
-                    <property name="use_action_appearance">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">_Change CD</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-- 
2.7.4




More information about the virt-tools-list mailing list