From 4be80459e55f80816ecea2c7d8f24aea7660d0c9 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Thu, 16 Jul 2015 00:48:16 +0200
Subject: adapt to UX discussion

Change-Id: I6a7ba1f13cddf20b2751f2ee113427db43978cfa
---
 .../controller/sidebar/ChartElementsPanel.cxx      |  32 ++++--
 .../controller/sidebar/ChartElementsPanel.hxx      |   6 +-
 chart2/uiconfig/ui/sidebarelements.ui              | 117 +++------------------
 3 files changed, 39 insertions(+), 116 deletions(-)

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 528bae3cb036..36afcc379e28 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -269,8 +269,10 @@ ChartElementsPanel::ChartElementsPanel(
     get(mpCB2ndYAxis,  "checkbutton_2nd_y_axis");
     get(mpCB2ndYAxisTitle,  "checkbutton_2nd_y_axis_title");
     get(mpCBLegend,  "checkbutton_legend");
-    get(mpCBGridVertical,  "checkbutton_gridline_vertical");
-    get(mpCBGridHorizontal,  "checkbutton_gridline_horizontal");
+    get(mpCBGridVerticalMajor,  "checkbutton_gridline_vertical_major");
+    get(mpCBGridHorizontalMajor,  "checkbutton_gridline_horizontal_major");
+    get(mpCBGridVerticalMinor,  "checkbutton_gridline_vertical_minor");
+    get(mpCBGridHorizontalMinor,  "checkbutton_gridline_horizontal_minor");
 
     Initialize();
 }
@@ -298,8 +300,10 @@ void ChartElementsPanel::dispose()
     mpCB2ndYAxis.clear();
     mpCB2ndYAxisTitle.clear();
     mpCBLegend.clear();
-    mpCBGridVertical.clear();
-    mpCBGridHorizontal.clear();
+    mpCBGridVerticalMajor.clear();
+    mpCBGridHorizontalMajor.clear();
+    mpCBGridVerticalMinor.clear();
+    mpCBGridHorizontalMinor.clear();
 
     PanelLayout::dispose();
 }
@@ -324,8 +328,10 @@ void ChartElementsPanel::Initialize()
     mpCB2ndYAxis->SetClickHdl(aLink);
     mpCB2ndYAxisTitle->SetClickHdl(aLink);
     mpCBLegend->SetClickHdl(aLink);
-    mpCBGridVertical->SetClickHdl(aLink);
-    mpCBGridHorizontal->SetClickHdl(aLink);
+    mpCBGridVerticalMajor->SetClickHdl(aLink);
+    mpCBGridHorizontalMajor->SetClickHdl(aLink);
+    mpCBGridVerticalMinor->SetClickHdl(aLink);
+    mpCBGridHorizontalMinor->SetClickHdl(aLink);
 }
 
 void ChartElementsPanel::updateData()
@@ -342,8 +348,10 @@ void ChartElementsPanel::updateData()
     mpCBZAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::Z_AXIS_TITLE));
     mpCB2ndXAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_X_AXIS_TITLE));
     mpCB2ndYAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE));
-    mpCBGridVertical->Check(isGridVisible(mxModel, GridType::VERT_MAJOR));
-    mpCBGridHorizontal->Check(isGridVisible(mxModel, GridType::HOR_MAJOR));
+    mpCBGridVerticalMajor->Check(isGridVisible(mxModel, GridType::VERT_MAJOR));
+    mpCBGridHorizontalMajor->Check(isGridVisible(mxModel, GridType::HOR_MAJOR));
+    mpCBGridVerticalMinor->Check(isGridVisible(mxModel, GridType::VERT_MINOR));
+    mpCBGridHorizontalMinor->Check(isGridVisible(mxModel, GridType::HOR_MINOR));
     mpCBXAxis->Check(isAxisVisible(mxModel, AxisType::X_MAIN));
     mpCBYAxis->Check(isAxisVisible(mxModel, AxisType::Y_MAIN));
     mpCBZAxis->Check(isAxisVisible(mxModel, AxisType::Z_MAIN));
