|
@@ -17,38 +17,27 @@ StatusWidget::StatusWidget(PatchList *legacy_patches, QWidget *parent)
|
|
|
, ui(new Ui::StatusWidget)
|
|
|
, legacy_patches_(legacy_patches)
|
|
|
{
|
|
|
-
|
|
|
ui->setupUi(this);
|
|
|
last_statusbar_update_time_.start();
|
|
|
|
|
|
- connect(ui->weekly_code_widget, &WeeklyCodeWidget::showCompletedTooltip, this, &StatusWidget::setToolTipToWeeklyCodeComplete);
|
|
|
- connect(ui->weekly_code_widget, &WeeklyCodeWidget::showHelpTooltip, this, &StatusWidget::setToolTipToWeeklyCodeHelp);
|
|
|
- connect(ui->weekly_code_widget, &WeeklyCodeWidget::showNoTooltip, this, &StatusWidget::resetToolTip);
|
|
|
+ connect(ui->weekly_code_widget, &WeeklyCodeWidget::showCompletedTooltip, this, [this](){setToolTipMessage("ЕЖЕНЕДЕЛЬНЫЙ КОД СКОПИРОВАН В БУФЕР ОБМЕНА", E_INFO);});
|
|
|
+ connect(ui->weekly_code_widget, &WeeklyCodeWidget::showHelpTooltip, this, [this](){setToolTipMessage("КЛИКНИТЕ ПО ЕЖЕНЕДЕЛЬНОМУ КОДУ, ЧТОБЫ СКОПИРОВАТЬ ЕГО", E_INFO);});
|
|
|
+ connect(ui->weekly_code_widget, &WeeklyCodeWidget::showNoTooltip, this, [this](){unsetToolTipMessage(E_INFO);});
|
|
|
|
|
|
- connect(ui->news_list, &NewsListWidget::showHelpToolTip, this, &StatusWidget::setToolTipToNewsHelp);
|
|
|
- connect(ui->news_list, &NewsListWidget::showNoToolTip, this, &StatusWidget::resetToolTip);
|
|
|
+ connect(ui->news_list, &NewsListWidget::showHelpToolTip, this, [this](){setToolTipMessage("НАЖМИТЕ НА ЗАГОЛОВОК НОВОСТИ, ЧТОБЫ ОТКРЫТЬ ЕЕ В БРАУЗЕРЕ", E_INFO);});
|
|
|
+ connect(ui->news_list, &NewsListWidget::showNoToolTip, this, [this](){unsetToolTipMessage(E_INFO);});
|
|
|
|
|
|
- connect(ui->server_status_widget, &ServerStatusWidget::updateServersTooltip, ui->server_status_tooltip, &QLabel::setText);
|
|
|
- connect(ui->server_status_widget, &ServerStatusWidget::showServersTooltip, this, &StatusWidget::setToolTipToServersStatus);
|
|
|
- connect(ui->server_status_widget, &ServerStatusWidget::showNoTooltip, this, &StatusWidget::resetToolTip);
|
|
|
+ connect(ui->server_status_widget, &ServerStatusWidget::showServersTooltip, this, [this](QString message){setToolTipMessage(message, E_INFO);});
|
|
|
+ connect(ui->server_status_widget, &ServerStatusWidget::showNoTooltip, this, [this](){unsetToolTipMessage(E_INFO);});
|
|
|
|
|
|
- tooltip_effects[ui->news_tooltip->objectName()] = new QGraphicsOpacityEffect(ui->news_tooltip);
|
|
|
- tooltip_effects[ui->weekly_code_tooltip_1->objectName()] = new QGraphicsOpacityEffect(ui->weekly_code_tooltip_1);
|
|
|
- tooltip_effects[ui->weekly_code_tooltip_2->objectName()] = new QGraphicsOpacityEffect(ui->weekly_code_tooltip_2);
|
|
|
- tooltip_effects[ui->patches_status->objectName()] = new QGraphicsOpacityEffect(ui->patches_status);
|
|
|
- tooltip_effects[ui->server_status_tooltip->objectName()] = new QGraphicsOpacityEffect(ui->server_status_tooltip);
|
|
|
+ tooltip_effects[ui->galadriel_tooltip_1->objectName()] = new QGraphicsOpacityEffect(ui->galadriel_tooltip_1);
|
|
|
+ tooltip_effects[ui->galadriel_tooltip_2->objectName()] = new QGraphicsOpacityEffect(ui->galadriel_tooltip_2);
|
|
|
|
|
|
- tooltip_animations[ui->news_tooltip->objectName()] = new QPropertyAnimation(tooltip_effects[ui->news_tooltip->objectName()], "opacity");
|
|
|
- tooltip_animations[ui->weekly_code_tooltip_1->objectName()] = new QPropertyAnimation(tooltip_effects[ui->weekly_code_tooltip_1->objectName()], "opacity");
|
|
|
- tooltip_animations[ui->weekly_code_tooltip_2->objectName()] = new QPropertyAnimation(tooltip_effects[ui->weekly_code_tooltip_2->objectName()], "opacity");
|
|
|
- tooltip_animations[ui->patches_status->objectName()] = new QPropertyAnimation(tooltip_effects[ui->patches_status->objectName()], "opacity");
|
|
|
- tooltip_animations[ui->server_status_tooltip->objectName()] = new QPropertyAnimation(tooltip_effects[ui->server_status_tooltip->objectName()], "opacity");
|
|
|
+ tooltip_animations[ui->galadriel_tooltip_1->objectName()] = new QPropertyAnimation(tooltip_effects[ui->galadriel_tooltip_1->objectName()], "opacity");
|
|
|
+ tooltip_animations[ui->galadriel_tooltip_2->objectName()] = new QPropertyAnimation(tooltip_effects[ui->galadriel_tooltip_2->objectName()], "opacity");
|
|
|
|
|
|
- ui->news_tooltip->setGraphicsEffect(tooltip_effects[ui->news_tooltip->objectName()]);
|
|
|
- ui->weekly_code_tooltip_1->setGraphicsEffect(tooltip_effects[ui->weekly_code_tooltip_1->objectName()]);
|
|
|
- ui->weekly_code_tooltip_2->setGraphicsEffect(tooltip_effects[ui->weekly_code_tooltip_2->objectName()]);
|
|
|
- ui->patches_status->setGraphicsEffect(tooltip_effects[ui->patches_status->objectName()]);
|
|
|
- ui->server_status_tooltip->setGraphicsEffect(tooltip_effects[ui->server_status_tooltip->objectName()]);
|
|
|
+ ui->galadriel_tooltip_1->setGraphicsEffect(tooltip_effects[ui->galadriel_tooltip_1->objectName()]);
|
|
|
+ ui->galadriel_tooltip_2->setGraphicsEffect(tooltip_effects[ui->galadriel_tooltip_2->objectName()]);
|
|
|
|
|
|
foreach (QPropertyAnimation* animation, tooltip_animations) {
|
|
|
animation->setDuration(350);
|
|
@@ -61,9 +50,6 @@ StatusWidget::StatusWidget(PatchList *legacy_patches, QWidget *parent)
|
|
|
effect->setOpacity(0);
|
|
|
}
|
|
|
|
|
|
- active_tooltip = nullptr;
|
|
|
- resetToolTip();
|
|
|
-
|
|
|
connect(legacy_patches_, &PatchList::patchOperationsStarted, this, &StatusWidget::onPatchTotalOperationsStarted);
|
|
|
connect(legacy_patches_, &PatchList::patchOperationsFinished, this, &StatusWidget::onPatchTotalOperationsFinished);
|
|
|
connect(legacy_patches_, &PatchList::progressChanged, this, &StatusWidget::onPatchTotalProgressChanged);
|
|
@@ -82,23 +68,32 @@ StatusWidget::~StatusWidget()
|
|
|
|
|
|
void StatusWidget::updateFontsSizes()
|
|
|
{
|
|
|
- ui->progress_label->setFont(crimson_10pt);
|
|
|
ui->game_button->setFont(trajan_11pt);
|
|
|
ui->news_label->setFont(trajan_10pt);
|
|
|
+}
|
|
|
|
|
|
- ui->graphicspatch_label->setFont(crimson_11pt);
|
|
|
- ui->graphicspatch_status->setFont(crimson_11pt);
|
|
|
- ui->soundspatch_label->setFont(crimson_11pt);
|
|
|
- ui->soundspatch_status->setFont(crimson_11pt);
|
|
|
- ui->textspatch_label->setFont(crimson_11pt);
|
|
|
- ui->textspatch_status->setFont(crimson_11pt);
|
|
|
- ui->videospatch_label->setFont(crimson_11pt);
|
|
|
- ui->videospatch_status->setFont(crimson_11pt);
|
|
|
-
|
|
|
- ui->news_tooltip->setFont(garamond_11pt);
|
|
|
- ui->weekly_code_tooltip_1->setFont(garamond_11pt);
|
|
|
- ui->weekly_code_tooltip_2->setFont(garamond_11pt);
|
|
|
- ui->server_status_tooltip->setFont(garamond_11pt);
|
|
|
+void StatusWidget::setToolTipMessage(QString message, StatusWidget::ToolTipState state)
|
|
|
+{
|
|
|
+ tooltip_messages_[state] = message;
|
|
|
+ tooltip_state_ = ToolTipState(int(tooltip_state_) | int(state));
|
|
|
+ if (tooltip_state_ < state * 2) {
|
|
|
+ fadeBetweenToolTips(message);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+void StatusWidget::unsetToolTipMessage(StatusWidget::ToolTipState state)
|
|
|
+{
|
|
|
+ tooltip_state_ = ToolTipState(int(tooltip_state_) & (~int(state)));
|
|
|
+
|
|
|
+ if (tooltip_state_ & E_INFO) {
|
|
|
+ fadeBetweenToolTips(tooltip_messages_[E_INFO]);
|
|
|
+ } else if (tooltip_state_ & E_ERROR) {
|
|
|
+ fadeBetweenToolTips(tooltip_messages_[E_ERROR]);
|
|
|
+ } else if (tooltip_state_ & E_PROCESS) {
|
|
|
+ fadeBetweenToolTips(tooltip_messages_[E_PROCESS]);
|
|
|
+ } else {
|
|
|
+ fadeBetweenToolTips(tooltip_messages_[E_RANDOM]);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
void StatusWidget::resizeEvent(QResizeEvent *)
|
|
@@ -136,49 +131,47 @@ void StatusWidget::resizeEvent(QResizeEvent *)
|
|
|
updateFontsSizes();
|
|
|
}
|
|
|
|
|
|
-void StatusWidget::setToolTipToWeeklyCodeHelp()
|
|
|
-{
|
|
|
- fadeBetweenToolTips(ui->weekly_code_tooltip_1);
|
|
|
-}
|
|
|
-
|
|
|
-void StatusWidget::setToolTipToWeeklyCodeComplete()
|
|
|
-{
|
|
|
- fadeBetweenToolTips(ui->weekly_code_tooltip_2);
|
|
|
-}
|
|
|
-
|
|
|
-void StatusWidget::setToolTipToNewsHelp()
|
|
|
-{
|
|
|
- fadeBetweenToolTips(ui->news_tooltip);
|
|
|
-}
|
|
|
-
|
|
|
-void StatusWidget::setToolTipToServersStatus()
|
|
|
-{
|
|
|
- fadeBetweenToolTips(ui->server_status_tooltip);
|
|
|
-}
|
|
|
-
|
|
|
-void StatusWidget::resetToolTip()
|
|
|
-{
|
|
|
- fadeBetweenToolTips(ui->patches_status);
|
|
|
-}
|
|
|
-
|
|
|
-void StatusWidget::fadeBetweenToolTips(QWidget* next_tooltip)
|
|
|
+void StatusWidget::fadeBetweenToolTips(QString next_tooltip_message)
|
|
|
{
|
|
|
- if (active_tooltip) {
|
|
|
- QPropertyAnimation* active_tooltip_anim = tooltip_animations[active_tooltip->objectName()];
|
|
|
-
|
|
|
- active_tooltip_anim->setDirection(QAbstractAnimation::Backward);
|
|
|
-
|
|
|
- if (active_tooltip_anim->state() == QAbstractAnimation::Stopped)
|
|
|
- active_tooltip_anim->start();
|
|
|
+ if (!galadriel_tooltip_1_type) {
|
|
|
+ // Previous state:
|
|
|
+ // tooltip1 - hiding, tooltip2 - showing.
|
|
|
+ galadriel_tooltip_1_type = true;
|
|
|
+
|
|
|
+ ui->galadriel_tooltip_1->setText(next_tooltip_message);
|
|
|
+
|
|
|
+ qDebug() << "StatusWidget: Showing message: " << ui->galadriel_tooltip_1->text();
|
|
|
+ qDebug() << "StatusWidget: Hiding message: " << ui->galadriel_tooltip_2->text();
|
|
|
+
|
|
|
+ QPropertyAnimation* showing_anim = tooltip_animations[ui->galadriel_tooltip_1->objectName()];
|
|
|
+ showing_anim->setDirection(QAbstractAnimation::Forward);
|
|
|
+ if (showing_anim->state() == QAbstractAnimation::Stopped)
|
|
|
+ showing_anim->start();
|
|
|
+
|
|
|
+ QPropertyAnimation* hiding_anim = tooltip_animations[ui->galadriel_tooltip_2->objectName()];
|
|
|
+ hiding_anim->setDirection(QAbstractAnimation::Backward);
|
|
|
+ if (hiding_anim->state() == QAbstractAnimation::Stopped)
|
|
|
+ hiding_anim->start();
|
|
|
+ } else {
|
|
|
+ // Previous state:
|
|
|
+ // tooltip1 - showing, tooltip2 - hiding.
|
|
|
+ galadriel_tooltip_1_type = false;
|
|
|
+
|
|
|
+ ui->galadriel_tooltip_2->setText(next_tooltip_message);
|
|
|
+
|
|
|
+ qDebug() << "StatusWidget: Showing message: " << ui->galadriel_tooltip_2->text();
|
|
|
+ qDebug() << "StatusWidget: Hiding message: " << ui->galadriel_tooltip_1->text();
|
|
|
+
|
|
|
+ QPropertyAnimation* showing_anim = tooltip_animations[ui->galadriel_tooltip_2->objectName()];
|
|
|
+ showing_anim->setDirection(QAbstractAnimation::Forward);
|
|
|
+ if (showing_anim->state() == QAbstractAnimation::Stopped)
|
|
|
+ showing_anim->start();
|
|
|
+
|
|
|
+ QPropertyAnimation* hiding_anim = tooltip_animations[ui->galadriel_tooltip_1->objectName()];
|
|
|
+ hiding_anim->setDirection(QAbstractAnimation::Backward);
|
|
|
+ if (hiding_anim->state() == QAbstractAnimation::Stopped)
|
|
|
+ hiding_anim->start();
|
|
|
}
|
|
|
-
|
|
|
- QPropertyAnimation* next_active_tooltip_anim = tooltip_animations[next_tooltip->objectName()];
|
|
|
- next_active_tooltip_anim->setDirection(QAbstractAnimation::Forward);
|
|
|
-
|
|
|
- if (next_active_tooltip_anim->state() == QAbstractAnimation::Stopped)
|
|
|
- next_active_tooltip_anim->start();
|
|
|
-
|
|
|
- active_tooltip = next_tooltip;
|
|
|
}
|
|
|
|
|
|
void StatusWidget::onPatchTotalOperationsStarted()
|
|
@@ -194,83 +187,83 @@ void StatusWidget::onPatchTotalOperationsFinished()
|
|
|
ui->game_button->setEnabled(true);
|
|
|
ui->check_for_updates_button->setEnabled(true);
|
|
|
|
|
|
- for (Patch* patch : legacy_patches_->getPatchList()) {
|
|
|
- QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
- QLabel *label = findChild<QLabel*>(label_name);
|
|
|
- if (!label) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- QString install_date;
|
|
|
- if (!(install_date = Settings::getValue("UpdateDates/" + patch->getPatchName()).toString()).isEmpty()) {
|
|
|
- label->setText("Патч версии от " + install_date);
|
|
|
- } else {
|
|
|
- label->setText("Все операции с патчем завершены.");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- ui->progress_label->setText("");
|
|
|
+// for (Patch* patch : legacy_patches_->getPatchList()) {
|
|
|
+// QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
+// QLabel *label = findChild<QLabel*>(label_name);
|
|
|
+// if (!label) {
|
|
|
+// return;
|
|
|
+// }
|
|
|
+
|
|
|
+// QString install_date;
|
|
|
+// if (!(install_date = Settings::getValue("UpdateDates/" + patch->getPatchName()).toString()).isEmpty()) {
|
|
|
+// label->setText("Патч версии от " + install_date);
|
|
|
+// } else {
|
|
|
+// label->setText("Все операции с патчем завершены.");
|
|
|
+// }
|
|
|
+// }
|
|
|
+
|
|
|
+// ui->progress_label->setText("");
|
|
|
}
|
|
|
|
|
|
void StatusWidget::onPatchOperationStarted(Patch::Operation operation, Patch *patch)
|
|
|
{
|
|
|
- QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
- QLabel *label = findChild<QLabel*>(label_name);
|
|
|
- patch_operations[patch] = operation;
|
|
|
- if (!label) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- switch (operation) {
|
|
|
- case Patch::E_CHECKFORUPDATES:
|
|
|
- label->setText("Проверка наличия обновлений...");
|
|
|
- break;
|
|
|
- case Patch::E_DOWNLOAD:
|
|
|
- label->setText("Подготовка к загрузке данных...");
|
|
|
- break;
|
|
|
- case Patch::E_INSTALL:
|
|
|
- label->setText("Ожидание начала установки...");
|
|
|
- break;
|
|
|
- case Patch::E_ACTIVATE:
|
|
|
- label->setText("Ожидание начала активации...");
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
+// QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
+// QLabel *label = findChild<QLabel*>(label_name);
|
|
|
+// patch_operations[patch] = operation;
|
|
|
+// if (!label) {
|
|
|
+// return;
|
|
|
+// }
|
|
|
+
|
|
|
+// switch (operation) {
|
|
|
+// case Patch::E_CHECKFORUPDATES:
|
|
|
+// label->setText("Проверка наличия обновлений...");
|
|
|
+// break;
|
|
|
+// case Patch::E_DOWNLOAD:
|
|
|
+// label->setText("Подготовка к загрузке данных...");
|
|
|
+// break;
|
|
|
+// case Patch::E_INSTALL:
|
|
|
+// label->setText("Ожидание начала установки...");
|
|
|
+// break;
|
|
|
+// case Patch::E_ACTIVATE:
|
|
|
+// label->setText("Ожидание начала активации...");
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
void StatusWidget::onPatchOperationFinished(Patch::Operation operation, Patch *patch)
|
|
|
{
|
|
|
- if (all_patch_operations_finished_) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
- QLabel *label = findChild<QLabel*>(label_name);
|
|
|
-
|
|
|
- if (!label) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- switch (operation) {
|
|
|
- case Patch::E_CHECKFORUPDATES:
|
|
|
- label->setText("Проверка обновлений завершена");
|
|
|
- break;
|
|
|
- case Patch::E_DOWNLOAD:
|
|
|
- label->setText("Загрузка данных завершена");
|
|
|
- break;
|
|
|
- case Patch::E_INSTALL:
|
|
|
- label->setText("Установка патча завершена");
|
|
|
- break;
|
|
|
- case Patch::E_ACTIVATE:
|
|
|
- label->setText("Активация патча завершена");
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
+// if (all_patch_operations_finished_) {
|
|
|
+// return;
|
|
|
+// }
|
|
|
+
|
|
|
+// QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
+// QLabel *label = findChild<QLabel*>(label_name);
|
|
|
+
|
|
|
+// if (!label) {
|
|
|
+// return;
|
|
|
+// }
|
|
|
+
|
|
|
+// switch (operation) {
|
|
|
+// case Patch::E_CHECKFORUPDATES:
|
|
|
+// label->setText("Проверка обновлений завершена");
|
|
|
+// break;
|
|
|
+// case Patch::E_DOWNLOAD:
|
|
|
+// label->setText("Загрузка данных завершена");
|
|
|
+// break;
|
|
|
+// case Patch::E_INSTALL:
|
|
|
+// label->setText("Установка патча завершена");
|
|
|
+// break;
|
|
|
+// case Patch::E_ACTIVATE:
|
|
|
+// label->setText("Активация патча завершена");
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
void StatusWidget::onPatchTotalProgressChanged(Patch::OperationProgress operation_progress)
|
|
|
{
|
|
|
- updateStatusBar(operation_progress);
|
|
|
+// updateStatusBar(operation_progress);
|
|
|
}
|
|
|
|
|
|
void StatusWidget::on_game_button_clicked()
|
|
@@ -281,54 +274,54 @@ void StatusWidget::on_game_button_clicked()
|
|
|
|
|
|
void StatusWidget::onPatchProgressChanged(Patch::OperationProgress progress, Patch *patch)
|
|
|
{
|
|
|
- QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
- QLabel *label = findChild<QLabel*>(label_name);
|
|
|
- if (!label) {
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- switch (patch_operations[patch]) {
|
|
|
- case Patch::E_CHECKFORUPDATES:
|
|
|
- label->setText("Проверка наличия обновлений...");
|
|
|
- break;
|
|
|
- case Patch::E_DOWNLOAD:
|
|
|
- label->setText("Загрузка... " + QString::number(progress.getDownloadPercent(), 'f', 1)
|
|
|
- + "% (" + Downloader::getSizeFormatted(progress.download_finished_bytes)
|
|
|
- + "/" + Downloader::getSizeFormatted(progress.download_total_bytes) + ")");
|
|
|
- break;
|
|
|
- case Patch::E_INSTALL:
|
|
|
- label->setText("Установка... " + QString::number(progress.getInstallPercent(), 'f', 2)
|
|
|
- + "% (" + QString::number(progress.install_finished_parts) + "/" + QString::number(progress.install_total_parts) + ")");
|
|
|
- break;
|
|
|
- case Patch::E_ACTIVATE:
|
|
|
- label->setText("Активация... " + QString::number(progress.getInstallPercent(), 'f', 2)
|
|
|
- + "% (" + QString::number(progress.install_finished_parts) + "/" + QString::number(progress.install_total_parts) + ")");
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
+// QString label_name = patch->getPatchName().toLower() + "_status";
|
|
|
+// QLabel *label = findChild<QLabel*>(label_name);
|
|
|
+// if (!label) {
|
|
|
+// return;
|
|
|
+// }
|
|
|
+
|
|
|
+// switch (patch_operations[patch]) {
|
|
|
+// case Patch::E_CHECKFORUPDATES:
|
|
|
+// label->setText("Проверка наличия обновлений...");
|
|
|
+// break;
|
|
|
+// case Patch::E_DOWNLOAD:
|
|
|
+// label->setText("Загрузка... " + QString::number(progress.getDownloadPercent(), 'f', 1)
|
|
|
+// + "% (" + Downloader::getSizeFormatted(progress.download_finished_bytes)
|
|
|
+// + "/" + Downloader::getSizeFormatted(progress.download_total_bytes) + ")");
|
|
|
+// break;
|
|
|
+// case Patch::E_INSTALL:
|
|
|
+// label->setText("Установка... " + QString::number(progress.getInstallPercent(), 'f', 2)
|
|
|
+// + "% (" + QString::number(progress.install_finished_parts) + "/" + QString::number(progress.install_total_parts) + ")");
|
|
|
+// break;
|
|
|
+// case Patch::E_ACTIVATE:
|
|
|
+// label->setText("Активация... " + QString::number(progress.getInstallPercent(), 'f', 2)
|
|
|
+// + "% (" + QString::number(progress.install_finished_parts) + "/" + QString::number(progress.install_total_parts) + ")");
|
|
|
+// default:
|
|
|
+// break;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
|
|
|
void StatusWidget::updateStatusBar(Patch::OperationProgress progress)
|
|
|
{
|
|
|
- if (last_statusbar_update_time_.elapsed() > 500) {
|
|
|
- QString text = "Выполнение операций...";
|
|
|
- if (progress.download_total_bytes != 0) {
|
|
|
- text += "\nЗагрузка данных: " + QString::number(progress.getDownloadPercent(), 'f', 1) + "% ("
|
|
|
- + Downloader::getSizeFormatted(progress.download_finished_bytes) + "/"
|
|
|
- + Downloader::getSizeFormatted(progress.download_total_bytes) + ", "
|
|
|
- + Downloader::getSpeedFormatted(progress.download_speed) + ")\n"
|
|
|
- + "До конца загрузки: " + Downloader::getElapsedTimeFormatted(progress.download_elapsed_time);
|
|
|
- }
|
|
|
-
|
|
|
- if (progress.install_total_parts != 0) {
|
|
|
- text += "\nПрименение патчей: " + QString::number(progress.getInstallPercent()) + "% "
|
|
|
- + "(часть " + QString::number(progress.install_finished_parts + 1) + " из " + QString::number(progress.install_total_parts);
|
|
|
- }
|
|
|
-
|
|
|
- ui->progress_label->setText(text);
|
|
|
- last_statusbar_update_time_.restart();
|
|
|
- }
|
|
|
+// if (last_statusbar_update_time_.elapsed() > 500) {
|
|
|
+// QString text = "Выполнение операций...";
|
|
|
+// if (progress.download_total_bytes != 0) {
|
|
|
+// text += "\nЗагрузка данных: " + QString::number(progress.getDownloadPercent(), 'f', 1) + "% ("
|
|
|
+// + Downloader::getSizeFormatted(progress.download_finished_bytes) + "/"
|
|
|
+// + Downloader::getSizeFormatted(progress.download_total_bytes) + ", "
|
|
|
+// + Downloader::getSpeedFormatted(progress.download_speed) + ")\n"
|
|
|
+// + "До конца загрузки: " + Downloader::getElapsedTimeFormatted(progress.download_elapsed_time);
|
|
|
+// }
|
|
|
+
|
|
|
+// if (progress.install_total_parts != 0) {
|
|
|
+// text += "\nПрименение патчей: " + QString::number(progress.getInstallPercent()) + "% "
|
|
|
+// + "(часть " + QString::number(progress.install_finished_parts + 1) + " из " + QString::number(progress.install_total_parts);
|
|
|
+// }
|
|
|
+
|
|
|
+// ui->progress_label->setText(text);
|
|
|
+// last_statusbar_update_time_.restart();
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
|