Update team lists.

[ultimatescore] / client / mainwindow.cpp

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index b6294cf059987dfcabb193170b3e80e5994a5a0f..82a735792ce9534425960b3d57f0cf1026fddb1a 100644 (file)
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -90,6 +90,24 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
        ui->setupUi(this);
+       for (QComboBox *team_combo : { ui->initials_1_edit, ui->initials_2_edit, ui->match_2_initials_1_edit, ui->match_2_initials_2_edit, ui->match_3_initials_1_edit, ui->match_3_initials_2_edit }) {
+       //      team_combo->addItem("BFK", "navy");
+               team_combo->addItem("BRI", "navy");
+               team_combo->addItem("BSI1", "white");
+               team_combo->addItem("BSI2", "yellow");
+               team_combo->addItem("ESK", "white");
+               team_combo->addItem("FRA", "");
+               team_combo->addItem("NHHI", "navy");
+               team_combo->addItem("NMBUI", "cyan");
+               team_combo->addItem("OSI", "black");
+               team_combo->addItem("PCL", "red");
+               team_combo->addItem("STO", "");
+               team_combo->addItem("TFK1", "yellow");
+               team_combo->addItem("TFK2", "yellow");
+               team_combo->addItem("TFK3", "green");
+               team_combo->addItem("TSI", "orange");
+       }
+
        ws = new WSServer("127.0.0.1", 5250);
        ws->set_connection_callback([this](bool connected) {
                string msg = connected ? "Connected" : "Not connected";
@@ -144,10 +162,17 @@ MainWindow::MainWindow(QWidget *parent) :
        connect(ui->show_schedule_btn, &QPushButton::clicked, this, &MainWindow::show_schedule_clicked);
        connect(ui->show_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_carousel_clicked);
        connect(ui->show_nothing_btn, &QPushButton::clicked, this, &MainWindow::show_nothing_clicked);
-       connect(ui->show_roster_1_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_1_edit->text().toStdString()); });
-       connect(ui->show_roster_2_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_2_edit->text().toStdString()); });
+       connect(ui->show_roster_1_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_1_edit->currentText().toStdString()); });
+       connect(ui->show_roster_2_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_2_edit->currentText().toStdString()); });
        connect(ui->show_roster_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_roster_carousel_clicked);
 
+       connect(ui->initials_1_edit, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) {
+               ui->color_1_edit->setText(ui->initials_1_edit->itemData(index).toString());
+       });
+       connect(ui->initials_2_edit, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) {
+               ui->color_2_edit->setText(ui->initials_2_edit->itemData(index).toString());
+       });
+
        autocomment_update();
 
        const set<pair<unsigned, unsigned>> usb{{ 0x0e8f, 0x0041 }};
@@ -168,8 +193,8 @@ void MainWindow::ws_disconnect_clicked()
 void MainWindow::set_initials_clicked()
 {
        map<string, string> param;
-       param["team1"] = escape_html(ui->initials_1_edit->text().toStdString());
-       param["team2"] = escape_html(ui->initials_2_edit->text().toStdString());
+       param["team1"] = escape_html(ui->initials_1_edit->currentText().toStdString());
+       param["team2"] = escape_html(ui->initials_2_edit->currentText().toStdString());
        ws->send_command("update " + serialize_as_json(param));
        ws->send_command("eval setteams()");
 }
@@ -177,8 +202,8 @@ void MainWindow::set_initials_clicked()
 void MainWindow::set_match_2_initials_clicked()
 {
        map<string, string> param;
-       param["team1"] = escape_html(ui->match_2_initials_1_edit->text().toStdString());
-       param["team2"] = escape_html(ui->match_2_initials_2_edit->text().toStdString());
+       param["team1"] = escape_html(ui->match_2_initials_1_edit->currentText().toStdString());
+       param["team2"] = escape_html(ui->match_2_initials_2_edit->currentText().toStdString());
        ws->send_command("update " + serialize_as_json(param));
        ws->send_command("eval setteams2()");
 }
@@ -186,8 +211,8 @@ void MainWindow::set_match_2_initials_clicked()
 void MainWindow::set_match_3_initials_clicked()
 {
        map<string, string> param;
-       param["team1"] = escape_html(ui->match_3_initials_1_edit->text().toStdString());
-       param["team2"] = escape_html(ui->match_3_initials_2_edit->text().toStdString());
+       param["team1"] = escape_html(ui->match_3_initials_1_edit->currentText().toStdString());
+       param["team2"] = escape_html(ui->match_3_initials_2_edit->currentText().toStdString());
        ws->send_command("update " + serialize_as_json(param));
        ws->send_command("eval setteams3()");
 }
@@ -406,8 +431,8 @@ void MainWindow::show_carousel_clicked()
 void MainWindow::show_roster_carousel_clicked()
 {
        map<string, string> param;
-       param["team1"] = escape_html(ui->initials_1_edit->text().toStdString());
-       param["team2"] = escape_html(ui->initials_2_edit->text().toStdString());
+       param["team1"] = escape_html(ui->initials_1_edit->currentText().toStdString());
+       param["team2"] = escape_html(ui->initials_2_edit->currentText().toStdString());
        ws->send_command("eval stopcarousel()");
        ws->send_command("update " + serialize_as_json(param));
        ws->send_command("eval showrostercarousel_from_state()");