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
commit 5578c25c59b81b0c22ac95d12ffdc2a670e7c3cf
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Jun 13 01:59:57 2021 +0200
Cleaned up resoure files
(cherry picked from commit c6ad6917c631456430442fc37a2ee2f80563e5d9)
---
main/uui/source/cookiedg.src | 88 +++++++--------------
main/uui/source/filechanged.src | 15 ++--
main/uui/source/masterpasscrtdlg.src | 127 +++++++++++++-----------------
main/uui/source/nameclashdlg.src | 76 +++++++++---------
main/uui/source/secmacrowarnings.src | 107 +++++++++++++-------------
main/uui/source/unknownauthdlg.src | 144 ++++++++++++++++++-----------------
6 files changed, 257 insertions(+), 300 deletions(-)
diff --git a/main/uui/source/cookiedg.src b/main/uui/source/cookiedg.src
index 22787ae..76a2911 100644
--- a/main/uui/source/cookiedg.src
+++ b/main/uui/source/cookiedg.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -35,7 +35,7 @@ ModalDialog DLG_COOKIES
HelpId = HID_DLG_COOKIES ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 295 , 193 ) ;
+ Size = MAP_APPFONT ( 295, 193 ) ;
Moveable = TRUE ;
FixedBitmap FB_COOKIES
{
@@ -50,55 +50,55 @@ ModalDialog DLG_COOKIES
{
SVLook = TRUE ;
WordBreak = True ;
- Pos = MAP_APPFONT ( 65 , 6 ) ;
- Size = MAP_APPFONT ( 224 , 145 ) ;
+ Pos = MAP_APPFONT ( 65, 6 ) ;
+ Size = MAP_APPFONT ( 224, 145 ) ;
};
FixedLine FL_COOKIES
{
- Pos = MAP_APPFONT ( 6 , 155 ) ;
- Size = MAP_APPFONT ( 283 , 1 ) ;
+ Pos = MAP_APPFONT ( 6, 155 ) ;
+ Size = MAP_APPFONT ( 283, 1 ) ;
};
RadioButton RB_INFUTURE_SEND
{
- HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND";
- Pos = MAP_APPFONT ( 12 , 171 ) ;
- Size = MAP_APPFONT ( 52 , 10 ) ;
+ HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND" ;
+ Pos = MAP_APPFONT ( 12, 171 ) ;
+ Size = MAP_APPFONT ( 52, 10 ) ;
Text [ en-US ] = "~Send" ;
};
RadioButton RB_INFUTURE_IGNORE
{
- HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE";
- Pos = MAP_APPFONT ( 67 , 171 ) ;
- Size = MAP_APPFONT ( 52 , 10 ) ;
+ HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE" ;
+ Pos = MAP_APPFONT ( 67, 171 ) ;
+ Size = MAP_APPFONT ( 52, 10 ) ;
Text [ en-US ] = "I~gnore" ;
};
RadioButton RB_INFUTURE_INTERACTIVE
{
- HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE";
- Pos = MAP_APPFONT ( 122 , 171 ) ;
- Size = MAP_APPFONT ( 52 , 10 ) ;
+ HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE" ;
+ Pos = MAP_APPFONT ( 122, 171 ) ;
+ Size = MAP_APPFONT ( 52, 10 ) ;
Text [ en-US ] = "I~nteractive" ;
};
- //TODO! If this dialog is ever used again (and it should definitely be
- // redesigned then!), get rid of the following group box (see #88883#):
+ // TODO! If this dialog is ever used again (and it should definitely be
+ // redesigned then!), get rid of the following group box (see #88883#):
GroupBox GB_INFUTURE
{
- Pos = MAP_APPFONT ( 6 , 160 ) ;
- Size = MAP_APPFONT ( 174 , 27 ) ;
+ Pos = MAP_APPFONT ( 6, 160 ) ;
+ Size = MAP_APPFONT ( 174, 27 ) ;
Text [ en-US ] = "Future Cookie Handling" ;
};
PushButton BTN_COOKIES_CANCEL
{
- HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL";
- Pos = MAP_APPFONT ( 186 , 173 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL" ;
+ Pos = MAP_APPFONT ( 186, 173 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Ignore" ;
};
PushButton BTN_COOKIES_OK
{
- HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK";
- Pos = MAP_APPFONT ( 239 , 173 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK" ;
+ Pos = MAP_APPFONT ( 239, 173 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
Text [ en-US ] = "~Send" ;
};
@@ -134,34 +134,4 @@ String STR_COOKIES_SEND_TITLE
Text [ en-US ] = "Send Cookies" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/uui/source/filechanged.src b/main/uui/source/filechanged.src
index c8d3c66..4580d8d 100644
--- a/main/uui/source/filechanged.src
+++ b/main/uui/source/filechanged.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -29,14 +29,15 @@
String STR_FILECHANGED_TITLE
{
- Text [ en-US ] = "Document Has Been Changed by Others";
+ Text [ en-US ] = "Document Has Been Changed by Others" ;
};
String STR_FILECHANGED_MSG
{
- Text [ en-US ] = "The file has been changed since it was opened for
editing in %PRODUCTNAME. Saving your version of the document will overwrite
changes made by others.\n\nDo you want to save anyway?\n\n";
+ Text [ en-US ] = "The file has been changed since it was opened for
editing in %PRODUCTNAME. Saving your version of the document will overwrite
changes made by others.\n\nDo you want to save anyway?\n\n" ;
};
String STR_FILECHANGED_SAVEANYWAY_BTN
{
- Text [ en-US ] = "~Save Anyway";
+ Text [ en-US ] = "~Save Anyway" ;
};
+// ********************************************************************** EOF
diff --git a/main/uui/source/masterpasscrtdlg.src
b/main/uui/source/masterpasscrtdlg.src
index 5e1490b..55cb706 100644
--- a/main/uui/source/masterpasscrtdlg.src
+++ b/main/uui/source/masterpasscrtdlg.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -37,95 +37,76 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
- Text [ en-US ] = "Set Master Password";
- FixedText FT_INFOTEXT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_0 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , 7*RSC_CD_FIXEDTEXT_HEIGHT ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Passwords for web connections are protected by a
master password. You will be asked to enter it once per session, if
%PRODUCTNAME retrieves a password from the protected password list.";
- };
- FixedLine FL_INFOTEXT
- {
- Pos = MAP_APPFONT ( 0 , ROW_1 ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- };
+ Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ;
+ Text [ en-US ] = "Set Master Password" ;
+ FixedText FT_INFOTEXT
+ {
+ Pos = MAP_APPFONT ( COL_0, ROW_0 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, 7*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "Passwords for web connections are protected
by a master password. You will be asked to enter it once per session, if
%PRODUCTNAME retrieves a password from the protected password list." ;
+ };
+ FixedLine FL_INFOTEXT
+ {
+ Pos = MAP_APPFONT ( 0, ROW_1 ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
FixedText FT_MASTERPASSWORD_CRT
{
- Pos = MAP_APPFONT ( COL_0 , ROW_2 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "~Enter password";
+ Pos = MAP_APPFONT ( COL_0, ROW_2 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "~Enter password" ;
};
Edit ED_MASTERPASSWORD_CRT
{
- HelpID =
"uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT";
- Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
- Border = TRUE ;
+ HelpID =
"uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT" ;
+ Pos = MAP_APPFONT ( COL_0, ROW_3 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, RSC_CD_TEXTBOX_HEIGHT ) ;
+ Border = TRUE ;
PassWord = TRUE ;
};
FixedText FT_MASTERPASSWORD_REPEAT
{
- Pos = MAP_APPFONT ( COL_0 , ROW_4 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "~Reenter password";
+ Pos = MAP_APPFONT ( COL_0, ROW_4 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Text [ en-US ] = "~Reenter password" ;
};
Edit ED_MASTERPASSWORD_REPEAT
{
- HelpID =
"uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT";
- Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
- Border = TRUE ;
+ HelpID =
"uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT" ;
+ Pos = MAP_APPFONT ( COL_0, ROW_5 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, RSC_CD_TEXTBOX_HEIGHT ) ;
+ Border = TRUE ;
PassWord = TRUE ;
};
- FixedText FT_CAUTIONTEXT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Caution: If you forget the master password, you will
be unable to access any of the information protected by it. Passwords are
case-sensitive.";
- };
- FixedLine FL_CAUTIONTEXT
- {
- Pos = MAP_APPFONT ( 0 , ROW_7 ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- };
- HelpButton BTN_MASTERPASSCRT_HELP
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH ,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
- };
+ FixedText FT_CAUTIONTEXT
+ {
+ Pos = MAP_APPFONT ( COL_0, ROW_6 ) ;
+ Size = MAP_APPFONT ( CTRL_WIDTH, 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "Caution: If you forget the master password,
you will be unable to access any of the information protected by it. Passwords
are case-sensitive." ;
+ };
+ FixedLine FL_CAUTIONTEXT
+ {
+ Pos = MAP_APPFONT ( 0, ROW_7 ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
+ HelpButton BTN_MASTERPASSCRT_HELP
+ {
+ Pos = MAP_APPFONT ( COL_0, ROW_8 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ };
OKButton BTN_MASTERPASSCRT_OK
{
- Pos = MAP_APPFONT ( COL_1 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH ,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( COL_1, ROW_8 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
DefButton = TRUE ;
};
CancelButton BTN_MASTERPASSCRT_CANCEL
{
- Pos = MAP_APPFONT ( COL_2 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH ,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( COL_2, ROW_8 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/uui/source/nameclashdlg.src b/main/uui/source/nameclashdlg.src
index 25d9888..25d61aa 100644
--- a/main/uui/source/nameclashdlg.src
+++ b/main/uui/source/nameclashdlg.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -31,82 +31,84 @@
#include "nameclashdlg.hrc"
#endif
-#define DLG_WIDTH 250
-#define DLG_HEIGTH 75
-#define BORDER_OFFSET 6
-#define EDIT_HEIGTH 12
-#define BTN_WIDTH 50
-#define BTN_HEIGTH 14
+#define DLG_WIDTH 250
+#define DLG_HEIGTH 75
+#define BORDER_OFFSET 6
+#define EDIT_HEIGTH 12
+#define BTN_WIDTH 50
+#define BTN_HEIGTH 14
ModalDialog DLG_SIMPLE_NAME_CLASH
{
- HelpId = HID_DLG_SIMPLE_NAME_CLASH ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGTH ) ;
- Moveable = TRUE ;
+ HelpId = HID_DLG_SIMPLE_NAME_CLASH ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGTH ) ;
+ Moveable = TRUE ;
Text [ en-US ] = "File Exists" ;
FixedText FT_FILE_EXISTS_WARNING
{
- Pos = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET,
DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 4*BORDER_OFFSET ) ;
+ Pos = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGTH -
EDIT_HEIGTH - BTN_HEIGTH - 4 * BORDER_OFFSET ) ;
WordBreak = TRUE ;
};
Edit EDIT_NEW_NAME
{
- HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH -
EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET ,
EDIT_HEIGTH ) ;
+ HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME" ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH -
BTN_HEIGTH - 2 * BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH - 2 * BORDER_OFFSET, EDIT_HEIGTH
) ;
};
PushButton BTN_OVERWRITE
{
- HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE";
- Pos = MAP_APPFONT ( DLG_WIDTH - 3*(BTN_WIDTH +
BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
- TabStop = TRUE ;
+ HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE" ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - 3 * (BTN_WIDTH +
BORDER_OFFSET), DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ TabStop = TRUE ;
Text [ en-US ] = "Replace" ;
};
PushButton BTN_RENAME
{
- HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME";
- Pos = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH +
BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
- TabStop = TRUE ;
+ HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME" ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - 2 * (BTN_WIDTH +
BORDER_OFFSET), DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ TabStop = TRUE ;
Text [ en-US ] = "Rename" ;
- DefButton = TRUE ;
+ DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
- Pos = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET,
DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET,
DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH
- BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH -
BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
TabStop = TRUE ;
};
};
String STR_RENAME_OR_REPLACE
{
- Text = "A file with the name \"%NAME\" already exists in the location
\"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new
name.";
+ Text = "A file with the name \"%NAME\" already exists in the location
\"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new
name." ;
};
String STR_NAME_CLASH_RENAME_ONLY
{
- Text = "A file with the name \"%NAME\" already exists in the location
\"%FOLDER\".\nPlease enter a new name.";
+ Text = "A file with the name \"%NAME\" already exists in the location
\"%FOLDER\".\nPlease enter a new name." ;
};
String STR_SAME_NAME_USED
{
- Text = "Please provide a different file name!";
+ Text = "Please provide a different file name!" ;
};
+
+// ********************************************************************** EOF
diff --git a/main/uui/source/secmacrowarnings.src
b/main/uui/source/secmacrowarnings.src
index 8f4f25b..38171b3 100644
--- a/main/uui/source/secmacrowarnings.src
+++ b/main/uui/source/secmacrowarnings.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -28,89 +28,90 @@
ModalDialog RID_XMLSECDLG_MACROWARN
{
- HelpId = HID_XMLSECDLG_MACROWARN;
- Size = MAP_APPFONT( MW_WIDTH, MW_HEIGHT );
- OutputSize = TRUE;
- Closeable = FALSE;
- Moveable = TRUE;
- SVLook = TRUE;
+ HelpId = HID_XMLSECDLG_MACROWARN ;
+ Size = MAP_APPFONT ( MW_WIDTH, MW_HEIGHT ) ;
+ OutputSize = TRUE ;
+ Closeable = FALSE ;
+ Moveable = TRUE ;
+ SVLook = TRUE ;
- Text [ en-US ] = "%PRODUCTNAME - Security Warning";
+ Text [ en-US ] = "%PRODUCTNAME - Security Warning" ;
FixedImage IMG_SYMBOL
{
- Pos = MAP_APPFONT( MW_COL_0, MW_ROW_0 );
- Size = MAP_APPFONT( MW_SYMBOL_WIDTH, MW_SYMBOL_HEIGHT );
+ Pos = MAP_APPFONT ( MW_COL_0, MW_ROW_0 ) ;
+ Size = MAP_APPFONT ( MW_SYMBOL_WIDTH, MW_SYMBOL_HEIGHT ) ;
};
FixedText FI_DOCNAME
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 2*RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_0+RSC_CD_FIXEDTEXT_HEIGHT
) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1,
2*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
};
FixedText FI_DESCR1A
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "The document contains document macros signed
by:";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_1 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT
) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "The document contains document macros signed
by:" ;
};
FixedText FI_DESCR1B
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "The document contains document macros.";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_1 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT
) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "The document contains document macros." ;
};
FixedText FI_SIGNS
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_2 );
- Size = MAP_APPFONT( MW_COL_2-MW_COL_1,
MW_ROW_3-MW_ROW_2-RSC_SP_CTRL_DESC_Y );
- Wordbreak = TRUE;
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_2 ) ;
+ Size = MAP_APPFONT ( MW_COL_2-MW_COL_1,
MW_ROW_3-MW_ROW_2-RSC_SP_CTRL_DESC_Y ) ;
+ Wordbreak = TRUE ;
};
PushButton PB_VIEWSIGNS
{
- HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS";
- Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
- Text [ en-US ] = "View Signatures...";
+ HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS" ;
+ Pos = MAP_APPFONT ( MW_COL_3, MW_ROW_2 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Text [ en-US ] = "View Signatures..." ;
};
FixedText FI_DESCR2
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 4*RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Macros may contain viruses. Disabling macros for a
document is always safe. If you disable macros you may lose functionality
provided by the document macros.";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_3 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1,
4*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE;
+ Text [ en-US ] = "Macros may contain viruses. Disabling macros
for a document is always safe. If you disable macros you may lose functionality
provided by the document macros." ;
};
CheckBox CB_ALWAYSTRUST
{
- HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST";
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Always trust macros from this source";
+ HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST" ;
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_4 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT
) ;
+ Text [ en-US ] = "Always trust macros from this source" ;
};
- FixedLine FL_BOTTOM_SEP
+ FixedLine FL_BOTTOM_SEP
{
- Pos = MAP_APPFONT( 0, MW_ROW_5 );
- Size = MAP_APPFONT( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+ Pos = MAP_APPFONT ( 0, MW_ROW_5 ) ;
+ Size = MAP_APPFONT ( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
};
- OKButton PB_ENABLE
+ OKButton PB_ENABLE
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), MW_ROW_6 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "~Enable Macros";
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_OK_X( MW_WIDTH ), MW_ROW_6 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ Text [ en-US ] = "~Enable Macros" ;
};
- CancelButton PB_DISABLE
+ CancelButton PB_DISABLE
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ), MW_ROW_6 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT );
- DefButton = TRUE;
- Text [ en-US ] = "~Disable Macros";
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ), MW_ROW_6
) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+ DefButton = TRUE ;
+ Text [ en-US ] = "~Disable Macros" ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( MW_WIDTH ), MW_ROW_6 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT );
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_HELP_X( MW_WIDTH ), MW_ROW_6 ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
};
};
+// ********************************************************************** EOF
diff --git a/main/uui/source/unknownauthdlg.src
b/main/uui/source/unknownauthdlg.src
index 8b8a21a..b9cdc3e 100644
--- a/main/uui/source/unknownauthdlg.src
+++ b/main/uui/source/unknownauthdlg.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,20 @@
* 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.
- *
+ *
*************************************************************/
+
#define __RSC
#ifndef UUI_IDS_HRC
@@ -31,105 +32,106 @@
ModalDialog DLG_UUI_UNKNOWNAUTH
{
- HelpId = HID_DLG_UNKNOWNAUTH_UUI;
- Border = TRUE ;
+ HelpId = HID_DLG_UNKNOWNAUTH_UUI ;
+ Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Pos = MAP_APPFONT( 136, 79 );
- Size = MAP_APPFONT( DLG_WIDTH, DLG_HEIGHT );
+ Pos = MAP_APPFONT ( 136, 79 ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ;
- Text [ en-US ] = "Website Certified by an Unknown Authority";
+ Text [ en-US ] = "Website Certified by an Unknown Authority" ;
FixedImage IMG_WARN
{
- Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP );
- Size = MAP_APPFONT( DLG_WARMIMG_WIDTH , DLG_WARMIMG_HEIGHT );
-
+ Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
RSC_SP_DLG_INNERBORDER_TOP ) ;
+ Size = MAP_APPFONT ( DLG_WARMIMG_WIDTH, DLG_WARMIMG_HEIGHT ) ;
+
Fixed = Image
{
/* ImageBitmap = Bitmap { File =
"certificate_40x56.png"; }; */
- MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;};
+ MaskColor = Color{Red=0xffff;Green=0x0000;Blue=0xffff;}
;
};
-
+
};
-
-
- PushButton PB_VIEW__CERTIFICATE
- {
- HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE";
- Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP +
DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y );
- Size = MAP_APPFONT( 70, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "Examine Certificate...";
- };
-
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT( DLG_CTLBTN_HELP_START_X, DLG_CTLBTN_START_Y );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ PushButton PB_VIEW__CERTIFICATE
+ {
+ HelpID =
"uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE" ;
+ Pos = MAP_APPFONT ( DLG_TEXT_START_X,
RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y ) ;
+ Size = MAP_APPFONT ( 70, RSC_CD_PUSHBUTTON_HEIGHT ) ;
+
+ Text [ en-US ] = "Examine Certificate..." ;
+
+ };
+
+ HelpButton PB_HELP
+ {
+ Pos = MAP_APPFONT ( DLG_CTLBTN_HELP_START_X, DLG_CTLBTN_START_Y
) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
- Text [ en-US ] = "Help";
+ Text [ en-US ] = "Help" ;
- };
+ };
- PushButton PB_OK
- {
- HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK";
- Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ PushButton PB_OK
+ {
+ HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK" ;
+ Pos = MAP_APPFONT ( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y )
;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
- Text [ en-US ] = "OK";
+ Text [ en-US ] = "OK" ;
- };
+ };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT( DLG_CTLBTN_CANCEL_START_X, DLG_CTLBTN_START_Y );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ CancelButton PB_CANCEL
+ {
+ Pos = MAP_APPFONT ( DLG_CTLBTN_CANCEL_START_X,
DLG_CTLBTN_START_Y ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH,
RSC_CD_PUSHBUTTON_HEIGHT ) ;
- };
+ };
- RadioButton RB_ACCEPT_1
- {
- HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1";
- Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y );
- Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
+ RadioButton RB_ACCEPT_1
+ {
+ HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1" ;
+ Pos = MAP_APPFONT ( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y ) ;
+ Size = MAP_APPFONT ( 182, RSC_CD_RADIOBUTTON_HEIGHT ) ;
- Text [ en-US ] = "Accept this certificate temporarily for this
session";
+ Text [ en-US ] = "Accept this certificate temporarily for this
session" ;
Check = TRUE;
- };
+ };
+
+ RadioButton RB_DONTACCEPT_2
+ {
+ HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2" ;
+ Pos = MAP_APPFONT ( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y +
RSC_CD_RADIOBUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT ( 182, RSC_CD_RADIOBUTTON_HEIGHT ) ;
- RadioButton RB_DONTACCEPT_2
- {
- HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2";
- Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y +
RSC_CD_RADIOBUTTON_HEIGHT );
- Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
+ Text [ en-US ] = "Do not accept this certificate and do not
connect to this Web site" ;
- Text [ en-US ] = "Do not accept this certificate and do not connect to
this Web site";
+ };
+
+ FixedText FT_LABEL_1
+ {
+ Pos = MAP_APPFONT ( DLG_TEXT_START_X,
RSC_SP_DLG_INNERBORDER_TOP ) ;
+ Size = MAP_APPFONT ( 190, DLG_TEXT_1_HEIGHT ) ;
- };
+ Text [ en-US ] = "No Text" ;
- FixedText FT_LABEL_1
- {
- Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP );
- Size = MAP_APPFONT( 190, DLG_TEXT_1_HEIGHT );
+ Border = FALSE ;
+ WordBreak = TRUE ;
- Text [ en-US ] = "No Text";
+ };
- Border = FALSE;
- WordBreak = TRUE;
+ FixedLine FL_LINE
+ {
+ Pos = MAP_APPFONT ( 0, DLG_CTLBTN_START_Y -
RSC_SP_FLGR_INNERBORDER_TOP - RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+ };
- };
-
- FixedLine FL_LINE
- {
- Pos = MAP_APPFONT( 0, DLG_CTLBTN_START_Y - RSC_SP_FLGR_INNERBORDER_TOP
- RSC_CD_FIXEDLINE_HEIGHT );
- Size = MAP_APPFONT( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT );
- };
-
};
+// ********************************************************************** EOF
