pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win] online-installer: disable repair mode

Browse Source
This commit is contained in:
SimplestStudio
2024-12-13 11:37:33 +02:00
parent 0773e98782
commit ec1fc5b9f4
4 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
win-linux/extras/online-installer/res/langs/langs.iss
View File

@ -304,11 +304,8 @@ ru.BUTTON_CLOSE =Закрыть
en.BUTTON_BACK =Back
ru.BUTTON_BACK =Назад
en.RADIO_UPDATE =Update
ru.RADIO_UPDATE =Обновить
en.RADIO_REPAIR =Repair
ru.RADIO_REPAIR =Восстановить
en.RADIO_UPDATE =Update/Repair
ru.RADIO_UPDATE =Обновить/Восстановить
en.RADIO_UNINST =Uninstall
ru.RADIO_UNINST =Удалить

82
win-linux/extras/online-installer/src/mainwindow.cpp
View File

@ -89,7 +89,7 @@ MainWindow::MainWindow(Widget *parent, const Rect &rc) :
m_bar(nullptr),
m_launchCheck(nullptr),
m_updRadio(nullptr),
m_repRadio(nullptr),
// m_repRadio(nullptr),
m_uninsRadio(nullptr),
m_cancelBtn(nullptr),
m_mode(Mode::Install),
@ -388,6 +388,16 @@ void MainWindow::startUpdate()
m_bar->setProgress(0);
m_comntInfoLbl->setText(_TR(LABEL_ERR_RUNNING), true);
} else {
if (m_checkState & ClrDataCheck) {
wstring dataPath = NS_File::appDataPath();
if (!dataPath.empty())
NS_File::removeDirRecursively(dataPath);
}
if (m_checkState & ClrStnCheck) {
wstring key(L"SOFTWARE\\");
key.append(_T(REG_GROUP_KEY));
SHDeleteKey(HKEY_CURRENT_USER, key.c_str());
}
m_bar->pulse(false);
m_bar->setProgress(100);
m_comntLbl->setText(_TR(LABEL_UPDATE_COMPL));
@ -505,18 +515,18 @@ void MainWindow::createSelectionPage()
m_is_completed = false;
/* Check box section*/
CheckBox *clrChkBox = new CheckBox(m_cenPanel, _TR(CHECK_CLR_DATA));
clrChkBox->setDisabled(!(m_checkState & RepairRadio));
clrChkBox->setDisabled(!(m_checkState & UpdateRadio));
clrChkBox->setChecked(m_checkState & ClrDataCheck);
clrChkBox->setGeometry(79, 114, 450, 18);
clrChkBox->setGeometry(79, 80, 450, 18);
setSelectorStyle(clrChkBox);
clrChkBox->onClick([=]() {
m_checkState = (m_checkState & ~ClrDataCheck) | (clrChkBox->isChecked() * ClrDataCheck);
});
CheckBox *stnChkBox = new CheckBox(m_cenPanel, _TR(CHECK_CLR_STNGS));
stnChkBox->setDisabled(!(m_checkState & RepairRadio));
stnChkBox->setDisabled(!(m_checkState & UpdateRadio));
stnChkBox->setChecked(m_checkState & ClrStnCheck);
stnChkBox->setGeometry(79, 146, 450, 18);
stnChkBox->setGeometry(79, 112, 450, 18);
setSelectorStyle(stnChkBox);
stnChkBox->onClick([stnChkBox, this]() {
m_checkState = (m_checkState & ~ClrStnCheck) | (stnChkBox->isChecked() * ClrStnCheck);
@ -525,7 +535,7 @@ void MainWindow::createSelectionPage()
CheckBox *clrAllChkBox = new CheckBox(m_cenPanel, _TR(CHECK_CLR_ALL));
clrAllChkBox->setDisabled(!(m_checkState & UninstRadio));
clrAllChkBox->setChecked(m_checkState & ClrAllCheck);
clrAllChkBox->setGeometry(79, 216, 450, 18);
clrAllChkBox->setGeometry(79, 182, 450, 18);
setSelectorStyle(clrAllChkBox);
clrAllChkBox->onClick([clrAllChkBox, this]() {
m_checkState = (m_checkState & ~ClrAllCheck) | (clrAllChkBox->isChecked() * ClrAllCheck);
@ -534,46 +544,46 @@ void MainWindow::createSelectionPage()
/* Update radio button section*/
m_updRadio = new RadioButton(m_cenPanel, _TR(RADIO_UPDATE));
m_updRadio->setChecked(m_checkState & UpdateRadio);
m_updRadio->setGeometry(50, 48, 128, 18);
m_updRadio->setGeometry(50, 48, 350, 18);
setSelectorStyle(m_updRadio);
m_updRadio->onClick([=]() {
clrChkBox->setDisabled(true);
stnChkBox->setDisabled(true);
clrChkBox->setDisabled(false);
stnChkBox->setDisabled(false);
clrAllChkBox->setDisabled(true);
if (m_repRadio->isChecked())
m_repRadio->setChecked(false);
// if (m_repRadio->isChecked())
// m_repRadio->setChecked(false);
if (m_uninsRadio->isChecked())
m_uninsRadio->setChecked(false);
m_checkState = (m_checkState | UpdateRadio) & ~(RepairRadio | UninstRadio);
});
/* Repair radio button section*/
m_repRadio = new RadioButton(m_cenPanel, _TR(RADIO_REPAIR));
m_repRadio->setChecked(m_checkState & RepairRadio);
m_repRadio->setGeometry(50, 82, 128, 18);
setSelectorStyle(m_repRadio);
m_repRadio->onClick([=]() {
clrChkBox->setDisabled(false);
stnChkBox->setDisabled(false);
clrAllChkBox->setDisabled(true);
if (m_updRadio->isChecked())
m_updRadio->setChecked(false);
if (m_uninsRadio->isChecked())
m_uninsRadio->setChecked(false);
m_checkState = (m_checkState | RepairRadio) & ~(UninstRadio | UpdateRadio);
});
// m_repRadio = new RadioButton(m_cenPanel, _TR(RADIO_REPAIR));
// m_repRadio->setChecked(m_checkState & RepairRadio);
// m_repRadio->setGeometry(50, 82, 128, 18);
// setSelectorStyle(m_repRadio);
// m_repRadio->onClick([=]() {
// clrChkBox->setDisabled(false);
// stnChkBox->setDisabled(false);
// clrAllChkBox->setDisabled(true);
// if (m_updRadio->isChecked())
// m_updRadio->setChecked(false);
// if (m_uninsRadio->isChecked())
// m_uninsRadio->setChecked(false);
// m_checkState = (m_checkState | RepairRadio) & ~(UninstRadio | UpdateRadio);
// });
/* Uninstall radio button section*/
m_uninsRadio = new RadioButton(m_cenPanel, _TR(RADIO_UNINST));
m_uninsRadio->setChecked(m_checkState & UninstRadio);
m_uninsRadio->setGeometry(50, 184, 128, 18);
m_uninsRadio->setGeometry(50, 150, 350, 18);
setSelectorStyle(m_uninsRadio);
m_uninsRadio->onClick([=]() {
clrChkBox->setDisabled(true);
stnChkBox->setDisabled(true);
clrAllChkBox->setDisabled(false);
if (m_repRadio->isChecked())
m_repRadio->setChecked(false);
// if (m_repRadio->isChecked())
// m_repRadio->setChecked(false);
if (m_updRadio->isChecked())
m_updRadio->setChecked(false);
m_checkState = (m_checkState | UninstRadio) & ~(UpdateRadio | RepairRadio);
@ -585,20 +595,20 @@ void MainWindow::createSelectionPage()
applyBtn->setGeometry(m_cenPanel->size().width - 100 - 12, m_cenPanel->size().height - 28 - 12, 100, 28);
setButtonStyle(applyBtn);
applyBtn->onClick([=]() {
wstring msg = m_uninsRadio->isChecked() ? _TR(MSG_REMOVE) : m_repRadio->isChecked() ? _TR(MSG_REPAIR) : _TR(MSG_UPDATE);
wstring msg = m_uninsRadio->isChecked() ? _TR(MSG_REMOVE) : /*m_repRadio->isChecked() ? _TR(MSG_REPAIR) :*/ _TR(MSG_UPDATE);
NS_Utils::Replace(msg, L"%1", _T(WINDOW_NAME));
if (IDOK == MessageBox(nativeWindowHandle(), msg.c_str(), _TR(CAPTION), MB_ICONWARNING | MB_OKCANCEL | MB_DEFBUTTON2)) {
m_cenPanel->disconnect(m_resize_conn);
m_updRadio->close();
m_repRadio->close();
// m_repRadio->close();
clrChkBox->close();
stnChkBox->close();
m_uninsRadio->close();
clrAllChkBox->close();
applyBtn->close();
msg = m_uninsRadio->isChecked() ? _TR(LABEL_UNINSTLING) : m_repRadio->isChecked() ? _TR(LABEL_REPAIRING) : _TR(LABEL_UPDATING);
msg = m_uninsRadio->isChecked() ? _TR(LABEL_UNINSTLING) : /*m_repRadio->isChecked() ? _TR(LABEL_REPAIRING) :*/ _TR(LABEL_UPDATING);
createProgressPage(msg);
if (m_updRadio->isChecked() || m_repRadio->isChecked()) {
if (m_updRadio->isChecked() /*|| m_repRadio->isChecked()*/) {
/* Check box section*/
m_launchCheck = new CheckBox(m_cenPanel, _TR(CHECK_LAUNCH));
m_launchCheck->setChecked(m_checkState & LaunchCheck);
@ -611,9 +621,9 @@ void MainWindow::createSelectionPage()
if (m_uninsRadio->isChecked())
startUninstall();
else
if (m_repRadio->isChecked())
startRepair();
else
// if (m_repRadio->isChecked())
// startRepair();
// else
startUpdate();
}
});
@ -621,7 +631,7 @@ void MainWindow::createSelectionPage()
applyBtn->setGeometry(w - 100 - 12, h - 28 - 12, 100, 28);
});
m_updRadio->show();
m_repRadio->show();
// m_repRadio->show();
clrChkBox->show();
stnChkBox->show();
m_uninsRadio->show();

2
win-linux/extras/online-installer/src/mainwindow.h
View File

@ -55,7 +55,7 @@ private:
BoxLayout *m_cenPanelVlut;
CheckBox *m_launchCheck;
RadioButton *m_updRadio,
*m_repRadio,
// *m_repRadio,
*m_uninsRadio;
Button *m_cancelBtn;
Mode m_mode;

4
win-linux/extras/online-installer/src/resource.h
View File

@ -42,8 +42,8 @@
#define BUTTON_APPLY "Apply"
#define BUTTON_CLOSE "Close"
#define BUTTON_BACK "Back"
#define RADIO_UPDATE "Update"
#define RADIO_REPAIR "Repair"
#define RADIO_UPDATE "Update/Repair"
// #define RADIO_REPAIR "Repair"
#define RADIO_UNINST "Uninstall"
#define CHECK_SILENT "Silent Installation"
#define CHECK_LAUNCH "Launch app"