INTEGRATION: CWS extmgrui01 (1.13.24); FILE MERGED

2008/04/28 10:57:55 dv 1.13.24.11: RESYNC: (1.15-1.16); FILE MERGED
2008/03/28 07:01:27 dv 1.13.24.10: Some more dialog changed a little bit
2008/03/27 08:06:17 dv 1.13.24.9: Adopted 'Already installed' request to latest version handling
2008/03/26 09:57:06 dv 1.13.24.8: fixed some merge problems with resource ids
2008/03/25 08:06:08 dv 1.13.24.7: RESYNC: (1.13-1.15); FILE MERGED
2008/03/01 07:45:40 dv 1.13.24.6: #i83902# Added support for HC mode, added error string
2008/02/28 15:16:51 dv 1.13.24.5: #i83902# Added support for updating a single extension via context menu
2008/02/27 12:58:54 dv 1.13.24.4: #i83902# Better handling of external adding of extensions
2008/02/22 07:50:19 dv 1.13.24.3: #i83902# Added progress handling
2008/02/12 14:52:04 dv 1.13.24.2: #i83902# new dialog for the extension manager (part 2)
2008/02/04 07:39:49 dv 1.13.24.1: #i83902# first version of new dialog

1 files changed, 44 insertions, 17 deletions

diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc
index 831d02e78937..a85b764da3e9 100644
--- a/desktop/source/deployment/gui/dp_gui.hrc
+++ b/desktop/source/deployment/gui/dp_gui.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dp_gui.hrc,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,6 +37,15 @@
 // Package Manager Dialog:
 #define RID_DLG_PACKAGE_MANAGER                RID_DEPLOYMENT_GUI_START
 
+#define RID_EM_BTN_CLOSE                       10
+#define RID_EM_BTN_HELP                        11
+#define RID_EM_BTN_ADD                         12
+#define RID_EM_BTN_CHECK_UPDATES               13
+#define RID_EM_BTN_OPTIONS                     14
+#define RID_EM_BTN_CANCEL                      15
+#define RID_EM_FT_GET_EXTENSIONS               20
+#define RID_EM_FT_PROGRESS                     21
+
 // local RIDs:
 #define RID_FT_PACKAGES                        5
 
@@ -96,16 +105,16 @@
 #define RID_DLG_DEPENDENCIES_LIST 2
 #define RID_DLG_DEPENDENCIES_OK 3
 
-#define RID_WARNINGBOX_VERSION_LESS                               (RID_DEPLOYMENT_GUI_START + 2)
-#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES           (RID_DEPLOYMENT_GUI_START + 3)
-#define RID_WARNINGBOX_VERSION_EQUAL                              (RID_DEPLOYMENT_GUI_START + 4)
-#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES          (RID_DEPLOYMENT_GUI_START + 5)
-#define RID_WARNINGBOX_VERSION_GREATER                            (RID_DEPLOYMENT_GUI_START + 6)
-#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 7)
-#define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 8)
-
+#define RID_QUERYBOX_INSTALL_FOR_ALL                              (RID_DEPLOYMENT_GUI_START + 2)
+#define RID_WARNINGBOX_VERSION_LESS                               (RID_DEPLOYMENT_GUI_START + 3)
+#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES           (RID_DEPLOYMENT_GUI_START + 4)
+#define RID_WARNINGBOX_VERSION_EQUAL                              (RID_DEPLOYMENT_GUI_START + 5)
+#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES          (RID_DEPLOYMENT_GUI_START + 6)
+#define RID_WARNINGBOX_VERSION_GREATER                            (RID_DEPLOYMENT_GUI_START + 7)
+#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES        (RID_DEPLOYMENT_GUI_START + 8)
+#define RID_WARNINGBOX_INSTALL_EXTENSION                          (RID_DEPLOYMENT_GUI_START + 9)
 
-#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 9)
+#define RID_DLG_UPDATE (RID_DEPLOYMENT_GUI_START + 10)
 
 #define RID_DLG_UPDATE_CHECKING 1
 #define RID_DLG_UPDATE_THROBBER 2
