Merge branch 'develop' into feature/sharing_groups

This commit is contained in:
Jonathan White 2019-01-16 22:54:25 -05:00
commit 9b4a680f7e
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
28 changed files with 284 additions and 88 deletions

View file

@ -196,6 +196,8 @@ void Config::init(const QString& fileName)
m_defaults.insert("security/resettouchidscreenlock", true);
m_defaults.insert("GUI/Language", "system");
m_defaults.insert("GUI/HideToolbar", false);
m_defaults.insert("GUI/MovableToolbar", false);
m_defaults.insert("GUI/ToolButtonStyle", Qt::ToolButtonIconOnly);
m_defaults.insert("GUI/ShowTrayIcon", false);
m_defaults.insert("GUI/DarkTrayIcon", false);
m_defaults.insert("GUI/MinimizeToTray", false);