This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new b575adceb6 Clean up resource files
b575adceb6 is described below
commit b575adceb6f0684e5c6487d3ae59ce7b5b5f778a
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Nov 21 23:59:04 2024 +0100
Clean up resource files
(cherry picked from commit 4c17cfc0abe27fe10e35cd976c510015e4362c58)
---
main/cui/source/dialogs/colorpicker.src | 8 +-
main/dbaccess/source/ui/dlg/admincontrols.src | 2 +-
main/dbaccess/source/ui/dlg/directsql.src | 107 ++++----
main/reportdesign/source/ui/dlg/CondFormat.src | 357 ++++++++++++-------------
main/reportdesign/source/ui/dlg/DateTime.src | 106 ++++----
5 files changed, 288 insertions(+), 292 deletions(-)
diff --git a/main/cui/source/dialogs/colorpicker.src
b/main/cui/source/dialogs/colorpicker.src
index 49588ea407..e4ac344bc6 100644
--- a/main/cui/source/dialogs/colorpicker.src
+++ b/main/cui/source/dialogs/colorpicker.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "colorpicker.hrc"
#define DLG_WIDTH 295
@@ -104,7 +102,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
HelpID = "cui:Control:ColorPicker:ColorPreview" ;
Pos = MAP_APPFONT ( 6, 6 + CHOOSER_SIZE + 3 ) ;
Size = MAP_APPFONT ( CHOOSER_SIZE, PREVIEW_HEIGHT ) ;
- Border = FALSE;
+ Border = FALSE ;
};
Control CT_PREVIOUS
@@ -134,7 +132,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
{
HelpID = "cui:ImageButton:ColorPicker:Picker" ;
Pos = MAP_APPFONT ( CONTROL_AREA_X - 2 - SLIDER_WIDTH + 4, 6 +
CHOOSER_SIZE + 3 ) ;
- Size = MAP_APPFONT( SLIDER_WIDTH - 8, PREVIEW_HEIGHT ) ;
+ Size = MAP_APPFONT ( SLIDER_WIDTH - 8, PREVIEW_HEIGHT ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Pick a color from the document" ;
ButtonImage = Image
@@ -156,7 +154,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
HelpID = "cui:RadioButton:ColorPicker:Red" ;
Pos = MAP_APPFONT ( CONTROL_AREA_X_RADIO, RGB_Y1+2 ) ;
Size = MAP_APPFONT ( RADIO_WIDTH, RADIO_HEIGHT ) ;
- Group = TRUE;
+ Group = TRUE ;
};
RadioButton CT_GREEN
diff --git a/main/dbaccess/source/ui/dlg/admincontrols.src
b/main/dbaccess/source/ui/dlg/admincontrols.src
index 885c68c369..e2a60e79c4 100644
--- a/main/dbaccess/source/ui/dlg/admincontrols.src
+++ b/main/dbaccess/source/ui/dlg/admincontrols.src
@@ -31,7 +31,7 @@
Control RID_MYSQL_NATIVE_SETTINGS
{
DialogControl = TRUE ;
- Size = MAP_APPFONT( SETTINGS_CONTROL_WIDTH, 5 * LINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( SETTINGS_CONTROL_WIDTH, 5 * LINE_HEIGHT ) ;
Hide = FALSE ;
FixedText FT_MYSQL_DATABASE_NAME
diff --git a/main/dbaccess/source/ui/dlg/directsql.src
b/main/dbaccess/source/ui/dlg/directsql.src
index 5568c1dc34..17da70982a 100644
--- a/main/dbaccess/source/ui/dlg/directsql.src
+++ b/main/dbaccess/source/ui/dlg/directsql.src
@@ -1,26 +1,24 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "License") ; you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#ifndef _DBACCESS_UI_DIRECTSQL_HRC_
#include "directsql.hrc"
#endif
@@ -36,89 +34,89 @@
ModalDialog DLG_DIRECTSQL
{
- HelpID = "dbaccess:ModalDialog:DLG_DIRECTSQL";
+ HelpID = "dbaccess:ModalDialog:DLG_DIRECTSQL" ;
OutputSize = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
FixedLine FL_SQL
{
- Pos = MAP_APPFONT( 4, 3 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 8, 8 );
- Text [ en-US ] = "SQL command";
+ Pos = MAP_APPFONT ( 4, 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+ Text [ en-US ] = "SQL command" ;
};
FixedText FT_SQL
{
- Pos = MAP_APPFONT( 7, 15 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 8 );
- Text [ en-US ] = "Command to execute";
+ Pos = MAP_APPFONT ( 7, 15 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
+ Text [ en-US ] = "Command to execute" ;
};
MultiLineEdit ME_SQL
{
- HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL";
- Pos = MAP_APPFONT( 7, 26 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 80 );
- SVLook = TRUE;
- Border = TRUE;
- TabStop = TRUE;
- IgnoreTab = TRUE;
+ HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL" ;
+ Pos = MAP_APPFONT ( 7, 26 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 80 ) ;
+ SVLook = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ IgnoreTab = TRUE ;
};
PushButton PB_EXECUTE
{
- HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE";
- Pos = MAP_APPFONT( WINDOW_SIZE_X - BUTTON_SIZE_X - 7, 109 );
- Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
- Text [ en-US ] = "Execute";
- DefButton = TRUE;
+ HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE" ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X - BUTTON_SIZE_X - 7, 109 ) ;
+ Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+ Text [ en-US ] = "Execute" ;
+ DefButton = TRUE ;
};
FixedText FT_HISTORY
{
- Pos = MAP_APPFONT( 7, 110 + BUTTON_SIZE_Y + 3 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 8 );
- Text [ en-US ] = "Previous commands";
+ Pos = MAP_APPFONT ( 7, 110 + BUTTON_SIZE_Y + 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 8 ) ;
+ Text [ en-US ] = "Previous commands" ;
};
ListBox LB_HISTORY
{
- HelpID = "dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY";
- Pos = MAP_APPFONT( 7, 121 + BUTTON_SIZE_Y + 3 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 14 );
- SvLook = TRUE;
- DropDown = TRUE;
- Border = TRUE;
+ HelpID = "dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY" ;
+ Pos = MAP_APPFONT ( 7, 121 + BUTTON_SIZE_Y + 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 14 ) ;
+ SvLook = TRUE ;
+ DropDown = TRUE ;
+ Border = TRUE ;
};
FixedLine FL_STATUS
{
- Pos = MAP_APPFONT( 4, 138 + BUTTON_SIZE_Y + 4 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 8, 8 );
- Text [ en-US ] = "Status";
+ Pos = MAP_APPFONT ( 4, 138 + BUTTON_SIZE_Y + 4 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+ Text [ en-US ] = "Status" ;
};
MultiLineEdit ME_STATUS
{
- HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS";
- Pos = MAP_APPFONT( 7, 153 + BUTTON_SIZE_Y );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 41 );
- Border = TRUE;
- ReadOnly = TRUE;
- VScroll = TRUE;
+ HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS" ;
+ Pos = MAP_APPFONT ( 7, 153 + BUTTON_SIZE_Y ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 41 ) ;
+ Border = TRUE ;
+ ReadOnly = TRUE ;
+ VScroll = TRUE ;
};
FixedLine FL_BUTTONS
{
- Pos = MAP_APPFONT( 4, 193 + BUTTON_SIZE_Y + 4 );
- Size = MAP_APPFONT( WINDOW_SIZE_X - 8, 8 );
+ Pos = MAP_APPFONT ( 4, 193 + BUTTON_SIZE_Y + 4 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X - 3 -
BUTTON_SIZE_X, 207 + BUTTON_SIZE_Y );
- Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X - 3 -
BUTTON_SIZE_X, 207 + BUTTON_SIZE_Y ) ;
+ Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
};
PushButton PB_CLOSE
{
- HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE";
- Pos = MAP_APPFONT( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X, 207 +
BUTTON_SIZE_Y );
- Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
- Text [ en-US ] = "Close";
+ HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE" ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X, 207 +
BUTTON_SIZE_Y ) ;
+ Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+ Text [ en-US ] = "Close" ;
};
Text [ en-US ] = "Execute SQL Statement" ;
@@ -131,6 +129,7 @@ String STR_COMMAND_EXECUTED_SUCCESSFULLY
String STR_DIRECTSQL_CONNECTIONLOST
{
- Text [ en-US ] = "The connection to the database has been lost. This
dialog will be closed.";
+ Text [ en-US ] = "The connection to the database has been lost. This
dialog will be closed." ;
};
+// ********************************************************************** EOF
diff --git a/main/reportdesign/source/ui/dlg/CondFormat.src
b/main/reportdesign/source/ui/dlg/CondFormat.src
index bdd24bc855..e487df48ae 100644
--- a/main/reportdesign/source/ui/dlg/CondFormat.src
+++ b/main/reportdesign/source/ui/dlg/CondFormat.src
@@ -1,25 +1,24 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "License") ; you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#include "CondFormat.hrc"
#include "RptResId.hrc"
#include "helpids.hrc"
@@ -30,12 +29,12 @@
Control WIN_CONDITION
{
- Size = MAP_APPFONT ( CONDITION_WIDTH , CONDITION_HEIGHT ) ;
- HelpId = HID_RPT_COND_DLG;
- DialogControl = TRUE;
- Hide = TRUE;
+ Size = MAP_APPFONT ( CONDITION_WIDTH, CONDITION_HEIGHT ) ;
+ HelpId = HID_RPT_COND_DLG ;
+ DialogControl = TRUE ;
+ Hide = TRUE ;
- FixedLine FL_CONDITION_HEADER
+ FixedLine FL_CONDITION_HEADER
{
Pos = MAP_APPFONT ( RELATED_CONTROLS, ROW_0_POS ) ;
Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS,
ROW_0_HEIGTH ) ;
@@ -44,103 +43,101 @@ Control WIN_CONDITION
ListBox LB_COND_TYPE
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS, ROW_1_POS ) ;
- Size = MAP_APPFONT( COND_TYPE_WIDTH, 60 );
- Border = TRUE;
- DropDown = TRUE;
- TabStop = TRUE;
- Sort = FALSE;
+ Size = MAP_APPFONT ( COND_TYPE_WIDTH, 60 ) ;
+ Border = TRUE ;
+ DropDown = TRUE ;
+ TabStop = TRUE ;
+ Sort = FALSE ;
StringList [ en-US ] =
{
- < "Field Value Is" ; Default ; > ;
- < "Expression Is" ; Default ; > ;
+ < "Field Value Is" ; Default ; > ;
+ < "Expression Is" ; Default ; > ;
};
};
ListBox LB_OP
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + COND_TYPE_WIDTH +
UNRELATED_CONTROLS, ROW_1_POS ) ;
- Size = MAP_APPFONT( COND_OP_WIDTH, 60 );
- Border = TRUE;
- DropDown = TRUE;
- TabStop = TRUE;
- Sort = FALSE;
+ Size = MAP_APPFONT ( COND_OP_WIDTH, 60 ) ;
+ Border = TRUE ;
+ DropDown = TRUE ;
+ TabStop = TRUE ;
+ Sort = FALSE ;
StringList [ en-US ] =
{
- < "between" ; 0; > ;
- < "not between" ; 1; > ;
- < "equal to" ; 2; > ;
- < "not equal to" ; 3; > ;
- < "greater than" ; 4; > ;
- < "less than" ; 5; > ;
- < "greater than or equal to" ; 6; > ;
- < "less than or equal to" ; 7; > ;
+ < "between" ; 0;
> ;
+ < "not between" ; 1; > ;
+ < "equal to" ; 2;
> ;
+ < "not equal to" ; 3; > ;
+ < "greater than" ; 4; > ;
+ < "less than" ; 5;
> ;
+ < "greater than or equal to" ; 6; > ;
+ < "less than or equal to" ; 7; > ;
};
};
Edit ED_CONDITION_LHS
{
- Pos = MAP_APPFONT ( 3*UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH, ROW_1_POS ) ;
- Size = MAP_APPFONT( EDIT_WIDTH, EDIT_HEIGHT );
- Border = TRUE;
- TabStop = TRUE;
+ Pos = MAP_APPFONT ( 3 * UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH, ROW_1_POS ) ;
+ Size = MAP_APPFONT ( EDIT_WIDTH, EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
};
FixedText FT_AND
{
- Pos = MAP_APPFONT ( 4*UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH + EDIT_WIDTH,
- ROW_1_POS + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 );
- Size = MAP_APPFONT( OPERATOR_SEP_WIDTH , FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "and";
+ Pos = MAP_APPFONT ( 4 * UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH + EDIT_WIDTH, ROW_1_POS + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2
) ;
+ Size = MAP_APPFONT ( OPERATOR_SEP_WIDTH, FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "and" ;
};
Edit ED_CONDITION_RHS
{
- Pos = MAP_APPFONT ( 5*UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH + EDIT_WIDTH + OPERATOR_SEP_WIDTH,
- ROW_1_POS );
- Size = MAP_APPFONT( EDIT_WIDTH, EDIT_HEIGHT );
- Border = TRUE;
- TabStop = TRUE;
+ Pos = MAP_APPFONT ( 5 * UNRELATED_CONTROLS + COND_TYPE_WIDTH +
COND_OP_WIDTH + EDIT_WIDTH + OPERATOR_SEP_WIDTH, ROW_1_POS ) ;
+ Size = MAP_APPFONT ( EDIT_WIDTH, EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
};
ImageButton BTN_MOVE_UP
{
Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS -
IMAGE_BUTTON_WIDTH, ROW_1_POS ) ;
Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- Symbol = IMAGEBUTTON_ARROW_UP ;
+ TabStop = TRUE ;
+ Symbol = IMAGEBUTTON_ARROW_UP ;
};
ImageButton BTN_MOVE_DOWN
{
Pos = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS -
IMAGE_BUTTON_WIDTH, ROW_1_POS + IMAGE_BUTTON_HEIGHT + RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- Symbol = IMAGEBUTTON_ARROW_DOWN ;
+ TabStop = TRUE ;
+ Symbol = IMAGEBUTTON_ARROW_DOWN ;
};
ToolBox TB_FORMAT
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS + RELATED_CONTROLS,
ROW_2_POS ) ;
- ButtonType = BUTTON_SYMBOL;
- Align = BOXALIGN_TOP;
- HelpId = HID_RPT_CONDFORMAT_TB;
- Customize = FALSE;
+ ButtonType = BUTTON_SYMBOL ;
+ Align = BOXALIGN_TOP ;
+ HelpId = HID_RPT_CONDFORMAT_TB ;
+ Customize = FALSE ;
ItemList =
{
ToolBoxItem
{
ITEM_FORMAT_ATTR_CHAR_WEIGHT
- Checkable = TRUE;
+ Checkable = TRUE ;
};
ToolBoxItem
{
ITEM_FORMAT_ATTR_CHAR_POSTURE
- Checkable = TRUE;
+ Checkable = TRUE ;
};
ToolBoxItem
{
ITEM_FORMAT_ATTR_CHAR_UNDERLINE
- Checkable = TRUE;
+ Checkable = TRUE ;
};
ToolBoxItem
{
@@ -149,13 +146,13 @@ Control WIN_CONDITION
ToolBoxItem
{
ITEM_TOOLBAR_BACKGROUND_COLOR
- DropDown = TRUE;
+ DropDown = TRUE ;
};
ToolBoxItem
{
ITEM_TOOLBAR_ATTR_CHAR_COLOR
- Identifier = SID_ATTR_CHAR_COLOR2;
- Command = ".uno:FontColor";
+ Identifier = SID_ATTR_CHAR_COLOR2 ;
+ Command = ".uno:FontColor" ;
};
ToolBoxItem
{
@@ -166,33 +163,33 @@ Control WIN_CONDITION
Window CRTL_FORMAT_PREVIEW
{
- Pos = MAP_APPFONT ( 2*UNRELATED_CONTROLS, ROW_2_POS ) ;
+ Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS, ROW_2_POS ) ;
Size = MAP_APPFONT ( CONDITION_WIDTH - UNRELATED_CONTROLS,
ROW_2_HEIGHT ) ;
Border = TRUE ;
- HelpId = HID_RPT_CRTL_FORMAT_PREVIEW;
- Text [ en-US ] = "Example";
+ HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ;
+ Text [ en-US ] = "Example" ;
};
- PushButton BTN_ADD_CONDITION
- {
- Pos = MAP_APPFONT( CONDITION_WIDTH - 2*UNRELATED_CONTROLS -
2*IMAGE_BUTTON_WIDTH - RELATED_CONTROLS, ROW_3_POS );
- Size = MAP_APPFONT( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT );
- Text = "+";
- };
+ PushButton BTN_ADD_CONDITION
+ {
+ Pos = MAP_APPFONT ( CONDITION_WIDTH - 2 * UNRELATED_CONTROLS -
2 * IMAGE_BUTTON_WIDTH - RELATED_CONTROLS, ROW_3_POS ) ;
+ Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ;
+ Text = "+" ;
+ };
- PushButton BTN_REMOVE_CONDITION
- {
- Pos = MAP_APPFONT( CONDITION_WIDTH - 2*UNRELATED_CONTROLS -
2*IMAGE_BUTTON_WIDTH - RELATED_CONTROLS, ROW_3_POS );
- Size = MAP_APPFONT( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT );
- Text = "-";
- };
+ PushButton BTN_REMOVE_CONDITION
+ {
+ Pos = MAP_APPFONT ( CONDITION_WIDTH - 2 * UNRELATED_CONTROLS -
2 * IMAGE_BUTTON_WIDTH - RELATED_CONTROLS, ROW_3_POS ) ;
+ Size = MAP_APPFONT ( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT ) ;
+ Text = "-" ;
+ };
Image IMG_MOVE_UP_HC
{
ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; };
};
- Image IMG_MOVE_DOWN_HC
+ Image IMG_MOVE_DOWN_HC
{
ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; };
};
@@ -202,59 +199,59 @@ ModalDialog RID_CONDFORMAT
{
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( COND_DLG_WIDTH, COND_DLG_HEIGHT ) ;
+ Size = MAP_APPFONT ( COND_DLG_WIDTH, COND_DLG_HEIGHT ) ;
Text [ en-US ] = "Conditional Formatting" ;
- HelpId = HID_RPT_CONDFORMAT_DLG;
+ HelpId = HID_RPT_CONDFORMAT_DLG ;
Moveable = TRUE ;
Closeable = TRUE ;
- Window WND_COND_PLAYGROUND
- {
+ Window WND_COND_PLAYGROUND
+ {
Pos = MAP_APPFONT ( 0, 0 ) ;
Size = MAP_APPFONT ( CONDITION_WIDTH, CONDITION_HEIGHT ) ;
- DialogControl = TRUE;
- Hide = FALSE;
- };
+ DialogControl = TRUE ;
+ Hide = FALSE ;
+ };
FixedLine FL_SEPARATOR1
{
Pos = MAP_APPFONT ( RELATED_CONTROLS, CONDITION_HEIGHT +
RELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( CONDITION_WIDTH - 2*RELATED_CONTROLS , 1 )
;
+ Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS, 1
) ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( CONDITION_WIDTH - 3*BUTTON_WIDTH -
2*UNRELATED_CONTROLS - RELATED_CONTROLS, CONDITION_HEIGHT + 2*RELATED_CONTROLS
+ 1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( CONDITION_WIDTH - 3 * BUTTON_WIDTH - 2 *
UNRELATED_CONTROLS - RELATED_CONTROLS, CONDITION_HEIGHT + 2 * RELATED_CONTROLS
+ 1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
- CancelButton PB_CANCEL
+ CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( CONDITION_WIDTH - 2*BUTTON_WIDTH -
2*UNRELATED_CONTROLS , CONDITION_HEIGHT + 2*RELATED_CONTROLS + 1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( CONDITION_WIDTH - 2 * BUTTON_WIDTH - 2 *
UNRELATED_CONTROLS, CONDITION_HEIGHT + 2 * RELATED_CONTROLS + 1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
- TabStop = TRUE ;
- Pos = MAP_APPFONT ( CONDITION_WIDTH - BUTTON_WIDTH -
UNRELATED_CONTROLS, CONDITION_HEIGHT + 2*RELATED_CONTROLS + 1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- Text [ en-US ] = "~Help";
+ TabStop = TRUE ;
+ Pos = MAP_APPFONT ( CONDITION_WIDTH - BUTTON_WIDTH -
UNRELATED_CONTROLS, CONDITION_HEIGHT + 2 * RELATED_CONTROLS + 1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
+ Text [ en-US ] = "~Help" ;
};
- ScrollBar SB_ALL_CONDITIONS
- {
+ ScrollBar SB_ALL_CONDITIONS
+ {
Pos = MAP_APPFONT ( CONDITION_WIDTH, RELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( SCROLLBAR_WIDTH, CONDITION_HEIGHT +
RELATED_CONTROLS ) ;
- };
+ Size = MAP_APPFONT ( SCROLLBAR_WIDTH, CONDITION_HEIGHT +
RELATED_CONTROLS ) ;
+ };
};
String STR_NUMBERED_CONDITION
{
- Text [ en-US ] = "Condition $number$";
+ Text [ en-US ] = "Condition $number$" ;
};
String STR_COLOR_WHITE
@@ -267,7 +264,7 @@ String STR_CHARCOLOR
};
String STR_CHARBACKGROUND
{
- Text [ en-US ] = "Background";
+ Text [ en-US ] = "Background" ;
};
String STR_TRANSPARENT
{
@@ -281,54 +278,54 @@ ImageList IMG_CONDFORMAT_DLG_SC
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
- < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
- < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ;
> ;
- < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR
; > ;
- < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
- < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ;
- };
+ {
+ < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ;
> ;
+ < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE
; > ;
+ < "res/commandimagelist/sc_underline.png" ;
SID_ATTR_CHAR_UNDERLINE ; > ;
+ < "res/commandimagelist/sc_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
+ < "res/commandimagelist/sc_fontcolor.png" ;
SID_ATTR_CHAR_COLOR2 ; > ;
+ < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ;
> ;
+ };
};
ImageList IMG_CONDFORMAT_DLG_SCH
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/sch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
- < "res/commandimagelist/sch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
- < "res/commandimagelist/sch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ;
> ;
- < "res/commandimagelist/sch_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
- < "res/commandimagelist/sch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
- < "res/commandimagelist/sch_fontdialog.png" ; SID_CHAR_DLG ; > ;
- };
+ {
+ < "res/commandimagelist/sch_bold.png" ; SID_ATTR_CHAR_WEIGHT ;
> ;
+ < "res/commandimagelist/sch_italic.png" ; SID_ATTR_CHAR_POSTURE
; > ;
+ < "res/commandimagelist/sch_underline.png" ;
SID_ATTR_CHAR_UNDERLINE ; > ;
+ < "res/commandimagelist/sch_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
+ < "res/commandimagelist/sch_fontcolor.png" ;
SID_ATTR_CHAR_COLOR2 ; > ;
+ < "res/commandimagelist/sch_fontdialog.png" ; SID_CHAR_DLG ;
> ;
+ };
};
ImageList IMG_CONDFORMAT_DLG_LC
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
- < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
- < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ;
> ;
- < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR
; > ;
- < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
- < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ;
- };
+ {
+ < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ;
> ;
+ < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE
; > ;
+ < "res/commandimagelist/lc_underline.png" ;
SID_ATTR_CHAR_UNDERLINE ; > ;
+ < "res/commandimagelist/lc_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
+ < "res/commandimagelist/lc_fontcolor.png" ;
SID_ATTR_CHAR_COLOR2 ; > ;
+ < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ;
> ;
+ };
};
ImageList IMG_CONDFORMAT_DLG_LCH
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/lch_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ;
- < "res/commandimagelist/lch_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ;
- < "res/commandimagelist/lch_underline.png" ; SID_ATTR_CHAR_UNDERLINE ;
> ;
- < "res/commandimagelist/lch_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
- < "res/commandimagelist/lch_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ;
- < "res/commandimagelist/lch_fontdialog.png" ; SID_CHAR_DLG ; > ;
- };
+ {
+ < "res/commandimagelist/lch_bold.png" ; SID_ATTR_CHAR_WEIGHT ;
> ;
+ < "res/commandimagelist/lch_italic.png" ; SID_ATTR_CHAR_POSTURE
; > ;
+ < "res/commandimagelist/lch_underline.png" ;
SID_ATTR_CHAR_UNDERLINE ; > ;
+ < "res/commandimagelist/lch_backgroundcolor.png" ;
SID_BACKGROUND_COLOR ; > ;
+ < "res/commandimagelist/lch_fontcolor.png" ;
SID_ATTR_CHAR_COLOR2 ; > ;
+ < "res/commandimagelist/lch_fontdialog.png" ; SID_CHAR_DLG ;
> ;
+ };
};
@@ -336,45 +333,45 @@ ImageList IMG_CONDFORMAT_DLG_LCH
ImageList 31000
{
MASKCOLOR;
- prefix = "sc";
- IdList = {05500;};
- IdCount = 1;
+ prefix = "sc" ;
+ IdList = {05500;} ;
+ IdCount = 1 ;
};
ToolBox RID_TB_SORTING
{
- Pos = MAP_APPFONT ( 0,0 ) ;
- ButtonType = BUTTON_SYMBOL;
- Align = BOXALIGN_TOP;
- Customize = FALSE;
+ Pos = MAP_APPFONT ( 0,0 ) ;
+ ButtonType = BUTTON_SYMBOL ;
+ Align = BOXALIGN_TOP ;
+ Customize = FALSE ;
ItemList =
{
- ToolBoxItem
+ ToolBoxItem
{
- Identifier = SID_FM_SORTUP;
- Text [ en-US ] = "Sort Ascending" ;
- Checkable = TRUE;
+ Identifier = SID_FM_SORTUP ;
+ Text [ en-US ] = "Sort Ascending" ;
+ Checkable = TRUE ;
};
ToolBoxItem
{
- Identifier = SID_FM_SORTDOWN;
- Text [ en-US ] = "Sort Descending" ;
- Checkable = TRUE;
+ Identifier = SID_FM_SORTDOWN ;
+ Text [ en-US ] = "Sort Descending" ;
+ Checkable = TRUE ;
};
- ToolBoxItem
+ ToolBoxItem
{
- Identifier = SID_FM_REMOVE_FILTER_SORT;
- Text [ en-US ] = "Remove sorting" ;
+ Identifier = SID_FM_REMOVE_FILTER_SORT ;
+ Text [ en-US ] = "Remove sorting" ;
};
- ToolBoxItem
+ ToolBoxItem
{
- Type = TOOLBOXITEM_SEPARATOR;
+ Type = TOOLBOXITEM_SEPARATOR ;
};
- ToolBoxItem
+ ToolBoxItem
{
- Identifier = SID_ADD_CONTROL_PAIR;
- Text [ en-US ] = "Insert" ;
+ Identifier = SID_ADD_CONTROL_PAIR ;
+ Text [ en-US ] = "Insert" ;
};
};
};
@@ -383,59 +380,61 @@ ImageList IMG_ADDFIELD_DLG_SC
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ;
- < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ;
- < "res/commandimagelist/sc_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
- };
+ {
+ < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ;
> ;
+ < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ;
> ;
+ < "res/commandimagelist/sc_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
+ };
};
ImageList IMG_ADDFIELD_DLG_SCH
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/sch_sortup.png" ; SID_FM_SORTUP ; > ;
- < "res/commandimagelist/sch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
- < "res/commandimagelist/sch_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
- };
+ {
+ < "res/commandimagelist/sch_sortup.png" ; SID_FM_SORTUP ;
> ;
+ < "res/commandimagelist/sch_sortdown.png" ; SID_FM_SORTDOWN ;
> ;
+ < "res/commandimagelist/sch_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
+ };
};
ImageList IMG_ADDFIELD_DLG_LC
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ;
- < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ;
- < "res/commandimagelist/lc_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
- };
+ {
+ < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ;
> ;
+ < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ;
> ;
+ < "res/commandimagelist/lc_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
+ };
};
ImageList IMG_ADDFIELD_DLG_LCH
{
MASKCOLOR;
FileList =
- {
- < "res/commandimagelist/lch_sortup.png" ; SID_FM_SORTUP ; > ;
- < "res/commandimagelist/lch_sortdown.png" ; SID_FM_SORTDOWN ; > ;
- < "res/commandimagelist/lch_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
- };
+ {
+ < "res/commandimagelist/lch_sortup.png" ; SID_FM_SORTUP ;
> ;
+ < "res/commandimagelist/lch_sortdown.png" ; SID_FM_SORTDOWN ;
> ;
+ < "res/commandimagelist/lch_removefiltersort.png" ;
SID_FM_REMOVE_FILTER_SORT ; > ;
+ };
};
FixedLine ADDFIELD_FL_HELP_SEPARATOR
{
SVLook = TRUE ;
- Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ;
- Text [ en-US ] = "Help";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS ) ;
+ Size = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS ) ;
+ Text [ en-US ] = "Help" ;
};
-
+
FixedText ADDFIELD_HELP_FIELD
{
SVLook = TRUE ;
- Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ;
- WordBreak = TRUE;
- Text [ en-US ] = "Highlight the fields to insert into the selected section
of the template, then click Insert or press Enter.";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS ) ;
+ Size = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS ) ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "Highlight the fields to insert into the selected
section of the template, then click Insert or press Enter." ;
};
+
+// ********************************************************************** EOF
diff --git a/main/reportdesign/source/ui/dlg/DateTime.src
b/main/reportdesign/source/ui/dlg/DateTime.src
index 7cecea5e75..55aa560ee7 100644
--- a/main/reportdesign/source/ui/dlg/DateTime.src
+++ b/main/reportdesign/source/ui/dlg/DateTime.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#include "DateTime.hrc"
#include "RptResId.hrc"
#include "helpids.hrc"
@@ -30,99 +29,100 @@
#include <svx/svxids.hrc>
#endif
-
ModalDialog RID_DATETIME_DLG
{
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( PAGE_WIDTH , PAGE_HEIGHT ) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH, PAGE_HEIGHT ) ;
Text [ en-US ] = "Date and Time" ;
HelpId = HID_RPT_DATETIME_DLG;
Moveable = TRUE ;
Closeable = TRUE ;
-
+
CheckBox CB_DATE
{
- HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE";
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , RELATED_CONTROLS /* +
UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
- Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
- Check = TRUE;
- Text [ en-US ] = "Include Date";
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE" ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS /* +
UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT */) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 2 * UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Check = TRUE ;
+ Text [ en-US ] = "Include Date" ;
};
-
+
FixedText FT_DATE_FORMAT
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS,
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT );
- Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Format";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS + 2 * UNRELATED_CONTROLS,
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Format" ;
};
ListBox LB_DATE_TYPE
{
- HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE";
- Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH,
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT) ;
- Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS -
BUTTON_WIDTH, 60 );
- Border = TRUE;
- DropDown = TRUE;
- TabStop = TRUE;
- Sort = FALSE;
- };
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE" ;
+ Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH,
RELATED_CONTROLS + UNRELATED_CONTROLS + CHECKBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 3 * UNRELATED_CONTROLS -
BUTTON_WIDTH, 60 ) ;
+ Border = TRUE ;
+ DropDown = TRUE ;
+ TabStop = TRUE ;
+ Sort = FALSE ;
+ };
FixedLine FL_SEPARATOR0
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS +
2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
- Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
- // Text [ en-US ] = "Time";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS + 2 *
UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 2 * RELATED_CONTROLS, 1 ) ;
+ //Text [ en-US ] = "Time" ;
};
CheckBox CB_TIME
{
- HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME";
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS +
3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
- Size = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
- Check = TRUE;
- Text [ en-US ] = "Include Time";
+ HelpID = "reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME" ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3 *
UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 2 * UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Check = TRUE ;
+ Text [ en-US ] = "Include Time" ;
};
-
+
FixedText FT_TIME_FORMAT
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS,
RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT);
- Size = MAP_APPFONT( BUTTON_WIDTH - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Format";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS + 2 * UNRELATED_CONTROLS,
RELATED_CONTROLS + 4 * UNRELATED_CONTROLS + 2 * CHECKBOX_HEIGHT +
LISTBOX_HEIGHT) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Format" ;
};
ListBox LB_TIME_TYPE
{
- HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE";
- Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH,
RELATED_CONTROLS + 4*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ;
- Size = MAP_APPFONT( PAGE_WIDTH - 3*UNRELATED_CONTROLS -
BUTTON_WIDTH, 60 );
- Border = TRUE;
- DropDown = TRUE;
- TabStop = TRUE;
- Sort = FALSE;
+ HelpID = "reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE" ;
+ Pos = MAP_APPFONT ( 2 * UNRELATED_CONTROLS + BUTTON_WIDTH,
RELATED_CONTROLS + 4 * UNRELATED_CONTROLS + 2 * CHECKBOX_HEIGHT +
LISTBOX_HEIGHT) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 3 * UNRELATED_CONTROLS -
BUTTON_WIDTH, 60 ) ;
+ Border = TRUE ;
+ DropDown = TRUE ;
+ TabStop = TRUE ;
+ Sort = FALSE ;
};
FixedLine FL_SEPARATOR1
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS +
5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ;
- Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ;
+ Pos = MAP_APPFONT ( RELATED_CONTROLS, RELATED_CONTROLS + 5 *
UNRELATED_CONTROLS + 2 * CHECKBOX_HEIGHT + 2 * LISTBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( PAGE_WIDTH - 2 * RELATED_CONTROLS, 1 ) ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS +
6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6 *
UNRELATED_CONTROLS + 2 * CHECKBOX_HEIGHT + 2 * LISTBOX_HEIGHT +1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS +
BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT +
2*LISTBOX_HEIGHT +1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS +
BUTTON_WIDTH, RELATED_CONTROLS + 6 * UNRELATED_CONTROLS + 2 * CHECKBOX_HEIGHT +
2 * LISTBOX_HEIGHT +1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( RELATED_CONTROLS + 2*UNRELATED_CONTROLS +
2*BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT +
2*LISTBOX_HEIGHT +1) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
- Text [ en-US ] = "~Help";
+ Pos = MAP_APPFONT ( RELATED_CONTROLS + 2 * UNRELATED_CONTROLS +
2 * BUTTON_WIDTH, RELATED_CONTROLS + 6 * UNRELATED_CONTROLS + 2 *
CHECKBOX_HEIGHT + 2 * LISTBOX_HEIGHT +1 ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH, BUTTON_HEIGHT ) ;
+ Text [ en-US ] = "~Help" ;
};
};
+
+// ********************************************************************** EOF
