Convert tp_SeriesToAxis.src to tp_SeriesToAxis.ui

Change-Id: Ida1be6cc97e2a96537dddd3c8d6dc91c451adf7a
Reviewed-on: https://gerrit.libreoffice.org/4906
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 469 insertions, 355 deletions

diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 3532030c4c42..c60a3f4aff4e 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
     chart2/source/controller/dialogs/tp_PolarOptions.src \
     chart2/source/controller/dialogs/tp_RangeChooser.src \
     chart2/source/controller/dialogs/tp_Scale.src \
-    chart2/source/controller/dialogs/tp_SeriesToAxis.src \
     chart2/source/controller/dialogs/tp_TitleRotation.src \
     chart2/source/controller/dialogs/tp_Trendline.src \
     chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 91d101b08104..76ab92489f83 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/insertgriddlg \
 	chart2/uiconfig/ui/smoothlinesdlg \
 	chart2/uiconfig/ui/steppedlinesdlg \
+	chart2/uiconfig/ui/tp_SeriesToAxis \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index c7b1782f6ec0..fab77a2a41cc 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "tp_SeriesToAxis.hxx"
-#include "tp_SeriesToAxis.hrc"
 
 #include "ResId.hxx"
 #include "chartview/ChartSfxItemIds.hxx"
@@ -40,31 +39,31 @@ namespace chart
 //.............................................................................
 
 SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
-    SfxTabPage(pWindow, SchResId(TP_OPTIONS), rInAttrs),
-    aGrpAxis(this, SchResId(GRP_OPT_AXIS)),
-    aRbtAxis1(this,SchResId(RBT_OPT_AXIS_1)),
-    aRbtAxis2(this,SchResId(RBT_OPT_AXIS_2)),
-
-    aGrpBar(this, SchResId(GB_BAR)),
-    aFTGap(this,SchResId(FT_GAP)),
-    aMTGap(this,SchResId(MT_GAP)),
-    aFTOverlap(this,SchResId(FT_OVERLAP)),
-    aMTOverlap(this,SchResId(MT_OVERLAP)),
-    aCBConnect(this,SchResId(CB_CONNECTOR)),
-    aCBAxisSideBySide(this,SchResId(CB_BARS_SIDE_BY_SIDE)),
-    m_aFL_PlotOptions(this,SchResId(FL_PLOT_OPTIONS)),
-    m_aFT_MissingValues(this,SchResId(FT_MISSING_VALUES)),
-    m_aRB_DontPaint(this,SchResId(RB_DONT_PAINT)),
-    m_aRB_AssumeZero(this,SchResId(RB_ASSUME_ZERO)),
-    m_aRB_ContinueLine(this,SchResId(RB_CONTINUE_LINE)),
-    m_aCBIncludeHiddenCells(this,SchResId(CB_INCLUDE_HIDDEN_CELLS)),
+    SfxTabPage(pWindow,
+               "TP_OPTIONS",
+               "modules/schart/ui/tp_SeriesToAxis.ui",
+               rInAttrs),
     m_bProvidesSecondaryYAxis(true),
     m_bProvidesOverlapAndGapWidth(false)
 {
-    FreeResource();
-
-    aRbtAxis1.SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl ));
-    aRbtAxis2.SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl ));
+    get(m_pGrpAxis,"frameGrpAxis");
+    get(m_pRbtAxis1,"RBT_OPT_AXIS_1");
+    get(m_pRbtAxis2,"RBT_OPT_AXIS_2");
+
+    get(m_pGrpBar,"frameSettings");
+    get(m_pMTGap,"MT_GAP");
+    get(m_pMTOverlap,"MT_OVERLAP");
+    get(m_pCBConnect,"CB_CONNECTOR");
+    get(m_pCBAxisSideBySide,"CB_BARS_SIDE_BY_SIDE");
+
+    get(m_pGridPlotOptions,"gridPLOT_OPTIONS");
+    get(m_pRB_DontPaint,"RB_DONT_PAINT");
+    get(m_pRB_AssumeZero,"RB_ASSUME_ZERO");
+    get(m_pRB_ContinueLine,"RB_CONTINUE_LINE");
+    get(m_pCBIncludeHiddenCells,"CB_INCLUDE_HIDDEN_CELLS");
+
+    m_pRbtAxis1->SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl ));
+    m_pRbtAxis2->SetClickHdl( LINK( this, SchOptionTabPage, EnableHdl ));
 }
 
 SchOptionTabPage::~SchOptionTabPage()
