This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6b417ef1a7 Clean up resource files
6b417ef1a7 is described below

commit 6b417ef1a7de1a5d44ffaa9f03cc83b879686183
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Jul 31 00:08:42 2024 +0200

    Clean up resource files
---
 .../source/deployment/gui/dp_gui_backend.src       |   2 -
 .../deployment/gui/dp_gui_dependencydialog.src     |  77 ++--
 .../source/deployment/gui/dp_gui_dialog.src        |   4 -
 .../source/deployment/gui/dp_gui_updatedialog.src  | 435 ++++++++++-----------
 4 files changed, 231 insertions(+), 287 deletions(-)

diff --git a/main/desktop/source/deployment/gui/dp_gui_backend.src 
b/main/desktop/source/deployment/gui/dp_gui_backend.src
index 9cbcbc12fd..5371cf1a61 100644
--- a/main/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/main/desktop/source/deployment/gui/dp_gui_backend.src
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #include "dp_gui.hrc"
 
 // package bundle:
diff --git a/main/desktop/source/deployment/gui/dp_gui_dependencydialog.src 
b/main/desktop/source/deployment/gui/dp_gui_dependencydialog.src
index a04dc9aaa8..b9ec5f8f96 100644
--- a/main/desktop/source/deployment/gui/dp_gui_dependencydialog.src
+++ b/main/desktop/source/deployment/gui/dp_gui_dependencydialog.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,20 +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 "svtools/controldims.hrc"
 
 #include "dp_gui.hrc"
@@ -29,40 +27,35 @@
 #define LOCAL_TEXT_HEIGHT (2 * RSC_CD_FIXEDTEXT_HEIGHT)
 #define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT)
 
-ModalDialog RID_DLG_DEPENDENCIES {
-    HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES";
-    Size = MAP_APPFONT(
-        (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
-         RSC_SP_DLG_INNERBORDER_RIGHT),
-        (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + RSC_SP_CTRL_DESC_Y +
-         LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y + RSC_CD_PUSHBUTTON_HEIGHT +
-         RSC_SP_DLG_INNERBORDER_BOTTOM));
-    Text[en-US] = "System dependencies check";
-    Sizeable = TRUE;
-    Moveable = TRUE;
-    Closeable = TRUE;
-    FixedText RID_DLG_DEPENDENCIES_TEXT {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP);
-        Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_TEXT_HEIGHT);
-        Text[en-US] = "The extension cannot be installed as the 
following\nsystem dependencies are not fulfilled:";
-        NoLabel = TRUE;
-    };
-    ListBox RID_DLG_DEPENDENCIES_LIST {
-        HelpID = 
"desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST";
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT);
-    };
-    OKButton RID_DLG_DEPENDENCIES_OK {
-        Pos = MAP_APPFONT(
-            (RSC_SP_DLG_INNERBORDER_LEFT +
-             (LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH) / 2),
-            (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y));
-        Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
-        DefButton = TRUE;
-    };
+ModalDialog RID_DLG_DEPENDENCIES
+{
+       HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES" ;
+       Size = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH + 
RSC_SP_DLG_INNERBORDER_RIGHT,
+               RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y + 
RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_DLG_INNERBORDER_BOTTOM ) ;
+       Text [en-US] = "System dependencies check" ;
+       Sizeable = TRUE ;
+       Moveable = TRUE ;
+       Closeable = TRUE ;
+       FixedText RID_DLG_DEPENDENCIES_TEXT
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, 
RSC_SP_DLG_INNERBORDER_TOP ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, LOCAL_TEXT_HEIGHT ) ;
+               Text [en-US] = "The extension cannot be installed as the 
following\nsystem dependencies are not fulfilled:";
+               NoLabel = TRUE ;
+       };
+       ListBox RID_DLG_DEPENDENCIES_LIST
+       {
+               HelpID = 
"desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST" ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, 
RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, LOCAL_LIST_HEIGHT ) ;
+       };
+       OKButton RID_DLG_DEPENDENCIES_OK
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_PUSHBUTTON_WIDTH / 2,
+                       RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT + RSC_SP_CTRL_Y ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               DefButton = TRUE ;
+       };
 };
