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 57b6b03 Cleaned up resource files, removed MASKCOLOR
57b6b03 is described below
commit 57b6b03fd2228196c789002783ce50bcfc3d27f6
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Dec 23 13:32:15 2019 +0100
Cleaned up resource files, removed MASKCOLOR
(cherry picked from commit 71bf7eeeeb30164bfb473af18538ec3b8c54a64b)
---
main/dbaccess/source/ext/adabas/AdabasNewDb.src | 359 ++++++++++++------------
main/dbaccess/source/ui/dlg/CollectionView.src | 91 +++---
main/dbaccess/source/ui/dlg/sqlmessage.src | 72 +++--
3 files changed, 257 insertions(+), 265 deletions(-)
diff --git a/main/dbaccess/source/ext/adabas/AdabasNewDb.src
b/main/dbaccess/source/ext/adabas/AdabasNewDb.src
index be515a6..0666665 100644
--- a/main/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/main/dbaccess/source/ext/adabas/AdabasNewDb.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,380 +29,378 @@
//==================================================================
// NEWDB Admin
//==================================================================
-#define WIN_X 268
-#define WIN_Y 210
-#define MOVE_Y 21
+#define WIN_X 268
+#define WIN_Y 210
+#define MOVE_Y 21
#define ADJUST_X 45
+
ModalDialog DLG_ADABAS_NEWDB
{
- Moveable = TRUE ;
- Closeable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE;
- HelpID = HID_DLG_ADABAS_NEWDB ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ HelpID = HID_DLG_ADABAS_NEWDB ;
+ Size = MAP_APPFONT ( WIN_X, WIN_Y + MOVE_Y ) ;
FixedText FT_DATABASENAME
{
- Pos = MAP_APPFONT ( 12 , 6) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
- Text[ en-US ] = "Database ~name";
+ Pos = MAP_APPFONT ( 12, 6) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Text [ en-US ] = "Database ~name" ;
};
Edit ET_DATABASENAME
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 5) ;
- Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 5 ) ;
+ Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DBNAME ;
+ HelpID = HID_DLG_ADABAS_DBNAME ;
};
- FixedLine FL_USER
+ FixedLine FL_USER
{
- Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ;
- Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
- Text[ en-US ] = "User settings";
+ Pos = MAP_APPFONT ( 6, 3 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( WIN_X - 12, 8 ) ;
+ Text [ en-US ] = "User settings" ;
};
FixedText FT_CONUSR
{
- Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
- Text[ en-US ] = "~Control user";
+ Pos = MAP_APPFONT ( 12, 31 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Text [ en-US ] = "~Control user" ;
};
FixedText FT_SYSUSR
{
- Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
- Text[ en-US ] = "~Administrator";
+ Pos = MAP_APPFONT ( 12, 14 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Text [ en-US ] = "~Administrator" ;
};
FixedText FT_DOMAIN_USR
{
- Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
- Text[ en-US ] = "~Domain user";
+ Pos = MAP_APPFONT ( 12, 48 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Text [ en-US ] = "~Domain user" ;
};
Edit ET_SYSUSR
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSUSR ;
+ HelpID = HID_DLG_ADABAS_SYSUSR ;
};
PushButton PB_SYSPWD
{
- Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 188, 13 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSPWD ;
- Text[ en-US ] = "P~assword...";
+ HelpID = HID_DLG_ADABAS_SYSPWD ;
+ Text [ en-US ] = "P~assword..." ;
};
Edit ET_CONUSR
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONUSR ;
+ HelpID = HID_DLG_ADABAS_CONUSR ;
};
PushButton PB_CONPWD
{
- Pos = MAP_APPFONT ( 188 , 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 188, 30 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONPWD ;
- Text[ en-US ] = "~Password...";
+ HelpID = HID_DLG_ADABAS_CONPWD ;
+ Text [ en-US ] = "~Password..." ;
};
Edit ET_DOMAIN_USR
{
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
- Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
TabStop = TRUE ;
- ReadOnly= TRUE;
- HelpID = HID_DLG_ADABAS_USR ;
- Text = "adabas";
+ ReadOnly= TRUE ;
+ HelpID = HID_DLG_ADABAS_USR ;
+ Text = "adabas" ;
};
PushButton PB_DOMAINPWD
{
- Pos = MAP_APPFONT ( 188 , 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 188, 47 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DOMAINPWD ;
- Text[ en-US ] = "Passwo~rd...";
+ HelpID = HID_DLG_ADABAS_DOMAINPWD ;
+ Text [ en-US ] = "Passwo~rd..." ;
};
FixedImage BMP_CON
{
- Pos = MAP_APPFONT ( 240 , 27 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_CON_PWD ;
+ Pos = MAP_APPFONT ( 240, 27 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 20, 20 ) ;
+ HelpID = HID_DLG_ADABAS_CON_PWD ;
};
FixedImage BMP_SYS
{
- Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_SYS_PWD ;
+ Pos = MAP_APPFONT ( 240, 11 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 20, 20 ) ;
+ HelpID = HID_DLG_ADABAS_SYS_PWD ;
};
FixedImage BMP_DOMAIN
{
- Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
+ Pos = MAP_APPFONT ( 240, 44 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 20, 20 ) ;
+ HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
};
FixedText FT_RESTORE
{
- Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
- Text[ en-US ] = "~Backup file";
+ Pos = MAP_APPFONT ( 12, 13 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Text [ en-US ] = "~Backup file" ;
};
Edit ET_RESTORE
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_RESTORE ;
+ HelpID = HID_DLG_ADABAS_RESTORE ;
};
PushButton PB_RESTORE
{
- Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 188, 13 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBRESTORE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBRESTORE ;
+ Text [ en-US ] = "..." ;
};
/* DEVSPACE positions */
- FixedLine FL_DBSETTINGS
+ FixedLine FL_DBSETTINGS
{
- Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
- Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
- Text[ en-US ] = "Database settings";
+ Pos = MAP_APPFONT ( 6, 70 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( WIN_X - 12, 8 ) ;
+ Text [ en-US ] = "Database settings" ;
};
FixedText FT_SYSDEVSPACE
{
- Pos = MAP_APPFONT ( 12 , 83 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "S~YSDEVSPACE";
+ Pos = MAP_APPFONT ( 12, 83 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "S~YSDEVSPACE" ;
};
FixedText FT_TRANSACTIONLOG
{
- Pos = MAP_APPFONT ( 12 , 99 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "TRANSACTI~ONLOG";
+ Pos = MAP_APPFONT ( 12, 99 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "TRANSACTI~ONLOG" ;
};
FixedText FT_DATADEVSPACE
{
- Pos = MAP_APPFONT ( 12 , 116 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "DATAD~EVSPACE";
+ Pos = MAP_APPFONT ( 12, 116 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "DATAD~EVSPACE" ;
};
Edit ET_SYSDEVSPACE
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y) ;
- Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
+ HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
};
PushButton PB_SYSDEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 12, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
+ Text [ en-US ] = "..." ;
};
Edit ET_TRANSACTIONLOG
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y) ;
- Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
};
PushButton PB_TRANSACTIONLOG
{
- Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y ) ;
+ Size = MAP_APPFONT ( 12, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
+ Text [ en-US ] = "..." ;
};
Edit ET_DATADEVSPACE
{
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y) ;
- Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ;
- Border = TRUE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ;
+ Border = TRUE ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
};
PushButton PB_DATADEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 12, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
+ Text [ en-US ] = "..." ;
};
/* DEVSPACE sizes */
FixedText FT_TRANSACTIONLOG_SIZE
{
- Pos = MAP_APPFONT ( 12 , 133 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "Transaction ~file (MB)";
+ Pos = MAP_APPFONT ( 12, 133 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "Transaction ~file (MB)" ;
};
NumericField NF_TRANSACTIONLOG_SIZE
{
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
-StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
+ StrictFormat = TRUE ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
};
FixedText FT_DATADEVSPACE_SIZE
{
- Pos = MAP_APPFONT ( 12 , 150 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "Data~base size (MB)";
+ Pos = MAP_APPFONT ( 12, 150 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "Data~base size (MB)" ;
};
NumericField NF_DATADEVSPACE_SIZE
{
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
-StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
+ StrictFormat = TRUE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
};
FixedText FT_CACHE_SIZE
{
- Pos = MAP_APPFONT ( 12 , 167 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
- Text[ en-US ] = "Data ~buffer size (MB)";
+ Pos = MAP_APPFONT ( 12, 167 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ;
+ Text [ en-US ] = "Data ~buffer size (MB)" ;
};
NumericField NF_CACHE_SIZE
{
- Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
-StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
+ Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 40, 12 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
+ StrictFormat = TRUE ;
+ HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
};
- FixedLine FL_END
- {
- Pos = MAP_APPFONT ( 0 , WIN_Y - 24 + MOVE_Y) ;
- Size = MAP_APPFONT ( WIN_X , 1 ) ;
+ FixedLine FL_END
+ {
+ Pos = MAP_APPFONT ( 0, WIN_Y - 24 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( WIN_X, 1 ) ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20
+ MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y -
20+ MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 56, WIN_Y - 20+ MOVE_Y ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ TabStop = TRUE ;
};
String STR_BACKUPFILE_LOAD
{
- Text[ en-US ] = "Backup file information";
+ Text [ en-US ] = "Backup file information" ;
};
- Text[ en-US ] = "Create New Adabas D Database";
+ Text [ en-US ] = "Create New Adabas D Database" ;
};
Image CHECK_GREEN
{
- ImageBitmap = Bitmap { File = "nu07.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "nu07.png" ;} ;
};
Image UNCHECK_RED
{
- ImageBitmap = Bitmap { File = "nu08.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "nu08.png" ;} ;
};
Image DEFAULT_BLUE
{
- ImageBitmap = Bitmap { File = "nu09.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "nu09.png" ;} ;
};
/* Fehlermeldungen beim Erstellen einer Adabas DB */
String STR_ADABAS_NO_PARAM_SET
{
- Text[ en-US ] = "No entry could be written in the configuration
file.";
+ Text [ en-US ] = "No entry could be written in the configuration file."
;
};
String STR_ADABAS_NO_DB_CREATED
{
- Text[ en-US ] = "An error occurred as the DB files were being
created.";
+ Text [ en-US ] = "An error occurred as the DB files were being
created." ;
};
String STR_ADABAS_NO_SYSTEM_TABLES
{
- Text[ en-US ] = "An error occurred as the system tables were being
created.";
+ Text [ en-US ] = "An error occurred as the system tables were being
created." ;
};
String STR_ADABAS_NO_BACKUP_FILE
{
- Text[ en-US ] = "The backup file entered does not exist.";
+ Text [ en-US ] = "The backup file entered does not exist." ;
};
InfoBox INFO_STR_MAX_FILE_LENGTH
{
- Message[ en-US ] = "The fully qualified file cannot be longer
than \'#\' characters.";
+ Message [ en-US ] = "The fully qualified file cannot be longer than
\'#\' characters." ;
};
String STR_NO_SAME_USER
{
- Text[ en-US ] = "The administrator and the control user cannot have the
same name!";
+ Text [ en-US ] = "The administrator and the control user cannot have
the same name!" ;
};
String STR_DEVSPACE_NO_FILE
{
- Text[ en-US ] = "No name has been entered for the $name$ file!";
+ Text [ en-US ] = "No name has been entered for the $name$ file!" ;
};
String STR_NO_PERMISSION
{
- Text[ en-US ] = "You have to have administrator rights to create a new
database!";
+ Text [ en-US ] = "You have to have administrator rights to create a new
database!" ;
};
String STR_FILE_OR_DIR_UNKNOWN
{
- Text[ en-US ] = "The specified file name or directory does not exist.";
+ Text [ en-US ] = "The specified file name or directory does not exist."
;
};
String STR_ERROR_IN_ADABAS_INSTALLATION
{
- Text [ en-US ] = "No new database can be created.\nPlease check your
Adabas D installation, especially the variables \"DBROOT\" and \"DBWORK\".";
+ Text [ en-US ] = "No new database can be created.\nPlease check your
Adabas D installation, especially the variables \"DBROOT\" and \"DBWORK\"." ;
};
String STR_STAT_WARNING
@@ -426,26 +424,27 @@ String STR_ADABAS_START_DATABASE
};
String STR_ADABAS_DB_EXISTS
{
- Text[ en-US ] = "The name entered already exists.";
+ Text [ en-US ] = "The name entered already exists." ;
};
String STR_ADABAS_NO_DEFAULTNAME
{
- Text[ en-US ] = "No default names could be set for the database files.
The total length is more than 40 characters.";
+ Text [ en-US ] = "No default names could be set for the database files.
The total length is more than 40 characters." ;
};
String STR_ADABAS_NO_ACCESSRIGHTS
{
- Text[ en-US ] = "No default names could be set for the database files.
There is no write access.";
+ Text [ en-US ] = "No default names could be set for the database files.
There is no write access." ;
};
String STR_ADABAS_CANNOT_CONVERT
{
- Text[ en-US ] = "The current database needs to be converted. Please
insert control user and password.";
+ Text [ en-US ] = "The current database needs to be converted. Please
insert control user and password." ;
};
String STR_ADABAS_PASSWORD_ILLEGAL
{
- Text[ en-US ] = "Spaces are not permitted in the password. Please enter
a new password.";
+ Text [ en-US ] = "Spaces are not permitted in the password. Please
enter a new password." ;
};
+// ********************************************************************** EOF
diff --git a/main/dbaccess/source/ui/dlg/CollectionView.src
b/main/dbaccess/source/ui/dlg/CollectionView.src
index de47b7f..9edc740 100644
--- a/main/dbaccess/source/ui/dlg/CollectionView.src
+++ b/main/dbaccess/source/ui/dlg/CollectionView.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.
- *
+ *
*************************************************************/
@@ -27,8 +27,8 @@
#include "dbaccess_helpid.hrc"
#include "CollectionView.hrc"
-#define WIN_X 200
-#define WIN_Y 192
+#define WIN_X 200
+#define WIN_Y 192
#define CHECKBOX_HEIGHT 8
#define FIXEDTEXT_HEIGHT 8
@@ -46,89 +46,89 @@ ModalDialog DLG_COLLECTION_VIEW
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
- //Sizeable = TRUE;
+ //Sizeable = TRUE ;
HelpId = HID_EXPLORERDLG_COLLECTION ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
+ Size = MAP_APPFONT ( WIN_X, WIN_Y ) ;
Text [ en-US ] = "Save" ;
-
+
FixedText FT_EXPLORERFILE_CURRENTPATH
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( 100 , FIXEDTEXT_HEIGHT ) ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, UNRELATED_CONTROLS ) ;
+ Size = MAP_APPFONT ( 100, FIXEDTEXT_HEIGHT ) ;
NoLabel = TRUE ;
};
ImageButton BTN_EXPLORERFILE_NEWFOLDER
{
- HelpID =
"dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER";
+ HelpID =
"dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS -
RELATED_CONTROLS - 2*IMG_SIZE, UNRELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
+ Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS -
RELATED_CONTROLS - 2 * IMG_SIZE, UNRELATED_CONTROLS ) ;
+ Size = MAP_APPFONT ( IMG_SIZE, IMG_SIZE ) ;
QuickHelpText [ en-US ] = "Create New Directory" ;
};
ImageButton BTN_EXPLORERFILE_UP
{
- HelpID =
"dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP";
+ HelpID =
"dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP" ;
TabStop = TRUE ;
Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - IMG_SIZE,
UNRELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
+ Size = MAP_APPFONT ( IMG_SIZE, IMG_SIZE ) ;
QuickHelpText [ en-US ] = "Up One Level" ;
};
-
+
Control CTRL_VIEW
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS +
IMG_SIZE) ;
- Size = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS , WIN_Y -
6*UNRELATED_CONTROLS - BUTTON_HEIGHT - IMG_SIZE - EDIT_HEIGHT -
FIXEDTEXT_HEIGHT) ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 2*UNRELATED_CONTROLS +
IMG_SIZE) ;
+ Size = MAP_APPFONT ( WIN_X - 2 * UNRELATED_CONTROLS, WIN_Y - 6
* UNRELATED_CONTROLS - BUTTON_HEIGHT - IMG_SIZE - EDIT_HEIGHT -
FIXEDTEXT_HEIGHT) ;
Border = TRUE ;
};
FixedText FT_EXPLORERFILE_FILENAME
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , WIN_Y -
3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT ) ;
- Size = MAP_APPFONT ( 50 , FIXEDTEXT_HEIGHT ) ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, WIN_Y - 3 *
UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT ) ;
+ Size = MAP_APPFONT ( 50, FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "File ~name:" ;
};
Edit ED_EXPLORERFILE_FILENAME
{
- HelpID =
"dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME";
- Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50
, WIN_Y - 3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT -
EDIT_HEIGHT) ;
- Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS -
2*UNRELATED_CONTROLS - 50 , EDIT_HEIGHT ) ;
+ HelpID =
"dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME" ;
+ Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50,
WIN_Y - 3 * UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT -
EDIT_HEIGHT) ;
+ Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS - 2 *
UNRELATED_CONTROLS - 50, EDIT_HEIGHT ) ;
Border = TRUE ;
TabStop = TRUE ;
};
-
+
FixedLine FL_1
{
- Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS -
BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ;
- Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 0, WIN_Y - 2 * UNRELATED_CONTROLS -
BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ;
+ Size = MAP_APPFONT ( WIN_X, FIXEDLINE_HEIGHT ) ;
};
-
+
PushButton BTN_EXPLORERFILE_SAVE
{
- HelpID =
"dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE";
- Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS -
RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
- Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
+ HelpID =
"dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE" ;
+ Pos = MAP_APPFONT ( WIN_X - 2 * UNRELATED_CONTROLS -
RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT ( 50, BUTTON_HEIGHT ) ;
DefButton = TRUE ;
TabStop = TRUE ;
Text [ en-US ] = "Save" ;
};
-
+
CancelButton PB_CANCEL
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y -
UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
- Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( WIN_X - 2 * UNRELATED_CONTROLS - 100, WIN_Y
- UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT ( 50, BUTTON_HEIGHT ) ;
};
-
+
HelpButton PB_HELP
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y -
UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
- Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y -
UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT ( 50, BUTTON_HEIGHT ) ;
};
-
-
+
+
String STR_PATHNAME
{
Text [ en-US ] = "~Path:" ;
@@ -141,23 +141,19 @@ String STR_NEW_FOLDER
};
Image IMG_NAVIGATION_BTN_UP_SC
{
- ImageBitmap = Bitmap { File = "fp010"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "fp010" ;} ;
};
Image IMG_NAVIGATION_BTN_UP_SCH
{
- ImageBitmap = Bitmap { File = "fph010"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "fph010" ;} ;
};
Image IMG_NAVIGATION_CREATEFOLDER_SC
{
- ImageBitmap = Bitmap { File = "fp015"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "fp015" ;} ;
};
Image IMG_NAVIGATION_CREATEFOLDER_SCH
{
- ImageBitmap = Bitmap { File = "fph015"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ ImageBitmap = Bitmap {File = "fph015" ;} ;
};
String STR_ALREADYEXISTOVERWRITE
@@ -165,3 +161,4 @@ String STR_ALREADYEXISTOVERWRITE
Text [ en-US ] = "The file already exists. Overwrite?" ;
};
+// ********************************************************************** EOF
diff --git a/main/dbaccess/source/ui/dlg/sqlmessage.src
b/main/dbaccess/source/ui/dlg/sqlmessage.src
index e884db9..d96aae3 100644
--- a/main/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/main/dbaccess/source/ui/dlg/sqlmessage.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.
- *
+ *
*************************************************************/
@@ -34,125 +34,121 @@
//-------------------------------------------------------------------------
Image BMP_EXCEPTION_ERROR
{
- ImageBitmap = Bitmap { File = "exerror.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exerror.png" ;} ;
};
Image BMP_EXCEPTION_WARNING
{
- ImageBitmap = Bitmap { File = "exwarning.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exwarning.png" ;} ;
};
Image BMP_EXCEPTION_INFO
{
- ImageBitmap = Bitmap { File = "exinfo.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exinfo.png" ;} ;
};
Image BMP_EXCEPTION_ERROR_SCH
{
- ImageBitmap = Bitmap { File = "exerror_sch.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exerror_sch.png" ;} ;
};
Image BMP_EXCEPTION_WARNING_SCH
{
- ImageBitmap = Bitmap { File = "exwarning_sch.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exwarning_sch.png" ;} ;
};
Image BMP_EXCEPTION_INFO_SCH
{
- ImageBitmap = Bitmap { File = "exinfo_sch.png"; };
- MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
+ ImageBitmap = Bitmap {File = "exinfo_sch.png" ;} ;
};
ModalDialog DLG_SQLEXCEPTIONCHAIN
{
- HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN";
+ HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN" ;
Moveable = TRUE ;
Closeable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 240 , 150 ) ;
+ Size = MAP_APPFONT ( 240, 150 ) ;
Text [ en-US ] = "%PRODUCTNAME Base" ;
FixedLine FL_DETAILS
{
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 228, 8 ) ;
- Text [ en-US ] = "Details";
+ Text [ en-US ] = "Details" ;
};
FixedText FT_ERRORLIST
{
Pos = MAP_APPFONT ( 12, 12 ) ;
Size = MAP_APPFONT ( 85, 10 ) ;
- Text [ en-US ] = "Error ~list:";
- Group = TRUE;
+ Text [ en-US ] = "Error ~list:" ;
+ Group = TRUE ;
};
Control CTL_ERRORLIST
{
Pos = MAP_APPFONT ( 12, 25 ) ;
Size = MAP_APPFONT ( 85, 93 ) ;
- Border = TRUE;
- TabStop = TRUE;
- HelpId = HID_SQLERROR_EXCHAIN_ERRORS;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ HelpId = HID_SQLERROR_EXCHAIN_ERRORS ;
};
FixedText FT_DESCRIPTION
{
Pos = MAP_APPFONT ( 103, 12 ) ;
Size = MAP_APPFONT ( 125, 10 ) ;
- Text [ en-US ] = "~Description:";
- Group = TRUE;
+ Text [ en-US ] = "~Description:" ;
+ Group = TRUE ;
};
MultiLineEdit ME_DESCRIPTION
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 103 , 25 ) ;
- Size = MAP_APPFONT ( 125 , 93 ) ;
+ Pos = MAP_APPFONT ( 103, 25 ) ;
+ Size = MAP_APPFONT ( 125, 93 ) ;
TabStop = TRUE ;
VScroll = TRUE ;
- HelpId = HID_SQLERROR_EXCHAIN_TEXT;
+ HelpId = HID_SQLERROR_EXCHAIN_TEXT ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 95 , 130 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 95, 130 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
String STR_EXCEPTION_STATUS
{
- Text [ en-US ] = "SQL Status";
+ Text [ en-US ] = "SQL Status" ;
};
String STR_EXCEPTION_ERRORCODE
{
- Text [ en-US ] = "Error code";
+ Text [ en-US ] = "Error code" ;
};
};
String STR_EXPLAN_STRINGCONVERSION_ERROR
{
- Text [ en-US ] = "A frequent reason for this error is an inappropriate
character set setting for the language of your database. Check the setting by
choosing Edit - Database - Properties.";
+ Text [ en-US ] = "A frequent reason for this error is an inappropriate
character set setting for the language of your database. Check the setting by
choosing Edit - Database - Properties." ;
};
String STR_EXCEPTION_ERROR
{
- Text [ en-US ] = "Error";
+ Text [ en-US ] = "Error" ;
};
String STR_EXCEPTION_WARNING
{
- Text [ en-US ] = "Warning";
+ Text [ en-US ] = "Warning" ;
};
String STR_EXCEPTION_INFO
{
- Text [ en-US ] = "Information";
+ Text [ en-US ] = "Information" ;
};
String STR_EXCEPTION_DETAILS
{
- Text [ en-US ] = "Details";
+ Text [ en-US ] = "Details" ;
};
+
+// ********************************************************************** EOF
