StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr446'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-16 19:38:12 +02:00
commit 85f7a71533
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget/form/settings/generalform.cpp
View File

@ -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()

4
src/widget/form/settingswidget.cpp
View File

@ -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)

2
src/widget/form/settingswidget.h
View File

@ -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);

2
src/widget/widget.cpp
View File

@ -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);