aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-09-16 23:22:34 +0300
committerCrystalwarrior <varsash@gmail.com>2019-09-16 23:22:34 +0300
commit13221319b889a48255f8409389ef41f37ee8ac98 (patch)
tree5d262cab34e53c84b8113c46b70744d3fe4044c9 /include
parentf3c7beab70aeb1e9b1446553c3cb57345a1e5eb7 (diff)
Change get_stylesheet to return text of a parsed stylesheet file, its functionality was transferred to get_tagged_stylesheet
Remove some useless/unused ui elements Implement stylesheet for courtrooms in a way that lets the end user modify a lot of its elements Use get_image_suffix for evidence_appear images
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h6
-rw-r--r--include/courtroom.h9
2 files changed, 8 insertions, 7 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 052ad08a..c33130f4 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -259,8 +259,12 @@ public:
//Returns a QStringList of all key=value definitions on a given tag.
QStringList read_char_ini_tag(QString p_char, QString target_tag);
+
+ //Returns the text between target_tag and terminator_tag in p_file
+ QString get_stylesheet(QString p_file);
+
//Returns the text between target_tag and terminator_tag in p_file
- QString get_stylesheet(QString target_tag, QString p_file);
+ QString get_tagged_stylesheet(QString target_tag, QString p_file);
//Returns the side of the p_char character from that characters ini file
QString get_char_side(QString p_char);
diff --git a/include/courtroom.h b/include/courtroom.h
index 45a3dfd3..0a7002bc 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -119,16 +119,16 @@ public:
void set_widgets();
//sets font size based on theme ini files
- void set_font(QWidget *widget, QString p_identifier);
+ void set_font(QWidget *widget, QString class_name, QString p_identifier);
//actual operation of setting the font on a widget
- void set_qfont(QWidget *widget, QFont font, QColor f_color = Qt::black, bool bold = false);
+ void set_qfont(QWidget *widget, QString class_name, QFont font, QColor f_color = Qt::black, bool bold = false);
//helper function that calls above function on the relevant widgets
void set_fonts();
//sets dropdown menu stylesheet
- void set_dropdown(QWidget *widget, QString target_tag);
+ void set_dropdown(QWidget *widget);
//helper funciton that call above function on the relevant widgets
void set_dropdowns();
@@ -514,9 +514,6 @@ private:
AOImage *ui_muted;
- QSpinBox *ui_log_limit_spinbox;
- QLabel *ui_log_limit_label;
-
AOButton *ui_evidence_button;
AOImage *ui_evidence;
AOLineEdit *ui_evidence_name;