From c7d5ff85088aeab9d979bf7c7a261df963b722eb Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 18 Feb 2019 00:24:35 +0100 Subject: [PATCH] Add an option (default on) to autoshow comment when time goes out. --- client/mainwindow.cpp | 6 ++++++ client/mainwindow.ui | 10 ++++++++++ score.js | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index 228fe6b..d6d3200 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -124,6 +124,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->set_and_show_comment_btn, &QPushButton::clicked, this, &MainWindow::set_and_show_comment_clicked); connect(ui->hide_comment_btn, &QPushButton::clicked, this, &MainWindow::hide_comment_clicked); connect(ui->set_and_show_autocomment_btn, &QPushButton::clicked, this, &MainWindow::set_and_show_autocomment_clicked); + connect(ui->autoshow_autocomment, &QCheckBox::stateChanged, this, &MainWindow::autocomment_update); connect(ui->show_lower_third_btn, &QPushButton::clicked, this, &MainWindow::show_lower_third_clicked); connect(ui->hide_lower_third_btn, &QPushButton::clicked, this, &MainWindow::hide_lower_third_clicked); @@ -333,6 +334,11 @@ void MainWindow::autocomment_update() } } ui->autocomment_edit->setText(QString::fromStdString(msg)); + + map param; + param["autocomment_on_clock_limit"] = ui->autoshow_autocomment->isChecked() ? "1" : "0"; + param["autocomment"] = msg; + ws->send_command("update " + serialize_as_json(param)); } void MainWindow::show_scorebug_clicked() diff --git a/client/mainwindow.ui b/client/mainwindow.ui index 68bfff9..44418ef 100644 --- a/client/mainwindow.ui +++ b/client/mainwindow.ui @@ -576,6 +576,16 @@ + + + + Auto-show on clock limit + + + true + + + diff --git a/score.js b/score.js index 273a311..b25a611 100644 --- a/score.js +++ b/score.js @@ -213,6 +213,13 @@ function time_elapsed_raw() clock_elapsed = clock_limit; clock_origin = Date.now(); clock_running = false; + + if (state['autocomment_on_clock_limit'] == '1' && !comment_visible) { + state['comment'] = state['autocomment']; + setcomment(); + showcomment(); + } + return clock_limit; } return clock_elapsed + elapsed; -- 2.39.2