Skip to content

C
core
Kaydet (Commit) 0a4e4263 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert text attributes tab page to widget UI 

Conflicts:
	cui/UIConfig_cui.mk

Change-Id: I9332e159a4a4865aac42f601ff1d592fd94a84b5
Reviewed-on: https://gerrit.libreoffice.org/5468Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 21bf1ceb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 283 deletions
cui/AllLangResTarget_cui.mk
Dosyayı görüntüle @ 0a4e4263
......@@ -76,7 +76,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/paragrph.src \
cui/source/tabpages/strings.src \
cui/source/tabpages/textanim.src \
cui/source/tabpages/textattr.src \
cui/source/tabpages/transfrm.src \
))
......
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 0a4e4263
......@@ -107,6 +107,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/splitcellsdialog \
cui/uiconfig/ui/storedwebconnectiondialog \
cui/uiconfig/ui/swpossizepage \
cui/uiconfig/ui/textattrtabpage \
cui/uiconfig/ui/textflowpage \
cui/uiconfig/ui/thesaurus \
cui/uiconfig/ui/transparencytabpage \
......
cui/source/inc/helpid.hrc
Dosyayı görüntüle @ 0a4e4263
......@@ -241,8 +241,6 @@
#define HID_TPSHADOW_CTRL "CUI_HID_TPSHADOW_CTRL"
#define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
#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"
#define HID_SVXPAGE_CHAR_NAME "CUI_HID_SVXPAGE_CHAR_NAME"
#define HID_HYPERLINK_INTERNET "CUI_HID_HYPERLINK_INTERNET"
......
cui/source/inc/textattr.hxx
Dosyayı görüntüle @ 0a4e4263
......@@ -37,30 +37,22 @@ class SdrView;
class SvxTextAttrPage : public SvxTabPage
{
private:
FixedLine aFlText;
TriStateBox aTsbAutoGrowWidth;
TriStateBox aTsbAutoGrowHeight;
TriStateBox aTsbFitToSize;
TriStateBox aTsbContour;
TriStateBox aTsbWordWrapText;
TriStateBox aTsbAutoGrowSize;
FixedLine aFlDistance;
FixedText aFtLeft;
MetricField aMtrFldLeft;
FixedText aFtRight;
MetricField aMtrFldRight;
FixedText aFtTop;
MetricField aMtrFldTop;
FixedText aFtBottom;
MetricField aMtrFldBottom;
FixedLine aFlSeparator;
FixedLine aFlPosition;
SvxRectCtl aCtlPosition;
TriStateBox aTsbFullWidth;
TriStateBox* m_pTsbAutoGrowWidth;
TriStateBox* m_pTsbAutoGrowHeight;
TriStateBox* m_pTsbFitToSize;
TriStateBox* m_pTsbContour;
TriStateBox* m_pTsbWordWrapText;
TriStateBox* m_pTsbAutoGrowSize;
VclFrame* m_pFlDistance;
MetricField* m_pMtrFldLeft;
MetricField* m_pMtrFldRight;
MetricField* m_pMtrFldTop;
MetricField* m_pMtrFldBottom;
VclFrame* m_pFlPosition;
SvxRectCtl* m_pCtlPosition;
TriStateBox* m_pTsbFullWidth;
const SfxItemSet& rOutAttrs;
const SdrView* pView;
......
cui/source/tabpages/textattr.hrc deleted 100644 → 0
Dosyayı görüntüle @ 21bf1ceb
/* -*- 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 .
*/
#define FL_TEXT 2
#define FL_DISTANCE 1
#define FL_POSITION 3
#define FL_SEPARATOR 4
#define TSB_AUTOGROW_HEIGHT 1
#define TSB_AUTOGROW_WIDTH 2
#define TSB_FIT_TO_SIZE 3
#define TSB_FULL_WIDTH 4
#define TSB_CONTOUR 5
#define TSB_WORDWRAP_TEXT 6
#define TSB_AUTOGROW_SIZE 7
#define CTL_POSITION 1
#define FT_LEFT 1
#define MTR_FLD_LEFT 1
#define FT_RIGHT 2
#define MTR_FLD_RIGHT 2
#define FT_TOP 3
#define MTR_FLD_TOP 3
#define FT_BOTTOM 4
#define MTR_FLD_BOTTOM 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/tabpages/textattr.src deleted 100644 → 0
Dosyayı görüntüle @ 21bf1ceb
/* -*- 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 <svtools/controldims.hrc>
#include <cuires.hrc>
#include "textattr.hrc"
#include "helpid.hrc"
#include <svx/dialogs.hrc>
// RID_SVXPAGE_TEXTATTR --------------------------------------------------
TabPage RID_SVXPAGE_TEXTATTR
{
HelpId = HID_PAGE_TEXTATTR ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Text" ;
FixedLine FL_TEXT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Text" ;
};
TriStateBox TSB_AUTOGROW_WIDTH
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "Fit wi~dth to text" ;
};
TriStateBox TSB_AUTOGROW_HEIGHT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "Fit h~eight to text" ;
};
TriStateBox TSB_FIT_TO_SIZE
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 42 ) ;
Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "~Fit to frame" ;
};
TriStateBox TSB_CONTOUR
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 12 , 56 ) ;
Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "~Adjust to contour" ;
};
TriStateBox TSB_WORDWRAP_TEXT
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT";
TabStop = TRUE;
Pos = MAP_APPFONT( 132, 14 ) ;
Size = MAP_APPFONT( 127 , 10 ) ;
Text [ en-US ] = "~Word wrap text in shape";
};
TriStateBox TSB_AUTOGROW_SIZE
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE";
TabStop = TRUE;
Pos = MAP_APPFONT( 132, 28 );
Size = MAP_APPFONT( 127 , 10 );
Text [ en-US ] = "~Resize shape to fit text";
};
FixedLine FL_DISTANCE
{
Pos = MAP_APPFONT ( 6 , 72 ) ;
Size = MAP_APPFONT ( 114 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Spacing to borders" ;
};
FixedText FT_LEFT
{
Pos = MAP_APPFONT ( 12 , 85 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Left" ;
};
FixedText FT_RIGHT
{
Pos = MAP_APPFONT ( 12 , 101 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Right" ;
};
FixedText FT_TOP
{
Pos = MAP_APPFONT ( 12 , 117 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Top" ;
};
FixedText FT_BOTTOM
{
Pos = MAP_APPFONT ( 12 , 133 ) ;
Size = MAP_APPFONT ( 50 , 8 ) ;
Text [ en-US ] = "~Bottom" ;
};
MetricField MTR_FLD_LEFT
{
HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT";
Border = TRUE ;
Pos = MAP_APPFONT ( 69 , 83 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Minimum = -10000 ;
First = -10000 ;
Maximum = 10000 ;
Last = 10000 ;
SpinSize = 10 ;
};
MetricField MTR_FLD_RIGHT
{
HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT";
Border = TRUE ;
Pos = MAP_APPFONT ( 69 , 99 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Minimum = -10000 ;
First = -10000 ;
Maximum = 10000 ;
Last = 10000 ;
SpinSize = 10 ;
};
MetricField MTR_FLD_TOP
{
HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP";
Border = TRUE ;
Pos = MAP_APPFONT ( 69 , 115 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Minimum = -10000 ;
First = -10000 ;
Maximum = 10000 ;
Last = 10000 ;
SpinSize = 10 ;
};
MetricField MTR_FLD_BOTTOM
{
HelpID = "cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM";
Border = TRUE ;
Pos = MAP_APPFONT ( 69 , 131 ) ;
Size = MAP_APPFONT ( 45 , 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
DecimalDigits = 2 ;
Unit = FUNIT_MM ;
Minimum = -10000 ;
First = -10000 ;
Maximum = 10000 ;
Last = 10000 ;
SpinSize = 10 ;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( 121 , 83 ) ;
Size = MAP_APPFONT ( RSC_CD_FIXEDLINE_WIDTH , 66 ) ;
Vert = TRUE;
};
FixedLine FL_POSITION
{
Pos = MAP_APPFONT ( 126 , 72 ) ;
Size = MAP_APPFONT ( 128 , RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Text anchor" ;
};
Control CTL_POSITION
{
HelpId = HID_TEXTATTR_CTL_POSITION ;
Border = TRUE ;
Pos = MAP_APPFONT ( 132 , 83 ) ;
Size = MAP_APPFONT ( 116 , 52 ) ;
TabStop = TRUE ;
};
TriStateBox TSB_FULL_WIDTH
{
HelpID = "cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH";
TabStop = TRUE ;
Pos = MAP_APPFONT ( 132 , 139 ) ;
Size = MAP_APPFONT ( 116 , 10 ) ;
Text [ en-US ] = "Full ~width" ;
};
};
// ********************************************************************** EOF
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/uiconfig/ui/textattrtabpage.ui 0 → 100644
Dosyayı görüntüle @ 0a4e4263
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment