Attachment #80629 for issue #122140

View | Details | Raw Unified | Return to issue 122140
Collapse All | Expand All

Lines 107-112 Link Here

(-)a/main/svx/source/sidebar/text/TextPropertyPanel.hrc (+2 lines)
107	#define IMG_DASH_DOT_DOT_SEL 48	107	#define IMG_DASH_DOT_DOT_SEL 48
108	#define IMG_WAVE_SEL 49	108	#define IMG_WAVE_SEL 49
109		109
		110	#define STR_WITHOUT 50
		111
110	//popup window font color	112	//popup window font color
111	#define VS_FONT_COLOR 1	113	#define VS_FONT_COLOR 1
112	#define STR_AUTOMATICE 2	114	#define STR_AUTOMATICE 2

Lines 392-397 Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE Link Here

(-)a/main/svx/source/sidebar/text/TextPropertyPanel.src (+5 lines)
392	ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};	392	ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
393	};	393	};
394		394
		395	String STR_WITHOUT
		396	{
		397	Text [ en-US ] = "(Without)";
		398	};
		399
395	//tips	400	//tips
396	String STR_SINGLE	401	String STR_SINGLE
397	{	402	{





void TextUnderlineControl::initial()
{
    maVSUnderline.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
        GetSettings().GetStyleSettings().GetMenuColor():
        sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
    maVSUnderline.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
        GetSettings().GetStyleSettings().GetMenuColor():
        sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));

    Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ;
    maPBOptions.SetClickHdl(aLink);

    maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_3DLOOK | WB_NO_DIRECTSELECT );

    // 'none' item
    maVSUnderline.SetStyle( maVSUnderline.GetStyle()| WB_NONEFIELD | WB_MENUSTYLEVALUESET );
    maVSUnderline.SetText( String(SVX_RES(STR_WITHOUT) ) );

    maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE)));
    maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE);

    maVSUnderline.InsertItem(2, maIMGDouble ,String(SVX_RES(STR_DOUBLE)));
    maVSUnderline.SetItemData(2, (void*)(sal_uInt64)UNDERLINE_DOUBLE);

    maVSUnderline.InsertItem(3, maIMGBold, String(SVX_RES(STR_BOLD)));
    maVSUnderline.SetItemData(3,(void*)(sal_uInt64)UNDERLINE_BOLD);

    maVSUnderline.InsertItem(4, maIMGDot, String(SVX_RES(STR_DOT)));
    maVSUnderline.SetItemData(4,(void*)(sal_uInt64)UNDERLINE_DOTTED);

    maVSUnderline.InsertItem(5, maIMGDotBold, String(SVX_RES(STR_DOT_BOLD)));
    maVSUnderline.SetItemData(5,(void*)(sal_uInt64)UNDERLINE_BOLDDOTTED);

    maVSUnderline.InsertItem(6, maIMGDash, String(SVX_RES(STR_DASH)));
    maVSUnderline.SetItemData(6,(void*)(sal_uInt64)UNDERLINE_DASH);

    maVSUnderline.InsertItem(7, maIMGDashLong,String(SVX_RES(STR_DASH_LONG)));
    maVSUnderline.SetItemData(7,(void*)(sal_uInt64)UNDERLINE_LONGDASH);

    maVSUnderline.InsertItem(8, maIMGDashDot, String(SVX_RES(STR_DASH_DOT)));
    maVSUnderline.SetItemData(8,(void*)(sal_uInt64)UNDERLINE_DASHDOT);

    maVSUnderline.InsertItem(9, maIMGDashDotDot, String(SVX_RES(STR_DASH_DOT_DOT)));
    maVSUnderline.SetItemData(9,(void*)(sal_uInt64)UNDERLINE_DASHDOTDOT);

    maVSUnderline.InsertItem(10, maIMGWave, String(SVX_RES(STR_WAVE)));
    maVSUnderline.SetItemData(10,(void*)(sal_uInt64)UNDERLINE_WAVE);

    maVSUnderline.SetColCount( 1 );
    aLink =  LINK( this, TextUnderlineControl, VSSelectHdl ) ;
    maVSUnderline.SetSelectHdl(aLink);

    maVSUnderline.StartSelection();
    maVSUnderline.Show();
}



	maVSUnderline.SetItemImage(9, GetDisplayBackground().GetColor().IsDark()? maIMGDashDotDotH : maIMGDashDotDot);
	maVSUnderline.SetItemImage(10, GetDisplayBackground().GetColor().IsDark()? maIMGWaveH : maIMGWave);

    switch(eLine)
    {
    case UNDERLINE_SINGLE:
        maVSUnderline.SetItemImage(1, maIMGSingleSel);
        maVSUnderline.SelectItem(1);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_DOUBLE:
        maVSUnderline.SetItemImage(2, maIMGDoubleSel);
        maVSUnderline.SelectItem(2);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_BOLD:
        maVSUnderline.SetItemImage(3, maIMGBoldSel);
        maVSUnderline.SelectItem(3);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_DOTTED:
        maVSUnderline.SetItemImage(4, maIMGDotSel);
        maVSUnderline.SelectItem(4);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_BOLDDOTTED:
        maVSUnderline.SetItemImage(5, maIMGDotBoldSel);
        maVSUnderline.SelectItem(5);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_DASH:
        maVSUnderline.SetItemImage(6, maIMGDashSel);
        maVSUnderline.SelectItem(6);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_LONGDASH:
        maVSUnderline.SetItemImage(7, maIMGDashLongSel);
        maVSUnderline.SelectItem(7);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_DASHDOT:
        maVSUnderline.SetItemImage(8, maIMGDashDotSel);
        maVSUnderline.SelectItem(8);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_DASHDOTDOT:
        maVSUnderline.SetItemImage(9, maIMGDashDotDotSel);
        maVSUnderline.SelectItem(9);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_WAVE:
        maVSUnderline.SetItemImage(10, maIMGWaveSel);
        maVSUnderline.SelectItem(10);
        maVSUnderline.GrabFocus();
        break;
    case UNDERLINE_NONE:
        maVSUnderline.SelectItem(0);
        maVSUnderline.GrabFocus();
        break;
    default:
        maVSUnderline.SelectItem(1);
        maVSUnderline.SetNoSelection();
        maPBOptions.GrabFocus();
    }
    maVSUnderline.StartSelection();
}


IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
{
    if ( pControl == &maVSUnderline )
    {
        const sal_uInt16 iPos = maVSUnderline.GetSelectItemId();
        const FontUnderline eUnderline = ( iPos == 0 )
                                         ? UNDERLINE_NONE
                                         : (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );

        SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);

        aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
        mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);

        mrTextPropertyPanel.SetUnderline(eUnderline);

        mrTextPropertyPanel.EndUnderlinePopupMode();
    }
    return( 0L );
}

IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn)

Return to issue 122140

Lines 85-138 TextUnderlineControl::TextUnderlineControl ( Link Here

(-)a/main/svx/source/sidebar/text/TextUnderlineControl.cxx (-103 / +112 lines)
85		85
86	void TextUnderlineControl::initial()	86	void TextUnderlineControl::initial()
87	{	87	{
88	maVSUnderline.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?	88	maVSUnderline.SetColor(GetSettings().GetStyleSettings().GetHighContrastMode()?
89	GetSettings().GetStyleSettings().GetMenuColor():	89	GetSettings().GetStyleSettings().GetMenuColor():
90	sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));	90	sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
91	maVSUnderline.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?	91	maVSUnderline.SetBackground(GetSettings().GetStyleSettings().GetHighContrastMode()?
92	GetSettings().GetStyleSettings().GetMenuColor():	92	GetSettings().GetStyleSettings().GetMenuColor():
93	sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));	93	sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Paint_PanelBackground ));
94		94
95	Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ;	95	Link aLink = LINK( this, TextUnderlineControl, PBClickHdl ) ;
96	maPBOptions.SetClickHdl(aLink);	96	maPBOptions.SetClickHdl(aLink);
97		97
98	maVSUnderline.SetStyle( maVSUnderline.GetStyle()\| WB_3DLOOK \| WB_NO_DIRECTSELECT );	98	maVSUnderline.SetStyle( maVSUnderline.GetStyle()\| WB_3DLOOK \| WB_NO_DIRECTSELECT );
99		99
100	maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE)));	100	// 'none' item
101	maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE);	101	maVSUnderline.SetStyle( maVSUnderline.GetStyle()\| WB_NONEFIELD \| WB_MENUSTYLEVALUESET );
		102	maVSUnderline.SetText( String(SVX_RES(STR_WITHOUT) ) );