+
+// ********************************************************************** EOF
diff --git a/main/desktop/source/deployment/gui/dp_gui_dialog.src 
b/main/desktop/source/deployment/gui/dp_gui_dialog.src
index 14bb9ceb6f..848015e65e 100644
--- a/main/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/main/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #include "svtools/controldims.hrc"
 #include "dp_gui.hrc"
 
@@ -289,7 +287,6 @@ ModalDialog RID_DLG_LICENSE
                Text [ en-US ] = "Decline" ;
                TabStop = TRUE ;
        };
-
 };
 
 ModalDialog RID_DLG_SHOW_LICENSE
@@ -322,7 +319,6 @@ ModalDialog RID_DLG_SHOW_LICENSE
 };
 
 
-
 WarningBox RID_WARNINGBOX_INSTALL_EXTENSION {
        Buttons = WB_OK_CANCEL ;
        DefButton = WB_DEF_OK ;
diff --git a/main/desktop/source/deployment/gui/dp_gui_updatedialog.src 
b/main/desktop/source/deployment/gui/dp_gui_updatedialog.src
index ddfea13a55..8f5b623c3e 100644
--- a/main/desktop/source/deployment/gui/dp_gui_updatedialog.src
+++ b/main/desktop/source/deployment/gui/dp_gui_updatedialog.src
@@ -5,7 +5,7 @@
  * 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
@@ -28,248 +28,205 @@
 #define LOCAL_LIST_HEIGHT1 (6 * RSC_BS_CHARHEIGHT) + 4
 #define LOCAL_LIST_HEIGHT2 (7 * RSC_BS_CHARHEIGHT) + 3
 
-ModalDialog RID_DLG_UPDATE {
-    HelpID = HID_DEPLOYMENT_GUI_UPDATE;
-    Size = MAP_APPFONT(
-        (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH +
-         RSC_SP_DLG_INNERBORDER_RIGHT),
-        (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-         RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-         RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-         RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
-         RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y +
-         RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_DLG_INNERBORDER_BOTTOM));
-    Text[en-US] = "Extension Update";
-    Moveable = TRUE;
-    Closeable = TRUE;
-    FixedText RID_DLG_UPDATE_CHECKING {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH * 2 / 3,
-            RSC_SP_DLG_INNERBORDER_TOP);
-        Size = MAP_APPFONT(
-            (LOCAL_WIDTH - LOCAL_WIDTH * 2 / 3 - RSC_SP_CTRL_DESC_X -
-             RSC_CD_FIXEDTEXT_HEIGHT),
-            RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "Checking... ";
-        Right = TRUE;
-        NoLabel = TRUE;
-    };
-    FixedImage RID_DLG_UPDATE_THROBBER {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_FIXEDTEXT_HEIGHT,
-            RSC_SP_DLG_INNERBORDER_TOP);
-        Size = MAP_APPFONT(RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT + 
1);
-    };
-    FixedText RID_DLG_UPDATE_UPDATE {
-        Disable = TRUE;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP);
-        Size = MAP_APPFONT(
-            LOCAL_WIDTH * 2 / 3 - RSC_SP_CTRL_GROUP_X, 
RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "~Available extension updates";
-    };
-    Control RID_DLG_UPDATE_UPDATES {
-        HelpId = HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES;
-        Disable = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT1);
-        TabStop = TRUE;
-    };
-    CheckBox RID_DLG_UPDATE_ALL {
-        HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL";
-        Disable = TRUE;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT);
-        Text[en-US] = "~Show all updates";
-    };
-    FixedLine RID_DLG_UPDATE_DESCRIPTION {
-        Disable = TRUE;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "Description";
-    };
-    FixedText RID_DLG_UPDATE_PUBLISHER_LABEL
-    {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LABEL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "Publisher:";
-    };
-    FixedText RID_DLG_UPDATE_PUBLISHER_LINK
-    {
-        HelpId = HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT + LABEL_WIDTH + RSC_SP_CTRL_DESC_X,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH - LABEL_WIDTH - RSC_SP_CTRL_DESC_X, 
RSC_CD_FIXEDTEXT_HEIGHT);
-    };
-    FixedText RID_DLG_UPDATE_RELEASENOTES_LABEL
-    {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LABEL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "What is new:";
-    };
-    FixedText RID_DLG_UPDATE_RELEASENOTES_LINK
-    {
-        HelpId = HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT + LABEL_WIDTH + RSC_SP_CTRL_DESC_X,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH - LABEL_WIDTH - RSC_SP_CTRL_DESC_X, 
RSC_CD_FIXEDTEXT_HEIGHT);
-        Text[en-US] = "Release Notes";
-    };
-    MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS {
-        HelpID = 
"desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS";
-        Disable = TRUE;
-        Border = TRUE;
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, LOCAL_LIST_HEIGHT2);
-        ReadOnly = TRUE;
-        VScroll = TRUE;
-        IgnoreTab = TRUE;
-    };
-    FixedLine RID_DLG_UPDATE_LINE {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y));
-        Size = MAP_APPFONT(LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT);
-    };
-    HelpButton RID_DLG_UPDATE_HELP {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
-             RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
-        Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
-    };
-    PushButton RID_DLG_UPDATE_OK {
-        HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK";
-        Disable = TRUE;
-        Pos = MAP_APPFONT(
-            (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_PUSHBUTTON_WIDTH -
-             RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH),
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
-             RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
-        Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
-        Text[en-US] = "~Install";
-        DefButton = TRUE;
-    };
-    PushButton RID_DLG_UPDATE_CLOSE {
-        Pos = MAP_APPFONT(
-            RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_PUSHBUTTON_WIDTH,
-            (RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
-             RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT +
-             RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + RSC_SP_FLGR_SPACE_Y +
-             RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y));
-        Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT);
-        Text[en-US] = "Close";
-    };
-
-    Image RID_DLG_UPDATE_NORMALALERT {
-        ImageBitmap = Bitmap {
-            File = "caution_12.png";
-        };
-    };
-    Image RID_DLG_UPDATE_HIGHCONTRASTALERT {
-        ImageBitmap = Bitmap {
-            File = "caution_12_h.png";
-        };
-    };
-    String RID_DLG_UPDATE_ERROR {
-        Text[en-US] = "Error";
-    };
-    String RID_DLG_UPDATE_NONE {
-        Text[en-US] = "No new updates are available.";
-    };
-    String RID_DLG_UPDATE_NOINSTALLABLE {
-        Text[en-US] = "No installable updates are available. To see ignored or 
disabled updates, mark the check box 'Show all updates'.";
-    };
-    String RID_DLG_UPDATE_FAILURE {
-        Text[en-US] = "An error occurred:";
-    };
-    String RID_DLG_UPDATE_UNKNOWNERROR {
-        Text[en-US] = "Unknown error.";
-    };
-    String RID_DLG_UPDATE_NODESCRIPTION {
-        Text[en-US] = "No more details are available for this update.";
-    };
-    String RID_DLG_UPDATE_NOINSTALL {
-        Text[en-US] = "The extension cannot be updated because:";
-    };
-    String RID_DLG_UPDATE_NODEPENDENCY {
-        Text[en-US] = "Required Apache OpenOffice version doesn't match:";
-    };
-    String RID_DLG_UPDATE_NODEPENDENCY_CUR_VER {
-        Text[en-US] = "You have Apache OpenOffice %VERSION";
-    };
-    String RID_DLG_UPDATE_BROWSERBASED {
-        Text[en-US] = "browser based update";
-    };
-    String RID_DLG_UPDATE_VERSION {
-        Text[en-US] = "Version";
-    };
-    String RID_DLG_UPDATE_IGNORE {
-        Text[en-US] = "Ignore this Update";
-    };
-    String RID_DLG_UPDATE_IGNORE_ALL {
-        Text[en-US] = "Ignore all Updates";
-    };
-    String RID_DLG_UPDATE_ENABLE {
-        Text[en-US] = "Enable Updates";
-    };
-    String RID_DLG_UPDATE_IGNORED_UPDATE {
-        Text[en-US] = "This update will be ignored.\n";
-    };
+ModalDialog RID_DLG_UPDATE
+{
+       HelpID = HID_DEPLOYMENT_GUI_UPDATE ;
+       Size = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH + 
RSC_SP_DLG_INNERBORDER_RIGHT,
+               RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+               RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + 
RSC_SP_FLGR_SPACE_Y +
+               RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y + 
RSC_CD_PUSHBUTTON_HEIGHT + RSC_SP_DLG_INNERBORDER_BOTTOM ) ;
+       Text [en-US] = "Extension Update" ;
+       Moveable = TRUE ;
+       Closeable = TRUE ;
+       FixedText RID_DLG_UPDATE_CHECKING
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH * 
2 / 3, RSC_SP_DLG_INNERBORDER_TOP ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH - LOCAL_WIDTH * 2 / 3 - 
RSC_SP_CTRL_DESC_X - RSC_CD_FIXEDTEXT_HEIGHT, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+               Text [en-US] = "Checking... " ;
+               Right = TRUE ;
+               NoLabel = TRUE ;
+       };
+       FixedImage RID_DLG_UPDATE_THROBBER
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_FIXEDTEXT_HEIGHT, RSC_SP_DLG_INNERBORDER_TOP ) ;
+               Size = MAP_APPFONT ( RSC_CD_FIXEDTEXT_HEIGHT, 
RSC_CD_FIXEDTEXT_HEIGHT + 1 ) ;
+       };
+       FixedText RID_DLG_UPDATE_UPDATE
+       {
+               Disable = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, 
RSC_SP_DLG_INNERBORDER_TOP ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH * 2 / 3 - RSC_SP_CTRL_GROUP_X, 
RSC_CD_FIXEDTEXT_HEIGHT ) ;
+               Text [en-US] = "~Available extension updates" ;
+       };
+       Control RID_DLG_UPDATE_UPDATES
+       {
+               HelpId = HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES ;
+               Disable = TRUE ;
+               Border = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, 
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, LOCAL_LIST_HEIGHT1 ) ;
+               TabStop = TRUE ;
+       };
+       CheckBox RID_DLG_UPDATE_ALL
+       {
+               HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" ;
+               Disable = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT, 
RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + 
LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_CHECKBOX_HEIGHT ) ;
+               Text [en-US] = "~Show all updates" ;
+       };
+       FixedLine RID_DLG_UPDATE_DESCRIPTION
+       {
+               Disable = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+               Text [en-US] = "Description" ;
+       };
+       FixedText RID_DLG_UPDATE_PUBLISHER_LABEL
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LABEL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+               Text [en-US] = "Publisher:" ;
+       };
+       FixedText RID_DLG_UPDATE_PUBLISHER_LINK
+       {
+               HelpId = HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LABEL_WIDTH + 
RSC_SP_CTRL_DESC_X,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH - LABEL_WIDTH - 
RSC_SP_CTRL_DESC_X, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+       };
+       FixedText RID_DLG_UPDATE_RELEASENOTES_LABEL
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LABEL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+               Text [en-US] = "What is new:" ;
+       };
+       FixedText RID_DLG_UPDATE_RELEASENOTES_LINK
+       {
+               HelpId = HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LABEL_WIDTH + 
RSC_SP_CTRL_DESC_X,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT (LOCAL_WIDTH - LABEL_WIDTH - 
RSC_SP_CTRL_DESC_X, RSC_CD_FIXEDTEXT_HEIGHT) ;
+               Text [en-US] = "Release Notes" ;
+       };
+       MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS
+       {
+               HelpID = 
"desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" ;
+               Disable = TRUE ;
+               Border = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, LOCAL_LIST_HEIGHT2 ) ;
+               ReadOnly = TRUE ;
+               VScroll = TRUE ;
+               IgnoreTab = TRUE ;
+       };
+       FixedLine RID_DLG_UPDATE_LINE
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + 
RSC_SP_FLGR_SPACE_Y ) ;
+               Size = MAP_APPFONT ( LOCAL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+       };
+       HelpButton RID_DLG_UPDATE_HELP
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y +
+                       RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + 
RSC_CD_FIXEDTEXT_HEIGHT + RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + 
RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+       };
+       PushButton RID_DLG_UPDATE_OK
+       {
+               HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK" ;
+               Disable = TRUE ;
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X - RSC_CD_PUSHBUTTON_WIDTH,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y 
+RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + RSC_CD_FIXEDTEXT_HEIGHT +
+                       RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + 
RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [en-US] = "~Install" ;
+               DefButton = TRUE ;
+       };
+       PushButton RID_DLG_UPDATE_CLOSE
+       {
+               Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - 
RSC_CD_PUSHBUTTON_WIDTH,
+                       RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + 
RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT1 + RSC_SP_CTRL_GROUP_Y 
+RSC_CD_CHECKBOX_HEIGHT + RSC_SP_CTRL_GROUP_Y + RSC_CD_FIXEDTEXT_HEIGHT +
+                       RSC_SP_CTRL_DESC_Y + LOCAL_LIST_HEIGHT2 + 
RSC_SP_FLGR_SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_Y ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [en-US] = "Close" ;
+       };
+       Image RID_DLG_UPDATE_NORMALALERT {
+               ImageBitmap = Bitmap {
+                       File = "caution_12.png" ;
+               };
+       };
+       Image RID_DLG_UPDATE_HIGHCONTRASTALERT {
+               ImageBitmap = Bitmap {
+                       File = "caution_12_h.png" ;
+               };
+       };
+       String RID_DLG_UPDATE_ERROR {
+               Text [en-US] = "Error" ;
+       };
+       String RID_DLG_UPDATE_NONE {
+               Text [en-US] = "No new updates are available." ;
+       };
+       String RID_DLG_UPDATE_NOINSTALLABLE {
+               Text [en-US] = "No installable updates are available. To see 
ignored or disabled updates, mark the check box 'Show all updates'." ;
+       };
+       String RID_DLG_UPDATE_FAILURE {
+               Text [en-US] = "An error occurred:" ;
+       };
+       String RID_DLG_UPDATE_UNKNOWNERROR {
+               Text [en-US] = "Unknown error." ;
+       };
+       String RID_DLG_UPDATE_NODESCRIPTION {
+               Text [en-US] = "No more details are available for this update." 
;
+       };
+       String RID_DLG_UPDATE_NOINSTALL {
+               Text [en-US] = "The extension cannot be updated because:" ;
+       };
+       String RID_DLG_UPDATE_NODEPENDENCY {
+               Text [en-US] = "Required Apache OpenOffice version doesn't 
match:" ;
+       };
+       String RID_DLG_UPDATE_NODEPENDENCY_CUR_VER {
+               Text [en-US] = "You have Apache OpenOffice %VERSION" ;
+       };
+       String RID_DLG_UPDATE_BROWSERBASED {
+               Text [en-US] = "browser based update" ;
+       };
+       String RID_DLG_UPDATE_VERSION {
+               Text [en-US] = "Version" ;
+       };
+       String RID_DLG_UPDATE_IGNORE {
+               Text [en-US] = "Ignore this Update" ;
+       };
+       String RID_DLG_UPDATE_IGNORE_ALL {
+               Text [en-US] = "Ignore all Updates" ;
+       };
+       String RID_DLG_UPDATE_ENABLE {
+               Text [en-US] = "Enable Updates" ;
+       };
+       String RID_DLG_UPDATE_IGNORED_UPDATE {
+               Text [en-US] = "This update will be ignored.\n" ;
+       };
 };
 
 WarningBox RID_WARNINGBOX_UPDATE_SHARED_EXTENSION
 {
-    Buttons = WB_OK_CANCEL;
-    DefButton = WB_DEF_CANCEL;
-    Message[en-US] = "Make sure that no further users are working with the 
same "
-    "%PRODUCTNAME, when changing shared extensions in a multi user 
environment.\n"
-    "Click \'OK\' to update the extensions.\n"
-    "Click \'Cancel\' to stop updating the extensions.";
+       Buttons = WB_OK_CANCEL ;
+       DefButton = WB_DEF_CANCEL ;
+       Message [en-US] = "Make sure that no further users are working with the 
same "
+       "%PRODUCTNAME, when changing shared extensions in a multi user 
environment.\n"
+       "Click \'OK\' to update the extensions.\n"
+       "Click \'Cancel\' to stop updating the extensions." ;
 };
 
 // ******************************************************************* EOF

Reply via email to