diff --git a/src/lib/autofill/passwordmanager.cpp b/src/lib/autofill/passwordmanager.cpp index 647d7550d..f7f3d9c1e 100644 --- a/src/lib/autofill/passwordmanager.cpp +++ b/src/lib/autofill/passwordmanager.cpp @@ -119,13 +119,15 @@ void PasswordManager::removeAllEntries() m_backend->removeAll(); } -QHash PasswordManager::availableBackends() const +QHash PasswordManager::availableBackends() { + ensureLoaded(); return m_backends; } -PasswordBackend* PasswordManager::activeBackend() const +PasswordBackend* PasswordManager::activeBackend() { + ensureLoaded(); return m_backend; } diff --git a/src/lib/autofill/passwordmanager.h b/src/lib/autofill/passwordmanager.h index e2b1af30a..6aa0bd8dc 100644 --- a/src/lib/autofill/passwordmanager.h +++ b/src/lib/autofill/passwordmanager.h @@ -72,8 +72,8 @@ public: void removeEntry(const PasswordEntry &entry); void removeAllEntries(); - QHash availableBackends() const; - PasswordBackend* activeBackend() const; + QHash availableBackends(); + PasswordBackend* activeBackend(); void switchBackend(PasswordBackend* backend); bool registerBackend(const QString &id, PasswordBackend* backend); diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp index b7936c7b7..e3ddd1b51 100644 --- a/src/lib/preferences/preferences.cpp +++ b/src/lib/preferences/preferences.cpp @@ -65,6 +65,12 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(this); + m_themesManager = new ThemeManager(ui->themesWidget, this); + m_autoFillManager = new AutoFillManager(this); + ui->autoFillFrame->addWidget(m_autoFillManager); + m_pluginsList = new PluginsManager(this); + ui->pluginsFrame->addWidget(m_pluginsList); + if (QIcon::themeName().toLower() == QLatin1String("oxygen")) { ui->listWidget->item(0)->setIcon(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/preferences/preferences-desktop.png"))); ui->listWidget->item(1)->setIcon(QIcon::fromTheme("format-stroke-color", QIcon(":/icons/preferences/application-x-theme.png"))); @@ -177,7 +183,6 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) startProfileIndexChanged(ui->startProfile->currentText()); //APPEREANCE - m_themesManager = new ThemeManager(ui->themesWidget, this); settings.beginGroup("Browser-View-Settings"); ui->showStatusbar->setChecked(settings.value("showStatusBar", true).toBool()); if (p_QupZilla) { @@ -276,8 +281,6 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) ui->allowPassManager->setChecked(settings.value("SavePasswordsOnSites", true).toBool()); connect(ui->allowPassManager, SIGNAL(toggled(bool)), this, SLOT(showPassManager(bool))); - m_autoFillManager = new AutoFillManager(this); - ui->autoFillFrame->addWidget(m_autoFillManager); showPassManager(ui->allowPassManager->isChecked()); //PRIVACY @@ -346,10 +349,6 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) ui->loadSpeedDialsCtrl->setChecked(settings.value("useSpeedDialNumberShortcuts", true).toBool()); settings.endGroup(); - //PLUGINS - m_pluginsList = new PluginsManager(this); - ui->pluginsFrame->addWidget(m_pluginsList); - //NOTIFICATIONS ui->useNativeSystemNotifications->setEnabled(mApp->desktopNotifications()->supportsNativeNotifications());