102		103
103	maVSUnderline.InsertItem(2, maIMGDouble ,String(SVX_RES(STR_DOUBLE)));	104	maVSUnderline.InsertItem(1, maIMGSingle ,String(SVX_RES(STR_SINGLE)));
104	maVSUnderline.SetItemData(2, (void*)(sal_uInt64)UNDERLINE_DOUBLE);	105	maVSUnderline.SetItemData(1, (void*)(sal_uInt64)UNDERLINE_SINGLE);
105		106
106	maVSUnderline.InsertItem(3, maIMGBold, String(SVX_RES(STR_BOLD)));	107	maVSUnderline.InsertItem(2, maIMGDouble ,String(SVX_RES(STR_DOUBLE)));
107	maVSUnderline.SetItemData(3,(void*)(sal_uInt64)UNDERLINE_BOLD);	108	maVSUnderline.SetItemData(2, (void*)(sal_uInt64)UNDERLINE_DOUBLE);
108		109
109	maVSUnderline.InsertItem(4, maIMGDot, String(SVX_RES(STR_DOT)));	110	maVSUnderline.InsertItem(3, maIMGBold, String(SVX_RES(STR_BOLD)));
110	maVSUnderline.SetItemData(4,(void*)(sal_uInt64)UNDERLINE_DOTTED);	111	maVSUnderline.SetItemData(3,(void*)(sal_uInt64)UNDERLINE_BOLD);
111		112
112	maVSUnderline.InsertItem(5, maIMGDotBold, String(SVX_RES(STR_DOT_BOLD)));	113	maVSUnderline.InsertItem(4, maIMGDot, String(SVX_RES(STR_DOT)));
113	maVSUnderline.SetItemData(5,(void*)(sal_uInt64)UNDERLINE_BOLDDOTTED);	114	maVSUnderline.SetItemData(4,(void*)(sal_uInt64)UNDERLINE_DOTTED);
114		115
115	maVSUnderline.InsertItem(6, maIMGDash, String(SVX_RES(STR_DASH)));	116	maVSUnderline.InsertItem(5, maIMGDotBold, String(SVX_RES(STR_DOT_BOLD)));
116	maVSUnderline.SetItemData(6,(void*)(sal_uInt64)UNDERLINE_DASH);	117	maVSUnderline.SetItemData(5,(void*)(sal_uInt64)UNDERLINE_BOLDDOTTED);
117		118
118	maVSUnderline.InsertItem(7, maIMGDashLong,String(SVX_RES(STR_DASH_LONG)));	119	maVSUnderline.InsertItem(6, maIMGDash, String(SVX_RES(STR_DASH)));
119	maVSUnderline.SetItemData(7,(void*)(sal_uInt64)UNDERLINE_LONGDASH);	120	maVSUnderline.SetItemData(6,(void*)(sal_uInt64)UNDERLINE_DASH);
120		121
121	maVSUnderline.InsertItem(8, maIMGDashDot, String(SVX_RES(STR_DASH_DOT)));	122	maVSUnderline.InsertItem(7, maIMGDashLong,String(SVX_RES(STR_DASH_LONG)));
122	maVSUnderline.SetItemData(8,(void*)(sal_uInt64)UNDERLINE_DASHDOT);	123	maVSUnderline.SetItemData(7,(void*)(sal_uInt64)UNDERLINE_LONGDASH);
123		124
124	maVSUnderline.InsertItem(9, maIMGDashDotDot, String(SVX_RES(STR_DASH_DOT_DOT)));	125	maVSUnderline.InsertItem(8, maIMGDashDot, String(SVX_RES(STR_DASH_DOT)));
125	maVSUnderline.SetItemData(9,(void*)(sal_uInt64)UNDERLINE_DASHDOTDOT);	126	maVSUnderline.SetItemData(8,(void*)(sal_uInt64)UNDERLINE_DASHDOT);
126		127
127	maVSUnderline.InsertItem(10, maIMGWave, String(SVX_RES(STR_WAVE)));	128	maVSUnderline.InsertItem(9, maIMGDashDotDot, String(SVX_RES(STR_DASH_DOT_DOT)));
128	maVSUnderline.SetItemData(10,(void*)(sal_uInt64)UNDERLINE_WAVE);	129	maVSUnderline.SetItemData(9,(void*)(sal_uInt64)UNDERLINE_DASHDOTDOT);
129		130
130	maVSUnderline.SetColCount( 1 );	131	maVSUnderline.InsertItem(10, maIMGWave, String(SVX_RES(STR_WAVE)));
131	aLink = LINK( this, TextUnderlineControl, VSSelectHdl ) ;	132	maVSUnderline.SetItemData(10,(void*)(sal_uInt64)UNDERLINE_WAVE);
		133
		134	maVSUnderline.SetColCount( 1 );
		135	aLink = LINK( this, TextUnderlineControl, VSSelectHdl ) ;
