aboutsummaryrefslogtreecommitdiff
path: root/src/browser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/browser.cpp')
-rw-r--r--src/browser.cpp37
1 files changed, 18 insertions, 19 deletions
diff --git a/src/browser.cpp b/src/browser.cpp
index b3039a5..c3cbd2f 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -9,17 +9,21 @@
#include "browser.h"
#include "aboutdialog.h"
#include "aboutplugin.h"
-#include "mainwindow/addressbar.h"
+#include "adblock/adblocklist.h"
#include "bookmarkswidget.h"
-#include "conf.hpp"
#include "configuration.h"
#include "downloadswidget.h"
+#include "hostlist/hostlist.h"
+#include "mainwindow/addressbar.h"
#include "mainwindow/mainwindow.h"
-#include "webengine/webprofilemanager.h"
+#include "mainwindow/menubar.h"
#include "subwindow/subwindow.h"
+#include "urlfilter.h"
#include "util.h"
#include "webengine/urlinterceptor.h"
#include "webengine/webprofile.h"
+#include "webengine/webprofilemanager.h"
+#include "webengine/webview.h"
#include <QAction>
#include <QDir>
#include <QFileDialog>
@@ -27,30 +31,25 @@
#include <QFileInfoList>
#include <QJsonArray>
#include <QJsonDocument>
+#include <QLibraryInfo>
#include <QPluginLoader>
#include <QTimer>
+#include <QTranslator>
#include <QVersionNumber>
#include <plugininterface.h>
-#include <version.h>
-#include "mainwindow/menubar.h"
-#include "webengine/webview.h"
-#include "urlfilter.h"
-#include "adblock/adblocklist.h"
-#include "hostlist/hostlist.h"
-#include <spdlog/spdlog.h>
#include <pluginloader.h>
-#include <QLibraryInfo>
-#include <QTranslator>
+#include <spdlog/spdlog.h>
+#include <version.h>
Browser::Browser(int &argc, char *argv[], bool allowSecondary)
: SingleApplication(argc, argv, allowSecondary, SingleApplication::User | SingleApplication::SecondaryNotification | SingleApplication::ExcludeAppVersion)
{
- setApplicationName(CONFIG_POI_NAME);
- setWindowIcon(QIcon(CONFIG_POI_ICON));
+ Configuration conf;
+
+ setApplicationName(conf.value<QString>("poi.name").value());
+ setWindowIcon(QIcon(conf.value<QString>("poi.icon").value()));
setApplicationVersion(QVersionNumber::fromString(QLatin1String(poi_Version)).toString());
- Configuration conf;
-
if(const auto _translation = conf.value<QString>("browser.translation")) {
auto *translator = new QTranslator(this);
if(translator->load(_translation.value()))
@@ -70,7 +69,6 @@ Browser::Browser(int &argc, char *argv[], bool allowSecondary)
if(auto iconTheme = conf.value<QString>("browser.iconTheme")) {
QIcon::setThemeName(iconTheme.value());
}
-
}
Browser::~Browser()
@@ -104,7 +102,7 @@ QPair<QString, Profile *> Browser::loadProfile(const QString &id, bool isOffTheR
{
Configuration conf;
- const QString _id = [id](){
+ const QString _id = [id]() {
// if id contains a separator, it should be a path
if(id.contains(QDir::separator())) {
return QFileInfo(id).baseName();
@@ -313,7 +311,8 @@ void Browser::addPluginTo(PluginInfo *info, MainWindow *window)
});
auto *removeAction = pluginMenu->addAction(tr("Remove"));
- connect(removeAction, &QAction::triggered, this, [this, info]() {;
+ connect(removeAction, &QAction::triggered, this, [this, info]() {
+ ;
m_plugins.removeOne(info);
delete info;
});