diff options
| -rw-r--r-- | data.cpp | 2 | ||||
| -rw-r--r-- | gui/theme/common/landscape.xml | 7 | ||||
| -rw-r--r-- | gui/theme/common/portrait.xml | 7 | ||||
| -rw-r--r-- | gui/theme/common/watch.xml | 7 | ||||
| -rw-r--r-- | variables.h | 2 |
5 files changed, 17 insertions, 8 deletions
@@ -676,7 +676,7 @@ void DataManager::SetDefaultValues() mConst.SetValue(TW_MIN_SYSTEM_VAR, TW_MIN_SYSTEM_SIZE); mData.SetValue(TW_BACKUP_NAME, "(Auto Generate)"); - mPersist.SetValue(TW_REBOOT_AFTER_FLASH_VAR, "0"); + mPersist.SetValue(TW_INSTALL_REBOOT_VAR, "0"); mPersist.SetValue(TW_SIGNED_ZIP_VERIFY_VAR, "0"); mPersist.SetValue(TW_FORCE_MD5_CHECK_VAR, "0"); mPersist.SetValue(TW_DISABLE_FREE_SPACE_VAR, "0"); diff --git a/gui/theme/common/landscape.xml b/gui/theme/common/landscape.xml index 9272db01b..df68a3a63 100644 --- a/gui/theme/common/landscape.xml +++ b/gui/theme/common/landscape.xml @@ -441,9 +441,9 @@ </checkbox> <checkbox> - <placement x="%col1_x_right%" y="%row12_y%" /> + <placement x="%col1_x_right%" y="%row12_y%"/> <text>{@install_reboot_chk=Reboot after installation is complete}</text> - <data variable="tw_install_reboot" /> + <data variable="tw_install_reboot"/> </checkbox> <button style="main_button_half_width"> @@ -2771,6 +2771,9 @@ <listitem name="{@zip_sig_chk=Zip signature verification}"> <data variable="tw_signed_zip_verify"/> </listitem> + <listitem name="{@install_reboot_chk=Reboot after installation is complete}"> + <data variable="tw_install_reboot"/> + </listitem> <listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}"> <data variable="tw_rm_rf"/> </listitem> diff --git a/gui/theme/common/portrait.xml b/gui/theme/common/portrait.xml index 507f3841b..dbd43054b 100644 --- a/gui/theme/common/portrait.xml +++ b/gui/theme/common/portrait.xml @@ -386,9 +386,9 @@ </checkbox> <checkbox> - <placement x="%indent%" y="%row13a_y%" /> + <placement x="%indent%" y="%row13a_y%"/> <text>{@install_reboot_chk=Reboot after installation is complete}</text> - <data variable="tw_install_reboot" /> + <data variable="tw_install_reboot"/> </checkbox> <checkbox> @@ -2904,6 +2904,9 @@ <listitem name="{@zip_sig_chk=Zip signature verification}"> <data variable="tw_signed_zip_verify"/> </listitem> + <listitem name="{@install_reboot_chk=Reboot after installation is complete}"> + <data variable="tw_install_reboot"/> + </listitem> <listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}"> <data variable="tw_rm_rf"/> </listitem> diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml index d7bba84bd..b61d3eff6 100644 --- a/gui/theme/common/watch.xml +++ b/gui/theme/common/watch.xml @@ -526,9 +526,9 @@ </checkbox> <checkbox> - <placement x="%indent%" y="%row4_y%" /> + <placement x="%indent%" y="%row4_y%"/> <text>{@install_reboot_chk=Reboot after installation is complete}</text> - <data variable="tw_install_reboot" /> + <data variable="tw_install_reboot"/> </checkbox> <button> @@ -3467,6 +3467,9 @@ <listitem name="{@zip_sig_chk=Zip signature verification}"> <data variable="tw_signed_zip_verify"/> </listitem> + <listitem name="{@install_reboot_chk=Reboot after installation is complete}"> + <data variable="tw_install_reboot"/> + </listitem> <listitem name="{@use_rmrf_chk=Use rm -rf instead of formatting}"> <data variable="tw_rm_rf"/> </listitem> diff --git a/variables.h b/variables.h index 5acae753f..241c7dc66 100644 --- a/variables.h +++ b/variables.h @@ -72,7 +72,7 @@ #define TW_SKIP_MD5_GENERATE_VAR "tw_skip_md5_generate" #define TW_DISABLE_FREE_SPACE_VAR "tw_disable_free_space" #define TW_SIGNED_ZIP_VERIFY_VAR "tw_signed_zip_verify" -#define TW_REBOOT_AFTER_FLASH_VAR "tw_reboot_after_flash_option" +#define TW_INSTALL_REBOOT_VAR "tw_install_reboot" #define TW_TIME_ZONE_VAR "tw_time_zone" #define TW_RM_RF_VAR "tw_rm_rf" |