132	maVSUnderline.SetSelectHdl(aLink);	136	maVSUnderline.SetSelectHdl(aLink);
133		137
134	maVSUnderline.StartSelection();	138	maVSUnderline.StartSelection();
135	maVSUnderline.Show();	139	maVSUnderline.Show();
136	}	140	}
137		141
138		142
Lines 150-234 void TextUnderlineControl::Rearrange(FontUnderline eLine) Link Here
150	maVSUnderline.SetItemImage(9, GetDisplayBackground().GetColor().IsDark()? maIMGDashDotDotH : maIMGDashDotDot);	154	maVSUnderline.SetItemImage(9, GetDisplayBackground().GetColor().IsDark()? maIMGDashDotDotH : maIMGDashDotDot);
151	maVSUnderline.SetItemImage(10, GetDisplayBackground().GetColor().IsDark()? maIMGWaveH : maIMGWave);	155	maVSUnderline.SetItemImage(10, GetDisplayBackground().GetColor().IsDark()? maIMGWaveH : maIMGWave);
152		156
153	switch(eLine)	157	switch(eLine)
154	{	158	{
155	case UNDERLINE_SINGLE:	159	case UNDERLINE_SINGLE:
156	maVSUnderline.SetItemImage(1, maIMGSingleSel);	160	maVSUnderline.SetItemImage(1, maIMGSingleSel);
157	maVSUnderline.SelectItem(1);	161	maVSUnderline.SelectItem(1);
158	maVSUnderline.GrabFocus();	162	maVSUnderline.GrabFocus();
159	break;	163	break;
160	case UNDERLINE_DOUBLE:	164	case UNDERLINE_DOUBLE:
161	maVSUnderline.SetItemImage(2, maIMGDoubleSel);	165	maVSUnderline.SetItemImage(2, maIMGDoubleSel);
162	maVSUnderline.SelectItem(2);	166	maVSUnderline.SelectItem(2);
163	maVSUnderline.GrabFocus();	167	maVSUnderline.GrabFocus();
164	break;	168	break;
165	case UNDERLINE_BOLD:	169	case UNDERLINE_BOLD:
166	maVSUnderline.SetItemImage(3, maIMGBoldSel);	170	maVSUnderline.SetItemImage(3, maIMGBoldSel);
167	maVSUnderline.SelectItem(3);	171	maVSUnderline.SelectItem(3);
168	maVSUnderline.GrabFocus();	172	maVSUnderline.GrabFocus();
169	break;	173	break;
170	case UNDERLINE_DOTTED:	174	case UNDERLINE_DOTTED:
171	maVSUnderline.SetItemImage(4, maIMGDotSel);	175	maVSUnderline.SetItemImage(4, maIMGDotSel);
172	maVSUnderline.SelectItem(4);	176	maVSUnderline.SelectItem(4);
173	maVSUnderline.GrabFocus();	177	maVSUnderline.GrabFocus();
174	break;	178	break;
175	case UNDERLINE_BOLDDOTTED:	179	case UNDERLINE_BOLDDOTTED:
176	maVSUnderline.SetItemImage(5, maIMGDotBoldSel);	180	maVSUnderline.SetItemImage(5, maIMGDotBoldSel);
177	maVSUnderline.SelectItem(5);	181	maVSUnderline.SelectItem(5);
178	maVSUnderline.GrabFocus();	182	maVSUnderline.GrabFocus();
179	break;	183	break;
180	case UNDERLINE_DASH:	184	case UNDERLINE_DASH:
181	maVSUnderline.SetItemImage(6, maIMGDashSel);	185	maVSUnderline.SetItemImage(6, maIMGDashSel);
182	maVSUnderline.SelectItem(6);	186	maVSUnderline.SelectItem(6);
183	maVSUnderline.GrabFocus();	187	maVSUnderline.GrabFocus();
184	break;	188	break;
185	case UNDERLINE_LONGDASH:	189	case UNDERLINE_LONGDASH:
186	maVSUnderline.SetItemImage(7, maIMGDashLongSel);	190	maVSUnderline.SetItemImage(7, maIMGDashLongSel);
187	maVSUnderline.SelectItem(7);	191	maVSUnderline.SelectItem(7);
188	maVSUnderline.GrabFocus();	192	maVSUnderline.GrabFocus();
189	break;	193	break;
190	case UNDERLINE_DASHDOT:	194	case UNDERLINE_DASHDOT:
191	maVSUnderline.SetItemImage(8, maIMGDashDotSel);	195	maVSUnderline.SetItemImage(8, maIMGDashDotSel);
192	maVSUnderline.SelectItem(8);	196	maVSUnderline.SelectItem(8);
193	maVSUnderline.GrabFocus();	197	maVSUnderline.GrabFocus();
194	break;	198	break;
195	case UNDERLINE_DASHDOTDOT:	199	case UNDERLINE_DASHDOTDOT:
196	maVSUnderline.SetItemImage(9, maIMGDashDotDotSel);	200	maVSUnderline.SetItemImage(9, maIMGDashDotDotSel);
197	maVSUnderline.SelectItem(9);	201	maVSUnderline.SelectItem(9);
198	maVSUnderline.GrabFocus();	202	maVSUnderline.GrabFocus();
199	break;	203	break;
200	case UNDERLINE_WAVE:	204	case UNDERLINE_WAVE:
201	maVSUnderline.SetItemImage(10, maIMGWaveSel);	205	maVSUnderline.SetItemImage(10, maIMGWaveSel);
202	maVSUnderline.SelectItem(10);	206	maVSUnderline.SelectItem(10);
203	maVSUnderline.GrabFocus();	207	maVSUnderline.GrabFocus();
204	break;	208	break;
205	case UNDERLINE_NONE:	209	case UNDERLINE_NONE:
206	default:	210	maVSUnderline.SelectItem(0);
207	maVSUnderline.SelectItem(1);	211	maVSUnderline.GrabFocus();
208	maVSUnderline.SetNoSelection();	212	break;
209	maPBOptions.GrabFocus();	213	default:
210	}	214	maVSUnderline.SelectItem(1);
211	maVSUnderline.StartSelection();	215	maVSUnderline.SetNoSelection();
		216	maPBOptions.GrabFocus();
		217	}
		218	maVSUnderline.StartSelection();
