Convert tab stop page to widget UI

Conflicts:
	cui/UIConfig_cui.mk

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

cui/AllLangResTarget_cui.mk

@@ -81,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/tabpages/swpossizetabpage.src \
     cui/source/tabpages/tabarea.src \
     cui/source/tabpages/tabline.src \
-    cui/source/tabpages/tabstpge.src \
     cui/source/tabpages/textanim.src \
     cui/source/tabpages/textattr.src \
     cui/source/tabpages/transfrm.src \

cui/UIConfig_cui.mk

@@ -62,6 +62,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/pageformatpage \
 	cui/uiconfig/ui/paragalignpage \
 	cui/uiconfig/ui/paraindentspacing \
+	cui/uiconfig/ui/paratabspage \
 	cui/uiconfig/ui/pastespecial \
 	cui/uiconfig/ui/personalization_tab \
 	cui/uiconfig/ui/pickbulletpage \

cui/source/inc/helpid.hrc

@@ -258,7 +258,6 @@
 #define HID_LINE_LINE "CUI_HID_LINE_LINE"
 #define HID_LINE_DEF "CUI_HID_LINE_DEF"
 #define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
-#define HID_TABULATOR "CUI_HID_TABULATOR"
 #define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
 #define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
 #define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"

cui/source/inc/tabstpge.hxx

@@ -68,44 +68,38 @@ private:
     SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // tabulators and positions
-    FixedLine       aTabLabel;
-    MetricBox       aTabBox;
-    FixedLine       aTabLabelVert;
-
-    FixedLine       aTabTypeLabel;
+    MetricBox*      m_pTabBox;
     // TabType
-    RadioButton     aLeftTab;
-    RadioButton     aRightTab;
-    RadioButton     aCenterTab;
-    RadioButton     aDezTab;
-
-    TabWin_Impl*    pLeftWin;
-    TabWin_Impl*    pRightWin;
-    TabWin_Impl*    pCenterWin;
-    TabWin_Impl*    pDezWin;
-
-    FixedText       aDezCharLabel;
-    Edit            aDezChar;
-
-    FixedLine       aFillLabel;
-
-    RadioButton     aNoFillChar;
-    RadioButton     aFillPoints;
-    RadioButton     aFillDashLine ;
-    RadioButton     aFillSolidLine;
-    RadioButton     aFillSpecial;
-    Edit            aFillChar;
-
-    PushButton      aNewBtn;
-    PushButton      aDelAllBtn;
-    PushButton      aDelBtn;
+    RadioButton*    m_pLeftTab;
+    RadioButton*    m_pRightTab;
+    RadioButton*    m_pCenterTab;
+    RadioButton*    m_pDezTab;
+
+    TabWin_Impl*    m_pLeftWin;
+    TabWin_Impl*    m_pRightWin;
+    TabWin_Impl*    m_pCenterWin;
+    TabWin_Impl*    m_pDezWin;
+
+    FixedText*      m_pDezCharLabel;
+    Edit*           m_pDezChar;
+
+    RadioButton*    m_pNoFillChar;
+    RadioButton*    m_pFillPoints;
+    RadioButton*    m_pFillDashLine ;
+    RadioButton*    m_pFillSolidLine;
+    RadioButton*    m_pFillSpecial;
+    Edit*           m_pFillChar;
+
+    PushButton*     m_pNewBtn;
+    PushButton*     m_pDelAllBtn;
+    PushButton*     m_pDelBtn;
 
     // local variables, internal functions
     SvxTabStop      aAktTab;
     SvxTabStopItem  aNewTabs;
     long            nDefDist;
     FieldUnit       eDefUnit;
-    sal_Bool            bCheck;
+    sal_Bool        bCheck;
 
     void            InitTabPos_Impl( sal_uInt16 nPos = 0 );
     void            SetFillAndTabType_Impl();

cui/source/tabpages/tabstpge.hrc

-/* -*- 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 .
- */
-#ifndef _SVX_TABSTPGE_HRC
-#define _SVX_TABSTPGE_HRC
-
-// defines ------------------------------------------------------------------
-
-#define ED_TABPOS                       10
-#define FL_TABPOS                       11
-#define FL_TABPOS_VERT                  12
-
-#define BTN_TABTYPE_LEFT        20
-#define WIN_TABLEFT                     21
-#define BTN_TABTYPE_RIGHT       22
-#define WIN_TABRIGHT            23
-#define BTN_TABTYPE_CENTER      24
-#define WIN_TABCENTER           25
-#define BTN_TABTYPE_DECIMAL     26
-#define WIN_TABDECIMAL          27
-#define ED_TABTYPE_DECCHAR      28
-#define FT_TABTYPE_DECCHAR      29
-#define FL_TABTYPE                      30
-
-
-#define BTN_FILLCHAR_NO         40
-#define BTN_FILLCHAR_POINTS     41
-#define BTN_FILLCHAR_DASHLINE           42
-#define BTN_FILLCHAR_UNDERSCORE         43
-#define BTN_FILLCHAR_OTHER      44
-#define ED_FILLCHAR_OTHER       45
-#define FL_FILLCHAR                     46
-
-#define BTN_NEW                         50
-#define BTN_DEL                         51
-#define BTN_DELALL                      52
-#define ST_LEFTTAB_ASIAN                53
-#define ST_RIGHTTAB_ASIAN               54
-#define ST_FILLCHAR_OTHER               55
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

