mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SafeModeDialog: Rename widget to match label

Browse Source 
Change-Id: I6bb02527fa77846343e55ff73497d1b46b5e1ba8
Reviewed-on: https://gerrit.libreoffice.org/31699
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2016-12-06 21:23:13 +01:00
parent 709053fc72
commit 6ce819eefe
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
svx/source/dialog/SafeModeDialog.cxx
View File

@@ -47,7 +47,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
mpRadioRestore(), mpRadioRestore(),
mpRadioConfigure(), mpRadioConfigure(),
mpRadioDeinstall(), mpRadioExtensions(),
mpRadioReset(), mpRadioReset(),
mpCBCheckProfilesafeConfig(), mpCBCheckProfilesafeConfig(),
@@ -73,7 +73,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
get(mpRadioRestore, "radio_restore"); get(mpRadioRestore, "radio_restore");
get(mpRadioConfigure, "radio_configure"); get(mpRadioConfigure, "radio_configure");
get(mpRadioDeinstall, "radio_deinstall"); get(mpRadioExtensions, "radio_extensions");
get(mpRadioReset, "radio_reset"); get(mpRadioReset, "radio_reset");
get(mpCBCheckProfilesafeConfig, "check_profilesafe_config"); get(mpCBCheckProfilesafeConfig, "check_profilesafe_config");
@@ -92,7 +92,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
mpRadioRestore->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioRestore->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
mpRadioConfigure->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioConfigure->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
mpRadioDeinstall->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioExtensions->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl)); mpRadioReset->SetClickHdl(LINK(this, SafeModeDialog, RadioBtnHdl));
mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl)); mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, DialogBtnHdl));
@@ -137,7 +137,7 @@ void SafeModeDialog::dispose()
{ {
mpRadioRestore.clear(); mpRadioRestore.clear();
mpRadioConfigure.clear(); mpRadioConfigure.clear();
mpRadioDeinstall.clear(); mpRadioExtensions.clear();
mpRadioReset.clear(); mpRadioReset.clear();
mpBoxRestore.clear(); mpBoxRestore.clear();
@@ -223,7 +223,7 @@ void SafeModeDialog::applyChanges()
} }
// Deinstall // Deinstall
if (mpRadioDeinstall->IsChecked()) if (mpRadioExtensions->IsChecked())
{ {
if (mpCBDeinstallUserExtensions->IsChecked()) if (mpCBDeinstallUserExtensions->IsChecked())
{ {
@@ -289,7 +289,7 @@ IMPL_LINK(SafeModeDialog, RadioBtnHdl, Button*, pBtn, void)
mpBoxDeinstall->Disable(); mpBoxDeinstall->Disable();
} }
else if (pBtn == mpRadioDeinstall.get()) else if (pBtn == mpRadioExtensions.get())
{ {
// Enable the currently selected box // Enable the currently selected box
mpBoxDeinstall->Enable(); mpBoxDeinstall->Enable();

2
svx/source/dialog/SafeModeDialog.hxx
View File

@@ -44,7 +44,7 @@ private:
VclPtr<RadioButton> mpRadioRestore; VclPtr<RadioButton> mpRadioRestore;
VclPtr<RadioButton> mpRadioConfigure; VclPtr<RadioButton> mpRadioConfigure;
VclPtr<RadioButton> mpRadioDeinstall; VclPtr<RadioButton> mpRadioExtensions;
VclPtr<RadioButton> mpRadioReset; VclPtr<RadioButton> mpRadioReset;
VclPtr<CheckBox> mpCBCheckProfilesafeConfig; VclPtr<CheckBox> mpCBCheckProfilesafeConfig;

2
svx/uiconfig/ui/safemodedialog.ui
View File

@@ -230,7 +230,7 @@ The proposed changes get more radical from top down so it is recommended to try
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkRadioButton" id="radio_deinstall"> <object class="GtkRadioButton" id="radio_extensions">
<property name="label" translatable="yes">Extensions</property> <property name="label" translatable="yes">Extensions</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>