Attachment #82439 for issue #122554

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

Lines 1641-1646 Link Here

(-)cui/source/customize/cfg.cxx (-11 / +5 lines)
1641	SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),	1641	SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),
1642	bInitialised( sal_False ),	1642	bInitialised( sal_False ),
1643	pCurrentSaveInData( 0 ),	1643	pCurrentSaveInData( 0 ),
		1644	aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
		1645	aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
1644	aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),	1646	aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),
1645	aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),	1647	aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),
1646	aTopLevelListBox( this, CUI_RES( LB_MENUS ) ),	1648	aTopLevelListBox( this, CUI_RES( LB_MENUS ) ),
Lines 1653-1660 Link Here
1653	aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ),	1655	aModifyCommandButton( this, CUI_RES( BTN_CHANGE_ENTRY ) ),
1654	aMoveUpButton( this, CUI_RES( BTN_UP ) ),	1656	aMoveUpButton( this, CUI_RES( BTN_UP ) ),
1655	aMoveDownButton( this, CUI_RES( BTN_DOWN ) ),	1657	aMoveDownButton( this, CUI_RES( BTN_DOWN ) ),
1656	aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
1657	aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
1658	aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ),	1658	aDescriptionLabel( this, CUI_RES( FT_DESCRIPTION ) ),
1659	aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ),	1659	aDescriptionField( this, CUI_RES( ED_DESCRIPTION ) ),
1660	pSelectorDlg( 0 )	1660	pSelectorDlg( 0 )
Lines 1996-2003 Link Here
1996	return;	1996	return;
1997	}	1997	}
1998		1998
1999	Point p, newp;
2000	Size s, news;
2001	long x, y, width, height;	1999	long x, y, width, height;
2002		2000
2003	// x and width is same as aTopLevelListBox	2001	// x and width is same as aTopLevelListBox
Lines 2007-2019 Link Here
2007	// y is same as aAddCommandsButton	2005	// y is same as aAddCommandsButton
2008	y = aAddCommandsButton.GetPosPixel().Y();	2006	y = aAddCommandsButton.GetPosPixel().Y();
2009		2007
2010	// get gap between aAddCommandsButton and aContentsSeparator	2008	height = aDescriptionLabel.GetPosPixel().Y() - y - y +
2011	p = aContentsSeparator.GetPosPixel();	2009	aContentsSeparator.GetPosPixel().Y() +
2012	s = aContentsSeparator.GetSizePixel();	2010	aContentsSeparator.GetSizePixel().Height();
2013	long gap = y - ( p.Y() + s.Height() );
2014
2015	height = aSaveInListBox.GetPosPixel().Y() - y - gap;
2016
2017	aContentsListBox->SetPosPixel( Point( x, y ) );	2011	aContentsListBox->SetPosPixel( Point( x, y ) );
2018	aContentsListBox->SetSizePixel( Size( width, height ) );	2012	aContentsListBox->SetSizePixel( Size( width, height ) );
2019	}	2013	}




	Text [ en-US ] = "Toolbar Name" ;\

#define TEXT_SAVE_IN \
	Text [ en-US ] = "Scope" ;\

