restore missing mnemonics of writer print options page

as pkacer points out, also use the 12 pixel indent
for dependant controls that mduffy suggested as the
best default

Change-Id: If854ec394b4233bb821f37be9c784c1ccd80b912

2 files changed, 36 insertions, 48 deletions

diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 1021eff2a8f7..4d716c8de90d 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -18,14 +18,8 @@
  */
 
 /* TabPage View */
-#define FL_DISP                 1
 #define FL_NOPRINT              2
-#define FL_WINDOW               3
 
-#define CB_GRF                  1
-#define CB_TBL                  2
-#define CB_DRWFAST              3
-#define CB_FIELD                4
 #define CB_PARA                 5
 #define CB_TAB                  6
 #define CB_SPACE                7
@@ -33,19 +27,6 @@
 #define CB_SHYPH                9
 #define CB_FLD_HIDDEN           10
 #define CB_BREAK                11
-#define CB_ANY_RULER            12
-#define CB_CROSS                14
-#define CB_HSCROLL              15
-#define CB_VSCROLL              16
-#define CB_HRULER               17
-#define CB_VRULER               18
-#define FL_LINE                 22
-#define CB_POSTIT               23
-#define CB_VRULER_RIGHT         24
-
-#define FL_SETTINGS             26
-#define LB_METRIC               27
-#define FT_METRIC               28
 
 //test tab page
 
@@ -82,17 +63,6 @@
 #define RB_END             82
 #define RB_PAGEEND         83
 
-#define LB_FAX             86
-#define CB_BLACK_FONT      87
-#define LB_HMETRIC         88
-#define LB_VMETRIC         89
-#define FL_SEP_PRT_LEFT     90
-#define FL_SEP_PRT_RIGHT    91
-#define CB_PRINTEMPTYPAGES  92
-#define CB_HIDDEN_TEXT      93
-#define CB_TEXT_PLACEHOLDER  94
-
-
 // Tabpage Basic Fonts
 #define FT_STANDARD         90
 #define LB_STANDARD                     91
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui
index ad81a5f36493..e6df82be959e 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -33,10 +33,11 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="graphics">
-                        <property name="label" translatable="yes">Pictures and objects</property>
+                        <property name="label" translatable="yes">_Pictures and objects</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -49,10 +50,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="formcontrols">
-                        <property name="label" translatable="yes">Form controls</property>
+                        <property name="label" translatable="yes">Form control_s</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -65,10 +67,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="background">
-                        <property name="label" translatable="yes">Page background</property>
+                        <property name="label" translatable="yes">Page ba_ckground</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -81,10 +84,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="inblack">
-                        <property name="label" translatable="yes">Print text in black</property>
+                        <property name="label" translatable="yes">Print text in blac_k</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -97,10 +101,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="hiddentext">
-                        <property name="label" translatable="yes">Hidden text</property>
+                        <property name="label" translatable="yes">Hidden te_xt</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -113,10 +118,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="textplaceholder">
-                        <property name="label" translatable="yes">Text placeholder</property>
+                        <property name="label" translatable="yes">Text _placeholder</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -169,10 +175,11 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="leftpages">
-                        <property name="label" translatable="yes">Left pages</property>
+                        <property name="label" translatable="yes">_Left pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -185,10 +192,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="rightpages">
-                        <property name="label" translatable="yes">Right pages</property>
+                        <property name="label" translatable="yes">_Right pages</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -201,10 +209,11 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="brochure">
-                        <property name="label" translatable="yes">Brochure</property>
+                        <property name="label" translatable="yes">Broch_ure</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -221,7 +230,8 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="margin_left">18</property>
+                        <property name="margin_left">12</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -273,10 +283,11 @@
                     <property name="row_spacing">6</property>
                     <child>
                       <object class="GtkRadioButton" id="none">
-                        <property name="label" translatable="yes">None</property>
+                        <property name="label" translatable="yes">_None</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">only</property>
@@ -290,10 +301,11 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="only">
-                        <property name="label" translatable="yes">Comments only</property>
+                        <property name="label" translatable="yes">Comments _only</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">end</property>
@@ -307,10 +319,11 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="end">
-                        <property name="label" translatable="yes">End of document</property>
+                        <property name="label" translatable="yes">End of docu_ment</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">endpage</property>
@@ -324,10 +337,11 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="endpage">
-                        <property name="label" translatable="yes">End of page</property>
+                        <property name="label" translatable="yes">_End of page</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">none</property>
@@ -389,12 +403,14 @@
                   <object class="GtkGrid" id="grid7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">10</property>
+                    <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Fax </property>
+                        <property name="label" translatable="yes">_Fax</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">fax</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -425,10 +441,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="blankpages">
-                    <property name="label" translatable="yes">Print automatically inserted blank pages</property>
+                    <property name="label" translatable="yes">Print _automatically inserted blank pages</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -441,10 +458,11 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="papertray">
-                    <property name="label" translatable="yes">Paper tray from printer settings</property>
+                    <property name="label" translatable="yes">_Paper tray from printer settings</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>