weld PageOrientationControl

Change-Id: I4b8b5e9a467396a97531c915613d84a361163775
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

2 files changed, 18 insertions, 21 deletions

diff --git a/sw/uiconfig/swriter/ui/pagemargincontrol.ui b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
index 176c81abc412..1360d9c4a90e 100644
--- a/sw/uiconfig/swriter/ui/pagemargincontrol.ui
+++ b/sw/uiconfig/swriter/ui/pagemargincontrol.ui
@@ -329,6 +329,7 @@
                             <property name="can_focus">False</property>
                             <property name="label" translatable="yes" context="pagemargincontrol|innerLabel">I_nner</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">left</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
diff --git a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
index d9a3a80faaf1..7de8ac5557df 100644
--- a/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
+++ b/sw/uiconfig/swriter/ui/pageorientationcontrol.ui
@@ -1,32 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkImage" id="image_landscape">
-    <property name="visible">True</property>
+  <object class="GtkPopover" id="PageOrientationControl">
     <property name="can_focus">False</property>
-    <property name="pixbuf">sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png</property>
-  </object>
-  <object class="GtkImage" id="image_portrait">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/lc_orientation.png</property>
-  </object>
-  <object class="GtkWindow" id="PageOrientationControl">
-    <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
-    <property name="vexpand">True</property>
+    <property name="no_show_all">True</property>
     <property name="border_width">4</property>
-    <property name="resizable">False</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">popup-menu</property>
-    <property name="skip_pager_hint">True</property>
-    <property name="deletable">False</property>
     <child>
-      <object class="GtkBox" id="box">
+      <object class="GtkBox" id="container">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_right">6</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="orientation">vertical</property>
@@ -39,7 +22,9 @@
             <property name="receives_default">True</property>
             <property name="image">image_portrait</property>
             <property name="relief">none</property>
+            <property name="use_underline">True</property>
             <property name="xalign">0</property>
+            <property name="always_show_image">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -55,6 +40,7 @@
             <property name="receives_default">True</property>
             <property name="image">image_landscape</property>
             <property name="relief">none</property>
+            <property name="use_underline">True</property>
             <property name="xalign">0</property>
             <property name="always_show_image">True</property>
           </object>
@@ -67,4 +53,14 @@
       </object>
     </child>
   </object>
+  <object class="GtkImage" id="image_landscape">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png</property>
+  </object>
+  <object class="GtkImage" id="image_portrait">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">cmd/lc_orientation.png</property>
+  </object>
 </interface>