TabPage RID_SVXPAGE_MENUS
{

	HelpId = HID_SVX_CONFIG_MENU ;
	FixedLine GRP_MENUS
	{
		Pos = MAP_APPFONT ( 6 , 25 ) ;
		Size = MAP_APPFONT ( 261 , 8 ) ;
		Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;
	};
	FixedText FT_MENUS
	{
        Pos = MAP_APPFONT ( 9 , 38 ) ;
		Size = MAP_APPFONT ( 55 , 8 ) ;
		TEXT_MENU
	};

	{
	    HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
		Border = TRUE ;
		Pos = MAP_APPFONT ( 64 , 36 ) ;
        Size = MAP_APPFONT ( 108 , 108 ) ;
		DropDown = TRUE ;
	};
	PushButton BTN_NEW
	{
	    HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
        Pos = MAP_APPFONT ( 192 , 36 ) ;
        Size = MAP_APPFONT ( 75 , 14 ) ;
		TabStop = TRUE ;
		Text [ en-US ] = "New..." ;

	MenuButton BTN_CHANGE
	{
	    HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
        Pos = MAP_APPFONT ( 192 , 53 ) ;
        Size = MAP_APPFONT ( 75 , 14 ) ;
		TabStop = TRUE ;
		TEXT_MENU
	};
	FixedLine GRP_MENU_SEPARATOR
	{
		Pos = MAP_APPFONT ( 6 , 70 ) ;
		Size = MAP_APPFONT ( 261 , 8 ) ;
		Text [ en-US ] = "Menu Content" ;
	};
	FixedText GRP_MENU_ENTRIES
	{
		Pos = MAP_APPFONT ( 9 , 81 ) ;
		Size = MAP_APPFONT ( 55 , 8 ) ;
		Group = TRUE ;
		Text [ en-US ] = "Entries" ;

	Control BOX_ENTRIES
	{
		Border = TRUE ;
		Pos = MAP_APPFONT ( 64 , 81 ) ;
        Size = MAP_APPFONT ( 108 , 120 ) ;
		TabStop = TRUE ;
		HelpId = HID_SVX_CONFIG_MENU_CONTENTS ;
	};
	PushButton BTN_ADD_COMMANDS
	{
	    HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
        Pos = MAP_APPFONT ( 192 , 81 ) ;
        Size = MAP_APPFONT ( 75 , 14 ) ;
		TabStop = TRUE ;
		Text [ en-US ] = "Add..." ;

	MenuButton BTN_CHANGE_ENTRY
	{
	    HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
        Pos = MAP_APPFONT ( 192 , 98 ) ;
        Size = MAP_APPFONT ( 75 , 14 ) ;
		TabStop = TRUE ;
		Text [ en-US ] = "Modify" ;

	ImageButton BTN_UP
	{
	    HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
        Pos = MAP_APPFONT ( 175 , 116 ) ;
		Size = MAP_APPFONT ( 14 , 14 ) ;
		TabStop = TRUE ;
		Symbol = IMAGEBUTTON_ARROW_UP ;

	ImageButton BTN_DOWN
	{
	    HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
        Pos = MAP_APPFONT ( 175 , 133 ) ;
		Size = MAP_APPFONT ( 14 , 14 ) ;
		TabStop = TRUE ;
		Symbol = IMAGEBUTTON_ARROW_DOWN ;

	};
	FixedText TXT_SAVEIN
	{
		Pos = MAP_APPFONT ( 9 , 11 ) ;
		Size = MAP_APPFONT ( 55 , 8 ) ;
		Group = TRUE ;
		TEXT_SAVE_IN

	{
	    HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
		Border = TRUE ;
		Pos = MAP_APPFONT ( 64 , 9 ) ;
        Size = MAP_APPFONT ( 108 , 53 ) ;
		DropDown = TRUE ;
	};

Lines 385-390 Link Here

(-)cui/source/inc/cfg.hxx (-3 / +3 lines)
385		385
386	protected:	386	protected:
387		387
		388	FixedText aSaveInText;
		389	ListBox aSaveInListBox;
		390
388	// the top section of the tab page where top level menus and toolbars	391	// the top section of the tab page where top level menus and toolbars
389	// are displayed in a listbox	392	// are displayed in a listbox
390	FixedLine aTopLevelSeparator;	393	FixedLine aTopLevelSeparator;
Lines 405-413 Link Here
405	ImageButton aMoveUpButton;	408	ImageButton aMoveUpButton;
406	ImageButton aMoveDownButton;	409	ImageButton aMoveDownButton;
407		410
408	FixedText aSaveInText;
409	ListBox aSaveInListBox;
410
411	FixedText aDescriptionLabel;	411	FixedText aDescriptionLabel;
412	SvxDescriptionEdit aDescriptionField;	412	SvxDescriptionEdit aDescriptionField;
413		413

Return to issue 122554

Lines 94-100 Link Here

(-)cui/source/customize/cfg.src (-16 / +16 lines)
94	Text [ en-US ] = "Toolbar Name" ;\	94	Text [ en-US ] = "Toolbar Name" ;\
95		95
96	#define TEXT_SAVE_IN \	96	#define TEXT_SAVE_IN \
97	Text [ en-US ] = "Save In" ;\	97	Text [ en-US ] = "Scope" ;\
98		98
99	TabPage RID_SVXPAGE_MENUS	99	TabPage RID_SVXPAGE_MENUS
100	{	100	{
Lines 103-115 Link Here
103	HelpId = HID_SVX_CONFIG_MENU ;	103	HelpId = HID_SVX_CONFIG_MENU ;
104	FixedLine GRP_MENUS	104	FixedLine GRP_MENUS
105	{	105	{
106	Pos = MAP_APPFONT ( 6 , 11 ) ;	106	Pos = MAP_APPFONT ( 6 , 25 ) ;
107	Size = MAP_APPFONT ( 261 , 8 ) ;	107	Size = MAP_APPFONT ( 261 , 8 ) ;
108	Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;	108	Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;
109	};	109	};
110	FixedText FT_MENUS	110	FixedText FT_MENUS
111	{	111	{
112	Pos = MAP_APPFONT ( 9 , 24 ) ;	112	Pos = MAP_APPFONT ( 9 , 38 ) ;
113	Size = MAP_APPFONT ( 55 , 8 ) ;	113	Size = MAP_APPFONT ( 55 , 8 ) ;
114	TEXT_MENU	114	TEXT_MENU
115	};	115	};
Lines 117-130 Link Here
117	{	117	{
118	HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";	118	HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
119	Border = TRUE ;	119	Border = TRUE ;
120	Pos = MAP_APPFONT ( 64 , 22 ) ;	120	Pos = MAP_APPFONT ( 64 , 36 ) ;
121	Size = MAP_APPFONT ( 108 , 108 ) ;	121	Size = MAP_APPFONT ( 108 , 108 ) ;
122	DropDown = TRUE ;	122	DropDown = TRUE ;
123	};	123	};
124	PushButton BTN_NEW	124	PushButton BTN_NEW
125	{	125	{
126	HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";	126	HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
127	Pos = MAP_APPFONT ( 192 , 22 ) ;	127	Pos = MAP_APPFONT ( 192 , 36 ) ;
128	Size = MAP_APPFONT ( 75 , 14 ) ;	128	Size = MAP_APPFONT ( 75 , 14 ) ;
129	TabStop = TRUE ;	129	TabStop = TRUE ;
130	Text [ en-US ] = "New..." ;	130	Text [ en-US ] = "New..." ;
Lines 132-151 Link Here
132	MenuButton BTN_CHANGE	132	MenuButton BTN_CHANGE
133	{	133	{
134	HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";	134	HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
135	Pos = MAP_APPFONT ( 192 , 39 ) ;	135	Pos = MAP_APPFONT ( 192 , 53 ) ;
136	Size = MAP_APPFONT ( 75 , 14 ) ;	136	Size = MAP_APPFONT ( 75 , 14 ) ;
137	TabStop = TRUE ;	137	TabStop = TRUE ;
138	TEXT_MENU	138	TEXT_MENU
139	};	139	};
140	FixedLine GRP_MENU_SEPARATOR	140	FixedLine GRP_MENU_SEPARATOR
141	{	141	{
142	Pos = MAP_APPFONT ( 6 , 56 ) ;	142	Pos = MAP_APPFONT ( 6 , 70 ) ;
143	Size = MAP_APPFONT ( 261 , 8 ) ;	143	Size = MAP_APPFONT ( 261 , 8 ) ;
144	Text [ en-US ] = "Menu Content" ;	144	Text [ en-US ] = "Menu Content" ;
145	};	145	};
146	FixedText GRP_MENU_ENTRIES	146	FixedText GRP_MENU_ENTRIES
147	{	147	{
148	Pos = MAP_APPFONT ( 9 , 67 ) ;	148	Pos = MAP_APPFONT ( 9 , 81 ) ;
149	Size = MAP_APPFONT ( 55 , 8 ) ;	149	Size = MAP_APPFONT ( 55 , 8 ) ;
150	Group = TRUE ;	150	Group = TRUE ;
151	Text [ en-US ] = "Entries" ;	151	Text [ en-US ] = "Entries" ;
Lines 153-167 Link Here
153	Control BOX_ENTRIES	153	Control BOX_ENTRIES
154	{	154	{
155	Border = TRUE ;	155	Border = TRUE ;
156	Pos = MAP_APPFONT ( 64 , 67 ) ;	156	Pos = MAP_APPFONT ( 64 , 81 ) ;
157	Size = MAP_APPFONT ( 108 , 115 ) ;	157	Size = MAP_APPFONT ( 108 , 120 ) ;
158	TabStop = TRUE ;	158	TabStop = TRUE ;
159	HelpId = HID_SVX_CONFIG_MENU_CONTENTS ;	159	HelpId = HID_SVX_CONFIG_MENU_CONTENTS ;
160	};	160	};
161	PushButton BTN_ADD_COMMANDS	161	PushButton BTN_ADD_COMMANDS
162	{	162	{
163	HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";	163	HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
164	Pos = MAP_APPFONT ( 192 , 67 ) ;	164	Pos = MAP_APPFONT ( 192 , 81 ) ;
165	Size = MAP_APPFONT ( 75 , 14 ) ;	165	Size = MAP_APPFONT ( 75 , 14 ) ;
166	TabStop = TRUE ;	166	TabStop = TRUE ;
167	Text [ en-US ] = "Add..." ;	167	Text [ en-US ] = "Add..." ;
Lines 169-175 Link Here
169	MenuButton BTN_CHANGE_ENTRY	169	MenuButton BTN_CHANGE_ENTRY
170	{	170	{
171	HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";	171	HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
172	Pos = MAP_APPFONT ( 192 , 84 ) ;	172	Pos = MAP_APPFONT ( 192 , 98 ) ;
173	Size = MAP_APPFONT ( 75 , 14 ) ;	173	Size = MAP_APPFONT ( 75 , 14 ) ;
174	TabStop = TRUE ;	174	TabStop = TRUE ;
175	Text [ en-US ] = "Modify" ;	175	Text [ en-US ] = "Modify" ;
Lines 177-183 Link Here
177	ImageButton BTN_UP	177	ImageButton BTN_UP
178	{	178	{
179	HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";	179	HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
180	Pos = MAP_APPFONT ( 175 , 102 ) ;	180	Pos = MAP_APPFONT ( 175 , 116 ) ;
181	Size = MAP_APPFONT ( 14 , 14 ) ;	181	Size = MAP_APPFONT ( 14 , 14 ) ;
182	TabStop = TRUE ;	182	TabStop = TRUE ;
183	Symbol = IMAGEBUTTON_ARROW_UP ;	183	Symbol = IMAGEBUTTON_ARROW_UP ;
Lines 186-192 Link Here
186	ImageButton BTN_DOWN	186	ImageButton BTN_DOWN
187	{	187	{
188	HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";	188	HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
189	Pos = MAP_APPFONT ( 175 , 119 ) ;	189	Pos = MAP_APPFONT ( 175 , 133 ) ;
190	Size = MAP_APPFONT ( 14 , 14 ) ;	190	Size = MAP_APPFONT ( 14 , 14 ) ;
191	TabStop = TRUE ;	191	TabStop = TRUE ;
192	Symbol = IMAGEBUTTON_ARROW_DOWN ;	192	Symbol = IMAGEBUTTON_ARROW_DOWN ;
Lines 194-200 Link Here
194	};	194	};
195	FixedText TXT_SAVEIN	195	FixedText TXT_SAVEIN
196	{	196	{
197	Pos = MAP_APPFONT ( 9 , 190 ) ;	197	Pos = MAP_APPFONT ( 9 , 11 ) ;
198	Size = MAP_APPFONT ( 55 , 8 ) ;	198	Size = MAP_APPFONT ( 55 , 8 ) ;
199	Group = TRUE ;	199	Group = TRUE ;
200	TEXT_SAVE_IN	200	TEXT_SAVE_IN
Lines 203-209 Link Here
203	{	203	{
204	HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";	204	HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
205	Border = TRUE ;	205	Border = TRUE ;
206	Pos = MAP_APPFONT ( 64 , 188 ) ;	206	Pos = MAP_APPFONT ( 64 , 9 ) ;
207	Size = MAP_APPFONT ( 108 , 53 ) ;	207	Size = MAP_APPFONT ( 108 , 53 ) ;
208	DropDown = TRUE ;	208	DropDown = TRUE ;
209	};	209	};