@@ -74,9 +73,9 @@ SchOptionTabPage::~SchOptionTabPage()
 IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl)
 {
     if( m_nAllSeriesAxisIndex == 0 )
-        aCBAxisSideBySide.Enable( aRbtAxis2.IsChecked());
+        m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked());
     else if( m_nAllSeriesAxisIndex == 1 )
-        aCBAxisSideBySide.Enable( aRbtAxis1.IsChecked());
+        m_pCBAxisSideBySide->Enable( m_pRbtAxis1->IsChecked());
 
     return 0;
 }
@@ -88,34 +87,34 @@ SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet& rOutAttrs
 
 sal_Bool SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
-    if(aRbtAxis2.IsChecked())
+    if(m_pRbtAxis2->IsChecked())
         rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_SECONDARY_Y));
     else
         rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y));
 
-    if(aMTGap.IsVisible())
-        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( aMTGap.GetValue())));
+    if(m_pMTGap->IsVisible())
+        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,static_cast< sal_Int32 >( m_pMTGap->GetValue())));
 
-    if(aMTOverlap.IsVisible())
-        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( aMTOverlap.GetValue())));
+    if(m_pMTOverlap->IsVisible())
+        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,static_cast< sal_Int32 >( m_pMTOverlap->GetValue())));
 
-    if(aCBConnect.IsVisible())
-        rOutAttrs.Put(SfxBoolItem(SCHATTR_BAR_CONNECT,aCBConnect.IsChecked()));
+    if(m_pCBConnect->IsVisible())
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_BAR_CONNECT,m_pCBConnect->IsChecked()));
 
     // model property is "group bars per axis", UI feature is the other way
     // round: "show bars side by side"
-    if(aCBAxisSideBySide.IsVisible())
-        rOutAttrs.Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! aCBAxisSideBySide.IsChecked()));
+    if(m_pCBAxisSideBySide->IsVisible())
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_GROUP_BARS_PER_AXIS, ! m_pCBAxisSideBySide->IsChecked()));
 
-    if(m_aRB_DontPaint.IsChecked())
+    if(m_pRB_DontPaint->IsChecked())
         rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP));
-    else if(m_aRB_AssumeZero.IsChecked())
+    else if(m_pRB_AssumeZero->IsChecked())
         rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::USE_ZERO));
-    else if(m_aRB_ContinueLine.IsChecked())
+    else if(m_pRB_ContinueLine->IsChecked())
         rOutAttrs.Put(SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT,::com::sun::star::chart::MissingValueTreatment::CONTINUE));
 
-    if (m_aCBIncludeHiddenCells.IsVisible())
-        rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_aCBIncludeHiddenCells.IsChecked()));
+    if (m_pCBIncludeHiddenCells->IsVisible())
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, m_pCBIncludeHiddenCells->IsChecked()));
 
     return sal_True;
 }
@@ -124,15 +123,15 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    aRbtAxis1.Check(sal_True);
-    aRbtAxis2.Check(sal_False);
+    m_pRbtAxis1->Check(sal_True);
+    m_pRbtAxis2->Check(sal_False);
     if (rInAttrs.GetItemState(SCHATTR_AXIS,sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
         if(nVal==CHART_AXIS_SECONDARY_Y)
         {
-            aRbtAxis2.Check(sal_True);
-            aRbtAxis1.Check(sal_False);
+            m_pRbtAxis2->Check(sal_True);
+            m_pRbtAxis1->Check(sal_False);
         }
     }
 
@@ -140,36 +139,36 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
-        aMTGap.SetValue(nTmp);
+        m_pMTGap->SetValue(nTmp);
     }
 
     if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
