titlerotationtabpage.ui widgets

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

chart2/AllLangResTarget_chartcontroller.mk

@@ -60,7 +60,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_TitleRotation.src \
     chart2/source/controller/dialogs/tp_Trendline.src \
     chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
 ))

chart2/UIConfig_chart2.mk

@@ -35,6 +35,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/insertgriddlg \
 	chart2/uiconfig/ui/smoothlinesdlg \
 	chart2/uiconfig/ui/steppedlinesdlg \
+	chart2/uiconfig/ui/titlerotationtabpage \
 	chart2/uiconfig/ui/tp_SeriesToAxis \
 ))
 

chart2/source/controller/dialogs/TextDirectionListBox.cxx

@@ -22,6 +22,7 @@
 #include "Strings.hrc"
 #include <svl/languageoptions.hxx>
 #include <vcl/window.hxx>
+#include <vcl/builder.hxx>
 
 namespace chart
 {
@@ -41,6 +42,26 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, const ResId& rResId
     }
 }
 
+TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) :
+    svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
+{
+    InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP );
+    InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_RTL ), FRMDIR_HORI_RIGHT_TOP );
+    InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_SUPER ), FRMDIR_ENVIRONMENT );
+
+    if( !SvtLanguageOptions().IsCTLFontEnabled() )
+    {
+        Hide();
+        if( pWindow1 ) pWindow1->Hide();
+        if( pWindow2 ) pWindow2->Hide();
+    }
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap &)
+     {
+         return new TextDirectionListBox(pParent);
+     }
+
 TextDirectionListBox::~TextDirectionListBox()
 {
 }

chart2/source/controller/dialogs/tp_TitleRotation.cxx

@@ -34,34 +34,31 @@ namespace chart
 
 SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
                                          const SfxItemSet& rInAttrs, bool bWithRotation) :
-    SfxTabPage(pWindow, SchResId(TP_ALIGNMENT), rInAttrs),
-    aFlAlign        ( this, SchResId( FL_ALIGN ) ),
-    aCtrlDial       ( this, SchResId( CTR_DIAL ) ),
-    aFtRotate       ( this, SchResId( FT_DEGREES ) ),
-    aNfRotate       ( this, SchResId( NF_ORIENT ) ),
-    aCbStacked      ( this, SchResId( BTN_TXTSTACKED ) ),
-    aOrientHlp      ( aCtrlDial, aNfRotate, aCbStacked ),
-    aFtTextDirection( this, SchResId( FT_TEXTDIR ) ),
-    aLbTextDirection( this, SchResId( LB_TEXTDIR ), &aFtTextDirection )
+    SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", rInAttrs)
 {
-    FreeResource();
-
-    aCbStacked.EnableTriState( sal_False );
-    aOrientHlp.AddDependentWindow( aFtRotate, STATE_CHECK );
+    get(m_pCtrlDial,"dialCtrl");
+    get(m_pFtRotate,"degreeL");
+    get(m_pNfRotate,"OrientDegree");
+    get(m_pCbStacked,"stackedCB");
+    get(m_pFtTextDirection,"textdirL");
+    get(m_pLbTextDirection,"textdirLB");
+    get(m_pFtABCD,"labelABCD");
+    m_pCtrlDial->SetText(m_pFtABCD->GetText());
+    m_pOrientHlp = new svx::OrientationHelper(*m_pCtrlDial, *m_pNfRotate, *m_pCbStacked);
+
+    m_pCbStacked->EnableTriState( sal_False );
+    m_pOrientHlp->Enable( sal_True );
+    m_pOrientHlp->AddDependentWindow( *m_pFtRotate, STATE_CHECK );
 
     if( !bWithRotation )
     {
-        aOrientHlp.Hide();
-        Point aMove( 0, aCtrlDial.GetPosPixel().Y() - aFtTextDirection.GetPosPixel().Y() );
-        aFtTextDirection.SetPosPixel( aFtTextDirection.GetPosPixel() + aMove );
-        aLbTextDirection.SetPosPixel( aLbTextDirection.GetPosPixel() + aMove );
-
-        aLbTextDirection.SetHelpId( HID_SCH_TEXTDIRECTION_EQUATION );
+        m_pOrientHlp->Hide();
     }
 }
 
 SchAlignmentTabPage::~SchAlignmentTabPage()
 {
+    delete m_pOrientHlp;
 }
 
 SfxTabPage* SchAlignmentTabPage::Create(Window* pParent,
@@ -79,13 +76,13 @@ SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent,
 sal_Bool SchAlignmentTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     //Since 04/1998 text can be rotated by an arbitrary angle: SCHATTR_TEXT_DEGREES
-    bool bStacked = aOrientHlp.GetStackedState() == STATE_CHECK;
+    bool bStacked = m_pOrientHlp->GetStackedState() == STATE_CHECK;
     rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bStacked ) );
 