@@ -138,6 +147,9 @@
 #define RID_DLG_UPDATE_NOUPDATE 29
 #define RID_DLG_UPDATE_VERSION 30
 
+#define RID_DLG_EXTENSION_MANAGER (RID_DEPLOYMENT_GUI_START + 6)
+
+
 #define RID_DLG_UPDATEINSTALL                  (RID_DEPLOYMENT_GUI_START + 20)
 #define RID_INFOBOX_UPDATE_SHARED_EXTENSION    (RID_DEPLOYMENT_GUI_START + 21)
 
@@ -147,6 +159,13 @@
 #define RID_IMG_DEF_DOCUMENT_HC                (RID_DEPLOYMENT_GUI_START+53)
 #define RID_IMG_DEF_PACKAGE                    (RID_DEPLOYMENT_GUI_START+54)
 #define RID_IMG_DEF_PACKAGE_HC                 (RID_DEPLOYMENT_GUI_START+55)
+#define RID_IMG_WARNING                        (RID_DEPLOYMENT_GUI_START+56)
+#define RID_IMG_WARNING_HC                     (RID_DEPLOYMENT_GUI_START+57)
+#define RID_IMG_LOCKED                         (RID_DEPLOYMENT_GUI_START+58)
+#define RID_IMG_LOCKED_HC                      (RID_DEPLOYMENT_GUI_START+59)
+#define RID_IMG_EXTENSION                      (RID_DEPLOYMENT_GUI_START+60)
+#define RID_IMG_EXTENSION_HC                   (RID_DEPLOYMENT_GUI_START+61)
+
 
 #define RID_STR_USER_INSTALLATION              (RID_DEPLOYMENT_GUI_START+60)
 #define RID_STR_SHARED_INSTALLATION            (RID_DEPLOYMENT_GUI_START+61)
@@ -175,15 +194,23 @@
 #define RID_STR_ENABLING_PACKAGES              (RID_DEPLOYMENT_GUI_START+92)
 #define RID_STR_DISABLING_PACKAGES             (RID_DEPLOYMENT_GUI_START+93)
 #define RID_STR_EXPORTING_PACKAGES             (RID_DEPLOYMENT_GUI_START+94)
-#define RID_STR_UNSUPPORTED_PLATFORM           (RID_DEPLOYMENT_GUI_START+95)
-#define RID_WARNINGBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+100)
-#define RID_WARNINGBOX_ADD_SHARED_EXTENSION     (RID_DEPLOYMENT_GUI_START+101)
-#define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+102)
-#define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+103)
-#define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104)
+
+#define RID_STR_INSTALL_FOR_ALL                (RID_DEPLOYMENT_GUI_START+95)
+#define RID_STR_INSTALL_FOR_ME                 (RID_DEPLOYMENT_GUI_START+96)
+#define RID_STR_PUBLISHER_LINK                 (RID_DEPLOYMENT_GUI_START+97)
+#define RID_STR_ERROR_UNKNOWN_STATUS           (RID_DEPLOYMENT_GUI_START+98)
+
+#define WARNINGBOX_CONCURRENTINSTANCE          (RID_DEPLOYMENT_GUI_START+100)
+
+#define RID_STR_UNSUPPORTED_PLATFORM            (RID_DEPLOYMENT_GUI_START+101)
+#define RID_WARNINGBOX_UPDATE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+102)
+#define RID_WARNINGBOX_ADD_SHARED_EXTENSION     (RID_DEPLOYMENT_GUI_START+103)
+#define RID_WARNINGBOX_REMOVE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+104)
+#define RID_WARNINGBOX_ENABLE_SHARED_EXTENSION  (RID_DEPLOYMENT_GUI_START+105)
+#define RID_WARNINGBOX_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106)
 
 #define RID_DLG_LICENSE                         RID_DEPLOYMENT_LICENSE_START
-#define WARNINGBOX_NOSHAREDALLOWED              (RID_DEPLOYMENT_LICENSE_START+1)
+#define WARNINGBOX_NOSHAREDALLOWED             (RID_DEPLOYMENT_LICENSE_START+1)