cui/source/tabpages/tabstpge.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 "helpid.hrc"
-#include <cuires.hrc>
-#include "tabstpge.hrc"
-#include <svx/dialogs.hrc>
-
- // RID_SVXPAGE_TABULATOR -------------------------------------------------
-TabPage RID_SVXPAGE_TABULATOR
-{
-    HelpId = HID_TABULATOR ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Tabs" ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedLine FL_TABPOS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 48 , 8 ) ;
-        Text [ en-US ] = "Position" ;
-    };
-    MetricBox ED_TABPOS
-    {
-        HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 39 , 165 ) ;
-        Minimum = -5600 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-    };
-    FixedLine FL_TABPOS_VERT
-    {
-        Pos = MAP_APPFONT ( 55 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 165 ) ;
-        Vert = TRUE;
-    };
-    FixedLine FL_TABTYPE
-    {
-        Pos = MAP_APPFONT ( 60 , 3 ) ;
-        Size = MAP_APPFONT ( 138 , 8 ) ;
-        Text [ en-US ] = "Type" ;
-    };
-    RadioButton BTN_TABTYPE_LEFT
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT";
-        Pos = MAP_APPFONT ( 66 , 14 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "~Left" ;
-        Check = TRUE ;
-    };
-    Window WIN_TABLEFT
-    {
-        Pos = MAP_APPFONT ( 157 , 14 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_RIGHT
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT";
-        Pos = MAP_APPFONT ( 66 , 28 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Righ~t" ;
-    };
-    Window WIN_TABRIGHT
-    {
-        Pos = MAP_APPFONT ( 157 , 28 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_CENTER
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER";
-        Pos = MAP_APPFONT ( 66 , 42 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "C~entered" ;
-    };
-    Window WIN_TABCENTER
-    {
-        Pos = MAP_APPFONT ( 157 , 42 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_DECIMAL
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL";
-        Pos = MAP_APPFONT ( 66 , 56 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Deci~mal" ;
-    };
-    Window WIN_TABDECIMAL
-    {
-        Pos = MAP_APPFONT ( 157 , 56 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    FixedText FT_TABTYPE_DECCHAR
-    {
-        Pos = MAP_APPFONT ( 75 , 70 ) ;
-        Size = MAP_APPFONT ( 79 , 8 ) ;
-        Text [ en-US ] = "~Character" ;
-    };
-    Edit ED_TABTYPE_DECCHAR
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 156 , 68 ) ;
-        Size = MAP_APPFONT ( 9 , 12 ) ;
-        Left = TRUE ;
-    };
-    FixedLine FL_FILLCHAR
-    {
-        Pos = MAP_APPFONT ( 60 , 86 ) ;
-        Size = MAP_APPFONT ( 138 , 8 ) ;
-        Text [ en-US ] = "Fill character" ;
-    };
-    RadioButton BTN_FILLCHAR_NO
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO";
-        Pos = MAP_APPFONT ( 66 , 97 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "N~one" ;
-        Check = TRUE ;
-    };
-    RadioButton BTN_FILLCHAR_POINTS
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS";
-        Pos = MAP_APPFONT ( 66 , 111 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~........" ;
-    };
-    RadioButton BTN_FILLCHAR_DASHLINE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE";
-        Pos = MAP_APPFONT ( 66 , 125 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~--------" ;
-    };
-    RadioButton BTN_FILLCHAR_UNDERSCORE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE";
-        Pos = MAP_APPFONT ( 66 , 139 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~_____" ;
-    };
-    RadioButton BTN_FILLCHAR_OTHER
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER";
-        Pos = MAP_APPFONT ( 66 , 153 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Character" ;
-    };
-    Edit ED_FILLCHAR_OTHER
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 156 , 151 ) ;
-        Size = MAP_APPFONT ( 9 , 12 ) ;
-        Left = TRUE ;
-    };
-    PushButton BTN_NEW
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW";
-        Pos = MAP_APPFONT ( 204 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~New" ;
-    };
-    PushButton BTN_DELALL
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL";
-        Pos = MAP_APPFONT ( 204 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Delete ~All" ;
-    };
-    PushButton BTN_DEL
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL";
-        Pos = MAP_APPFONT ( 204 , 40 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-    };
-    String ST_LEFTTAB_ASIAN
-    {
-        Text [ en-US ] = "~Left/Top" ;
-    };
-    String ST_RIGHTTAB_ASIAN
-    {
-        Text [ en-US ] = "Righ~t/Bottom" ;
-    };
-    String ST_FILLCHAR_OTHER
-    {
-        Text [ en-US ] = "Character" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -320,6 +320,8 @@
     <glade-widget-class title="Sidebar ToolBox" name="sfxlo-SidebarToolBox"
                         generic-name="Sidebar ToolBox" parent="GtkToolbar"
                         icon-name="widget-gtk-toolbar"/>
-
+    <glade-widget-class title="Tab Stop Images" name="cuilo-TabWin_Impl"
+                        generic-name="TabWin_Impl" parent="GtkDrawingArea"
+                        icon-name="widget-gtk-drawingarea"/>
   </glade-widget-classes>
 </glade-catalog>