-        aMTOverlap.SetValue(nTmp);
+        m_pMTOverlap->SetValue(nTmp);
     }
 
     if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-        aCBConnect.Check(bCheck);
+        m_pCBConnect->Check(bCheck);
     }
 
     if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
-        aCBAxisSideBySide.Disable();
+        m_pCBAxisSideBySide->Disable();
     }
     if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         // model property is "group bars per axis", UI feature is the other way
         // round: "show bars side by side"
         sal_Bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
-        aCBAxisSideBySide.Check( bCheck );
+        m_pCBAxisSideBySide->Check( bCheck );
     }
     else
     {
-        aCBAxisSideBySide.Show(sal_False);
+        m_pCBAxisSideBySide->Show(sal_False);
     }
 
 
@@ -181,35 +180,32 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
 
         if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,sal_True, &pPoolItem) == SFX_ITEM_SET)
         {
-            m_aRB_DontPaint.Enable(sal_False);
-            m_aRB_AssumeZero.Enable(sal_False);
-            m_aRB_ContinueLine.Enable(sal_False);
+            m_pRB_DontPaint->Enable(sal_False);
+            m_pRB_AssumeZero->Enable(sal_False);
+            m_pRB_ContinueLine->Enable(sal_False);
 
             for( sal_Int32 nN =0; nN<aMissingValueTreatments.getLength(); nN++ )
             {
                 sal_Int32 nVal = aMissingValueTreatments[nN];
                 if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
-                    m_aRB_DontPaint.Enable(sal_True);
+                    m_pRB_DontPaint->Enable(sal_True);
                 else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
-                    m_aRB_AssumeZero.Enable(sal_True);
+                    m_pRB_AssumeZero->Enable(sal_True);
                 else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
-                    m_aRB_ContinueLine.Enable(sal_True);
+                    m_pRB_ContinueLine->Enable(sal_True);
             }
 
             long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
             if(nVal==::com::sun::star::chart::MissingValueTreatment::LEAVE_GAP)
-                m_aRB_DontPaint.Check(sal_True);
+                m_pRB_DontPaint->Check(sal_True);
             else if(nVal==::com::sun::star::chart::MissingValueTreatment::USE_ZERO)
-                m_aRB_AssumeZero.Check(sal_True);
+                m_pRB_AssumeZero->Check(sal_True);
             else if(nVal==::com::sun::star::chart::MissingValueTreatment::CONTINUE)
-                m_aRB_ContinueLine.Check(sal_True);
+                m_pRB_ContinueLine->Check(sal_True);
         }
         else
         {
-            m_aFT_MissingValues.Show(sal_False);
-            m_aRB_DontPaint.Show(sal_False);
-            m_aRB_AssumeZero.Show(sal_False);
-            m_aRB_ContinueLine.Show(sal_False);
+            m_pGridPlotOptions->Show(sal_False);
         }
     }
 
@@ -217,13 +213,12 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, sal_True, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
-        m_aCBIncludeHiddenCells.Check(bVal);
+        m_pCBIncludeHiddenCells->Check(bVal);
     }
     else
     {
-        m_aCBIncludeHiddenCells.Show(sal_False);
-        if(!m_aFT_MissingValues.IsVisible())
-            m_aFL_PlotOptions.Show(sal_False);
+        m_pCBIncludeHiddenCells->Show(sal_False);
+        m_pGridPlotOptions->Show(sal_False);
     }
 
     AdaptControlPositionsAndVisibility();
