mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
MainApplication: Add support for starting in test mode
This commit is contained in:
parent
c2a730e9f4
commit
0af95e3b1f
|
@ -1,6 +1,6 @@
|
||||||
/* ============================================================
|
/* ============================================================
|
||||||
* Falkon - Qt web browser
|
* Falkon - Qt web browser
|
||||||
* Copyright (C) 2014-2017 David Rosca <nowrep@gmail.com>
|
* Copyright (C) 2014-2018 David Rosca <nowrep@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -18,6 +18,7 @@
|
||||||
#include "datapaths.h"
|
#include "datapaths.h"
|
||||||
#include "qztools.h"
|
#include "qztools.h"
|
||||||
#include "../config.h"
|
#include "../config.h"
|
||||||
|
#include "mainapplication.h"
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
@ -92,7 +93,12 @@ void DataPaths::init()
|
||||||
initAssetsIn(location);
|
initAssetsIn(location);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_paths[Config].append(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
|
if (MainApplication::isTestModeEnabled()) {
|
||||||
|
m_paths[Config].append(QDir::tempPath() + QL1S("/QupZilla-test"));
|
||||||
|
} else {
|
||||||
|
m_paths[Config].append(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation));
|
||||||
|
}
|
||||||
|
|
||||||
m_paths[Profiles].append(m_paths[Config].at(0) + QLatin1String("/profiles"));
|
m_paths[Profiles].append(m_paths[Config].at(0) + QLatin1String("/profiles"));
|
||||||
// We also allow to load data from Config path
|
// We also allow to load data from Config path
|
||||||
initAssetsIn(m_paths[Config].at(0));
|
initAssetsIn(m_paths[Config].at(0));
|
||||||
|
|
|
@ -78,6 +78,8 @@
|
||||||
#include "registerqappassociation.h"
|
#include "registerqappassociation.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static bool s_testMode = false;
|
||||||
|
|
||||||
MainApplication::MainApplication(int &argc, char** argv)
|
MainApplication::MainApplication(int &argc, char** argv)
|
||||||
: QtSingleApplication(argc, argv)
|
: QtSingleApplication(argc, argv)
|
||||||
, m_isPrivate(false)
|
, m_isPrivate(false)
|
||||||
|
@ -217,6 +219,10 @@ MainApplication::MainApplication(int &argc, char** argv)
|
||||||
appId.append(QLatin1String("Portable"));
|
appId.append(QLatin1String("Portable"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isTestModeEnabled()) {
|
||||||
|
appId.append(QSL("TestMode"));
|
||||||
|
}
|
||||||
|
|
||||||
if (newInstance) {
|
if (newInstance) {
|
||||||
if (startProfile.isEmpty() || startProfile == QLatin1String("default")) {
|
if (startProfile.isEmpty() || startProfile == QLatin1String("default")) {
|
||||||
std::cout << "New instance cannot be started with default profile!" << std::endl;
|
std::cout << "New instance cannot be started with default profile!" << std::endl;
|
||||||
|
@ -272,7 +278,7 @@ MainApplication::MainApplication(int &argc, char** argv)
|
||||||
|
|
||||||
setupUserScripts();
|
setupUserScripts();
|
||||||
|
|
||||||
if (!isPrivate()) {
|
if (!isPrivate() && !isTestModeEnabled()) {
|
||||||
m_sessionManager = new SessionManager(this);
|
m_sessionManager = new SessionManager(this);
|
||||||
m_autoSaver = new AutoSaver(this);
|
m_autoSaver = new AutoSaver(this);
|
||||||
connect(m_autoSaver, SIGNAL(save()), m_sessionManager, SLOT(autoSaveLastSession()));
|
connect(m_autoSaver, SIGNAL(save()), m_sessionManager, SLOT(autoSaveLastSession()));
|
||||||
|
@ -313,7 +319,7 @@ MainApplication::MainApplication(int &argc, char** argv)
|
||||||
|
|
||||||
connect(this, SIGNAL(focusChanged(QWidget*,QWidget*)), this, SLOT(onFocusChanged()));
|
connect(this, SIGNAL(focusChanged(QWidget*,QWidget*)), this, SLOT(onFocusChanged()));
|
||||||
|
|
||||||
if (!isPrivate()) {
|
if (!isPrivate() && !isTestModeEnabled()) {
|
||||||
#ifndef DISABLE_CHECK_UPDATES
|
#ifndef DISABLE_CHECK_UPDATES
|
||||||
Settings settings;
|
Settings settings;
|
||||||
bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", true).toBool();
|
bool checkUpdates = settings.value("Web-Browser-Settings/CheckUpdates", true).toBool();
|
||||||
|
@ -619,6 +625,18 @@ MainApplication* MainApplication::instance()
|
||||||
return static_cast<MainApplication*>(QCoreApplication::instance());
|
return static_cast<MainApplication*>(QCoreApplication::instance());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// static
|
||||||
|
bool MainApplication::isTestModeEnabled()
|
||||||
|
{
|
||||||
|
return s_testMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
// static
|
||||||
|
void MainApplication::setTestModeEnabled(bool enabled)
|
||||||
|
{
|
||||||
|
s_testMode = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
void MainApplication::addNewTab(const QUrl &url)
|
void MainApplication::addNewTab(const QUrl &url)
|
||||||
{
|
{
|
||||||
BrowserWindow* window = getWindow();
|
BrowserWindow* window = getWindow();
|
||||||
|
|
|
@ -118,6 +118,9 @@ public:
|
||||||
|
|
||||||
static MainApplication* instance();
|
static MainApplication* instance();
|
||||||
|
|
||||||
|
static bool isTestModeEnabled();
|
||||||
|
static void setTestModeEnabled(bool enabled);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void addNewTab(const QUrl &url = QUrl());
|
void addNewTab(const QUrl &url = QUrl());
|
||||||
void startPrivateBrowsing(const QUrl &startUrl = QUrl());
|
void startPrivateBrowsing(const QUrl &startUrl = QUrl());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user