mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert number format page to .ui

Browse Source 
Change-Id: Icaae0aa69156ebffab5750a1820a0a7a94a39022
This commit is contained in:
Caolán McNamara
2012-12-06 11:54:45 +00:00
parent b01fb77366
commit 43137f0650
11 changed files with 917 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cui/AllLangResTarget_cui.mk
View File

@@ -118,7 +118,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/tabpages/labdlg.src \
cui/source/tabpages/macroass.src \
cui/source/tabpages/measure.src \
cui/source/tabpages/numfmt.src \
cui/source/tabpages/numpages.src \
cui/source/tabpages/page.src \
cui/source/tabpages/paragrph.src \

5
cui/source/dialogs/cuires.src
View File

@@ -49,6 +49,11 @@ String RID_SVXSTR_COL
Text [ en-US ] = "Insert Columns" ;
};
String RID_SVXSTR_AUTO_ENTRY
{
Text [ en-US ] = "Automatic";
};
#define MASKCOLOR MaskColor = \
Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };

3
cui/source/inc/cuires.hrc
View File

@@ -429,7 +429,8 @@
#define RID_SVXSTR_SELECTOR_RUN (RID_SVX_START + 1200)
#define RID_SVXSTR_ROW (RID_SVX_START + 1201)
#define RID_SVXSTR_COL (RID_SVX_START + 1202)
#define RID_SVXSTR_AUTO_ENTRY (RID_SVX_START + 1203)
#define RID_SVXDLG_CERTPATH (RID_SVX_START + 1203)
#define RID_SVXDLG_CERTPATH (RID_SVX_START + 1204)
#endif

6
cui/source/inc/helpid.hrc
View File

@@ -256,12 +256,9 @@
#define HID_TPROTATION_CTRL2 "CUI_HID_TPROTATION_CTRL2"
#define HID_TRANS_ANGLE "CUI_HID_TRANS_ANGLE"
#define HID_TPPOSITION_CTRL "CUI_HID_TPPOSITION_CTRL"
#define HID_NUMBERFORMAT_LB_FORMAT "CUI_HID_NUMBERFORMAT_LB_FORMAT"
#define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW "CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW"
#define HID_TRANS_SLANT "CUI_HID_TRANS_SLANT"
#define HID_TPHATCH_CTRL "CUI_HID_TPHATCH_CTRL"
#define HID_SEARCHATTR_CTL_ATTR "CUI_HID_SEARCHATTR_CTL_ATTR"
#define HID_NUMBERFORMAT_TBI_INFO "CUI_HID_NUMBERFORMAT_TBI_INFO"
#define HID_SEARCHATTR "CUI_HID_SEARCHATTR"
#define HID_ALIGNMENT_CTR_DIAL "CUI_HID_ALIGNMENT_CTR_DIAL"
#define HID_ALIGNMENT_CTR_BORDER_LOCK "CUI_HID_ALIGNMENT_CTR_BORDER_LOCK"
@@ -298,9 +295,6 @@
#define HID_CAPTION_CTL_TYPE "CUI_HID_CAPTION_CTL_TYPE"
#define HID_PAGE_MEASURE "CUI_HID_PAGE_MEASURE"
#define HID_MEASURE_CTL_POSITION "CUI_HID_MEASURE_CTL_POSITION"
#define HID_NUMBERFORMAT "CUI_HID_NUMBERFORMAT"
#define HID_NUMBERFORMAT_TBI_ADD "CUI_HID_NUMBERFORMAT_TBI_ADD"
#define HID_NUMBERFORMAT_TBI_REMOVE "CUI_HID_NUMBERFORMAT_TBI_REMOVE"
#define HID_FORMAT_PAGE "CUI_HID_FORMAT_PAGE"
#define HID_REDLINING_DLG "CUI_HID_REDLINING_DLG"
#define HID_REDLINING_EDIT "CUI_HID_REDLINING_EDIT"

62
cui/source/inc/numfmt.hxx
View File

