Kaydet (Commit) 5918816d authored tarafından Caolán McNamara's avatar Caolán McNamara

move fonts options page .ui to cui and adapt code

Change-Id: I3838de932dea44accd3ec5a8eca3706f65058661
üst 0d9a68f9
......@@ -78,7 +78,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/connpooloptions.src \
cui/source/options/dbregister.src \
cui/source/options/doclinkdialog.src \
cui/source/options/fontsubs.src \
cui/source/options/internationaloptions.src \
cui/source/options/optasian.src \
cui/source/options/optchart.src \
......
......@@ -32,6 +32,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/objecttitledescdialog \
cui/uiconfig/ui/optaccessibilitypage \
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
......
......@@ -178,10 +178,7 @@
#define HID_HANGULDLG_BUTTON_IGNOREALL "CUI_HID_HANGULDLG_BUTTON_IGNOREALL"
#define HID_HANGULDLG_BUTTON_CHANGE "CUI_HID_HANGULDLG_BUTTON_CHANGE"
#define HID_HANGULDLG_BUTTON_CHANGEALL "CUI_HID_HANGULDLG_BUTTON_CHANGEALL"
#define HID_OFA_FONT_SUBSTITUTION "CUI_HID_OFA_FONT_SUBSTITUTION"
#define HID_HANGULDLG_EDIT_NEWWORD "CUI_HID_HANGULDLG_EDIT_NEWWORD"
#define HID_OFA_SUBST_APPLY "CUI_HID_OFA_SUBST_APPLY"
#define HID_OFA_SUBST_DELETE "CUI_HID_OFA_SUBST_DELETE"
#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
......
This diff is collapsed.
/*
* 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_FONT_SUBSTITUTION
#define _SVX_FONT_SUBSTITUTION
#include <cuires.hrc>
// defines ------------------------------------------------------------------
#define CLB_SUBSTITUTES 1
#define FT_FONT1 2
#define CB_FONT1 3
#define FT_FONT2 4
#define CB_FONT2 5
#define TBX_SUBSTNEWDEL 6
#define BT_SUBSTAPPLY 7
#define BT_SUBSTDELETE 8
#define STR_HEADER1 10
#define STR_HEADER2 11
#define STR_HEADER3 12
#define STR_HEADER4 13
#define IL_ICON 20
#define CB_USETABLE 21
#define FL_SOURCEVIEW 22
#define FT_FONTNAME 23
#define LB_FONTNAME 24
#define CB_NONPROP 25
#define FT_FONTHEIGHT 26
#define LB_FONTHEIGHT 27
#define STR_AUTOMATIC 28
#endif
......@@ -38,6 +38,7 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
protected:
virtual void SetTabs();
virtual void KeyInput( const KeyEvent& rKEvt );
virtual void Resize();
public:
SvxFontSubstCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
......@@ -54,37 +55,30 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked);
SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const;
void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState );
void setColSizes();
};
// class SvxFontSubstTabPage ----------------------------------------------------
class SvtFontSubstConfig;
class SvxFontSubstTabPage : public SfxTabPage
{
CheckBox aUseTableCB;
FixedText aFont1FT;
FontNameBox aFont1CB;
FixedText aFont2FT;
FontNameBox aFont2CB;
ToolBox aNewDelTBX;
SvxSimpleTableContainer m_aCheckLBContainer;
SvxFontSubstCheckListBox aCheckLB;
FixedLine aSourceViewFontsFL;
FixedText aFontNameFT;
ListBox aFontNameLB;
CheckBox aNonPropFontsOnlyCB;
FixedText aFontHeightFT;
ListBox aFontHeightLB;
ImageList aImageList;
String sAutomatic;
CheckBox* m_pUseTableCB;
VclContainer* m_pReplacements;
FontNameBox* m_pFont1CB;
FontNameBox* m_pFont2CB;
PushButton* m_pApply;
PushButton* m_pDelete;
SvtFontSubstConfig* pConfig;
SvxFontSubstCheckListBox* m_pCheckLB;
ListBox* m_pFontNameLB;
CheckBox* m_pNonPropFontsOnlyCB;
ListBox* m_pFontHeightLB;
String sHeader1;
String sHeader2;
String sHeader3;
String sHeader4;
OUString m_sAutomatic;
SvtFontSubstConfig* pConfig;
Color aTextColor;
......
/*
* 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 "fontsubs.hrc"
#include "helpid.hrc"
/**************************************************************************/
TabPage RID_SVX_FONT_SUBSTITUTION
{
HelpID = HID_OFA_FONT_SUBSTITUTION ;
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox CB_USETABLE
{
HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE";
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 248 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Apply replacement table";
};
FixedText FT_FONT1
{
Pos = MAP_APPFONT ( 6 , 20 ) ;
Size = MAP_APPFONT ( 100 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "~Font";
};
ComboBox CB_FONT1
{
HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1";
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 33 ) ;
Size = MAP_APPFONT ( 100 , 100 ) ;
TabStop = TRUE ;
AutoSize = TRUE ;
AutoHScroll = TRUE ;
DDExtraWidth = TRUE ;
DropDown = TRUE;
Sort = TRUE;
};
FixedText FT_FONT2
{
Pos = MAP_APPFONT ( 110 , 20 ) ;
Size = MAP_APPFONT ( 100 , 8 ) ;
Left = TRUE ;
Text [ en-US ] = "Re~place with";
};
ComboBox CB_FONT2
{
HelpID = "cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2";
Border = TRUE ;
Pos = MAP_APPFONT ( 110 , 33 ) ;
Size = MAP_APPFONT ( 100 , 100 ) ;
TabStop = TRUE ;
AutoSize = TRUE ;
AutoHScroll = TRUE ;
DDExtraWidth = TRUE ;
DropDown = TRUE;
Sort = TRUE;
};
ImageList IL_ICON
{
Prefix = "nu";
MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
IdList =
{
BT_SUBSTAPPLY ;
BT_SUBSTDELETE ;
};
IdCount = { 2 ; };
};
ToolBox TBX_SUBSTNEWDEL
{
Pos = MAP_APPFONT ( 214 , 33 ) ;
SVLook = TRUE ;
Border = FALSE ;
ItemList =
{
ToolBoxItem
{
Identifier = BT_SUBSTAPPLY ;
HelpID = HID_OFA_SUBST_APPLY ;
Text [ en-US ] = "Apply" ;
};
ToolBoxItem
{
Identifier = BT_SUBSTDELETE ;
HelpID = HID_OFA_SUBST_DELETE ;
Text [ en-US ] = "Delete" ;
};
};
};
Control CLB_SUBSTITUTES
{
Pos = MAP_APPFONT ( 6 , 48 ) ;
Size = MAP_APPFONT ( 248 , 75 ) ;
Border = TRUE ;
TabStop = TRUE ;
};
FixedLine FL_SOURCEVIEW
{
Pos = MAP_APPFONT ( 6 , 129 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Font settings for HTML, Basic and SQL sources" ;
};
FixedText FT_FONTNAME
{
Pos = MAP_APPFONT ( 6 , 142 ) ;
Size = MAP_APPFONT ( 57 , 8 ) ;
Text [ en-US ] = "Fonts" ;
};
ListBox LB_FONTNAME
{
HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME";
Pos = MAP_APPFONT ( 65 , 140 ) ;
Size = MAP_APPFONT ( 100 , 68 ) ;
Border = TRUE ;
TabStop = TRUE ;
DropDown = TRUE;
};
CheckBox CB_NONPROP
{
HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP";
Pos = MAP_APPFONT ( 65 , 155 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Non-proportional fonts only" ;
};
FixedText FT_FONTHEIGHT
{
Pos = MAP_APPFONT ( 6 , 171 ) ;
Size = MAP_APPFONT ( 57 , 8 ) ;
Text [ en-US ] ="~Size";
};
ListBox LB_FONTHEIGHT
{
HelpID = "cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT";
Pos = MAP_APPFONT ( 65 , 169 ) ;
Size = MAP_APPFONT ( 30 , 68 ) ;
Border = TRUE ;
TabStop = TRUE ;
DropDown = TRUE;
};
String STR_HEADER1
{
Text [ en-US ] = "Always";
};
String STR_HEADER2
{
Text [ en-US ] = "Screen only";
};
String STR_HEADER3
{
Text [ en-US ] = "Font";
};
String STR_HEADER4
{
Text [ en-US ] = "Replace with";
};
String STR_AUTOMATIC
{
Text [ en-US ] = "Automatic";
};
};
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