212	}	219	}
213		220
214		221
215	IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)	222	IMPL_LINK(TextUnderlineControl, VSSelectHdl, void *, pControl)
216	{	223	{
217	if(pControl == &maVSUnderline)	224	if ( pControl == &maVSUnderline )
218	{	225	{
219	sal_uInt16 iPos = maVSUnderline.GetSelectItemId();	226	const sal_uInt16 iPos = maVSUnderline.GetSelectItemId();
220	FontUnderline eUnderline = (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );	227	const FontUnderline eUnderline = ( iPos == 0 )
		228	? UNDERLINE_NONE
		229	: (FontUnderline)(sal_uInt64)maVSUnderline.GetItemData( iPos );
221		230
222	SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);	231	SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
223		232
224	aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());	233	aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
225	mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);	234	mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SFX_CALLMODE_RECORD, &aLineItem, 0L);
226		235
227	mrTextPropertyPanel.SetUnderline(eUnderline);	236	mrTextPropertyPanel.SetUnderline(eUnderline);
228		237
229	mrTextPropertyPanel.EndUnderlinePopupMode();	238	mrTextPropertyPanel.EndUnderlinePopupMode();
230	}	239	}
231	return( 0L );	240	return( 0L );
232	}	241	}
233		242
234	IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn)	243	IMPL_LINK(TextUnderlineControl, PBClickHdl, PushButton *, pPBtn)