Skip to content

C
core
Kaydet (Commit) 6b722f7d authored tarafından Armin Le Grand's avatar Armin Le Grand
Dosyalara gözat
Seçenekler

i122041 Added 'Automatic' to TextPropertyPanel FontColor and HilightColor, added… 

i122041 Added 'Automatic' to TextPropertyPanel FontColor and HilightColor, added 'No Color' to ParagraphPropertyPanel BackgroundColor
üst fadba070
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 49 deletions
svx/inc/svx/dialogs.hrc
Dosyayı görüntüle @ 6b722f7d
......@@ -374,6 +374,7 @@
#define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 320)
#define RID_POPUPPANEL_PARAPAGE_BULLETS (RID_SVX_START + 321)
#define RID_POPUPPANEL_PARAPAGE_NUMBERING (RID_SVX_START + 322)
#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR (RID_SVX_START + 323)
// !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see above)
......
svx/source/sidebar/line/LinePropertyPanel.cxx
Dosyayı görüntüle @ 6b722f7d
......@@ -87,11 +87,6 @@ namespace {
return bFound ? n : -1;
}
Color GetTransparentColor (void)
{
return COL_TRANSPARENT;
}
void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList)
{
const sal_uInt32 nCount(rList.Count());
......@@ -916,10 +911,16 @@ IMPL_LINK( LinePropertyPanel, ChangeTransparentHdl, void *, EMPTYARG )
PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
namespace
{
const ResId aResId(SVX_RES(STR_AUTOMATICE));
Color GetTransparentColor (void)
{
return COL_TRANSPARENT;
}
} // end of anonymous namespace
PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
{
return new ColorControl(
pParent,
mpBindings,
......@@ -928,7 +929,7 @@ PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParen
::boost::bind(GetTransparentColor),
::boost::bind(&LinePropertyPanel::SetColor, this, _1, _2),
pParent,
&aResId);
0);
}
......
svx/source/sidebar/line/LinePropertyPanel.hrc
Dosyayı görüntüle @ 6b722f7d
......@@ -71,7 +71,6 @@
//color popup page
#define VS_COLOR 1
#define STR_AUTOMATICE 2
//style popup page
#define VS_STYLE 1
......
svx/source/sidebar/line/LinePropertyPanel.src
Dosyayı görüntüle @ 6b722f7d
......@@ -326,10 +326,6 @@ Control RID_POPUPPANEL_LINEPAGE_COLOR
TabStop = TRUE ;
Text = "Color";
};
String STR_AUTOMATICE
{
Text [ en-US ] = "No Color";
};
};
Control RID_POPUPPANEL_LINEPAGE_STYLE
{
......
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
Dosyayı görüntüle @ 6b722f7d
......@@ -767,11 +767,6 @@ void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /* nSID */, SfxItemState
}
}
Color ParaPropertyPanel::GetBGColor (void) const
{
return maColor;
}
void ParaPropertyPanel::SetBGColor (
const String& /* rsColorName */,
const Color aColor)
......@@ -1538,17 +1533,27 @@ PopupControl* ParaPropertyPanel::CreateNumberingPopupControl (PopupContainer* pP
return new ParaNumberingControl(pParent, *this);
}
namespace
{
Color GetNoBackgroundColor(void)
{
return COL_TRANSPARENT;
}
} // end of anonymous namespace
PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pParent)
{
const ResId aResId(SVX_RES(STR_NOFILL));
return new ColorControl(
pParent,
mpBindings,
SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
SVX_RES(RID_POPUPPANEL_PARAPAGE_BACK_COLOR),
SVX_RES(VS_FONT_COLOR),
::boost::bind(&ParaPropertyPanel::GetBGColor, this),
::boost::bind(GetNoBackgroundColor),
::boost::bind(&ParaPropertyPanel::SetBGColor, this, _1,_2),
pParent,
0);
&aResId);
}
......
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
Dosyayı görüntüle @ 6b722f7d
......@@ -278,7 +278,6 @@ private:
void InitToolBoxSpacing();
void InitToolBoxLineSpacing();
Color GetBGColor (void) const;
void SetBGColor (const String& rsColorName, const Color aColor);
};
......
svx/source/sidebar/paragraph/ParaPropertyPanel.src
Dosyayı görüntüle @ 6b722f7d
......@@ -557,31 +557,27 @@ Control RID_SIDEBAR_PARA_PANEL
};
//===========================================Back color page==============================
/*
Control RID_POPUPPANEL_PARAPAGE_BACK_COLOR
{
OutputSize = TRUE;
DialogControl = TRUE;
Border = FALSE;
Size = MAP_APPFONT( POPUP_COLOR_PICKER_WIDTH + POPUP_BORDER_WIDTH , POPUP_COLOR_PICKER_HEIGHT +POPUP_BORDER_HEIGHT );
Size = MAP_APPFONT( POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
Control VS_FONT_COLOR
{
HelpID = HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS ;
Hide = TRUE ;
Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
Hide = TRUE ;
Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
TabStop = TRUE ;
Text = "Color Picker";
};
String STR_NOFILL
{
Text [ en-US ] = "No Color";
};
};*/
};
//===========================================Bullet popup page==============================
Control RID_POPUPPANEL_PARAPAGE_BULLETS
......
svx/source/sidebar/text/TextPropertyPanel.cxx
Dosyayı görüntüle @ 6b722f7d
......@@ -96,30 +96,42 @@ PopupControl* TextPropertyPanel::CreateUnderlinePopupControl (PopupContainer* pP
return new TextUnderlineControl(pParent, *this);
}
namespace
{
Color GetAutomaticColor(void)
{
return COL_AUTO;
}
} // end of anonymous namespace
PopupControl* TextPropertyPanel::CreateFontColorPopupControl (PopupContainer* pParent)
{
const ResId aResId(SVX_RES(STR_AUTOMATICE));
return new ColorControl(
pParent,
mpBindings,
SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
SVX_RES(VS_FONT_COLOR),
::boost::bind(&TextPropertyPanel::GetFontColor, this),
::boost::bind(GetAutomaticColor),
::boost::bind(&TextPropertyPanel::SetFontColor, this, _1,_2),
pParent,
0);
&aResId);
}
PopupControl* TextPropertyPanel::CreateBrushColorPopupControl (PopupContainer* pParent)
{
const ResId aResId(SVX_RES(STR_AUTOMATICE));
return new ColorControl(
pParent,
mpBindings,
SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
SVX_RES(VS_FONT_COLOR),
::boost::bind(&TextPropertyPanel::GetBrushColor, this),
::boost::bind(GetAutomaticColor),
::boost::bind(&TextPropertyPanel::SetBrushColor, this, _1,_2),
pParent,
0);
&aResId);
}
long TextPropertyPanel::GetSelFontSize()
......@@ -1550,11 +1562,6 @@ void TextPropertyPanel::UpdateFontScript()
}
}
Color TextPropertyPanel::GetFontColor (void) const
{
return maColor;
}
void TextPropertyPanel::SetFontColor (
const String& /* rsColorName */,
const Color aColor)
......@@ -1564,11 +1571,6 @@ void TextPropertyPanel::SetFontColor (
maColor = aColor;
}
Color TextPropertyPanel::GetBrushColor (void) const
{
return maBackColor;
}
void TextPropertyPanel::SetBrushColor (
const String& /* rsColorName */,
const Color aColor)
......
svx/source/sidebar/text/TextPropertyPanel.hxx
Dosyayı görüntüle @ 6b722f7d
......@@ -69,9 +69,7 @@ public:
void SetSpacing(long nKern);
void EndSpacingPopupMode (void);
void EndUnderlinePopupMode (void);
Color GetFontColor (void) const;
void SetFontColor (const String& rsColorName,const Color aColor);
Color GetBrushColor (void) const;
void SetBrushColor (const String& rsColorName,const Color aColor);
void SetUnderline(FontUnderline eUnderline);
Color& GetUnderlineColor();
......
svx/source/sidebar/text/TextPropertyPanel.src
Dosyayı görüntüle @ 6b722f7d
......@@ -599,7 +599,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
Control VS_FONT_COLOR
{
// HelpID = HID_COLOR_VS ;
HelpID = HID_PPROPERTYPANEL_TEXT_COLOR_VS;
Hide = TRUE ;
Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
......@@ -611,7 +610,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
{
Text [ en-US ] = "Automatic";
};
};
Control RID_POPUPPANEL_TEXTPAGE_SPACING
......
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