@@ -251,52 +246,16 @@ void lcl_optimzeRadioButtonSize( RadioButton& rCtrl )
 
 void SchOptionTabPage::AdaptControlPositionsAndVisibility()
 {
-    aRbtAxis1.Show(m_bProvidesSecondaryYAxis);
-    aRbtAxis2.Show(m_bProvidesSecondaryYAxis);
-    aGrpAxis.Show(m_bProvidesSecondaryYAxis);
-
-    aMTGap.Show(m_bProvidesOverlapAndGapWidth);
-    aFTGap.Show(m_bProvidesOverlapAndGapWidth);
-
-    aMTOverlap.Show(m_bProvidesOverlapAndGapWidth);
-    aFTOverlap.Show(m_bProvidesOverlapAndGapWidth);
-
-    aCBConnect.Show(m_bProvidesBarConnectors);
-
-    if( !aMTGap.IsVisible() && !aMTOverlap.IsVisible() )
-    {
-        aGrpBar.Show(sal_False);
-        Point aPos;
-        if( !aRbtAxis1.IsVisible() && !aRbtAxis2.IsVisible() )
-            aPos = aGrpAxis.GetPosPixel();
-        else
-            aPos = aGrpBar.GetPosPixel();
-
-        long nYOffset = aPos.getY() - m_aFL_PlotOptions.GetPosPixel().getY();
-        lcl_offsetControl(m_aFL_PlotOptions,       0, nYOffset);
-        lcl_offsetControl(m_aFT_MissingValues,     0, nYOffset);
-        lcl_offsetControl(m_aRB_DontPaint,         0, nYOffset);
-        lcl_offsetControl(m_aRB_AssumeZero,        0, nYOffset);
-        lcl_offsetControl(m_aRB_ContinueLine,      0, nYOffset);
-        lcl_offsetControl(m_aCBIncludeHiddenCells, 0, nYOffset);
-    }
+    m_pGrpAxis->Show(m_bProvidesSecondaryYAxis);
 
-    m_aFT_MissingValues.SetSizePixel( m_aFT_MissingValues.CalcMinimumSize() );
-    lcl_optimzeRadioButtonSize( m_aRB_DontPaint );
-    lcl_optimzeRadioButtonSize( m_aRB_AssumeZero );
-    lcl_optimzeRadioButtonSize( m_aRB_ContinueLine );
+    m_pGrpBar->Show(m_bProvidesOverlapAndGapWidth);
 
-    Size aControlDistance( m_aFT_MissingValues.LogicToPixel( Size(RSC_SP_CTRL_DESC_X,RSC_SP_CTRL_GROUP_Y), MapMode(MAP_APPFONT) ) );
-    long nXOffset = m_aFT_MissingValues.GetPosPixel().getX() + m_aFT_MissingValues.GetSizePixel().getWidth() + aControlDistance.getWidth() - m_aRB_DontPaint.GetPosPixel().getX();
-    lcl_offsetControl(m_aRB_DontPaint,         nXOffset, 0);
-    lcl_offsetControl(m_aRB_AssumeZero,        nXOffset, 0);
-    lcl_offsetControl(m_aRB_ContinueLine,      nXOffset, 0);
+    m_pCBConnect->Show(m_bProvidesBarConnectors);
 
-    if( !m_aFT_MissingValues.IsVisible() )
-    {
-        //for example for stock charts
-        m_aCBIncludeHiddenCells.SetPosPixel( m_aFT_MissingValues.GetPosPixel() );
-    }
+     if( !m_pMTGap->IsVisible() && !m_pMTOverlap->IsVisible() )
+     {
+         m_pGrpBar->Show(sal_False);
+     }
 }
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc b/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc
deleted file mode 100644
index 2860b8c5373f..000000000000
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "ResourceIds.hrc"
-
-#define GRP_OPT_AXIS                1
-#define RBT_OPT_AXIS_1              2
-#define RBT_OPT_AXIS_2              3
-#define MT_GAP                      4
-#define MT_OVERLAP                  5
-#define FT_GAP                      6
-#define FT_OVERLAP                  7
-#define GB_BAR                      8
-#define CB_CONNECTOR                9
-#define CB_BARS_SIDE_BY_SIDE       10
-#define FL_PLOT_OPTIONS            11
-#define FT_MISSING_VALUES          12
-#define RB_DONT_PAINT              13
-#define RB_ASSUME_ZERO             14
-#define RB_CONTINUE_LINE           15
-#define CB_INCLUDE_HIDDEN_CELLS    16
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 27c37a51860d..c38dec3cc429 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -49,25 +49,22 @@ private: //methods
     void AdaptControlPositionsAndVisibility();
 
 private: //member
