aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2020-03-12 18:09:56 +0300
committerCrystalwarrior <varsash@gmail.com>2020-03-12 18:09:56 +0300
commit7aa24bf50158b3a93c17c56e1371b72389238185 (patch)
tree1d4a6b1bb763fb7607cc88a5f7b7b53c5bfb6b23 /include
parentce3269cc36485e44a85778b0d93b6bfc26f95eb1 (diff)
Add a search bar for server list
Add options for sticky sounds, sticky effects and sticky preanims Optimize the search for areas and music (previously, area search also searched for music in the background, causing lag with huge music lists)
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h12
-rw-r--r--include/aooptionsdialog.h9
-rw-r--r--include/lobby.h2
3 files changed, 23 insertions, 0 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 9f11087..3ed7046 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -188,6 +188,18 @@ public:
// from the config.ini.
bool is_colorlog_enabled();
+ // Returns the value of whether sticky sounds should be a thing.
+ // from the config.ini.
+ bool is_stickysounds_enabled();
+
+ // Returns the value of whether sticky effects should be a thing.
+ // from the config.ini.
+ bool is_stickyeffects_enabled();
+
+ // Returns the value of whether sticky preanims should be a thing.
+ // from the config.ini.
+ bool is_stickypres_enabled();
+
// Returns the value of the maximum amount of lines the IC chatlog
// may contain, from config.ini.
int get_max_log_size();
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 9e34e65..4a63ca3 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -75,6 +75,15 @@ private:
QLabel *ui_colorlog_lbl;
QCheckBox *ui_colorlog_cb;
+ QLabel *ui_stickysounds_lbl;
+ QCheckBox *ui_stickysounds_cb;
+
+ QLabel *ui_stickyeffects_lbl;
+ QCheckBox *ui_stickyeffects_cb;
+
+ QLabel *ui_stickypres_lbl;
+ QCheckBox *ui_stickypres_cb;
+
QWidget *ui_callwords_tab;
QWidget *ui_callwords_widget;
QVBoxLayout *ui_callwords_layout;
diff --git a/include/lobby.h b/include/lobby.h
index 4b95fb2..10a7c1d 100644
--- a/include/lobby.h
+++ b/include/lobby.h
@@ -66,6 +66,7 @@ private:
AOButton *ui_about;
QTreeWidget *ui_server_list;
+ QLineEdit *ui_server_search;
QLabel *ui_player_count;
AOTextArea *ui_description;
@@ -97,6 +98,7 @@ private slots:
void on_about_clicked();
void on_server_list_clicked(QTreeWidgetItem* p_item, int column);
void on_server_list_doubleclicked(QTreeWidgetItem* p_item, int column);
+ void on_server_search_edited(QString p_text);
void on_chatfield_return_pressed();
};