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 d541c9e Cleaned up resource files, removed MASKCOLOR
d541c9e is described below
commit d541c9e6b457e7bb0ad40875cd04027bd7ba6842
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Dec 12 12:45:13 2019 +0100
Cleaned up resource files, removed MASKCOLOR
(cherry picked from commit 0508b79be158ed5da908695a68e5fcea25807208)
---
main/dbaccess/source/ui/dlg/dbfindex.src | 176 +++++++------------
main/extensions/source/dbpilots/commonpagesdbp.src | 191 ++++++++++-----------
main/extensions/source/update/ui/updatecheckui.src | 46 +++--
3 files changed, 180 insertions(+), 233 deletions(-)
diff --git a/main/dbaccess/source/ui/dlg/dbfindex.src
b/main/dbaccess/source/ui/dlg/dbfindex.src
index bf13b18..94d803a 100644
--- a/main/dbaccess/source/ui/dlg/dbfindex.src
+++ b/main/dbaccess/source/ui/dlg/dbfindex.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,20 +28,14 @@
#include "dbu_dlg.hrc"
#endif
-#define WIN_X 264
-#define WIN_Y 149
+#define WIN_X 264
+#define WIN_Y 149
Image IMG_ONE_LEFT_H
{
ImageBitmap = Bitmap
{
- File = "one_left_h.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "one_left_h.png" ;
};
};
@@ -49,13 +43,7 @@ Image IMG_ALL_LEFT_H
{
ImageBitmap = Bitmap
{
- File = "all_left_h.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "all_left_h.png" ;
};
};
@@ -63,13 +51,7 @@ Image IMG_ONE_RIGHT_H
{
ImageBitmap = Bitmap
{
- File = "one_right_h.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "one_right_h.png" ;
};
};
@@ -77,174 +59,146 @@ Image IMG_ALL_RIGHT_H
{
ImageBitmap = Bitmap
{
- File = "all_right_h.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "all_right_h.png" ;
};
};
ModalDialog DLG_DBASE_INDEXES
{
- HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
+ HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES" ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
+ Size = MAP_APPFONT ( WIN_X, WIN_Y ) ;
Text [ en-US ] = "Indexes" ;
Moveable = TRUE ;
Closeable = TRUE ;
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 208 , 5 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 208, 5 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( 208 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 208, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT ( 208 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 208, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
FixedText FT_TABLES
{
- Pos = MAP_APPFONT ( 8 , 7 ) ;
- Size = MAP_APPFONT ( 50 , 8 ) ;
- Text [ en-US ] = "~Table";
+ Pos = MAP_APPFONT ( 8, 7 ) ;
+ Size = MAP_APPFONT ( 50, 8 ) ;
+ Text [ en-US ] = "~Table" ;
};
ComboBox CB_TABLES
{
- HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES";
+ HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES" ;
Border = TRUE ;
SVLook = TRUE ;
- Pos = MAP_APPFONT ( 62 , 5 ) ;
- Size = MAP_APPFONT ( 134 , 12 ) ;
+ Pos = MAP_APPFONT ( 62, 5 ) ;
+ Size = MAP_APPFONT ( 134, 12 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
- FixedLine FL_INDEXES
+ FixedLine FL_INDEXES
{
- Pos = MAP_APPFONT ( 6 , 22 ) ;
- Size = MAP_APPFONT ( 196 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 22 ) ;
+ Size = MAP_APPFONT ( 196, 8 ) ;
Text [ en-US ] = "Assignment" ;
};
FixedText FT_TABLEINDEXES
{
- Pos = MAP_APPFONT ( 12 , 33 ) ;
- Size = MAP_APPFONT ( 83 , 8 ) ;
- Text [ en-US ] = "T~able indexes";
+ Pos = MAP_APPFONT ( 12, 33 ) ;
+ Size = MAP_APPFONT ( 83, 8 ) ;
+ Text [ en-US ] = "T~able indexes" ;
};
ListBox LB_TABLEINDEXES
{
- HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES";
+ HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES" ;
Border = TRUE ;
SVLook = TRUE ;
- Pos = MAP_APPFONT ( 12 , 44 ) ;
- Size = MAP_APPFONT ( 76 , 98 ) ;
+ Pos = MAP_APPFONT ( 12, 44 ) ;
+ Size = MAP_APPFONT ( 76, 98 ) ;
TabStop = TRUE ;
};
FixedText FT_ALLINDEXES
{
- Pos = MAP_APPFONT ( 120 , 33 ) ;
- Size = MAP_APPFONT ( 73 , 8 ) ;
- Text [ en-US ] = "~Free indexes";
+ Pos = MAP_APPFONT ( 120, 33 ) ;
+ Size = MAP_APPFONT ( 73, 8 ) ;
+ Text [ en-US ] = "~Free indexes" ;
};
ListBox LB_FREEINDEXES
{
- HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES";
+ HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES" ;
Border = TRUE ;
SVLook = TRUE ;
- Pos = MAP_APPFONT ( 120 , 44 ) ;
- Size = MAP_APPFONT ( 76 , 98 ) ;
+ Pos = MAP_APPFONT ( 120, 44 ) ;
+ Size = MAP_APPFONT ( 76, 98 ) ;
TabStop = TRUE ;
};
- ImageButton IB_ADD
+ ImageButton IB_ADD
{
- HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD";
- Pos = MAP_APPFONT ( 94 , 60 ) ;
- Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD" ;
+ Pos = MAP_APPFONT ( 94, 60 ) ;
+ Size = MAP_APPFONT ( 20, 14 ) ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
- File = "one_left.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "one_left.png" ;
};
};
};
- ImageButton IB_ADDALL
+ ImageButton IB_ADDALL
{
- HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL";
- Pos = MAP_APPFONT ( 94 , 77 ) ;
- Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL" ;
+ Pos = MAP_APPFONT ( 94, 77 ) ;
+ Size = MAP_APPFONT ( 20, 14 ) ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
- File = "all_left.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "all_left.png" ;
};
};
};
- ImageButton IB_REMOVE
+ ImageButton IB_REMOVE
{
- HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE";
- Pos = MAP_APPFONT ( 94 , 98 ) ;
- Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE" ;
+ Pos = MAP_APPFONT ( 94, 98 ) ;
+ Size = MAP_APPFONT ( 20, 14 ) ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
- File = "one_right.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "one_right.png" ;
};
};
};
- ImageButton IB_REMOVEALL
+ ImageButton IB_REMOVEALL
{
- HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL";
- Pos = MAP_APPFONT ( 94, 114 ) ;
- Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL" ;
+ Pos = MAP_APPFONT ( 94, 114 ) ;
+ Size = MAP_APPFONT ( 20, 14 ) ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
- File = "all_right.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
+ File = "all_right.png" ;
};
};
};
};
+
+// ********************************************************************** EOF
diff --git a/main/extensions/source/dbpilots/commonpagesdbp.src
b/main/extensions/source/dbpilots/commonpagesdbp.src
index de2a253..e671dd8 100644
--- a/main/extensions/source/dbpilots/commonpagesdbp.src
+++ b/main/extensions/source/dbpilots/commonpagesdbp.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,209 +27,206 @@
TabPage RID_PAGE_TABLESELECTION
{
- HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION";
+ HelpID = "extensions:TabPage:RID_PAGE_TABLESELECTION" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
- Text [ en-US ] = "Data";
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
+ Text [ en-US ] = "Data" ;
FixedLine FL_DATA
{
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
- Text [ en-US ] = "Data";
+ Pos = MAP_APPFONT ( 4, 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+ Text [ en-US ] = "Data" ;
};
FixedText FT_EXPLANATION
{
- Pos = MAP_APPFONT ( 7 , 15 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y -
21 ) ;
- WordBreak = TRUE;
- Group = TRUE;
- Text [ en-US ] = "Currently, the form the control belongs to is
not (or not completely) bound to a data source.\n\nPlease choose a data source
and a table.\n\n\nPlease note that the settings made on this page will take
effect immediately upon leaving the page.";
+ Pos = MAP_APPFONT ( 7, 15 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y -
21 ) ;
+ WordBreak = TRUE ;
+ Group = TRUE ;
+ Text [ en-US ] = "Currently, the form the control belongs to is
not (or not completely) bound to a data source.\n\nPlease choose a data source
and a table.\n\n\nPlease note that the settings made on this page will take
effect immediately upon leaving the page." ;
};
FixedText FT_DATASOURCE
{
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 15 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , 8) ;
- Group = TRUE;
- Text [ en-US ] = "~Data source:";
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 15 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, 8) ;
+ Group = TRUE ;
+ Text [ en-US ] = "~Data source:" ;
};
ListBox LB_DATASOURCE
{
- HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE";
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 , 26 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 27 , 14 ) ;
+ HelpID =
"extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE" ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 26 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 27, 14 ) ;
SVLook = TRUE ;
Border = TRUE ;
DropDown = TRUE ;
AutoHScroll = TRUE ;
};
-
+
PushButton PB_FORMDATASOURCE
{
- HelpID =
"extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE";
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X
- 24 , 25 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- Text [ en-US ] = "~...";
+ HelpID =
"extensions:PushButton:RID_PAGE_TABLESELECTION:PB_FORMDATASOURCE" ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3 + WINDOW_HALF_SIZE_X
- 24, 25 ) ;
+ Size = MAP_APPFONT ( 14, 14 ) ;
+ Text [ en-US ] = "~..." ;
};
-
+
FixedText FT_TABLE
{
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 46 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 14 , 8) ;
- Group = TRUE;
- Text [ en-US ] = "~Table / Query:";
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 14, 8) ;
+ Group = TRUE ;
+ Text [ en-US ] = "~Table / Query:" ;
};
ListBox LB_TABLE
{
- HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE";
- Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 57 ) ;
- Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10 , WINDOW_SIZE_Y -
6 - 57 ) ;
+ HelpID = "extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE" ;
+ Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 3, 57 ) ;
+ Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 10, WINDOW_SIZE_Y - 6
- 57 ) ;
SVLook = TRUE ;
Border = TRUE ;
- Sort = TRUE;
+ Sort = TRUE ;
AutoHScroll = TRUE ;
};
- Image IMG_TABLE
- {
- ImageBitmap = Bitmap { File = "sx03188.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
+ Image IMG_TABLE
+ {
+ ImageBitmap = Bitmap {File = "sx03188.png" ;} ;
+ };
- Image IMG_TABLE_HC
- {
- ImageBitmap = Bitmap { File = "sxh03188.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
+ Image IMG_TABLE_HC
+ {
+ ImageBitmap = Bitmap {File = "sxh03188.png" ;} ;
+ };
- Image IMG_QUERY
- {
- ImageBitmap = Bitmap { File = "sx03202.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
+ Image IMG_QUERY
+ {
+ ImageBitmap = Bitmap {File = "sx03202.png" ;} ;
+ };
- Image IMG_QUERY_HC
- {
- ImageBitmap = Bitmap { File = "sxh03202.png"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
- };
+ Image IMG_QUERY_HC
+ {
+ ImageBitmap = Bitmap {File = "sxh03202.png" ;} ;
+ };
};
TabPage RID_PAGE_OPTION_DBFIELD
{
- HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD";
+ HelpID = "extensions:TabPage:RID_PAGE_OPTION_DBFIELD" ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
- Text [ en-US ] = "Database Field";
+ Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
+ Text [ en-US ] = "Database Field" ;
FixedLine FL_DATABASEFIELD_EXPL
{
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
+ Pos = MAP_APPFONT ( 4, 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
};
FixedText FT_DATABASEFIELD_EXPL
{
- Pos = MAP_APPFONT ( 7 , 15 ) ;
+ Pos = MAP_APPFONT ( 7, 15 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 16 ) ;
WordBreak = TRUE;
};
FixedText FT_DATABASEFIELD_QUEST
{
- Pos = MAP_APPFONT ( 7 , 34 ) ;
+ Pos = MAP_APPFONT ( 7, 34 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 16 ) ;
- WordBreak = TRUE;
- Text [ en-US ] = "Do you want to save the value in a database
field?";
+ WordBreak = TRUE ;
+ Text [ en-US ] = "Do you want to save the value in a database
field?" ;
};
RadioButton RB_STOREINFIELD_YES
{
- HelpID =
"extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES";
- Pos = MAP_APPFONT ( 7 , 53 ) ;
+ HelpID =
"extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES" ;
+ Pos = MAP_APPFONT ( 7, 53 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 20, 10 ) ;
- Group = TRUE;
- TabStop = TRUE;
- Text [ en-US ] = "~Yes, I want to save it in the following
database field:";
+ Group = TRUE ;
+ TabStop = TRUE ;
+ Text [ en-US ] = "~Yes, I want to save it in the following
database field:" ;
};
ListBox LB_STOREINFIELD
{
- HelpID =
"extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD";
+ HelpID =
"extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD" ;
Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X + 23, 51 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - 30, 14 ) ;
- TabStop = TRUE;
+ TabStop = TRUE ;
SVLook = TRUE ;
Border = TRUE ;
- DropDown = TRUE;
+ DropDown = TRUE ;
AutoHScroll = TRUE ;
};
RadioButton RB_STOREINFIELD_NO
{
- HelpID =
"extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO";
- Pos = MAP_APPFONT ( 7 , 68 ) ;
+ HelpID =
"extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO" ;
+ Pos = MAP_APPFONT ( 7, 68 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 14, 10 ) ;
- TabStop = FALSE;
- Text [ en-US ] = "~No, I only want to save the value in the
form.";
+ TabStop = FALSE ;
+ Text [ en-US ] = "~No, I only want to save the value in the
form." ;
};
};
TabPage RID_PAGE_FORM_DATASOURCE_STATUS
{
- HelpID = "extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS";
+ HelpID = "extensions:TabPage:RID_PAGE_FORM_DATASOURCE_STATUS" ;
FixedLine FL_FORMSETINGS
{
- Pos = MAP_APPFONT ( 4 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
- Text [ en-US ] = "Form";
+ Pos = MAP_APPFONT ( 4, 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+ Text [ en-US ] = "Form" ;
};
FixedText FT_FORMDATASOURCELABEL
{
- Pos = MAP_APPFONT ( 7 , 15 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Data source";
+ Pos = MAP_APPFONT ( 7, 15 ) ;
+ Size = MAP_APPFONT ( 60, 8 ) ;
+ Text [ en-US ] = "Data source" ;
};
FixedText FT_FORMDATASOURCE
{
- Pos = MAP_APPFONT ( 7 + 60 + 3 , 15 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X / 2 - 80 - 3 , 19 ) ;
- WordBreak = TRUE;
+ Pos = MAP_APPFONT ( 7 + 60 + 3, 15 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X / 2 - 80 - 3, 19 ) ;
+ WordBreak = TRUE ;
};
FixedText FT_FORMCONTENTTYPELABEL
{
Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3, 15 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Content type";
+ Size = MAP_APPFONT ( 60, 8 ) ;
+ Text [ en-US ] = "Content type" ;
};
FixedText FT_FORMCONTENTTYPE
{
- Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3 + 60 , 15 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - ( WINDOW_SIZE_X / 2 + 3 +
60 ) - 7 , 8 ) ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3 + 60, 15 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - ( WINDOW_SIZE_X / 2 + 3 +
60 ) - 7, 8 ) ;
};
FixedText FT_FORMTABLELABEL
{
Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3, 26 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Content";
+ Size = MAP_APPFONT ( 60, 8 ) ;
+ Text [ en-US ] = "Content" ;
};
FixedText FT_FORMTABLE
{
- Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3 + 60 , 26 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - ( WINDOW_SIZE_X / 2 + 3 +
60 ) - 7 , 8 ) ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X / 2 + 3 + 60, 26 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - ( WINDOW_SIZE_X / 2 + 3 +
60 ) - 7, 8 ) ;
};
};
String RID_STR_TYPE_TABLE
{
- Text [ en-US ] = "Table";
+ Text [ en-US ] = "Table" ;
};
String RID_STR_TYPE_QUERY
{
- Text [ en-US ] = "Query";
+ Text [ en-US ] = "Query" ;
};
String RID_STR_TYPE_COMMAND
{
- Text [ en-US ] = "SQL command";
+ Text [ en-US ] = "SQL command" ;
};
+// ********************************************************************** EOF
diff --git a/main/extensions/source/update/ui/updatecheckui.src
b/main/extensions/source/update/ui/updatecheckui.src
index eccc93d..1daded2 100644
--- a/main/extensions/source/update/ui/updatecheckui.src
+++ b/main/extensions/source/update/ui/updatecheckui.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,41 +7,37 @@
* 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 "updatecheckui.hrc"
-#define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue
= 0xFFFF; };
+ Image RID_UPDATE_AVAILABLE_16
+ {
+ ImageBitmap = Bitmap {File = "onlineupdate_16.png" ;} ;
+ };
+ Image RID_UPDATE_AVAILABLE_26
+ {
+ ImageBitmap = Bitmap {File = "onlineupdate_26.png" ;} ;
+ };
+ Image RID_UPDATE_AVAILABLE_16_HC
+ {
+ ImageBitmap = Bitmap {File = "onlineupdate_16_h.png" ;} ;
+ };
+ Image RID_UPDATE_AVAILABLE_26_HC
+ {
+ ImageBitmap = Bitmap {File = "onlineupdate_26_h.png" ;} ;
+ };
- Image RID_UPDATE_AVAILABLE_16
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_16.png"; };
- STD_MASK_COLOR
- };
- Image RID_UPDATE_AVAILABLE_26
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_26.png"; };
- STD_MASK_COLOR
- };
- Image RID_UPDATE_AVAILABLE_16_HC
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_16_h.png"; };
- STD_MASK_COLOR
- };
- Image RID_UPDATE_AVAILABLE_26_HC
- {
- ImageBitmap = Bitmap{ file = "onlineupdate_26_h.png"; };
- STD_MASK_COLOR
- };
+// ********************************************************************** EOF