-    FixedLine   aGrpAxis;
-    RadioButton aRbtAxis1;
-    RadioButton aRbtAxis2;
-
-    FixedLine   aGrpBar;
-    FixedText   aFTGap;
-    MetricField aMTGap;
-    FixedText   aFTOverlap;
-    MetricField aMTOverlap;
-    CheckBox    aCBConnect;
-    CheckBox    aCBAxisSideBySide;
-
-    FixedLine   m_aFL_PlotOptions;
-    FixedText   m_aFT_MissingValues;
-    RadioButton m_aRB_DontPaint;
-    RadioButton m_aRB_AssumeZero;
-    RadioButton m_aRB_ContinueLine;
-
-    CheckBox    m_aCBIncludeHiddenCells;
+    VclFrame*    m_pGrpAxis;
+    RadioButton* m_pRbtAxis1;
+    RadioButton* m_pRbtAxis2;
+
+    VclFrame*    m_pGrpBar;
+    MetricField* m_pMTGap;
+    MetricField* m_pMTOverlap;
+    CheckBox*    m_pCBConnect;
+    CheckBox*    m_pCBAxisSideBySide;
+
+    VclGrid*     m_pGridPlotOptions;
+    RadioButton* m_pRB_DontPaint;
+    RadioButton* m_pRB_AssumeZero;
+    RadioButton* m_pRB_ContinueLine;
+
+    CheckBox*    m_pCBIncludeHiddenCells;
 
     DECL_LINK(EnableHdl, void * );
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src
deleted file mode 100644
index 69158a2f699c..000000000000
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/tabpage.hrc>
-
-#include "HelpIds.hrc"
-#include "tp_SeriesToAxis.hrc"
-
-TabPage TP_OPTIONS
-{
-    HelpID = "chart2:TabPage:TP_OPTIONS";
-    Hide = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-
-    FixedLine 1
-    {
-        Pos = MAP_APPFONT ( 6 , 6  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Align data series to";
-    };
-
-    RadioButton RBT_OPT_AXIS_1
-    {
-        HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1";
-        Pos = MAP_APPFONT ( 12 , 20  ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Primary Y axis";
-    };
-
-    RadioButton RBT_OPT_AXIS_2
-    {
-        HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2";
-        Pos = MAP_APPFONT ( 12 , 34  ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Secondary Y axis";
-    };
-
-    FixedLine GB_BAR
-    {
-        Pos = MAP_APPFONT ( 6 , 50  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Settings";
-    };
-
-    FixedText FT_OVERLAP
-    {
-        Pos = MAP_APPFONT ( 12 , 80 ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
-        Text [ en-US ] = "~Overlap";
-    };
-
-    MetricField MT_OVERLAP
-    {
-        HelpID = "chart2:MetricField:TP_OPTIONS:MT_OVERLAP";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 63 , 78 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -100 ;
-        Maximum = 100 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText  = "%" ;
-        First = 1 ;
-        Last = 100 ;
-        SpinSize = 1 ;
-        DecimalDigits = 0 ;
-    };
-
-    FixedText FT_GAP
-    {
-        Pos = MAP_APPFONT ( 12 , 64 ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
-        Text [ en-US ] = "~Spacing";
-    };
-
-    MetricField MT_GAP
-    {
-        HelpID = "chart2:MetricField:TP_OPTIONS:MT_GAP";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 63 , 62 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 600 ;
-        StrictFormat = TRUE ;
-        Unit = FUNIT_CUSTOM ;
-        CustomUnitText  = "%" ;
-        First = 1 ;
-        Last = 100 ;
-        SpinSize = 1 ;
-        DecimalDigits = 0 ;
-    };
-
-    CheckBox CB_CONNECTOR
-    {
-        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR";
-        Pos = MAP_APPFONT ( 12 , 97 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Connection lines";
-    };
-
-    CheckBox CB_BARS_SIDE_BY_SIDE
-    {
-        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE";
-        Pos = MAP_APPFONT ( 12 , 97 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Show ~bars side by side";
-    };
-
-    FixedLine FL_PLOT_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 113  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Plot options";
-    };
-
-    FixedText FT_MISSING_VALUES
-    {
-        Pos = MAP_APPFONT ( 12 , 127  ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
-        Text [ en-US ] = "Plot missing values";
-    };
-
-    RadioButton RB_DONT_PAINT
-    {
-        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT";
-        Pos = MAP_APPFONT ( 82 , 127  ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Leave gap";
-    };
-
-    RadioButton RB_ASSUME_ZERO
-    {
-        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO";
-        Pos = MAP_APPFONT ( 82 , 141  ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Assume zero";
-    };
-
-    RadioButton RB_CONTINUE_LINE
-    {
-        HelpID = "chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE";
-        Pos = MAP_APPFONT ( 82 , 155  ) ;
-        Size = MAP_APPFONT ( 80 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Continue line";
-    };
-
-    CheckBox CB_INCLUDE_HIDDEN_CELLS
-    {
-        HelpID = "chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS";
-        Pos = MAP_APPFONT ( 12 , 172 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Include ~values from hidden cells";
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
new file mode 100644
index 000000000000..e03181841336
--- /dev/null
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -0,0 +1,384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustmentGAP">
+    <property name="upper">600</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentOVERLAP">
+    <property name="lower">-100</property>
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkBox" id="TP_OPTIONS">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkFrame" id="frameGrpAxis">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkRadioButton" id="RBT_OPT_AXIS_1">
+                    <property name="label" translatable="yes">Primary Y axis</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">RBT_OPT_AXIS_2</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="RBT_OPT_AXIS_2">
+                    <property name="label" translatable="yes">Secondary Y axis</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">RBT_OPT_AXIS_1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Align data series to</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frameSettings">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkBox" id="box3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkGrid" id="gridSettings">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="FT_GAP">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Spacing</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">MT_GAP:0%</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="FT_OVERLAP">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">_Overlap</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">MT_OVERLAP:0%</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="MT_GAP:0%">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="adjustment">adjustmentGAP</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="MT_OVERLAP:0%">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="adjustment">adjustmentOVERLAP</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="CB_BARS_SIDE_BY_SIDE">
+                    <property name="label" translatable="yes">Show _bars side by side</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</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>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="CB_CONNECTOR">
+                    <property name="label" translatable="yes">Connection lines</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</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>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Settings</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frameFL_PLOT_OPTIONS">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">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>
+                <child>
+                  <object class="GtkGrid" id="gridPLOT_OPTIONS">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">6</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="FT_MISSING_VALUES">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Plot missing values</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="RB_DONT_PAINT">
+                        <property name="label" translatable="yes">_Leave gap</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">RB_ASSUME_ZERO</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="RB_ASSUME_ZERO">
+                        <property name="label" translatable="yes">_Assume zero</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">RB_CONTINUE_LINE</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="RB_CONTINUE_LINE">
+                        <property name="label" translatable="yes">_Continue line</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">RB_DONT_PAINT</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS">
+                    <property name="label" translatable="yes">Include _values from hidden cells</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</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>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Plot options</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>