set mnemonic widgets and a max height

Change-Id: If52541caf94b76b38b3ec8b606db7bbc734d2591

4 files changed, 24 insertions, 36 deletions

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 51f973bbb03e..9188d407fd35 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -46,11 +46,7 @@
 #define HID_SC_NAVIPI_ROOT                                      "SC_HID_SC_NAVIPI_ROOT"
 #define HID_SC_NAVIPI_SCEN                                      "SC_HID_SC_NAVIPI_SCEN"
 #define HID_SC_NAVIPI_DROP                                      "SC_HID_SC_NAVIPI_DROP"
-//  Teilergebnisse
-#define HID_SC_SUBT_GROUP                                       "SC_HID_SC_SUBT_GROUP"
-#define HID_SC_SUBT_COLS                                        "SC_HID_SC_SUBT_COLS"
-#define HID_SC_SUBT_FUNC                                        "SC_HID_SC_SUBT_FUNC"
-//
+
 #define HID_SC_NAVIPI_TOOLBOX                                   "SC_HID_SC_NAVIPI_TOOLBOX"
 //  Bereich ist voll!
 
@@ -58,10 +54,6 @@
 #define HID_SC_PIVOTFILTER                                      "SC_HID_SC_PIVOTFILTER"
 #define HID_SC_INPORTOPT                                        "SC_HID_SC_INPORTOPT"
 #define HID_SC_PIVOTSUBT                                        "SC_HID_SC_PIVOTSUBT"
-#define HID_SCPAGE_SUBT_GROUP                                   "SC_HID_SCPAGE_SUBT_GROUP"
-#define HID_SCPAGE_SUBT_GROUP1                                  "SC_HID_SCPAGE_SUBT_GROUP1"
-#define HID_SCPAGE_SUBT_GROUP2                                  "SC_HID_SCPAGE_SUBT_GROUP2"
-#define HID_SCPAGE_SUBT_GROUP3                                  "SC_HID_SCPAGE_SUBT_GROUP3"
 
 #define HID_SC_NAVIGATOR                                        "SC_HID_SC_NAVIGATOR"
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 83f602caf56e..a1de7167949f 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1005,7 +1005,6 @@
 #define RID_SCDLG_DBNAMES       (SC_DIALOGS_START + 23)
 #define RID_SCDLG_SOLVER        (SC_DIALOGS_START + 26)
 #define RID_SCDLG_SUBTOTALS     (SC_DIALOGS_START + 27)
-#define RID_SUBTBASE            (SC_DIALOGS_START + 28)
 #define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
 #define RID_SCPAGE_USERLISTS    (SC_DIALOGS_START + 31)
 #define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
@@ -1058,10 +1057,6 @@
 #define RID_DROPMODE_COPY               (SC_DIALOGS_START + 95)
 #define RID_SCDLG_CONDFORMAT            (SC_DIALOGS_START + 96)
 
-#define RID_SCPAGE_SUBT_GROUP1          (SC_DIALOGS_START + 97)
-#define RID_SCPAGE_SUBT_GROUP2          (SC_DIALOGS_START + 98)
-#define RID_SCPAGE_SUBT_GROUP3          (SC_DIALOGS_START + 99)
-
 // derivations from RID_SCDLG_MTRINPUT
 #define RID_SCDLG_COL_MAN               (SC_DIALOGS_START + 104)
 #define RID_SCDLG_COL_OPT               (SC_DIALOGS_START + 105)
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 94be6039c808..28fb52a35bcc 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -50,9 +50,14 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent,
                                 GetSubTotalData() ),
             nFieldCount     ( 0 )
 {
-    get( mpLbGroup, "group_by");
-    get( mpLbColumns, "columns");
-    get( mpLbFunctions, "functions");
+    get(mpLbGroup, "group_by");
+    get(mpLbColumns, "columns");
+    get(mpLbFunctions, "functions");
+
+    long nHeight = mpLbColumns->GetTextHeight() * 14;
+    mpLbColumns->set_height_request(nHeight);
+    mpLbFunctions->set_height_request(nHeight);
+
     // Font is correctly initialized by SvTreeListBox ctor
     mpLbColumns->SetSelectionMode( SINGLE_SELECTION );
     mpLbColumns->SetDragDropMode( SV_DRAGDROP_NONE );
diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index b0aeaf1e7564..57b7548a9710 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
@@ -42,21 +43,22 @@
   <object class="GtkBox" id="SubTotalGrpPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
     <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
       <object class="GtkBox" id="box2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="label" translatable="yes">Group by:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">group_by</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -89,13 +91,15 @@
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="row_spacing">6</property>
-        <property name="column_spacing">6</property>
+        <property name="column_spacing">12</property>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="label" translatable="yes">Calculate subtotals for:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">columns:border</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -110,6 +114,8 @@
             <property name="can_focus">False</property>
             <property name="halign">start</property>
             <property name="label" translatable="yes">Use function:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">functions:border</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -119,11 +125,14 @@
           </packing>
         </child>
         <child>
-          <object class="svxcorelo-SvxCheckListBox" id="columns">
+          <object class="svxcorelo-SvxCheckListBox" id="columns:border">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
+            <child internal-child="selection">
+              <object class="GtkTreeSelection" id="Check List Box-selection1"/>
+            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -133,26 +142,13 @@
           </packing>
         </child>
         <child>
-          <object class="GtkTreeView" id="functions">
+          <object class="GtkTreeView" id="functions:border">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="model">liststore1</property>
             <property name="search_column">0</property>
-            <items>
-              <item translatable="yes">Sum</item>
-              <item translatable="yes">Count</item>
-              <item translatable="yes">Average</item>
-              <item translatable="yes">Max</item>
-              <item translatable="yes">Min</item>
-              <item translatable="yes">Product</item>
-              <item translatable="yes">Count (numbers only)</item>
-              <item translatable="yes">StDev (Sample)</item>
-              <item translatable="yes">StDevP (Population)</item>
-              <item translatable="yes">Var (Sample)</item>
-              <item translatable="yes">VarP (Population)</item>
-            </items>
             <child internal-child="selection">
               <object class="GtkTreeSelection" id="treeview-selection2"/>
             </child>