Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[Preferences] Update default settings on some options

Browse Source 
TabsOnTop: Enabled by default
DontLoadTabsUntilSelected: Enabled by default
AfterLaunch: Restore session is now default
This commit is contained in:
nowrep 2014-02-11 15:44:47 +01:00
parent 653db8f4bf
commit dc6f71a1b8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/app/mainapplication.cpp
View File

@ -314,7 +314,7 @@ MainApplication::MainApplication(int &argc, char** argv)
Settings settings; Settings settings;
m_startingAfterCrash = settings.value("SessionRestore/isRunning", false).toBool(); m_startingAfterCrash = settings.value("SessionRestore/isRunning", false).toBool();
bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool(); bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool();
int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 1).toInt(); int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 3).toInt();
settings.setValue("SessionRestore/isRunning", true); settings.setValue("SessionRestore/isRunning", true);
#ifndef DISABLE_UPDATES_CHECK #ifndef DISABLE_UPDATES_CHECK

4
src/lib/app/qupzilla.cpp
View File

@ -178,7 +178,7 @@ void QupZilla::postLaunch()
loadSettings(); loadSettings();
Settings settings; Settings settings;
int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 1).toInt(); int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 3).toInt();
bool addTab = true; bool addTab = true;
QUrl startUrl; QUrl startUrl;
@ -2057,7 +2057,7 @@ void QupZilla::closeEvent(QCloseEvent* event)
} }
Settings settings; Settings settings;
int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 1).toInt(); int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 3).toInt();
bool askOnClose = settings.value("Browser-Tabs-Settings/AskOnClosing", true).toBool(); bool askOnClose = settings.value("Browser-Tabs-Settings/AskOnClosing", true).toBool();
if (afterLaunch == 3 && mApp->windowCount() == 1) { if (afterLaunch == 3 && mApp->windowCount() == 1) {

4
src/lib/other/qzsettings.cpp
View File

@ -45,7 +45,7 @@ void QzSettings::loadSettings()
settings.beginGroup("Web-Browser-Settings"); settings.beginGroup("Web-Browser-Settings");
defaultZoom = settings.value("DefaultZoom", 100).toInt(); defaultZoom = settings.value("DefaultZoom", 100).toInt();
loadTabsOnActivation = settings.value("LoadTabsOnActivation", false).toBool(); loadTabsOnActivation = settings.value("LoadTabsOnActivation", true).toBool();
autoOpenProtocols = settings.value("AutomaticallyOpenProtocols", QStringList()).toStringList(); autoOpenProtocols = settings.value("AutomaticallyOpenProtocols", QStringList()).toStringList();
blockedProtocols = settings.value("BlockOpeningProtocols", QStringList()).toStringList(); blockedProtocols = settings.value("BlockOpeningProtocols", QStringList()).toStringList();
allowJsGeometryChange = settings.value("allowJavaScriptGeometryChange", true).toBool(); allowJsGeometryChange = settings.value("allowJavaScriptGeometryChange", true).toBool();
@ -57,7 +57,7 @@ void QzSettings::loadSettings()
settings.beginGroup("Browser-Tabs-Settings"); settings.beginGroup("Browser-Tabs-Settings");
newTabPosition = settings.value("OpenNewTabsSelected", false).toBool() ? Qz::NT_SelectedTab : Qz::NT_NotSelectedTab; newTabPosition = settings.value("OpenNewTabsSelected", false).toBool() ? Qz::NT_SelectedTab : Qz::NT_NotSelectedTab;
tabsOnTop = settings.value("TabsOnTop", false).toBool(); tabsOnTop = settings.value("TabsOnTop", true).toBool();
alwaysSwitchTabsWithWheel = settings.value("AlwaysSwitchTabsWithWheel", false).toBool(); alwaysSwitchTabsWithWheel = settings.value("AlwaysSwitchTabsWithWheel", false).toBool();
settings.endGroup(); settings.endGroup();
} }

4
src/lib/preferences/preferences.cpp
View File

@ -126,11 +126,11 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
m_newTabUrl = settings.value("newTabUrl", "qupzilla:speeddial").toString(); m_newTabUrl = settings.value("newTabUrl", "qupzilla:speeddial").toString();
ui->homepage->setText(m_homepage); ui->homepage->setText(m_homepage);
ui->newTabUrl->setText(m_newTabUrl); ui->newTabUrl->setText(m_newTabUrl);
int afterLaunch = settings.value("afterLaunch", 1).toInt(); int afterLaunch = settings.value("afterLaunch", 3).toInt();
settings.endGroup(); settings.endGroup();
ui->afterLaunch->setCurrentIndex(afterLaunch); ui->afterLaunch->setCurrentIndex(afterLaunch);
ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool()); ui->checkUpdates->setChecked(settings.value("Web-Browser-Settings/CheckUpdates", DEFAULT_CHECK_UPDATES).toBool());
ui->dontLoadTabsUntilSelected->setChecked(settings.value("Web-Browser-Settings/LoadTabsOnActivation", false).toBool()); ui->dontLoadTabsUntilSelected->setChecked(settings.value("Web-Browser-Settings/LoadTabsOnActivation", true).toBool());
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2) #if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
ui->checkDefaultBrowser->setChecked(settings.value("Web-Browser-Settings/CheckDefaultBrowser", DEFAULT_CHECK_DEFAULTBROWSER).toBool()); ui->checkDefaultBrowser->setChecked(settings.value("Web-Browser-Settings/CheckDefaultBrowser", DEFAULT_CHECK_DEFAULTBROWSER).toBool());