merged with master

This commit is contained in:
itsmattkc
2019-03-21 17:22:36 +11:00
46 changed files with 943 additions and 320 deletions
+1 -3
View File
@@ -30,9 +30,7 @@
#include <QWidget>
#include <QPainter>
#include "ui/checkboxex.h"
#include "ui/icons.h"
#include "global/debug.h"
CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) {
@@ -47,7 +45,7 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) {
title_bar->setAutoFillBackground(true);
title_bar_layout = new QHBoxLayout(title_bar);
title_bar_layout->setMargin(5);
enabled_check = new CheckboxEx(title_bar);
enabled_check = new QCheckBox(title_bar);
enabled_check->setChecked(true);
header = new QLabel(title_bar);
collapse_button = new QPushButton(title_bar);