diff --git a/src/widget/form/settings/generalform.cpp b/src/widget/form/settings/generalform.cpp index b03fb18ab..e6b695031 100644 --- a/src/widget/form/settings/generalform.cpp +++ b/src/widget/form/settings/generalform.cpp @@ -26,11 +26,11 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) : GenericForm(tr("General Settings"), QPixmap(":/img/settings/general.png")) { + parent = myParent; + bodyUI = new Ui::GeneralSettings; bodyUI->setupUi(this); - parent = myParent; - bodyUI->cbEnableIPv6->setChecked(Settings::getInstance().getEnableIPv6()); bodyUI->cbUseTranslations->setChecked(Settings::getInstance().getUseTranslations()); bodyUI->cbMakeToxPortable->setChecked(Settings::getInstance().getMakeToxPortable()); @@ -104,7 +104,7 @@ void GeneralForm::onStyleSelected(QString style) { Settings::getInstance().setStyle(style); this->setStyle(QStyleFactory::create(style)); - parent->setStyle(style); + parent->setBodyHeadStyle(style); } void GeneralForm::onSetStatusChange() diff --git a/src/widget/form/settingswidget.cpp b/src/widget/form/settingswidget.cpp index 8bb378c79..1c29fec65 100644 --- a/src/widget/form/settingswidget.cpp +++ b/src/widget/form/settingswidget.cpp @@ -73,10 +73,10 @@ SettingsWidget::~SettingsWidget() { } -void SettingsWidget::setStyle(QString style) +void SettingsWidget::setBodyHeadStyle(QString style) { + head->setStyle(QStyleFactory::create(style)); body->setStyle(QStyleFactory::create(style)); - head->setStyle(QStyleFactory::create(style)); } void SettingsWidget::show(Ui::MainWindow& ui) diff --git a/src/widget/form/settingswidget.h b/src/widget/form/settingswidget.h index 03d3646c2..2ba183fd1 100644 --- a/src/widget/form/settingswidget.h +++ b/src/widget/form/settingswidget.h @@ -42,7 +42,7 @@ public: void show(Ui::MainWindow &ui); IdentityForm *getIdentityForm() {return ifrm;} - void setStyle(QString style); + void setBodyHeadStyle(QString style); private slots: void onTabChanged(int); diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 27a0f2a25..bbff4ad90 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -113,7 +113,7 @@ Widget::Widget(QWidget *parent) ui->statusButton->setProperty("status", "offline"); Style::repolish(ui->statusButton); - settingsWidget = new SettingsWidget(this); + settingsWidget = new SettingsWidget(); // Disable some widgets until we're connected to the DHT ui->statusButton->setEnabled(false);