From afe44e984419f25fec0c3dfc5fc0f9800b205e2c Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 14 Feb 2017 16:08:47 +0100 Subject: Settings changes --- src/browser.cpp | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'src/browser.cpp') diff --git a/src/browser.cpp b/src/browser.cpp index 4bbfccb..6531070 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -23,30 +23,35 @@ #include "settings.h" #include -Browser::Browser(QString configPath, QObject *parent) : QObject(parent) +Browser::Browser(int &argc, char *argv[]) : + QApplication(argc, argv) { - if(configPath.isEmpty()) { - // set default config path - Settings::setFilepath(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini"); - } else { - // set custom config path - Settings::setFilepath(configPath); - } - - // TODO Restore previous session - QtWebEngine::initialize(); } Browser::~Browser() { - // TODO Save session - // cleanup qDeleteAll(m_windows); m_windows.clear(); } +Browser *Browser::instance() +{ + return static_cast(QCoreApplication::instance()); +} + +void Browser::setConfigPath(const QString &path) +{ + if(path.isEmpty()) { + // set default config path + Settings::setFilePath(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.ini"); + } else { + // set custom config path + Settings::setFilePath(path); + } +} + void Browser::addWindow(MainWindow *window) { if(m_windows.contains(window)) { -- cgit v1.2.1