зеркало из https://github.com/mozilla/pjs.git
disable the installer's upgrade panel for now.
This commit is contained in:
Родитель
7402a70cd3
Коммит
0d309ad5d0
|
@ -279,7 +279,7 @@ Sub Title=Where $ProductName$ will be installed.
|
||||||
Message0=$ProductName$ will be installed into the following folder:
|
Message0=$ProductName$ will be installed into the following folder:
|
||||||
|
|
||||||
[Dialog Upgrade]
|
[Dialog Upgrade]
|
||||||
Show Dialog=TRUE
|
Show Dialog=FALSE
|
||||||
Show In Easy Install=FALSE
|
Show In Easy Install=FALSE
|
||||||
;*** LOCALIZE ME BABY ***
|
;*** LOCALIZE ME BABY ***
|
||||||
Title=Upgrade
|
Title=Upgrade
|
||||||
|
|
|
@ -580,7 +580,8 @@ void CheckForUpgrade(HWND aPanel, int aNextPanel)
|
||||||
// "Easy Install" mode. If that flag is set to FALSE, the Upgrade
|
// "Easy Install" mode. If that flag is set to FALSE, the Upgrade
|
||||||
// panel is shown only in the "Custom"/"Advanced" pass.
|
// panel is shown only in the "Custom"/"Advanced" pass.
|
||||||
if (sgProduct.checkCleanupOnUpgrade &&
|
if (sgProduct.checkCleanupOnUpgrade &&
|
||||||
!(dwSetupType == ST_RADIO0 && !diUpgrade.bShowInEasyInstall)) {
|
!(dwSetupType == ST_RADIO0 && !diUpgrade.bShowInEasyInstall) &&
|
||||||
|
!(dwSetupType == ST_RADIO1 && !diUpgrade.bShowDialog)) {
|
||||||
|
|
||||||
// Found destination folder. check to see if we're upgrading ontop
|
// Found destination folder. check to see if we're upgrading ontop
|
||||||
// of a previous installation. If so, we need to prompt the user
|
// of a previous installation. If so, we need to prompt the user
|
||||||
|
|
Загрузка…
Ссылка в новой задаче