@@ -434,10 +442,14 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox)
         setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE, bChecked);
     else if (pCheckBox == mpCBLegend.get())
         setLegendVisible(mxModel, bChecked);
-    else if (pCheckBox == mpCBGridVertical.get())
+    else if (pCheckBox == mpCBGridVerticalMajor.get())
         setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked);
-    else if (pCheckBox == mpCBGridHorizontal.get())
+    else if (pCheckBox == mpCBGridHorizontalMajor.get())
         setGridVisible(mxModel, GridType::HOR_MAJOR, bChecked);
+    else if (pCheckBox == mpCBGridVerticalMinor.get())
+        setGridVisible(mxModel, GridType::VERT_MINOR, bChecked);
+    else if (pCheckBox == mpCBGridHorizontalMinor.get())
+        setGridVisible(mxModel, GridType::HOR_MINOR, bChecked);
 
     return 0;
 }
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index 316eb5dee253..4aee729818ee 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -85,8 +85,10 @@ private:
     VclPtr<CheckBox> mpCB2ndYAxis;
     VclPtr<CheckBox> mpCB2ndYAxisTitle;
     VclPtr<CheckBox> mpCBLegend;
-    VclPtr<CheckBox> mpCBGridVertical;
-    VclPtr<CheckBox> mpCBGridHorizontal;
+    VclPtr<CheckBox> mpCBGridVerticalMajor;
+    VclPtr<CheckBox> mpCBGridHorizontalMajor;
+    VclPtr<CheckBox> mpCBGridVerticalMinor;
+    VclPtr<CheckBox> mpCBGridHorizontalMinor;
 
     css::uno::Reference<css::frame::XFrame> mxFrame;
     ::sfx2::sidebar::EnumContext            maContext;
diff --git a/chart2/uiconfig/ui/sidebarelements.ui b/chart2/uiconfig/ui/sidebarelements.ui
index 2432c6e22407..e22976ab15b4 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -333,8 +333,7 @@
           <object class="GtkLabel" id="label_grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Gridlines
-</property>
+            <property name="label" translatable="yes">Gridlines</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -347,8 +346,8 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkCheckButton" id="checkbutton_gridline_vertical">
-                <property name="label" translatable="yes">Vertical</property>
+              <object class="GtkCheckButton" id="checkbutton_gridline_vertical_major">
+                <property name="label" translatable="yes">Vertical Major</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -362,54 +361,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="comboboxtext2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <items>
-                  <item translatable="yes">major</item>
-                </items>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">12</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton_gridline_horizontal">
-                <property name="label" translatable="yes">Horizontal</property>
+              <object class="GtkCheckButton" id="checkbutton_gridline_vertical_minor">
+                <property name="label" translatable="yes">Vertical minor</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="xalign">0</property>
-                <property name="yalign">0.56000000238418579</property>
                 <property name="draw_indicator">True</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="comboboxtext3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <items>
-                  <item translatable="yes">major</item>
-                </items>
-              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
@@ -420,32 +379,21 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">13</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_data">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Data</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">14</property>
+            <property name="position">12</property>
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box10">
+          <object class="GtkBox" id="box9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkCheckButton" id="checkbutton_label">
-                <property name="label" translatable="yes">Show label</property>
+              <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_major">
+                <property name="label" translatable="yes">Horizontal Major</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="xalign">0</property>
+                <property name="yalign">0.56000000238418579</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -455,53 +403,14 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="comboboxtext4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <items>
-                  <item translatable="yes">above</item>
-                </items>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">15</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box11">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkCheckButton" id="checkbutton_trendline">
-                <property name="label" translatable="yes">Trendline</property>
+              <object class="GtkCheckButton" id="checkbutton_gridline_horizontal_minor">
+                <property name="label" translatable="yes">Horizontal major</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="comboboxtext5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <items>
-                  <item translatable="yes">linear</item>
-                </items>
-              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
@@ -512,7 +421,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">16</property>
+            <property name="position">13</property>
           </packing>
         </child>
       </object>
-- 
cgit