@@ -41,7 +41,7 @@ class vector;
//------------------------------------------------------------------------
class SvxNumberPreviewImpl : public Window
class SvxNumberPreview : public Window
{
private:
String aPrevStr;
@@ -56,8 +56,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
SvxNumberPreviewImpl( Window* pParent, const ResId& rResId );
~SvxNumberPreviewImpl();
SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER);
void NotifyChange( const String& rPrevStr, const Color* pColor = NULL );
};
@@ -90,31 +89,31 @@ public:
private:
SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs );
FixedText aFtCategory;
ListBox aLbCategory;
FixedText aFtFormat;
ListBox aLbCurrency;
SvxFontListBox aLbFormat;
FixedText aFtLanguage;
SvxLanguageBox aLbLanguage;
CheckBox aCbSourceFormat;
SvxNumberPreviewImpl aWndPreview;
FixedLine aFlOptions;
FixedText aFtDecimals;
NumericField aEdDecimals;
CheckBox aBtnNegRed;
FixedText aFtLeadZeroes;
NumericField aEdLeadZeroes;
CheckBox aBtnThousand;
FixedText* m_pFtCategory;
ListBox* m_pLbCategory;
FixedText* m_pFtFormat;
ListBox* m_pLbCurrency;
SvxFontListBox* m_pLbFormat;
FixedText* m_pFtLanguage;
SvxLanguageBox* m_pLbLanguage;
CheckBox* m_pCbSourceFormat;
SvxNumberPreview* m_pWndPreview;
FixedText* m_pFtOptions;
FixedText* m_pFtDecimals;
NumericField* m_pEdDecimals;
CheckBox* m_pBtnNegRed;
FixedText* m_pFtLeadZeroes;
NumericField* m_pEdLeadZeroes;
CheckBox* m_pBtnThousand;
FixedText aFtEdFormat;
Edit aEdFormat;
ImageButton aIbAdd;
ImageButton aIbInfo;
ImageButton aIbRemove;
FixedText* m_pFtEdFormat;
Edit* m_pEdFormat;
PushButton* m_pIbAdd;
PushButton* m_pIbInfo;
PushButton* m_pIbRemove;
FixedText aFtComment;
Edit aEdComment;
FixedText* m_pFtComment;
Edit* m_pEdComment;
Timer aResetWinTimer;
@@ -127,17 +126,10 @@ private:
sal_Bool bOneAreaFlag;
short nFixedCategory;
long nCatHeight;
long nCurFormatY;
long nCurFormatHeight;
long nStdFormatY;
long nStdFormatHeight;
String sAutomaticEntry;
Window* pLastActivWindow;
#ifdef _SVX_NUMFMT_CXX
void Init_Impl();
void FillCurrencyBox();
void FillFormatListBox_Impl( std::vector<String*>& rEntries );
@@ -155,12 +147,10 @@ private:
DECL_LINK( LostFocusHdl_Impl, Edit* pEd );
DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb );
DECL_LINK( SelFormatHdl_Impl, void * );
DECL_LINK( ClickHdl_Impl, ImageButton* pIB );
DECL_LINK( ClickHdl_Impl, PushButton* pIB );
DECL_LINK( EditHdl_Impl, Edit* pEdFormat );
DECL_LINK( OptHdl_Impl, void * );
DECL_LINK(TimeHdl_Impl, void *);
#endif
};
#endif

753
cui/source/tabpages/numfmt.cxx
View File

File diff suppressed because it is too large Load Diff

59
cui/source/tabpages/numfmt.hrc
View File

