From: Steinar H. Gunderson Date: Thu, 20 Feb 2020 17:03:14 +0000 (+0100) Subject: Add default colors. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=31006bc2ec0369413124c2a611706d0ddc5ca454;p=ultimatescore Add default colors. --- diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index a654acf..b68c304 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -91,19 +91,19 @@ MainWindow::MainWindow(QWidget *parent) : { 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"); - team_combo->addItem("BRI"); - team_combo->addItem("BSI"); - team_combo->addItem("ESK"); - team_combo->addItem("GRI"); - team_combo->addItem("NMBUI"); - team_combo->addItem("OBSI"); - team_combo->addItem("OSI"); - team_combo->addItem("PCL1"); - team_combo->addItem("PCL2"); - team_combo->addItem("TFK"); - team_combo->addItem("TSI"); - team_combo->addItem("UUJJ"); + team_combo->addItem("BFK", "navy"); + team_combo->addItem("BRI", "navy"); + team_combo->addItem("BSI", "white"); + team_combo->addItem("ESK", "white"); + team_combo->addItem("GRI", ""); + team_combo->addItem("NMBUI", "cyan"); + team_combo->addItem("OBSI", "white"); + team_combo->addItem("OSI", "black"); + team_combo->addItem("PCLH", "red"); + team_combo->addItem("PCLA", "red"); + team_combo->addItem("TFK", "yellow"); + team_combo->addItem("TSI", "orange"); + team_combo->addItem("UUJJ", ""); } ws = new WSServer("127.0.0.1", 5250); @@ -164,6 +164,13 @@ MainWindow::MainWindow(QWidget *parent) : 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::of(&QComboBox::currentIndexChanged), [=](int index) { + ui->color_1_edit->setText(ui->initials_1_edit->itemData(index).toString()); + }); + connect(ui->initials_2_edit, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) { + ui->color_2_edit->setText(ui->initials_2_edit->itemData(index).toString()); + }); + autocomment_update(); const set> usb{{ 0x0e8f, 0x0041 }};