-    sal_Int32 nDegrees = bStacked ? 0 : aCtrlDial.GetRotation();
+    sal_Int32 nDegrees = bStacked ? 0 : m_pCtrlDial->GetRotation();
     rOutAttrs.Put( SfxInt32Item( SCHATTR_TEXT_DEGREES, nDegrees ) );
 
-    SvxFrameDirection aDirection( aLbTextDirection.GetSelectEntryValue() );
+    SvxFrameDirection aDirection( m_pLbTextDirection->GetSelectEntryValue() );
     rOutAttrs.Put( SfxInt32Item( EE_PARA_WRITINGDIR, aDirection ) );
 
     return sal_True;
@@ -96,14 +93,14 @@ void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
     const SfxPoolItem* pItem = GetItem( rInAttrs, SCHATTR_TEXT_DEGREES );
 
     sal_Int32 nDegrees = pItem ? ((const SfxInt32Item*)pItem)->GetValue() : 0;
-    aCtrlDial.SetRotation( nDegrees );
+    m_pCtrlDial->SetRotation( nDegrees );
 
     pItem = GetItem( rInAttrs, SCHATTR_TEXT_STACKED );
     bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue();
-    aOrientHlp.SetStackedState( bStacked ? STATE_CHECK : STATE_NOCHECK );
+    m_pOrientHlp->SetStackedState( bStacked ? STATE_CHECK : STATE_NOCHECK );
 
     if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, sal_True, &pItem) == SFX_ITEM_SET)
-        aLbTextDirection.SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) );
+        m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) );
 }
 
 } //namespace chart

chart2/source/controller/dialogs/tp_TitleRotation.hxx

