From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 19 Feb 2020 22:08:09 +0000 (+0100)
Subject: Make a combo box for preselecting teams.
X-Git-Url: https://git.sesse.net/?p=ultimatescore;a=commitdiff_plain;h=8d1b1024273f3e23aba93a34df2197e9d44762ee

Make a combo box for preselecting teams.
---

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index b6294cf..a654acf 100644
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -90,6 +90,22 @@ 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");
+		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");
+	}
+
 	ws = new WSServer("127.0.0.1", 5250);
 	ws->set_connection_callback([this](bool connected) {
 		string msg = connected ? "Connected" : "Not connected";
@@ -144,8 +160,8 @@ 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);
 
 	autocomment_update();
@@ -168,8 +184,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 +193,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 +202,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 +422,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()");
diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 8831891..28c42b3 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -233,8 +233,11 @@
            </widget>
           </item>
           <item row="1" column="2">
-           <widget class="QLineEdit" name="initials_1_edit">
-            <property name="text">
+           <widget class="QComboBox" name="initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>PCL</string>
             </property>
            </widget>
@@ -288,8 +291,11 @@
            </widget>
           </item>
           <item row="1" column="3">
-           <widget class="QLineEdit" name="initials_2_edit">
-            <property name="text">
+           <widget class="QComboBox" name="initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>TFK</string>
             </property>
            </widget>
@@ -337,15 +343,21 @@
            </widget>
           </item>
           <item row="5" column="2">
-           <widget class="QLineEdit" name="match_2_initials_1_edit">
-            <property name="text">
+           <widget class="QComboBox" name="match_2_initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>PCL</string>
             </property>
            </widget>
           </item>
           <item row="5" column="3">
-           <widget class="QLineEdit" name="match_2_initials_2_edit">
-            <property name="text">
+           <widget class="QComboBox" name="match_2_initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>TFK</string>
             </property>
            </widget>
@@ -365,15 +377,21 @@
            </widget>
           </item>
           <item row="6" column="2">
-           <widget class="QLineEdit" name="match_3_initials_1_edit">
-            <property name="text">
+           <widget class="QComboBox" name="match_3_initials_1_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>PCL</string>
             </property>
            </widget>
           </item>
           <item row="6" column="3">
-           <widget class="QLineEdit" name="match_3_initials_2_edit">
-            <property name="text">
+           <widget class="QComboBox" name="match_3_initials_2_edit">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <property name="currentText">
              <string>TFK</string>
             </property>
            </widget>