mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2580 from nextcloud/delay-settingsdialog-init

Browse source 
Delay initialization of SettingsDialog
This commit is contained in:
Kevin Ottens 2020-10-22 15:08:01 +02:00 committed by GitHub
commit b982a17998
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/owncloudgui.cpp
View file

@ -59,7 +59,7 @@ const char propertyAccountC[] = "oc_account";
ownCloudGui::ownCloudGui(Application *parent) ownCloudGui::ownCloudGui(Application *parent)
: QObject(parent) : QObject(parent)
, _tray(nullptr) , _tray(nullptr)
, _settingsDialog(new SettingsDialog(this)) , _settingsDialog(nullptr)
, _logBrowser(nullptr) , _logBrowser(nullptr)
#ifdef WITH_LIBCLOUDPROVIDERS #ifdef WITH_LIBCLOUDPROVIDERS
, _bus(QDBusConnection::sessionBus()) , _bus(QDBusConnection::sessionBus())

2
src/gui/settingsdialog.cpp
View file

@ -62,7 +62,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
{ {
ConfigFile cfg; ConfigFile cfg;
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
_ui->setupUi(this); _ui->setupUi(this);
_toolBar = new QToolBar; _toolBar = new QToolBar;
_toolBar->setIconSize(QSize(32, 32)); _toolBar->setIconSize(QSize(32, 32));
@ -130,6 +129,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent)
customizeStyle(); customizeStyle();
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
cfg.restoreGeometry(this); cfg.restoreGeometry(this);
} }