diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-06 17:23:27 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-06 20:05:13 +0000 |
commit | a3597a3f370175d0c06887e6691cbfa045937ad4 (patch) | |
tree | c0fbb7e0d80c4cb0423c8a85e706cc1c52f90ed5 /svx | |
parent | 9da0627254ca31f768740a7b6012ca85d925fb30 (diff) |
SafeModeDialog: Rename to match reality
This doesn't remove shared&bundled extensions, but resets the registration
database from shared extensions.
Change-Id: I9f198fc7b771fd3bd31547008fd8d006a6d1b5d5
Reviewed-on: https://gerrit.libreoffice.org/31693
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/SafeModeDialog.cxx | 18 | ||||
-rw-r--r-- | svx/source/dialog/SafeModeDialog.hxx | 2 | ||||
-rw-r--r-- | svx/uiconfig/ui/safemodedialog.ui | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx index 18256f3e97d5..f3a6960f4888 100644 --- a/svx/source/dialog/SafeModeDialog.cxx +++ b/svx/source/dialog/SafeModeDialog.cxx @@ -54,7 +54,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpCBCheckProfilesafeExtensions(), mpCBDisableAllExtensions(), mpCBDeinstallUserExtensions(), - mpCBDeinstallAllExtensions(), + mpCBResetSharedExtensions(), mpCBDisableHWAcceleration(), mpCBResetCustomizations(), mpCBResetWholeUserProfile(), @@ -79,7 +79,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) get(mpCBCheckProfilesafeExtensions, "check_profilesafe_extensions"); get(mpCBDisableAllExtensions, "check_disable_all_extensions"); get(mpCBDeinstallUserExtensions, "check_deinstall_user_extensions"); - get(mpCBDeinstallAllExtensions, "check_deinstall_all_extensions"); + get(mpCBResetSharedExtensions, "check_reset_shared_extensions"); get(mpCBDisableHWAcceleration, "check_disable_hw_acceleration"); get(mpCBResetCustomizations, "check_reset_customizations"); get(mpCBResetWholeUserProfile, "check_reset_whole_userprofile"); @@ -101,7 +101,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent) mpCBCheckProfilesafeExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBDisableAllExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBDeinstallUserExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); - mpCBDeinstallAllExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); + mpCBResetSharedExtensions->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBDisableHWAcceleration->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBResetCustomizations->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); mpCBResetWholeUserProfile->SetToggleHdl(LINK(this, SafeModeDialog, CheckBoxHdl)); @@ -150,7 +150,7 @@ void SafeModeDialog::dispose() mpCBCheckProfilesafeExtensions.clear(); mpCBDisableAllExtensions.clear(); mpCBDeinstallUserExtensions.clear(); - mpCBDeinstallAllExtensions.clear(); + mpCBResetSharedExtensions.clear(); mpCBDisableHWAcceleration.clear(); mpCBResetCustomizations.clear(); mpCBResetWholeUserProfile.clear(); @@ -168,7 +168,7 @@ void SafeModeDialog::enableDisableWidgets() mpCBCheckProfilesafeExtensions->Enable(maBackupFileHelper.isPopPossibleExtensionInfo()); mpCBDisableAllExtensions->Enable(comphelper::BackupFileHelper::isTryDisableAllExtensionsPossible()); mpCBDeinstallUserExtensions->Enable(comphelper::BackupFileHelper::isTryDeinstallUserExtensionsPossible()); - mpCBDeinstallAllExtensions->Enable(comphelper::BackupFileHelper::isTryDeinstallAllExtensionsPossible()); + mpCBResetSharedExtensions->Enable(comphelper::BackupFileHelper::isTryResetSharedExtensionsPossible()); mpCBResetCustomizations->Enable(comphelper::BackupFileHelper::isTryResetCustomizationsPossible()); // no disable of mpCBResetWholeUserProfile, always possible (as last choice) @@ -226,10 +226,10 @@ void SafeModeDialog::applyChanges() comphelper::BackupFileHelper::tryDeinstallUserExtensions(); } - if (mpCBDeinstallAllExtensions->IsChecked()) + if (mpCBResetSharedExtensions->IsChecked()) { - // Deinstall all Extensions (user|shared|bundled) - comphelper::BackupFileHelper::tryDeinstallAllExtensions(); + // Reset shared Extensions + comphelper::BackupFileHelper::tryResetSharedExtensions(); } } @@ -378,7 +378,7 @@ IMPL_LINK(SafeModeDialog, CheckBoxHdl, CheckBox&, /*pCheckBox*/, void) mpCBCheckProfilesafeExtensions->IsChecked() || mpCBDisableAllExtensions->IsChecked() || mpCBDeinstallUserExtensions->IsChecked() || - mpCBDeinstallAllExtensions->IsChecked() || + mpCBResetSharedExtensions->IsChecked() || mpCBDisableHWAcceleration->IsChecked() || mpCBResetCustomizations->IsChecked() || mpCBResetWholeUserProfile->IsChecked()); diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx index d926dd4d0c9a..ddba90f9be70 100644 --- a/svx/source/dialog/SafeModeDialog.hxx +++ b/svx/source/dialog/SafeModeDialog.hxx @@ -51,7 +51,7 @@ private: VclPtr<CheckBox> mpCBCheckProfilesafeExtensions; VclPtr<CheckBox> mpCBDisableAllExtensions; VclPtr<CheckBox> mpCBDeinstallUserExtensions; - VclPtr<CheckBox> mpCBDeinstallAllExtensions; + VclPtr<CheckBox> mpCBResetSharedExtensions; VclPtr<CheckBox> mpCBDisableHWAcceleration; VclPtr<CheckBox> mpCBResetCustomizations; VclPtr<CheckBox> mpCBResetWholeUserProfile; diff --git a/svx/uiconfig/ui/safemodedialog.ui b/svx/uiconfig/ui/safemodedialog.ui index bacc7f0f9995..a4d43536bdd4 100644 --- a/svx/uiconfig/ui/safemodedialog.ui +++ b/svx/uiconfig/ui/safemodedialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkDialog" id="SafeModeDialog"> @@ -231,7 +231,7 @@ The proposed changes get more radical from top down so it is recommended to try </child> <child> <object class="GtkRadioButton" id="radio_deinstall"> - <property name="label" translatable="yes">Uninstall extensions</property> + <property name="label" translatable="yes">Extensions</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -268,8 +268,8 @@ The proposed changes get more radical from top down so it is recommended to try </packing> </child> <child> - <object class="GtkCheckButton" id="check_deinstall_all_extensions"> - <property name="label" translatable="yes">Uninstall all extensions (including shared and bundled)</property> + <object class="GtkCheckButton" id="check_reset_shared_extensions"> + <property name="label" translatable="yes">Reset state of shared extensions</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> |