@@ -33,14 +33,14 @@ namespace chart
 class SchAlignmentTabPage : public SfxTabPage
 {
 private:
-    FixedLine               aFlAlign;
-    svx::DialControl        aCtrlDial;
-    FixedText               aFtRotate;
-    svx::WrapField          aNfRotate;
-    TriStateBox             aCbStacked;
-    svx::OrientationHelper  aOrientHlp;
-    FixedText               aFtTextDirection;
-    TextDirectionListBox    aLbTextDirection;
+    svx::DialControl*        m_pCtrlDial;
+    FixedText*               m_pFtRotate;
+    svx::WrapField*          m_pNfRotate;
+    TriStateBox*             m_pCbStacked;
+    svx::OrientationHelper*  m_pOrientHlp;
+    FixedText*               m_pFtTextDirection;
+    TextDirectionListBox*    m_pLbTextDirection;
+    FixedText*               m_pFtABCD;
 
 public:
     SchAlignmentTabPage(Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);

chart2/source/controller/dialogs/tp_TitleRotation.src

-/* -*- 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 "HelpIds.hrc"
-#include "TabPages.hrc"
-
-TabPage TP_ALIGNMENT
-{
-    Hide = TRUE ;
-    HelpID = HID_SCH_ALIGNMENT ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Control CTR_DIAL
-    {
-        HelpId = HID_SCH_ALIGNMENT_CTR_DIAL ;
-        Pos = MAP_APPFONT ( 12 , 14  ) ;
-        Size = MAP_APPFONT ( 43 , 43 ) ;
-        Text = "ABCD" ;
-    };
-    TriStateBox BTN_TXTSTACKED
-    {
-        HelpId = HID_SCH_ALIGNMENT_STACKED ;
-        Pos = MAP_APPFONT ( 139 , 14  ) ;
-        Size = MAP_APPFONT ( 116 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Ve~rtically stacked";
-    };
-    FixedText FT_DEGREES
-    {
-        Pos = MAP_APPFONT ( 93 , 32  ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "~Degrees" ;
-    };
-    NumericField NF_ORIENT
-    {
-        HelpId = HID_SCH_ALIGNMENT_DEGREES ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 61 , 30  ) ;
-        Size = MAP_APPFONT ( 28 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        StrictFormat = TRUE ;
-        SpinSize = 5 ;
-        Minimum = 0 ;
-        Maximum = 359 ;
-    };
-    FixedLine FL_ALIGN
-    {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Text orientation" ;
-    };
-    FixedText FT_TEXTDIR
-    {
-        Pos = MAP_APPFONT ( 12 , 65 ) ;
-        Size = MAP_APPFONT ( 64 , 8 ) ;
-        Text [ en-US ] = "Te~xt direction" ;
-    };
-    ListBox LB_TEXTDIR
-    {
-        HelpId = HID_SCH_TEXTDIRECTION_TITLE ;
-        Pos = MAP_APPFONT ( 78 , 63 ) ;
-        Size = MAP_APPFONT ( 170 , 100 ) ;
-        Border = TRUE;
-        TabStop = TRUE;
-        DropDown = TRUE;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/controller/inc/HelpIds.hrc

@@ -19,7 +19,6 @@
 #ifndef CHART_HELPIDS_HRC
 #define CHART_HELPIDS_HRC
 
-#define HID_SCH_ALIGNMENT                                   "CHART2_HID_SCH_ALIGNMENT"
 #define HID_SCH_LEGEND_POS                                  "CHART2_HID_SCH_LEGEND_POS"
 #define HID_SCH_DATA_DESCR                                  "CHART2_HID_SCH_DATA_DESCR"
 
@@ -93,8 +92,6 @@
 #define HID_SCH_DATALABEL_SEPARATOR                         "CHART2_HID_SCH_DATALABEL_SEPARATOR"
 #define HID_SCH_DATALABEL_PLACEMENT                         "CHART2_HID_SCH_DATALABEL_PLACEMENT"
 #define HID_SCH_TEXTDIRECTION                               "CHART2_HID_SCH_TEXTDIRECTION"
-#define HID_SCH_TEXTDIRECTION_TITLE                         "CHART2_HID_SCH_TEXTDIRECTION_TITLE"
-#define HID_SCH_TEXTDIRECTION_EQUATION                      "CHART2_HID_SCH_TEXTDIRECTION_EQUATION"
 #define HID_SCH_DATALABEL_ROTATION_KNOB                     "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB"
 #define HID_SCH_DATALABEL_ROTATION_EDIT                     "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT"
 

chart2/source/controller/inc/TextDirectionListBox.hxx

@@ -32,6 +32,8 @@ class TextDirectionListBox : public svx::FrameDirectionListBox
 public:
     explicit            TextDirectionListBox( Window* pParent, const ResId& rResId,
                             Window* pWindow1 = 0, Window* pWindow2 = 0 );
+    explicit            TextDirectionListBox( Window* pParent,
+                            Window* pWindow1 = 0, Window* pWindow2 = 0 );
     virtual             ~TextDirectionListBox();
 };
 

chart2/uiconfig/ui/titlerotationtabpage.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustmentSpinDegrees">
+    <property name="upper">359</property>
+    <property name="step_increment">5</property>
+  </object>
+  <object class="GtkFrame" id="TitleRotationTabPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="label_xalign">0</property>
+    <property name="shadow_type">none</property>
+    <child>
+      <object class="GtkAlignment" id="alignment5">
+        <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="GtkGrid" id="grid10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkGrid" id="grid3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="svxlo-WrapField" id="OrientDegree">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="margin_top">40</property>
+                    <property name="invisible_char">•</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="progress_pulse_step">1</property>
+                    <property name="adjustment">adjustmentSpinDegrees</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="degreeL">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_top">40</property>
+                    <property name="label" translatable="yes">_Degrees</property>
+                    <property name="use_underline">True</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>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </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="svxlo-DialControl" id="dialCtrl">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="active">True</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="GtkGrid" id="grid4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkCheckButton" id="stackedCB">
+                    <property name="label" translatable="yes">Ve_rtically stacked</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.019999999552965164</property>
+                    <property name="inconsistent">True</property>
+                    <property name="draw_indicator">True</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="labelABCD">
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">ABCD</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>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="textdirL">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Te_xt direction:</property>
+                <property name="use_underline">True</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="chartcontrollerlo-TextDirectionListBox" id="textdirLB">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child type="label">
+      <object class="GtkLabel" id="labelTextOrient">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Text orientation</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+        </attributes>
+      </object>
+    </child>
+  </object>
+</interface>

extras/source/glade/libreoffice-catalog.xml.in

@@ -332,9 +332,12 @@
     <glade-widget-class title="Rectangle Control" name="svxlo-SvxRectCtl"
                         generic-name="Rectangle Control" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
-    <glade-widget-class title="Text Direction ListBox" name="svxlo-FrameDirectionListBox"
+    <glade-widget-class title="Frame Direction ListBox" name="svxlo-FrameDirectionListBox"
                         generic-name="FrameDirectionListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>
+    <glade-widget-class title="Text Direction ListBox" name="chartcontrollerlo-TextDirectionListBox"
+                        generic-name="TextDirectionListBox" parent="svxlo-FrameDirectionListBox"
+                        icon-name="widget-gtk-combobox"/>
     <glade-widget-class title="Numbering Type ListBox" name="swlo-SwNumberingTypeListBox"
                         generic-name="NumberingTypeListBox" parent="GtkComboBox"
                         icon-name="widget-gtk-combobox"/>