summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/UI_cui.mk3
-rw-r--r--cui/source/inc/cuitabarea.hxx84
-rw-r--r--cui/source/inc/helpid.hrc2
-rw-r--r--cui/source/options/optcolor.cxx3
-rw-r--r--cui/source/tabpages/tabarea.hrc1
-rw-r--r--cui/source/tabpages/tabarea.src243
-rw-r--r--cui/source/tabpages/tpcolor.cxx532
-rw-r--r--cui/uiconfig/ui/colorpage.ui660
-rw-r--r--cui/uiconfig/ui/optappearancepage.ui (renamed from cui/uiconfig/ui/optcolorpage.ui)2
-rw-r--r--cui/util/hidother.src1
10 files changed, 928 insertions, 603 deletions
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 91e04486c65f..f1c0730e0bac 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/charnamepage \
+ cui/uiconfig/ui/colorpage \
cui/uiconfig/ui/colorconfigwin \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/hyphenate \
@@ -30,7 +31,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/objectnamedialog \
cui/uiconfig/ui/objecttitledescdialog \
cui/uiconfig/ui/optaccessibilitypage \
- cui/uiconfig/ui/optcolorpage \
+ cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/personalization_tab \
cui/uiconfig/ui/pickbulletpage \
cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index ef3832c6687e..f8d59d5de1fc 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -635,26 +635,28 @@ public:
virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
};
-/// Load save embed functionality
-class SvxLoadSaveEmbed {
+/************************************************************************/
+
+struct SvxColorTabPageShadow;
+class SvxColorTabPage : public SfxTabPage
+{
+ using TabPage::ActivatePage;
+ using TabPage::DeactivatePage;
+
+private:
XPropertyListType meType;
XOutdevItemPool* mpXPool;
Window *mpTopDlg;
- CheckBox maBoxEmbed;
- ImageButton maBtnLoad;
- ImageButton maBtnSave;
- FixedText maTableName;
+ CheckBox *m_pBoxEmbed;
+ PushButton *m_pBtnLoad;
+ PushButton *m_pBtnSave;
+ FixedText *m_pTableName;
DECL_LINK( EmbedToggleHdl_Impl, void * );
DECL_LINK( ClickLoadHdl_Impl, void * );
DECL_LINK( ClickSaveHdl_Impl, void * );
-public:
- SvxLoadSaveEmbed( Window *pParent, Window *pDialog,
- const ResId &aLoad, const ResId &aSave,
- const ResId &aEmbed, const ResId &aTableName,
- XPropertyListType t, XOutdevItemPool* mpXPool );
- virtual ~SvxLoadSaveEmbed() {};
+
XPropertyListRef GetList();
void HideLoadSaveEmbed();
bool GetEmbed();
@@ -662,48 +664,32 @@ public:
void UpdateTableName();
void EnableSave( bool bCanSave );
- virtual bool IsModified() = 0;
- virtual void SetModified(bool bIsModified) = 0;
- virtual void AddState(ChangeType nState) = 0;
- virtual void Update(bool bLoaded) = 0;
-};
-
-/************************************************************************/
-
-struct SvxColorTabPageShadow;
-class SvxColorTabPage : public SfxTabPage, public SvxLoadSaveEmbed
-{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
-private:
SvxColorTabPageShadow *pShadow;
- FixedLine aFlProp;
- FixedText aFtName;
- Edit aEdtName;
- FixedText aFtColor;
- ColorLB aLbColor;
+ Edit* m_pEdtName;
+ ColorLB* m_pLbColor;
- ValueSet aValSetColorList;
+ ValueSet* m_pValSetColorList;
- SvxXRectPreview aCtlPreviewOld;
- SvxXRectPreview aCtlPreviewNew;
+ SvxXRectPreview* m_pCtlPreviewOld;
+ SvxXRectPreview* m_pCtlPreviewNew;
- ListBox aLbColorModel;
- FixedText aFtColorModel1;
- MetricField aMtrFldColorModel1;
- FixedText aFtColorModel2;
- MetricField aMtrFldColorModel2;
- FixedText aFtColorModel3;
- MetricField aMtrFldColorModel3;
+ ListBox* m_pLbColorModel;
- FixedText aFtColorModel4;
- MetricField aMtrFldColorModel4;
+ VclContainer* m_pRGB;
+ NumericField* m_pR;
+ NumericField* m_pG;
+ NumericField* m_pB;
- PushButton aBtnAdd;
- PushButton aBtnModify;
- PushButton aBtnWorkOn;
- PushButton aBtnDelete;
+ VclContainer* m_pCYMK;
+ MetricField* m_pC;
+ MetricField* m_pY;
+ MetricField* m_pM;
+ MetricField* m_pK;
+
+ PushButton* m_pBtnAdd;
+ PushButton* m_pBtnModify;
+ PushButton* m_pBtnWorkOn;
+ PushButton* m_pBtnDelete;
const SfxItemSet& rOutAttrs;
@@ -743,8 +729,6 @@ private:
DECL_LINK( SelectColorModelHdl_Impl, void * );
long ChangeColorHdl_Impl( void* p );
DECL_LINK( ModifiedHdl_Impl, void * );
- DECL_LINK( ClickLoadHdl_Impl, void * );
- DECL_LINK( ClickSaveHdl_Impl, void * );
long CheckChanges_Impl();
#endif
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 78b84df96880..ffc7c9ebe5f1 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -23,7 +23,6 @@
// Help-Ids --------------------------------------------------------------
-#define HID_OPTIONS_COLOR "CUI_HID_OPTIONS_COLOR"
#define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
#define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
@@ -42,7 +41,6 @@
#define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
#define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define HID_OPTIONS_COLORCONFIG_NAME_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME"
#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
#define HID_OPTIONS_JAVA "CUI_HID_OPTIONS_JAVA"
#define HID_OPTIONS_JAVA_LIST "CUI_HID_OPTIONS_JAVA_LIST"
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3a1b6fb6d3b8..a89eadc6f719 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1020,7 +1020,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl)
SvxColorOptionsTabPage::SvxColorOptionsTabPage(
Window* pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "OptColorPage", "cui/ui/optcolorpage.ui", rCoreSet)
+ : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", rCoreSet)
, bFillItemSetCalled(false)
, pColorConfig(0)
, pExtColorConfig(0)
@@ -1153,7 +1153,6 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
aNameDlg->SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_SAVE1)));
aNameDlg->SetHelpId(HID_OPTIONS_COLORCONFIG_SAVE_SCHEME);
- aNameDlg->SetEditHelpId(HID_OPTIONS_COLORCONFIG_NAME_SCHEME);
aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl));
if(RET_OK == aNameDlg->Execute())
{
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 687ecc6214a0..9d2eb991203b 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -143,5 +143,4 @@
#define CB_HATCHBCKGRD 21
#define LB_HATCHBCKGRDCOLOR 22
-#define STR_CUI_COLORMODEL 5030
#define STR_LB_HATCHINGSTYLE 5031
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 17ae4203f3a1..8800ce206b79 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1267,243 +1267,6 @@ TabPage RID_SVXPAGE_GRADIENT
};
// ------------------------------------------------------
-TabPage RID_SVXPAGE_COLOR
-{
- HelpId = HID_OPTIONS_COLOR ;
- Hide = TRUE ;
- Text [ en-US ] = "Colors" ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedLine FL_PROP
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248, 8 ) ;
- Text [ en-US ] = "Properties";
- };
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 28 , 8 ) ;
- Text [ en-US ] = "~Name" ;
- };
- Edit EDT_NAME
- {
- HelpID = "cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 42 , 14 ) ;
- Size = MAP_APPFONT ( 76 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_COLOR
- {
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 28 , 8 ) ;
- Text [ en-US ] = "C~olor" ;
- };
- ListBox LB_COLOR
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 42 , 30 ) ;
- Size = MAP_APPFONT ( 76 , 100 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- DDExtraWidth = TRUE ;
- };
-
- FixedText FT_TABLE_NAME
- {
- Pos = MAP_APPFONT ( 42 , 48 ) ;
- Size = MAP_APPFONT ( 94 , 8 ) ;
- Text [ en-US ] = "Color table" ;
- };
- Control CTL_COLORTABLE
- {
- Border = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 42 , 59 ) ;
- Size = MAP_APPFONT ( 94 , 117 ) ;
- TabStop = TRUE ;
- };
-
- Control CTL_PREVIEW_OLD
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 157 , 14 ) ;
- Size = MAP_APPFONT ( 34 , 25 ) ;
- };
- Control CTL_PREVIEW_NEW
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 157, 39 ) ;
- Size = MAP_APPFONT ( 34 , 25 ) ;
- };
- ListBox LB_COLORMODEL
- {
- HelpID = "cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 157 , 71 ) ;
- Size = MAP_APPFONT ( 34 , 12 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- StringList [ en-US ] =
- {
- < "RGB" ; Default ; > ;
- < "CMYK" ; Default ; > ;
- };
- };
- FixedText FT_1
- {
- Pos = MAP_APPFONT ( 142 , 89 ) ;
- Size = MAP_APPFONT ( 15 , 8 ) ;
- Text [ en-US ] = "~C" ;
- };
- MetricField MTR_FLD_1
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_1";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 157 , 87 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- };
- FixedText FT_2
- {
- Pos = MAP_APPFONT ( 142 , 105 ) ;
- Size = MAP_APPFONT ( 15 , 8 ) ;
- Text [ en-US ] = "~M" ;
- };
- MetricField MTR_FLD_2
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_2";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 157 , 103 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- };
- FixedText FT_3
- {
- Pos = MAP_APPFONT ( 142 , 121 ) ;
- Size = MAP_APPFONT ( 15 , 8 ) ;
- Text [ en-US ] = "~Y" ;
- };
- MetricField MTR_FLD_3
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_3";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 157 , 119 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- };
- FixedText FT_4
- {
- Pos = MAP_APPFONT ( 142 , 137 ) ;
- Size = MAP_APPFONT ( 15 , 8 ) ;
- Text [ en-US ] = "~K" ;
- };
- MetricField MTR_FLD_4
- {
- HelpID = "cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 157 , 135 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
- TabStop = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Maximum = 100 ;
- Unit = FUNIT_CUSTOM ;
- CustomUnitText = "%" ;
- Last = 100 ;
- };
- PushButton BTN_ADD
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD";
- Pos = MAP_APPFONT ( 197 , 14 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Add" ;
- TabStop = TRUE ;
- };
- PushButton BTN_WORK_ON
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON";
- Pos = MAP_APPFONT ( 197 , 50 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Edit..." ;
- TabStop = TRUE ;
- };
- PushButton BTN_DELETE
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE";
- Pos = MAP_APPFONT ( 197 , 68 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete..." ;
- TabStop = TRUE ;
- };
- PushButton BTN_MODIFY
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY";
- Pos = MAP_APPFONT ( 197, 32 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Modify" ;
- TabStop = TRUE ;
- };
- ImageButton BTN_LOAD
- {
- HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD";
- Pos = MAP_APPFONT ( 197 , 104 ) ;
- Size = MAP_APPFONT ( 16 , 16 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Load Color List";
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sc05501.bmp" ;
- };
- };
- };
- ImageButton BTN_SAVE
- {
- HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE";
- Pos = MAP_APPFONT ( 217 , 104 ) ;
- Size = MAP_APPFONT ( 16 , 16 ) ;
- TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Save Color List";
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sc05502.bmp" ;
- };
- };
- };
- CheckBox BTN_EMBED
- {
- HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_EMBED";
- Pos = MAP_APPFONT ( 197 , 124 ) ;
- Size = MAP_APPFONT ( 122 , 10 ) ;
- Text [ en-US ] = "Embed";
- };
-};
-
-// ------------------------------------------------------
TabDialog RID_SVXDLG_AREA
{
OutputSize = TRUE ;
@@ -1566,9 +1329,3 @@ String STR_LB_HATCHINGSTYLE
{
Text [ en-US ] = "Hatching Style" ;
};
-
-String STR_CUI_COLORMODEL
-{
- Text [ en-US ] = "Color Mode" ;
-};
-
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 0cc1d1c8dc6f..97b397fb132a 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -51,29 +51,7 @@
#include <svx/dialogs.hrc>
-// Load save embed functionality
-SvxLoadSaveEmbed::SvxLoadSaveEmbed( Window *pParent, Window *pDialog,
- const ResId &rLoad, const ResId &rSave,
- const ResId &rEmbed, const ResId &rTableName,
- XPropertyListType t, XOutdevItemPool* pXPool )
- : meType( t )
- , mpXPool( pXPool )
- , mpTopDlg( pDialog )
- , maBoxEmbed( pParent, rEmbed )
- , maBtnLoad( pParent, rLoad )
- , maBtnSave( pParent, rSave )
- , maTableName( pParent, rTableName )
-{
- maBoxEmbed.SetToggleHdl( LINK( this, SvxLoadSaveEmbed, EmbedToggleHdl_Impl ) );
-
- maBtnLoad.SetClickHdl( LINK( this, SvxLoadSaveEmbed, ClickLoadHdl_Impl ) );
- maBtnSave.SetClickHdl( LINK( this, SvxLoadSaveEmbed, ClickSaveHdl_Impl ) );
-
- SetEmbed( GetEmbed() );
- UpdateTableName();
-}
-
-XPropertyListRef SvxLoadSaveEmbed::GetList()
+XPropertyListRef SvxColorTabPage::GetList()
{
SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( mpTopDlg );
SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( mpTopDlg );
@@ -101,34 +79,34 @@ XPropertyListRef SvxLoadSaveEmbed::GetList()
return XPropertyListRef( static_cast< XPropertyList * >( pList.get() ) );
}
-void SvxLoadSaveEmbed::SetEmbed( bool bEmbed )
+void SvxColorTabPage::SetEmbed( bool bEmbed )
{
XPropertyListRef pList = GetList();
if( pList.is() )
pList->SetEmbedInDocument( bEmbed );
- maBoxEmbed.Check( bEmbed );
+ m_pBoxEmbed->Check( bEmbed );
}
-bool SvxLoadSaveEmbed::GetEmbed()
+bool SvxColorTabPage::GetEmbed()
{
XPropertyListRef pList = GetList();
return pList.is() ? pList->IsEmbedInDocument() : 0;
}
-IMPL_LINK_NOARG(SvxLoadSaveEmbed, EmbedToggleHdl_Impl)
+IMPL_LINK_NOARG(SvxColorTabPage, EmbedToggleHdl_Impl)
{
- SetEmbed( maBoxEmbed.IsChecked() );
+ SetEmbed( m_pBoxEmbed->IsChecked() );
return 0;
}
-void SvxLoadSaveEmbed::HideLoadSaveEmbed()
+void SvxColorTabPage::HideLoadSaveEmbed()
{
- maBtnLoad.Hide();
- maBtnSave.Hide();
- maBoxEmbed.Hide();
+ m_pBtnLoad->Hide();
+ m_pBtnSave->Hide();
+ m_pBoxEmbed->Hide();
}
-void SvxLoadSaveEmbed::UpdateTableName()
+void SvxColorTabPage::UpdateTableName()
{
// Truncate the name if necessary ...
String aString( CUI_RES( RID_SVXSTR_TABLE ) );
@@ -149,12 +127,12 @@ void SvxLoadSaveEmbed::UpdateTableName()
else
aString += String (aURL.getBase());
- maTableName.SetText( aString );
+ m_pTableName->SetText( aString );
}
// -----------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickLoadHdl_Impl)
+IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
{
ResMgr& rMgr = CUI_MGR();
sal_uInt16 nReturn = RET_YES;
@@ -216,17 +194,17 @@ IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickLoadHdl_Impl)
return 0;
}
-void SvxLoadSaveEmbed::EnableSave( bool bCanSave )
+void SvxColorTabPage::EnableSave( bool bCanSave )
{
if ( bCanSave )
- maBtnSave.Enable();
+ m_pBtnSave->Enable();
else
- maBtnSave.Disable();
+ m_pBtnSave->Disable();
}
// -----------------------------------------------------------------------
-IMPL_LINK_NOARG(SvxLoadSaveEmbed, ClickSaveHdl_Impl)
+IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
{
::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -281,15 +259,15 @@ void SvxColorTabPage::Update(bool bLoaded)
if (bLoaded)
{
- aLbColor.Clear();
- aValSetColorList.Clear();
+ m_pLbColor->Clear();
+ m_pValSetColorList->Clear();
Construct();
Reset( rOutAttrs );
- if( aLbColor.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
- aLbColor.SelectEntryPos( 0 );
+ if( m_pLbColor->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
+ m_pLbColor->SelectEntryPos( 0 );
else
- aLbColor.SelectEntryPos( aLbColor.GetSelectEntryPos() );
+ m_pLbColor->SelectEntryPos( m_pLbColor->GetSelectEntryPos() );
ChangeColorHdl_Impl( this );
SelectColorLBHdl_Impl( this );
@@ -320,59 +298,64 @@ struct SvxColorTabPageShadow
// -----------------------------------------------------------------------
-SvxColorTabPage::SvxColorTabPage
-(
- Window* pParent,
- const SfxItemSet& rInAttrs
-) :
-
- SfxTabPage ( pParent, CUI_RES( RID_SVXPAGE_COLOR ), rInAttrs ),
- SvxLoadSaveEmbed ( this, GetParentDialog(),
- CUI_RES( BTN_LOAD ), CUI_RES( BTN_SAVE ),
- CUI_RES( BTN_EMBED ), CUI_RES( FT_TABLE_NAME ),
- XCOLOR_LIST, (XOutdevItemPool*) rInAttrs.GetPool() ),
-
- pShadow ( new SvxColorTabPageShadow() ),
- aFlProp ( this, CUI_RES( FL_PROP ) ),
- aFtName ( this, CUI_RES( FT_NAME ) ),
- aEdtName ( this, CUI_RES( EDT_NAME ) ),
- aFtColor ( this, CUI_RES( FT_COLOR ) ),
- aLbColor ( this, CUI_RES( LB_COLOR ) ),
-
- aValSetColorList ( this, CUI_RES( CTL_COLORTABLE ) ),
-
- aCtlPreviewOld ( this, CUI_RES( CTL_PREVIEW_OLD ) ),
- aCtlPreviewNew ( this, CUI_RES( CTL_PREVIEW_NEW ) ),
-
- aLbColorModel ( this, CUI_RES( LB_COLORMODEL ) ),
- aFtColorModel1 ( this, CUI_RES( FT_1 ) ),
- aMtrFldColorModel1 ( this, CUI_RES( MTR_FLD_1 ) ),
- aFtColorModel2 ( this, CUI_RES( FT_2 ) ),
- aMtrFldColorModel2 ( this, CUI_RES( MTR_FLD_2 ) ),
- aFtColorModel3 ( this, CUI_RES( FT_3 ) ),
- aMtrFldColorModel3 ( this, CUI_RES( MTR_FLD_3 ) ),
- aFtColorModel4 ( this, CUI_RES( FT_4 ) ),
- aMtrFldColorModel4 ( this, CUI_RES( MTR_FLD_4 ) ),
- aBtnAdd ( this, CUI_RES( BTN_ADD ) ),
- aBtnModify ( this, CUI_RES( BTN_MODIFY ) ),
- aBtnWorkOn ( this, CUI_RES( BTN_WORK_ON ) ),
- aBtnDelete ( this, CUI_RES( BTN_DELETE ) ),
-
- rOutAttrs ( rInAttrs ),
-
+SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", rInAttrs)
+ , meType( XCOLOR_LIST )
+ , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() )
+ , mpTopDlg( GetParentDialog() )
+ , pShadow ( new SvxColorTabPageShadow() )
+ , rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
- pPageType ( NULL ),
- pDlgType ( NULL ),
- pPos ( NULL ),
- pbAreaTP ( NULL ),
-
- aXFStyleItem ( XFILL_SOLID ),
- aXFillColorItem ( String(), Color( COL_BLACK ) ),
- aXFillAttr ( (XOutdevItemPool*) rInAttrs.GetPool() ),
- rXFSet ( aXFillAttr.GetItemSet() ),
- eCM ( CM_RGB )
+ , pPageType( NULL )
+ , pDlgType( NULL )
+ , pPos( NULL )
+ , pbAreaTP( NULL )
+ , aXFStyleItem( XFILL_SOLID )
+ , aXFillColorItem( String(), Color( COL_BLACK ) )
+ , aXFillAttr( (XOutdevItemPool*) rInAttrs.GetPool() )
+ , rXFSet( aXFillAttr.GetItemSet() )
+ , eCM( CM_RGB )
{
- FreeResource();
+ get(m_pBoxEmbed, "embed");
+ get(m_pBtnLoad, "load");
+ get(m_pBtnSave, "save");
+ get(m_pTableName, "colortableft");
+
+ get(m_pEdtName, "name");
+ get(m_pLbColor, "colorlb");
+ get(m_pValSetColorList, "colorset");
+ Size aSize = LogicToPixel(Size(94 , 117), MAP_APPFONT);
+ m_pValSetColorList->set_width_request(aSize.Width());
+ m_pValSetColorList->set_height_request(aSize.Height());
+ get(m_pCtlPreviewOld, "oldpreview");
+ get(m_pCtlPreviewNew, "newpreview");
+ aSize = LogicToPixel(Size(34 , 25), MAP_APPFONT);
+ m_pCtlPreviewOld->set_width_request(aSize.Width());
+ m_pCtlPreviewOld->set_height_request(aSize.Height());
+ m_pCtlPreviewNew->set_width_request(aSize.Width());
+ m_pCtlPreviewNew->set_height_request(aSize.Height());
+ get(m_pLbColorModel, "modellb");
+ get(m_pRGB, "rgb");
+ get(m_pR, "R");
+ get(m_pG, "G");
+ get(m_pB, "B");
+ get(m_pCYMK, "cymk");
+ get(m_pC, "C");
+ get(m_pY, "Y");
+ get(m_pM, "M");
+ get(m_pK, "K");
+ get(m_pBtnAdd, "add");
+ get(m_pBtnModify, "modify");
+ get(m_pBtnWorkOn, "edit");
+ get(m_pBtnDelete, "delete");
+
+ m_pBoxEmbed->SetToggleHdl( LINK( this, SvxColorTabPage, EmbedToggleHdl_Impl ) );
+
+ m_pBtnLoad->SetClickHdl( LINK( this, SvxColorTabPage, ClickLoadHdl_Impl ) );
+ m_pBtnSave->SetClickHdl( LINK( this, SvxColorTabPage, ClickSaveHdl_Impl ) );
+
+ SetEmbed( GetEmbed() );
+ UpdateTableName();
// this page needs ExchangeSupport
SetExchangeSupport();
@@ -380,43 +363,40 @@ SvxColorTabPage::SvxColorTabPage
// setting the output device
rXFSet.Put( aXFStyleItem );
rXFSet.Put( aXFillColorItem );
- aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
// overload handler
- aLbColor.SetSelectHdl(
+ m_pLbColor->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorLBHdl_Impl ) );
- aValSetColorList.SetSelectHdl(
+ m_pValSetColorList->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectValSetHdl_Impl ) );
- aLbColorModel.SetSelectHdl(
+ m_pLbColorModel->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorModelHdl_Impl ) );
Link aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
- aMtrFldColorModel1.SetModifyHdl( aLink );
- aMtrFldColorModel2.SetModifyHdl( aLink );
- aMtrFldColorModel3.SetModifyHdl( aLink );
- aMtrFldColorModel4.SetModifyHdl( aLink );
-
- aBtnAdd.SetClickHdl( LINK( this, SvxColorTabPage, ClickAddHdl_Impl ) );
- aBtnModify.SetClickHdl(
+ m_pR->SetModifyHdl( aLink );
+ m_pG->SetModifyHdl( aLink );
+ m_pB->SetModifyHdl( aLink );
+ m_pC->SetModifyHdl( aLink );
+ m_pY->SetModifyHdl( aLink );
+ m_pM->SetModifyHdl( aLink );
+ m_pK->SetModifyHdl( aLink );
+
+ m_pBtnAdd->SetClickHdl( LINK( this, SvxColorTabPage, ClickAddHdl_Impl ) );
+ m_pBtnModify->SetClickHdl(
LINK( this, SvxColorTabPage, ClickModifyHdl_Impl ) );
- aBtnWorkOn.SetClickHdl(
+ m_pBtnWorkOn->SetClickHdl(
LINK( this, SvxColorTabPage, ClickWorkOnHdl_Impl ) );
- aBtnDelete.SetClickHdl(
+ m_pBtnDelete->SetClickHdl(
LINK( this, SvxColorTabPage, ClickDeleteHdl_Impl ) );
// ValueSet
- aValSetColorList.SetStyle( aValSetColorList.GetStyle() | WB_VSCROLL | WB_ITEMBORDER );
- aValSetColorList.SetColCount( 8 );
- aValSetColorList.SetLineCount( 13 );
- aValSetColorList.SetExtraSpacing( 0 );
- aValSetColorList.Show();
-
- aLbColorModel.SetAccessibleName( String( CUI_RES(STR_CUI_COLORMODEL) ) );
- aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
- aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
- aBtnWorkOn.SetAccessibleRelationMemberOf( &aFlProp );
- aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
+ m_pValSetColorList->SetStyle( m_pValSetColorList->GetStyle() | WB_VSCROLL | WB_ITEMBORDER );
+ m_pValSetColorList->SetColCount( 8 );
+ m_pValSetColorList->SetLineCount( 13 );
+ m_pValSetColorList->SetExtraSpacing( 0 );
+ m_pValSetColorList->Show();
}
SvxColorTabPage::~SvxColorTabPage()
@@ -428,8 +408,8 @@ SvxColorTabPage::~SvxColorTabPage()
void SvxColorTabPage::Construct()
{
- aLbColor.Fill( pColorList );
- FillValueSet_Impl( aValSetColorList );
+ m_pLbColor->Fill(pColorList);
+ FillValueSet_Impl(*m_pValSetColorList);
UpdateTableName();
}
@@ -445,9 +425,9 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
{
if( *pPageType == PT_COLOR && *pPos != LISTBOX_ENTRY_NOTFOUND )
{
- aLbColor.SelectEntryPos( *pPos );
- aValSetColorList.SelectItem( aLbColor.GetSelectEntryPos() + 1 );
- aEdtName.SetText( aLbColor.GetSelectEntry() );
+ m_pLbColor->SelectEntryPos( *pPos );
+ m_pValSetColorList->SelectItem( m_pLbColor->GetSelectEntryPos() + 1 );
+ m_pEdtName->SetText( m_pLbColor->GetSelectEntry() );
ChangeColorHdl_Impl( this );
}
@@ -456,23 +436,23 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
const SfxPoolItem* pPoolItem = NULL;
if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), sal_True, &pPoolItem ) )
{
- aLbColorModel.SelectEntryPos( CM_RGB );
+ m_pLbColorModel->SelectEntryPos( CM_RGB );
aAktuellColor.SetColor ( ( ( const XFillColorItem* ) pPoolItem )->GetColorValue().GetColor() );
- aEdtName.SetText( ( ( const XFillColorItem* ) pPoolItem )->GetName() );
+ m_pEdtName->SetText( ( ( const XFillColorItem* ) pPoolItem )->GetName() );
- aMtrFldColorModel1.SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
- aMtrFldColorModel2.SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
- aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
// fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), aAktuellColor ) );
- aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.Invalidate();
- aCtlPreviewOld.Invalidate();
+ m_pCtlPreviewNew->Invalidate();
+ m_pCtlPreviewOld->Invalidate();
}
}
@@ -510,11 +490,11 @@ long SvxColorTabPage::CheckChanges_Impl()
if (eCM != CM_RGB)
ConvertColorValues (aTmpColor, CM_RGB);
- sal_uInt16 nPos = aLbColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
Color aColor = pColorList->GetColor( nPos )->GetColor();
- OUString aString = aLbColor.GetSelectEntry();
+ OUString aString = m_pLbColor->GetSelectEntry();
// aNewColor, because COL_USER != COL_something, even if RGB values are the same
// Color aNewColor( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
@@ -522,7 +502,7 @@ long SvxColorTabPage::CheckChanges_Impl()
if( ColorToPercent_Impl( aTmpColor.GetRed() ) != ColorToPercent_Impl( aColor.GetRed() ) ||
ColorToPercent_Impl( aTmpColor.GetGreen() ) != ColorToPercent_Impl( aColor.GetGreen() ) ||
ColorToPercent_Impl( aTmpColor.GetBlue() ) != ColorToPercent_Impl( aColor.GetBlue() ) ||
- aString != aEdtName.GetText() )
+ aString != m_pEdtName->GetText() )
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
@@ -549,7 +529,7 @@ long SvxColorTabPage::CheckChanges_Impl()
case RET_BTN_2:
{
ClickAddHdl_Impl( this );
- nPos = aLbColor.GetSelectEntryPos();
+ nPos = m_pLbColor->GetSelectEntryPos();
aColor = pColorList->GetColor( nPos )->GetColor();
}
break;
@@ -562,7 +542,7 @@ long SvxColorTabPage::CheckChanges_Impl()
}
if( *pDlgType == 0 ) // area dialog
{
- nPos = aLbColor.GetSelectEntryPos();
+ nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
*pPos = nPos;
@@ -581,11 +561,11 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
String aString;
Color aColor;
- sal_uInt16 nPos = aLbColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
aColor = pColorList->GetColor( nPos )->GetColor();
- aString = aLbColor.GetSelectEntry();
+ aString = m_pLbColor->GetSelectEntry();
}
else
{
@@ -603,9 +583,9 @@ sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
void SvxColorTabPage::UpdateModified()
{
bool bEnable = pColorList->Count();
- aBtnModify.Enable( bEnable );
- aBtnWorkOn.Enable( bEnable );
- aBtnDelete.Enable( bEnable );
+ m_pBtnModify->Enable( bEnable );
+ m_pBtnWorkOn->Enable( bEnable );
+ m_pBtnDelete->Enable( bEnable );
EnableSave( bEnable );
}
@@ -618,19 +598,19 @@ void SvxColorTabPage::Reset( const SfxItemSet& rSet )
if ( nState >= SFX_ITEM_DEFAULT )
{
XFillColorItem aColorItem( (const XFillColorItem&)rSet.Get( XATTR_FILLCOLOR ) );
- aLbColor.SelectEntry( aColorItem.GetColorValue() );
- aValSetColorList.SelectItem( aLbColor.GetSelectEntryPos() + 1 );
- aEdtName.SetText( aLbColor.GetSelectEntry() );
+ m_pLbColor->SelectEntry( aColorItem.GetColorValue() );
+ m_pValSetColorList->SelectItem( m_pLbColor->GetSelectEntryPos() + 1 );
+ m_pEdtName->SetText( m_pLbColor->GetSelectEntry() );
}
// set color model
String aStr = GetUserData();
- aLbColorModel.SelectEntryPos( (sal_uInt16) aStr.ToInt32() );
+ m_pLbColorModel->SelectEntryPos( (sal_uInt16) aStr.ToInt32() );
ChangeColorHdl_Impl( this );
SelectColorModelHdl_Impl( this );
- aCtlPreviewOld.Invalidate();
+ m_pCtlPreviewOld->Invalidate();
UpdateModified();
}
@@ -649,20 +629,31 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow,
//
IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
{
- // read current MtrFields, if cmyk, then k-value as transparency
- aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) aMtrFldColorModel4.GetValue() ),
- (sal_uInt8)PercentToColor_Impl( (sal_uInt16) aMtrFldColorModel1.GetValue() ),
- (sal_uInt8)PercentToColor_Impl( (sal_uInt16) aMtrFldColorModel2.GetValue() ),
- (sal_uInt8)PercentToColor_Impl( (sal_uInt16) aMtrFldColorModel3.GetValue() ) ).GetColor() );
+ if (eCM == CM_RGB)
+ {
+ // read current MtrFields, if cmyk, then k-value as transparency
+ aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pR->GetValue() ),
+ (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pG->GetValue() ),
+ (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pB->GetValue() ) ).GetColor() );
+ }
+ else
+ {
+ // read current MtrFields, if cmyk, then k-value as transparency
+ aAktuellColor.SetColor ( Color( (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pK->GetValue() ),
+ (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pC->GetValue() ),
+ (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pY->GetValue() ),
+ (sal_uInt8)PercentToColor_Impl( (sal_uInt16) m_pM->GetValue() ) ).GetColor() );
+ }
Color aTmpColor(aAktuellColor);
+
if (eCM != CM_RGB)
ConvertColorValues (aTmpColor, CM_RGB);
rXFSet.Put( XFillColorItem( String(), aTmpColor ) );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.Invalidate();
+ m_pCtlPreviewNew->Invalidate();
return 0;
}
@@ -679,7 +670,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
- String aName( aEdtName.GetText() );
+ String aName( m_pEdtName->GetText() );
XColorEntry* pEntry;
long nCount = pColorList->Count();
sal_Bool bDifferent = sal_True;
@@ -729,11 +720,11 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
pColorList->Insert( pEntry, pColorList->Count() );
- aLbColor.Append( pEntry );
- aValSetColorList.InsertItem( aValSetColorList.GetItemCount() + 1,
+ m_pLbColor->Append( pEntry );
+ m_pValSetColorList->InsertItem( m_pValSetColorList->GetItemCount() + 1,
pEntry->GetColor(), pEntry->GetName() );
- aLbColor.SelectEntryPos( aLbColor.GetEntryCount() - 1 );
+ m_pLbColor->SelectEntryPos( m_pLbColor->GetEntryCount() - 1 );
*pnColorListState |= CT_MODIFIED;
@@ -748,13 +739,13 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
{
- sal_uInt16 nPos = aLbColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
ResMgr& rMgr = CUI_MGR();
String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
- String aName( aEdtName.GetText() );
+ String aName( m_pEdtName->GetText() );
long nCount = pColorList->Count();
sal_Bool bDifferent = sal_True;
@@ -804,14 +795,14 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
pEntry->SetColor( aTmpColor );
pEntry->SetName( aName );
- aLbColor.Modify( pEntry, nPos );
- aLbColor.SelectEntryPos( nPos );
+ m_pLbColor->Modify( pEntry, nPos );
+ m_pLbColor->SelectEntryPos( nPos );
/////
- aValSetColorList.SetItemColor( nPos + 1, pEntry->GetColor() );
- aValSetColorList.SetItemText( nPos + 1, pEntry->GetName() );
- aEdtName.SetText( aName );
+ m_pValSetColorList->SetItemColor( nPos + 1, pEntry->GetColor() );
+ m_pValSetColorList->SetItemText( nPos + 1, pEntry->GetName() );
+ m_pEdtName->SetText( aName );
- aCtlPreviewOld.Invalidate();
+ m_pCtlPreviewOld->Invalidate();
*pnColorListState |= CT_MODIFIED;
}
@@ -838,19 +829,26 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
Color aPreviewColor = pColorDlg->GetColor();
aAktuellColor = aPreviewColor;
if (eCM != CM_RGB)
+ {
ConvertColorValues (aAktuellColor, eCM);
-
- aMtrFldColorModel1.SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
- aMtrFldColorModel2.SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
- aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
- aMtrFldColorModel4.SetValue( ColorToPercent_Impl( nK ) );
+ m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ m_pK->SetValue( ColorToPercent_Impl( nK ) );
+ }
+ else
+ {
+ m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ }
// fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), aPreviewColor ) );
- //aCtlPreviewOld.SetAttributes( aXFillAttr );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ //m_pCtlPreviewOld->SetAttributes( aXFillAttr );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.Invalidate();
+ m_pCtlPreviewNew->Invalidate();
}
delete( pColorDlg );
@@ -861,7 +859,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
{
- sal_uInt16 nPos = aLbColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
@@ -875,15 +873,15 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
delete pEntry;
// update Listbox and ValueSet
- aLbColor.RemoveEntry( nPos );
- aValSetColorList.Clear();
- FillValueSet_Impl( aValSetColorList );
+ m_pLbColor->RemoveEntry( nPos );
+ m_pValSetColorList->Clear();
+ FillValueSet_Impl(*m_pValSetColorList);
// positioning
- aLbColor.SelectEntryPos( nPos );
+ m_pLbColor->SelectEntryPos( nPos );
SelectColorLBHdl_Impl( this );
- aCtlPreviewOld.Invalidate();
+ m_pCtlPreviewOld->Invalidate();
*pnColorListState |= CT_MODIFIED;
}
@@ -897,19 +895,19 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl)
{
- sal_uInt16 nPos = aLbColor.GetSelectEntryPos();
+ sal_uInt16 nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- aValSetColorList.SelectItem( nPos + 1 );
- aEdtName.SetText( aLbColor.GetSelectEntry() );
+ m_pValSetColorList->SelectItem( nPos + 1 );
+ m_pEdtName->SetText( m_pLbColor->GetSelectEntry() );
rXFSet.Put( XFillColorItem( String(),
- aLbColor.GetSelectEntryColor() ) );
- aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pLbColor->GetSelectEntryColor() ) );
+ m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewOld.Invalidate();
- aCtlPreviewNew.Invalidate();
+ m_pCtlPreviewOld->Invalidate();
+ m_pCtlPreviewNew->Invalidate();
ChangeColorHdl_Impl( this );
}
@@ -920,19 +918,19 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl)
IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl)
{
- sal_uInt16 nPos = aValSetColorList.GetSelectItemId();
+ sal_uInt16 nPos = m_pValSetColorList->GetSelectItemId();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- aLbColor.SelectEntryPos( nPos - 1 );
- aEdtName.SetText( aLbColor.GetSelectEntry() );
+ m_pLbColor->SelectEntryPos( nPos - 1 );
+ m_pEdtName->SetText( m_pLbColor->GetSelectEntry() );
rXFSet.Put( XFillColorItem( String(),
- aLbColor.GetSelectEntryColor() ) );
- aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pLbColor->GetSelectEntryColor() ) );
+ m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewOld.Invalidate();
- aCtlPreviewNew.Invalidate();
+ m_pCtlPreviewOld->Invalidate();
+ m_pCtlPreviewNew->Invalidate();
ChangeColorHdl_Impl( this );
}
@@ -964,7 +962,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell)
IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
{
- int nPos = aLbColorModel.GetSelectEntryPos();
+ int nPos = m_pLbColorModel->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
if (eCM != (ColorModel) nPos)
@@ -978,110 +976,33 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
{
case CM_RGB:
{
- String aStr( aLbColorModel.GetSelectEntry() );
- String aColorStr(rtl::OUString("~X"));
- xub_StrLen nIdx = 1;
- aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
- aFtColorModel1.SetText( aColorStr );
- aColorStr.SetChar( nIdx, aStr.GetChar( 1 ) );
- aFtColorModel2.SetText( aColorStr );
- aColorStr.SetChar( nIdx, aStr.GetChar( 2 ) );
- aFtColorModel3.SetText( aColorStr );
-
- aFtColorModel4.Hide();
- aMtrFldColorModel4.Hide();
- aMtrFldColorModel4.SetValue( 0L );
-
- aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 );
- aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 );
- aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 );
-
- // Because the old HelpText is still at the Control
- // a change of the HelpID alone would not work
- aMtrFldColorModel1.SetHelpText( String() );
- aMtrFldColorModel2.SetHelpText( String() );
- aMtrFldColorModel3.SetHelpText( String() );
-
- // handle RGB-values (0..255, not in %),
- // and adjust MetricFields respectively
- aMtrFldColorModel1.SetUnit(FUNIT_NONE);
- aMtrFldColorModel1.SetMin(0);
- aMtrFldColorModel1.SetMax(255);
- aMtrFldColorModel1.SetLast(255);
-
- aMtrFldColorModel2.SetUnit(FUNIT_NONE);
- aMtrFldColorModel2.SetMin(0);
- aMtrFldColorModel2.SetMax(255);
- aMtrFldColorModel2.SetLast(255);
-
- aMtrFldColorModel3.SetUnit(FUNIT_NONE);
- aMtrFldColorModel3.SetMin(0);
- aMtrFldColorModel3.SetMax(255);
- aMtrFldColorModel3.SetLast(255);
+ m_pRGB->Show();
+ m_pCYMK->Hide();
+
+ m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+
}
break;
case CM_CMYK:
{
- String aStr( aLbColorModel.GetSelectEntry() );
- String aColorStr(rtl::OUString("~X"));
- xub_StrLen nIdx = 1;
- aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
- aFtColorModel1.SetText( aColorStr );
- aColorStr.SetChar( nIdx, aStr.GetChar( 1 ) );
- aFtColorModel2.SetText( aColorStr );
- aColorStr.SetChar( nIdx,aStr.GetChar( 2 ) );
- aFtColorModel3.SetText( aColorStr );
- aColorStr.SetChar( nIdx,aStr.GetChar( 3 ) );
- aFtColorModel4.SetText( aColorStr );
-
- aFtColorModel4.Show();
- aMtrFldColorModel4.Show();
-
- aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 );
- aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 );
- aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_CMYK_3 );
-
- // s.o.
- aMtrFldColorModel1.SetHelpText( String() );
- aMtrFldColorModel2.SetHelpText( String() );
- aMtrFldColorModel3.SetHelpText( String() );
-
- // handle CMYK-values (0..100%)
- // and adjust MetricFields respectively
- String aStrUnit( " %" );
-
- aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
- aMtrFldColorModel1.SetCustomUnitText( aStrUnit );
- aMtrFldColorModel1.SetMin(0);
- aMtrFldColorModel1.SetMax(100);
- aMtrFldColorModel1.SetLast(100);
-
- aMtrFldColorModel2.SetUnit(FUNIT_CUSTOM);
- aMtrFldColorModel2.SetCustomUnitText( aStrUnit );
- aMtrFldColorModel2.SetMin(0);
- aMtrFldColorModel2.SetMax(100);
- aMtrFldColorModel2.SetLast(100);
-
- aMtrFldColorModel3.SetUnit(FUNIT_CUSTOM);
- aMtrFldColorModel3.SetCustomUnitText( aStrUnit );
- aMtrFldColorModel3.SetMin(0);
- aMtrFldColorModel3.SetMax(100);
- aMtrFldColorModel3.SetLast(100);
+ m_pCYMK->Show();
+ m_pRGB->Hide();
+
+ m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ m_pK->SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
+
}
break;
}
- aMtrFldColorModel1.SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
- aMtrFldColorModel2.SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
- aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
- aMtrFldColorModel4.SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
- }
+ ChangeColorHdl_Impl( this );
- aMtrFldColorModel1.SetAccessibleName( GetNonMnemonicString(aFtColorModel1.GetText()) );
- aMtrFldColorModel2.SetAccessibleName( GetNonMnemonicString(aFtColorModel2.GetText()) );
- aMtrFldColorModel3.SetAccessibleName( GetNonMnemonicString(aFtColorModel3.GetText()) );
- aMtrFldColorModel4.SetAccessibleName( GetNonMnemonicString(aFtColorModel4.GetText()) );
+ }
return 0;
}
@@ -1090,26 +1011,33 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
long SvxColorTabPage::ChangeColorHdl_Impl( void* )
{
- int nPos = aLbColor.GetSelectEntryPos();
+ int nPos = m_pLbColor->GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
XColorEntry* pEntry = pColorList->GetColor( nPos );
aAktuellColor.SetColor ( pEntry->GetColor().GetColor() );
if (eCM != CM_RGB)
+ {
ConvertColorValues (aAktuellColor, eCM);
-
- aMtrFldColorModel1.SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
- aMtrFldColorModel2.SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
- aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
- aMtrFldColorModel4.SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
+ m_pC->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pY->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pM->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ m_pK->SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
+ }
+ else
+ {
+ m_pR->SetValue( ColorToPercent_Impl( aAktuellColor.GetRed() ) );
+ m_pG->SetValue( ColorToPercent_Impl( aAktuellColor.GetGreen() ) );
+ m_pB->SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
+ }
// fill ItemSet and pass it on to XOut
rXFSet.Put( XFillColorItem( String(), pEntry->GetColor() ) );
- aCtlPreviewOld.SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
+ m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- aCtlPreviewNew.Invalidate();
+ m_pCtlPreviewNew->Invalidate();
}
return 0;
}
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
new file mode 100644
index 000000000000..59db9a553a63
--- /dev/null
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -0,0 +1,660 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="ColorPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">name</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="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">C_olor</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">colorlb</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="GtkEntry" id="name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">22</property>
+ </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:ColorLB" id="colorlb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="colortableft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Color table</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="svtlo:ValueSet" id="colorset">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">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>
+ </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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="svxlo:SvxXRectPreview" id="oldpreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </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:SvxXRectPreview" id="newpreview">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="modellb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">RGB</item>
+ <item translatable="yes">CYMK</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="modellb-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Color Mode</property>
+ </object>
+ </child>
+ </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>
+ <object class="GtkGrid" id="rgb">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkSpinButton" id="B">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</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>
+ <object class="GtkSpinButton" id="G">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="R">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ </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="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_B</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">B</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="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_G</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">G</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="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_R</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">R</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="cymk">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_C</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">C:0%</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="label12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_M</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">M:0%</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="label13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_K</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">K:0%</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="C:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ </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="GtkSpinButton" id="M:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</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>
+ <object class="GtkSpinButton" id="K:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Y</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">Y:0%</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="GtkSpinButton" id="Y:0%">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</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">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="modify">
+ <property name="label" translatable="yes">_Modify</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit">
+ <property name="label">gtk-edit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="delete">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</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">6</property>
+ <child>
+ <object class="GtkButton" id="load">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Load Color List</property>
+ <property name="tooltip_text" translatable="yes">Load Color List</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="image">image1</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="GtkButton" id="save">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Save Color List</property>
+ <property name="tooltip_text" translatable="yes">Save Color List</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <property name="image">image2</property>
+ </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="GtkCheckButton" id="embed">
+ <property name="label" translatable="yes">Embed</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Properties</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">255</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/sc05501.png</property>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/sc05502.png</property>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="modellb"/>
+ <widget name="R"/>
+ <widget name="C:0%"/>
+ </widgets>
+ </object>
+</interface>
diff --git a/cui/uiconfig/ui/optcolorpage.ui b/cui/uiconfig/ui/optappearancepage.ui
index 58957e9ba8a6..4277ced9c20c 100644
--- a/cui/uiconfig/ui/optcolorpage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="OptColorPage">
+ <object class="GtkBox" id="OptAppearancePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/cui/util/hidother.src b/cui/util/hidother.src
index 02cd375ea05c..6cc80440c498 100644
--- a/cui/util/hidother.src
+++ b/cui/util/hidother.src
@@ -136,7 +136,6 @@ hidspecial HID_OFAPAGE_QUOTE_CLB { HelpId = HID_OFAPAGE_QUOTE
hidspecial HID_OFAPAGE_QUOTE_SW_CLB { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; };
hidspecial HID_OFA_CONNPOOL_DRIVERLIST { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; };
hidspecial HID_OFA_FONT_SUBST_CLB { HelpId = HID_OFA_FONT_SUBST_CLB; };
-hidspecial HID_OPTIONS_COLORCONFIG_NAME_SCHEME { HelpID = HID_OPTIONS_COLORCONFIG_NAME_SCHEME ;};
hidspecial HID_OPTIONS_COLORCONFIG_SAVE_SCHEME { HelpID = HID_OPTIONS_COLORCONFIG_SAVE_SCHEME ;};
hidspecial HID_OPTIONS_JAVA_LIST { HelpId = HID_OPTIONS_JAVA_LIST; };
hidspecial HID_OPTIONS_PATHS_SELECTFOLDER { HelpID = HID_OPTIONS_PATHS_SELECTFOLDER; };