diff --git a/src/dcc-update-plugin/operation/updatework.cpp b/src/dcc-update-plugin/operation/updatework.cpp index 70cd292c0..ca24f30ad 100644 --- a/src/dcc-update-plugin/operation/updatework.cpp +++ b/src/dcc-update-plugin/operation/updatework.cpp @@ -666,6 +666,13 @@ void UpdateWorker::setDownloadJob(const QString& jobPath) void UpdateWorker::doUpgrade(int updateTypes, bool doBackup) { + if (!m_model->batterIsOK()) { + notifyInfo(tr("Update"), tr("Please plug in and then install updates.")); + return; + } + + emit startDoUpgrade(); + qCInfo(DCC_UPDATE_WORKER) << "Do upgrade, update types:" << updateTypes << ", whether do backup:" << doBackup; cleanLaStoreJob(m_distUpgradeJob); cleanLaStoreJob(m_backupJob); @@ -700,6 +707,11 @@ void UpdateWorker::reStart() void UpdateWorker::modalUpgrade(bool rebootAfterUpgrade) { + if (!m_model->batterIsOK()) { + notifyInfo(tr("Update"), tr("Please plug in and then install updates.")); + return; + } + qCInfo(DCC_UPDATE_WORKER) << "request modal upgrade, reboot after upgrade:" << rebootAfterUpgrade; if (rebootAfterUpgrade) { m_updateInter->UpdateAndReboot(); diff --git a/src/dcc-update-plugin/operation/updatework.h b/src/dcc-update-plugin/operation/updatework.h index 49819e447..8b0ad9e89 100644 --- a/src/dcc-update-plugin/operation/updatework.h +++ b/src/dcc-update-plugin/operation/updatework.h @@ -125,6 +125,7 @@ public Q_SLOTS: Q_SIGNALS: void systemActivationChanged(bool systemActivation); void requestCloseTestingChannel(); + void startDoUpgrade(); private: Dtk::Core::DConfig *m_lastoreDConfig; diff --git a/src/dcc-update-plugin/qml/updateMain.qml b/src/dcc-update-plugin/qml/updateMain.qml index 016d0b7c2..01b77204b 100644 --- a/src/dcc-update-plugin/qml/updateMain.qml +++ b/src/dcc-update-plugin/qml/updateMain.qml @@ -293,7 +293,6 @@ DccObject { visible: false onSilentBtnClicked: { dccData.work().doUpgrade(updateType, true) - close() } onUpgradeRebootBtnClicked: { dccData.work().modalUpgrade(true) @@ -302,6 +301,13 @@ DccObject { dccData.work().modalUpgrade(false) } } + + Connections { + target: dccData.work() + function onStartDoUpgrade() { + updateSelectDialog.close() + } + } } } diff --git a/src/dcc-update-plugin/translations/update_ar.ts b/src/dcc-update-plugin/translations/update_ar.ts index a2115bf02..2afd5d59c 100644 --- a/src/dcc-update-plugin/translations/update_ar.ts +++ b/src/dcc-update-plugin/translations/update_ar.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_az.ts b/src/dcc-update-plugin/translations/update_az.ts index 4e77d86a3..6ce38470a 100644 --- a/src/dcc-update-plugin/translations/update_az.ts +++ b/src/dcc-update-plugin/translations/update_az.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_bo.ts b/src/dcc-update-plugin/translations/update_bo.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_bo.ts +++ b/src/dcc-update-plugin/translations/update_bo.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_ca.ts b/src/dcc-update-plugin/translations/update_ca.ts index 12a25fe31..f2365f030 100644 --- a/src/dcc-update-plugin/translations/update_ca.ts +++ b/src/dcc-update-plugin/translations/update_ca.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Actualitza + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ La capacitat de la bateria és inferior al 60%. Per obtenir actualitzacions correctes, endolleu el dispositiu. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_de_DE.ts b/src/dcc-update-plugin/translations/update_de_DE.ts index 45f2f08d6..293f35019 100644 --- a/src/dcc-update-plugin/translations/update_de_DE.ts +++ b/src/dcc-update-plugin/translations/update_de_DE.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -25,7 +27,7 @@ UpdateControl View Update Log - + @@ -75,22 +77,22 @@ Version: - + UpdateLogDialog Update Log - + Close - + Export to desktop - + @@ -247,26 +249,26 @@ The system has enabled auto recovery function and does not support updates. If you have any questions, please contact the enterprise administrator - + UpdateSelectDialog The updates have been already downloaded. What do you want to do? - + Silent Installation - + Update and Reboot - + Update and Shut Down - + @@ -369,11 +371,11 @@ Collapse - + Einfahren Only numbers between 1-99999 are allowed - + @@ -400,16 +402,20 @@ Log export failed, please try again - + The log has been exported to the desktop - + Update Aktualisieren + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Der Akku ist unter 60%. Um die Aktualisierung erfolgreich durchführen zu können schließen Sie bitte den Rechner ans Stromnetz an. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_en.ts b/src/dcc-update-plugin/translations/update_en.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_en.ts +++ b/src/dcc-update-plugin/translations/update_en.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_en_US.ts b/src/dcc-update-plugin/translations/update_en_US.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_en_US.ts +++ b/src/dcc-update-plugin/translations/update_en_US.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_es.ts b/src/dcc-update-plugin/translations/update_es.ts index da91070ab..62fda1955 100644 --- a/src/dcc-update-plugin/translations/update_es.ts +++ b/src/dcc-update-plugin/translations/update_es.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Actualizar + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ La capacidad de la batería es inferior al 60%. Para obtener actualizaciones exitosas, conéctese. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_et.ts b/src/dcc-update-plugin/translations/update_et.ts index c354e3bbd..7f7e2ef27 100644 --- a/src/dcc-update-plugin/translations/update_et.ts +++ b/src/dcc-update-plugin/translations/update_et.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_fi.ts b/src/dcc-update-plugin/translations/update_fi.ts index 1fbcfbe41..7fd810f0f 100644 --- a/src/dcc-update-plugin/translations/update_fi.ts +++ b/src/dcc-update-plugin/translations/update_fi.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Päivitä + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Akun kapasiteetti on alle 60%. Liitä kone sähköverkkoon päivityksen ajaksi. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_fr.ts b/src/dcc-update-plugin/translations/update_fr.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_fr.ts +++ b/src/dcc-update-plugin/translations/update_fr.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_gl_ES.ts b/src/dcc-update-plugin/translations/update_gl_ES.ts index 57089b82f..1bd2183cf 100644 --- a/src/dcc-update-plugin/translations/update_gl_ES.ts +++ b/src/dcc-update-plugin/translations/update_gl_ES.ts @@ -413,6 +413,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_hu.ts b/src/dcc-update-plugin/translations/update_hu.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_hu.ts +++ b/src/dcc-update-plugin/translations/update_hu.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_it.ts b/src/dcc-update-plugin/translations/update_it.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_it.ts +++ b/src/dcc-update-plugin/translations/update_it.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_ja.ts b/src/dcc-update-plugin/translations/update_ja.ts index 2f0caaafb..38051ff19 100644 --- a/src/dcc-update-plugin/translations/update_ja.ts +++ b/src/dcc-update-plugin/translations/update_ja.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update アップデート + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ バッテリー残量が60%以下です。正常にアップデートを実行するため、電源に接続してください。 - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_kk.ts b/src/dcc-update-plugin/translations/update_kk.ts index e23d1e6d2..d49bf5bd2 100644 --- a/src/dcc-update-plugin/translations/update_kk.ts +++ b/src/dcc-update-plugin/translations/update_kk.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_ko.ts b/src/dcc-update-plugin/translations/update_ko.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_ko.ts +++ b/src/dcc-update-plugin/translations/update_ko.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_lt.ts b/src/dcc-update-plugin/translations/update_lt.ts index eef220e5a..e202690d9 100644 --- a/src/dcc-update-plugin/translations/update_lt.ts +++ b/src/dcc-update-plugin/translations/update_lt.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_nb_NO.ts b/src/dcc-update-plugin/translations/update_nb_NO.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_nb_NO.ts +++ b/src/dcc-update-plugin/translations/update_nb_NO.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_ne.ts b/src/dcc-update-plugin/translations/update_ne.ts index d1bdadc17..3c5a0c7ae 100644 --- a/src/dcc-update-plugin/translations/update_ne.ts +++ b/src/dcc-update-plugin/translations/update_ne.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_nl.ts b/src/dcc-update-plugin/translations/update_nl.ts index 99ab667bc..274a01a70 100644 --- a/src/dcc-update-plugin/translations/update_nl.ts +++ b/src/dcc-update-plugin/translations/update_nl.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Bijwerken + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Het accuniveau is lager dan 60%. Sluit de stroomkabel aan om de updates te installeren. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_pl.ts b/src/dcc-update-plugin/translations/update_pl.ts index 21b7011f8..e85b96eb3 100644 --- a/src/dcc-update-plugin/translations/update_pl.ts +++ b/src/dcc-update-plugin/translations/update_pl.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Aktualizuj + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Poziom naładowania spadł poniżej 60%. Podłącz zasilanie, aby uniknąć problemów podczas aktualizacji. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_pt_BR.ts b/src/dcc-update-plugin/translations/update_pt_BR.ts index 615bd0e15..1b0513389 100644 --- a/src/dcc-update-plugin/translations/update_pt_BR.ts +++ b/src/dcc-update-plugin/translations/update_pt_BR.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Atualizar + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ A capacidade da bateria está abaixo de 60%. Para atualizar sem riscos de problemas, conecte o carregador. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_ru.ts b/src/dcc-update-plugin/translations/update_ru.ts index 1ae6dee08..d4520cb8a 100644 --- a/src/dcc-update-plugin/translations/update_ru.ts +++ b/src/dcc-update-plugin/translations/update_ru.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_sq.ts b/src/dcc-update-plugin/translations/update_sq.ts index a45cf0553..5689fbc71 100644 --- a/src/dcc-update-plugin/translations/update_sq.ts +++ b/src/dcc-update-plugin/translations/update_sq.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -396,7 +398,7 @@ updatelog - + Log export failed, please try again @@ -410,6 +412,10 @@ Update Përditësim + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Kapaciteti i baterisë është më pak se 60%. Që të merren me sukses përditësime, ju lutemi, vëreni në prizë. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_tr.ts b/src/dcc-update-plugin/translations/update_tr.ts index c87044de0..73263a6cf 100644 --- a/src/dcc-update-plugin/translations/update_tr.ts +++ b/src/dcc-update-plugin/translations/update_tr.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -90,7 +92,7 @@ Export to desktop - + @@ -247,7 +249,7 @@ The system has enabled auto recovery function and does not support updates. If you have any questions, please contact the enterprise administrator - + @@ -410,6 +412,10 @@ Update Güncelle + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Pil kapasitesi %60'tan düşük. Başarılı güncellemeler almak için lütfen güç kablosunu takın. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_uk.ts b/src/dcc-update-plugin/translations/update_uk.ts index 1279347e9..fa1bd0c16 100644 --- a/src/dcc-update-plugin/translations/update_uk.ts +++ b/src/dcc-update-plugin/translations/update_uk.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update Оновлення + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ Батарею заряджено менше ніж на 60%. Для успішного оновлення, будь ласка, з'єднайте пристрій із джерелом струму. - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_vi.ts b/src/dcc-update-plugin/translations/update_vi.ts index d4df83f38..afb05ebaf 100644 --- a/src/dcc-update-plugin/translations/update_vi.ts +++ b/src/dcc-update-plugin/translations/update_vi.ts @@ -412,6 +412,10 @@ Update + + Please plug in and then install updates. + + update diff --git a/src/dcc-update-plugin/translations/update_zh_CN.ts b/src/dcc-update-plugin/translations/update_zh_CN.ts index 779693551..042d3c4bd 100644 --- a/src/dcc-update-plugin/translations/update_zh_CN.ts +++ b/src/dcc-update-plugin/translations/update_zh_CN.ts @@ -1,4 +1,6 @@ - + + + CheckUpdate @@ -410,6 +412,10 @@ Update 更新 + + Please plug in and then install updates. + + update @@ -525,4 +531,4 @@ 电池电量低于60%，为保障更新成功，请及时接入电源 - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_zh_HK.ts b/src/dcc-update-plugin/translations/update_zh_HK.ts index 03048ee3d..c420019c8 100644 --- a/src/dcc-update-plugin/translations/update_zh_HK.ts +++ b/src/dcc-update-plugin/translations/update_zh_HK.ts @@ -1,9 +1,11 @@ - + + + CheckUpdate Last check: - + @@ -154,12 +156,12 @@ , - + 中文逗号不需要空格，英文逗号需要空格For more details, please visit for more details, please visit - + 这句话后面会带上一个超链接，各语言自行决定末尾需不需要加空格 @@ -410,6 +412,10 @@ Update 更新 + + Please plug in and then install updates. + + update @@ -442,7 +448,7 @@ Update size: - + Update download failed @@ -525,4 +531,4 @@ 電池電量低於60%，為保障更新成功，請及時接入電源 - \ No newline at end of file + diff --git a/src/dcc-update-plugin/translations/update_zh_TW.ts b/src/dcc-update-plugin/translations/update_zh_TW.ts index 5c6171486..82d9f7aef 100644 --- a/src/dcc-update-plugin/translations/update_zh_TW.ts +++ b/src/dcc-update-plugin/translations/update_zh_TW.ts @@ -1,9 +1,11 @@ - + + + CheckUpdate Last check: - + @@ -154,12 +156,12 @@ , - + 中文逗号不需要空格，英文逗号需要空格For more details, please visit for more details, please visit - + 这句话后面会带上一个超链接，各语言自行决定末尾需不需要加空格 @@ -410,6 +412,10 @@ Update 更新 + + Please plug in and then install updates. + + update @@ -442,7 +448,7 @@ Update size: - + Update download failed @@ -525,4 +531,4 @@ 電池電量低於60%，為保障更新成功，請及時接入電源 - \ No newline at end of file +