@@ -1,59 +0,0 @@
/*
* 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_NUMFMT_HRC
#define _SVX_NUMFMT_HRC
// defines ------------------------------------------------------------------
//================================================
// number TabPage:
#define WND_NUMBER_PREVIEW 2
#define FT_CATEGORY 3
#define FT_FORMAT 4
#define FT_OPTIONS 5
#define FT_EDFORMAT 6
#define LB_CATEGORY 9
#define LB_FORMAT 10
#define FL_OPTIONS 11
#define FT_LANGUAGE 12
#define LB_LANGUAGE 13
#define ED_FORMAT 14
#define BTN_ADD 15
#define BTN_REMOVE 16
#define FT_DECIMALS 21
#define ED_DECIMALS 22
#define FT_LEADZEROES 23
#define ED_LEADZEROES 24
#define BTN_NEGRED 25
#define BTN_THOUSAND 26
#define FT_COMMENT 27
#define ED_COMMENT 28
#define IB_ADD 29
#define IB_REMOVE 30
#define IB_INFO 31
#define IL_ICON 32
#define LB_CURRENCY 33
#define CB_SOURCEFORMAT 34
#define STR_AUTO_ENTRY 36
#define IID_ADD 1
#define IID_REMOVE 2
#define IID_INFO 3
#endif

250
cui/source/tabpages/numfmt.src
View File

@@ -1,250 +0,0 @@
/*
* 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 <cuires.hrc>
#include "helpid.hrc"
#include "numfmt.hrc"
#include <svx/dialogs.hrc>
// RID_SVXPAGE_NUMBERFORMAT ----------------------------------------------
TabPage RID_SVXPAGE_NUMBERFORMAT
{
HelpId = HID_NUMBERFORMAT ;
Hide = TRUE ;
Text [ en-US ] = "Number Format" ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_CATEGORY
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 70 , 8 ) ;
Text [ en-US ] = "~Category" ;
};
ListBox LB_CATEGORY
{
HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 70 , 71 ) ;
AutoHScroll = TRUE ;
StringList [ en-US ] =
{
< "All" ; Default ; > ;
< "User-defined" ; Default ; > ;
< "Number" ; Default ; > ;
< "Percent" ; Default ; > ;
< "Currency" ; Default ; > ;
< "Date" ; Default ; > ;
< "Time" ; Default ; > ;
< "Scientific" ; Default ; > ;
< "Fraction" ; Default ; > ;
< "Boolean Value" ; Default ; > ;
< "Text" ; Default ; > ;
};
};
FixedText FT_EDFORMAT
{
Pos = MAP_APPFONT ( 6 , 136 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "~Format code" ;
};
Edit ED_FORMAT
{
HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 147 ) ;
Size = MAP_APPFONT ( 200 , 12 ) ;
};
FixedText FT_COMMENT
{
Pos = MAP_APPFONT ( 6 , 163 ) ;
Size = MAP_APPFONT ( 248 , 16 ) ;
WordBreak = TRUE ;
NoLabel = TRUE ;
};
Edit ED_COMMENT
{
HelpID = "cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT";
Hide = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 163 ) ;
Size = MAP_APPFONT ( 248 , 12 ) ;
};
FixedText FT_FORMAT
{
Pos = MAP_APPFONT ( 82 , 3 ) ;
Size = MAP_APPFONT ( 90 , 8 ) ;
Text [ en-US ] = "F~ormat" ;
};
ListBox LB_CURRENCY
{
HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY";
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 14 ) ;
Size = MAP_APPFONT ( 90 , 71 ) ;
DropDown = TRUE ;
TabStop = TRUE ;
StringList [ en-US ] =
{
< "Automatically" ; Default ; > ;
};
};
Control LB_FORMAT
{
HelpId = HID_NUMBERFORMAT_LB_FORMAT ;
Border = TRUE ;
Pos = MAP_APPFONT ( 82 , 27 ) ;
Size = MAP_APPFONT ( 90 , 58 ) ;
TabStop = TRUE ;
};
FixedText FT_DECIMALS
{
Pos = MAP_APPFONT ( 12 , 104 ) ;
Size = MAP_APPFONT ( 69 , 8 ) ;
Text [ en-US ] = "~Decimal places" ;
};
NumericField ED_DECIMALS
{
HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS";
Border = TRUE ;
Pos = MAP_APPFONT ( 84 , 102 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Spin = TRUE ;
Maximum = 20 ;
Last = 15 ;
First = 0 ;
StrictFormat = TRUE ;
SpinSize = 1 ;
Repeat = TRUE ;
};
FixedText FT_LEADZEROES
{
Pos = MAP_APPFONT ( 12 , 120 ) ;
Size = MAP_APPFONT ( 69 , 8 ) ;
Text [ en-US ] = "Leading ~zeroes" ;
};
NumericField ED_LEADZEROES
{
HelpID = "cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES";
Border = TRUE ;
Pos = MAP_APPFONT ( 84 , 118 ) ;
Size = MAP_APPFONT ( 24 , 12 ) ;
Spin = TRUE ;
Maximum = 20 ;
Last = 15 ;
First = 0 ;
StrictFormat = TRUE ;
SpinSize = 1 ;
Repeat = TRUE ;
};
CheckBox BTN_NEGRED
{
HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED";
Pos = MAP_APPFONT ( 133 , 104 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "~Negative numbers red" ;
};
CheckBox BTN_THOUSAND
{
HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND";
Pos = MAP_APPFONT ( 133 , 120 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text [ en-US ] = "~Thousands separator" ;
};
FixedLine FL_OPTIONS
{
Pos = MAP_APPFONT ( 6 , 91 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Options" ;
};
FixedText FT_LANGUAGE
{
Pos = MAP_APPFONT ( 178 , 3 ) ;
Size = MAP_APPFONT ( 76 , 8 ) ;
Text [ en-US ] = "~Language" ;
};
ListBox LB_LANGUAGE
{
HelpID = "cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE";
Border = TRUE ;
Sort = TRUE ;
Pos = MAP_APPFONT ( 178 , 14 ) ;
Size = MAP_APPFONT ( 76 , 71 ) ;
DropDown = TRUE ;
};
CheckBox CB_SOURCEFORMAT
{
HelpID = "cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT";
Pos = MAP_APPFONT ( 178 , 42 ) ;
Size = MAP_APPFONT ( 76 , 10 ) ;
Text [ en-US ] = "So~urce format" ;
};
Window WND_NUMBER_PREVIEW
{
Border = TRUE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 178 , 67 ) ;
Size = MAP_APPFONT ( 76 , 18 ) ;
HelpId = HID_NUMBERFORMAT_WND_NUMBER_PREVIEW ;
};
ImageButton IB_ADD
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 208 , 146 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
HelpId = HID_NUMBERFORMAT_TBI_ADD ;
QuickHelpText [ en-US ] = "Add" ;
};
ImageButton IB_REMOVE
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 240 , 146 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
HelpId = HID_NUMBERFORMAT_TBI_REMOVE ;
QuickHelpText [ en-US ] = "Remove" ;
};
ImageButton IB_INFO
{
SVLook = TRUE ;
Pos = MAP_APPFONT ( 224 , 146 ) ;
Size = MAP_APPFONT ( 14 , 14 ) ;
HelpId = HID_NUMBERFORMAT_TBI_INFO ;
QuickHelpText [ en-US ] = "Edit Comment" ;
};
ImageList IL_ICON
{
Prefix = "nu";
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
IdList =
{
IID_ADD ;
IID_REMOVE ;
IID_INFO ;
};
IdCount = { 3 ; };
};
String STR_AUTO_ENTRY
{
Text [ en-US ] = "Automatic";
};
};
// ********************************************************************** EOF

965
cui/uiconfig/ui/numberformatpage.ui
View File

File diff suppressed because it is too large Load Diff

3
svx/inc/svx/fontlb.hxx
View File

@@ -70,7 +70,8 @@ private:
bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry().
public:
SvxFontListBox( Window* pParent, const ResId& rResId );
SvxFontListBox(Window* pParent, const ResId& rResId);
SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER);
/** Inserts a list entry and sets the font used for this entry.
@param pColor The font color. NULL = use default listbox text color. */

25
svx/source/dialog/fontlb.cxx
View File

@@ -18,6 +18,7 @@
*/
#include "svx/fontlb.hxx"
#include <vcl/builder.hxx>
#include <vcl/svapp.hxx>
#include "svtools/treelistentry.hxx"
#include "svtools/viewdataentry.hxx"
@@ -87,15 +88,29 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt
// ============================================================================
SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) :
SvTabListBox( pParent, rResId ),
maStdFont( GetFont() ),
mbUseFont( false )
SvxFontListBox::SvxFontListBox(Window* pParent, const ResId& rResId)
: SvTabListBox(pParent, rResId)
, maStdFont(GetFont())
, mbUseFont(false)
{
maStdFont.SetTransparent( sal_True );
maStdFont.SetTransparent(sal_True);
maEntryFont = maStdFont;
}
SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
, maStdFont(GetFont())
, mbUseFont(false)
{
maStdFont.SetTransparent(sal_True);
maEntryFont = maStdFont;
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &)
{
return new SvxFontListBox(pParent, 0);
}
void SvxFontListBox::InsertFontEntry( const String& rString, const Font& rFont, const Color* pColor )
{
mbUseFont = true; // InitEntry() will use maEntryFont