From b5f581eb5b336273c3e7976ac8f7c438fe454bb4 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Wed, 17 Feb 2021 15:15:40 +0300 Subject: Revert bad "fix" of the sound names for WTCE courtroom_sounds.ini Make pos dropdown ui editable for a custom pos Keep track of the custom pos index On switching from the custom pos, remove the entry at that index Fix regression causing the "sort by name" lobby server list header disappearing Expose column 0 for the # in the lobby server list header ("too ugly" just use lobby_stylesheets.css and pretty it up) --- src/lobby.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index 314874e5..2397c700 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -28,8 +28,8 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() ui_server_list = new QTreeWidget(this); ui_server_list->setHeaderLabels({"#", "Name"}); //, "Players"}); - ui_server_list->hideColumn(0); - ui_server_list->setHeaderHidden(true); +// ui_server_list->hideColumn(0); +// ui_server_list->setHeaderHidden(true); ui_server_search = new QLineEdit(this); ui_server_search->setFrame(false); -- cgit From f881df241533dafc214f72983d9c6e1c59837891 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Wed, 17 Feb 2021 15:29:18 +0300 Subject: Make the server list display all pretty and nice Resize the 0thcolumn to smallest possible size so it's not intrusive Remove text eliding so numbers don't get ...'s --- src/lobby.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index 2397c700..d9336e52 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -28,6 +28,11 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow() ui_server_list = new QTreeWidget(this); ui_server_list->setHeaderLabels({"#", "Name"}); //, "Players"}); + ui_server_list->setTextElideMode(Qt::ElideNone); + ui_server_list->header()->setMinimumSectionSize(24); + ui_server_list->header()->setSectionsMovable(false); + ui_server_list->setColumnWidth(0, 0); + ui_server_list->setIndentation(0); // ui_server_list->hideColumn(0); // ui_server_list->setHeaderHidden(true); -- cgit From 679dcca0792650f3a2899af8009846fdc289c9ba Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Sun, 21 Feb 2021 16:18:45 +0300 Subject: Remove hardcoded stylesheets from lobby Stop doing the "tagget stylesheets" monstrosity --- src/lobby.cpp | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'src/lobby.cpp') diff --git a/src/lobby.cpp b/src/lobby.cpp index d9336e52..616e5206 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -142,36 +142,21 @@ void Lobby::set_widgets() tr("Allows you to change various aspects of the client.")); set_size_and_pos(ui_server_list, "server_list"); - ui_server_list->setStyleSheet("background-color: rgba(0, 0, 0, 0);" - "font: bold;"); set_size_and_pos(ui_server_search, "server_search"); - ui_server_search->setStyleSheet("background-color: rgba(0, 0, 0, 0);"); set_size_and_pos(ui_player_count, "player_count"); ui_player_count->setText(tr("Offline")); - ui_player_count->setStyleSheet("font: bold;" - "color: white;" - "qproperty-alignment: AlignCenter;"); set_size_and_pos(ui_description, "description"); ui_description->setReadOnly(true); - ui_description->setStyleSheet("background-color: rgba(0, 0, 0, 0);" - "color: white;"); set_size_and_pos(ui_chatbox, "chatbox"); ui_chatbox->setReadOnly(true); - ui_chatbox->setStyleSheet( - "QTextBrowser{background-color: rgba(0, 0, 0, 0);}"); set_size_and_pos(ui_chatname, "chatname"); - ui_chatname->setStyleSheet("background-color: rgba(0, 0, 0, 0);" - "selection-background-color: rgba(0, 0, 0, 0);"); set_size_and_pos(ui_chatmessage, "chatmessage"); - ui_chatmessage->setStyleSheet( - "background-color: rgba(0, 0, 0, 0);" - "selection-background-color: rgba(0, 0, 0, 0);"); ui_loading_background->resize(this->width(), this->height()); ui_loading_background->set_image("loadingbackground"); @@ -181,8 +166,6 @@ void Lobby::set_widgets() ui_loading_text->setReadOnly(true); ui_loading_text->setAlignment(Qt::AlignCenter); ui_loading_text->setFrameStyle(QFrame::NoFrame); - ui_loading_text->setStyleSheet("background-color: rgba(0, 0, 0, 0);" - "color: rgba(255, 128, 0, 255);"); ui_loading_text->append(tr("Loading")); set_size_and_pos(ui_progress_bar, "progress_bar"); @@ -223,24 +206,17 @@ void Lobby::set_fonts() set_font(ui_server_list, "server_list"); } -void Lobby::set_stylesheet(QWidget *widget, QString target_tag) +void Lobby::set_stylesheet(QWidget *widget) { QString f_file = "lobby_stylesheets.css"; - QString style_sheet_string = - ao_app->get_tagged_stylesheet(target_tag, f_file); + QString style_sheet_string = ao_app->get_stylesheet(f_file); if (style_sheet_string != "") widget->setStyleSheet(style_sheet_string); } void Lobby::set_stylesheets() { - set_stylesheet(ui_player_count, "[PLAYER COUNT]"); - set_stylesheet(ui_description, "[DESCRIPTION]"); - set_stylesheet(ui_chatbox, "[CHAT BOX]"); - set_stylesheet(ui_chatname, "[CHAT NAME]"); - set_stylesheet(ui_chatmessage, "[CHAT MESSAGE]"); - set_stylesheet(ui_loading_text, "[LOADING TEXT]"); - set_stylesheet(ui_server_list, "[SERVER LIST]"); + set_stylesheet(this); } void Lobby::set_font(QWidget *widget, QString p_identifier) -- cgit