Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the Settings screen - reload theme, restore defaults #463

Merged
merged 3 commits into from
Feb 11, 2021
Merged

Update the Settings screen - reload theme, restore defaults #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff84c9e
Add a Reload Theme button to the settings screen (works with both lob…
Crystalwarrior Feb 11, 2021
7200280
Move all value updates on elements to "update_values" func in the set…
Crystalwarrior Feb 11, 2021
a9d07e6
wtf why didn't this error
Crystalwarrior Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/aooptionsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <QtWidgets/QApplication>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QDialog>
#include <QtWidgets/QDialogButtonBox>
#include <QtWidgets/QFormLayout>
Expand All @@ -24,6 +25,9 @@
#include <QDirIterator>
#include <QTextStream>

class Lobby;
class Courtroom;

class AOOptionsDialog : public QDialog {
Q_OBJECT
public:
Expand All @@ -41,6 +45,7 @@ class AOOptionsDialog : public QDialog {
QFormLayout *ui_gameplay_form;
QLabel *ui_theme_label;
QComboBox *ui_theme_combobox;
QPushButton *ui_theme_reload_button;
QFrame *ui_theme_log_divider;
QLabel *ui_downwards_lbl;
QCheckBox *ui_downwards_cb;
Expand Down Expand Up @@ -159,12 +164,15 @@ class AOOptionsDialog : public QDialog {
QCheckBox *ui_log_cb;

bool needs_default_audiodev();
void update_values();

signals:

public slots:
void save_pressed();
void discard_pressed();
void button_clicked(QAbstractButton *button);
void on_reload_theme_clicked();
};

#endif // AOOPTIONSDIALOG_H
2 changes: 1 addition & 1 deletion include/courtroom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ public slots:

void case_called(QString msg, bool def, bool pro, bool jud, bool jur,
bool steno);
void on_reload_theme_clicked();

private slots:
void start_chat_ticking();
Expand Down Expand Up @@ -911,7 +912,6 @@ private slots:
void on_guilty_clicked();

void on_change_character_clicked();
void on_reload_theme_clicked();
void on_call_mod_clicked();
void on_settings_clicked();
void on_announce_casing_clicked();
Expand Down
Loading