Skip to content

Commit

Permalink
Hack together window title for courtroom
Browse files Browse the repository at this point in the history
I hate this.
  • Loading branch information
Salanto committed Jan 29, 2023
1 parent b7ac4e9 commit 1a8ee68
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 22 deletions.
7 changes: 3 additions & 4 deletions include/lobby.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class AOApplication;

class Lobby : public QMainWindow {
Q_OBJECT

public:
Lobby(AOApplication *p_ao_app, NetworkManager *p_net_man = nullptr);
~Lobby();
Expand All @@ -28,9 +27,7 @@ class Lobby : public QMainWindow {
void set_server_description(const QString &server_description);
void list_servers();
int get_selected_server();

signals:

int pageSelected();

private:
AOApplication *ao_app;
Expand Down Expand Up @@ -83,6 +80,8 @@ class Lobby : public QMainWindow {

void loadUI();

TabPage current_page = SERVER;

private slots:
void on_tab_changed(int index);
void on_refresh_released();
Expand Down
8 changes: 8 additions & 0 deletions src/lobby.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void Lobby::on_tab_changed(int index)
{
switch (index) {
case SERVER:
current_page = SERVER;
ui_add_to_favorite_button->setVisible(true);
ui_remove_from_favorites_button->setVisible(false);
ui_add_server_button->setVisible(false);
Expand All @@ -44,6 +45,7 @@ void Lobby::on_tab_changed(int index)
reset_selection();
break;
case FAVORITES:
current_page = FAVORITES;
ui_add_to_favorite_button->setVisible(false);
ui_remove_from_favorites_button->setVisible(true);
ui_add_server_button->setVisible(true);
Expand All @@ -52,6 +54,7 @@ void Lobby::on_tab_changed(int index)
reset_selection();
break;
case DEMOS:
current_page = DEMOS;
ui_add_to_favorite_button->setVisible(false);
ui_add_server_button->setVisible(false);
ui_remove_from_favorites_button->setVisible(false);
Expand Down Expand Up @@ -81,6 +84,11 @@ int Lobby::get_selected_server()
return -1;
}

int Lobby::pageSelected()
{
return current_page;
}

void Lobby::reset_selection()
{
last_index = -1;
Expand Down
44 changes: 26 additions & 18 deletions src/packet_distribution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,26 +175,34 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
courtroom_loaded = false;

int selected_server = w_lobby->get_selected_server();

QString server_address = "", server_name = "";
if (true) {
if (selected_server >= 0 && selected_server < server_list.size()) {
auto info = server_list.at(selected_server);
server_name = info.name;
server_address =
QString("%1:%2").arg(info.ip, QString::number(info.port));
window_title = server_name;
}
switch (w_lobby->pageSelected()) {
case 0:
if (selected_server >= 0 && selected_server < server_list.size()) {
auto info = server_list.at(selected_server);
server_name = info.name;
server_address =
QString("%1:%2").arg(info.ip, QString::number(info.port));
window_title = server_name;
}
break;
case 1:
{
QVector<server_type> favorite_list = Options::getInstance().favorites();
if (selected_server >= 0 && selected_server < favorite_list.size()) {
auto info = favorite_list.at(selected_server);
server_name = info.name;
server_address =
QString("%1:%2").arg(info.ip, QString::number(info.port));
window_title = server_name;
}
}
else {
QVector<server_type> favorite_list = Options::getInstance().favorites();
if (selected_server >= 0 && selected_server < favorite_list.size()) {
auto info = favorite_list.at(selected_server);
server_name = info.name;
server_address =
QString("%1:%2").arg(info.ip, QString::number(info.port));
window_title = server_name;
}
break;
case 2:
window_title = "Local Demo Recording";
break;
default:
break;
}

if (courtroom_constructed)
Expand Down

0 comments on commit 1a8ee68

Please sign in to comment.