summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@pardus.org.tr>2017-05-22 11:41:20 +0300
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-06-09 10:24:53 +0200
commit5cae6a08a13ab0842826989eb5b840746be494a2 (patch)
treef242c60ebb9c2fc6de32241f6b9139d0c2b3d1d9 /desktop/inc
parent430e2d0d087ec981e59e0962bc029717481ee753 (diff)
tdf#36019: Enable/disable extension installation and removal via GUI
Now extension installation and removal via the Extension Manager dialog can be dynamically enabled/disabled from the expert configurations. This also affects the installation by double-clicking the extension file in the file manager, but doesn't affect the unopkg commands. When ExtensionSecurity::DisableExtensionRemoval is set in expert configurations, context menu entry of 'remove' for installed extensions is also disabled along with the "Remove" button on the dialog. This is the combination of 4 commits from master: 99b7c4f57d7f f09be32d0fcb 99841f1fd2bf 18cf49580846 Change-Id: Ide7b8bcae750b093bcc0a98948845273611cd620 Reviewed-on: https://gerrit.libreoffice.org/38455 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr>
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/dp_gui.hrc2
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc
index 9bb961474743..a22629cb1e7a 100644
--- a/desktop/inc/dp_gui.hrc
+++ b/desktop/inc/dp_gui.hrc
@@ -30,6 +30,8 @@
#define RID_STR_WARNING_VERSION_GREATER (RID_DEPLOYMENT_GUI_START + 7)
#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8)
#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9)
+#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 10)
+#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 11)
#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13)
#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14)