aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-11-29 15:44:40 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2018-11-29 15:44:40 +0100
commite4402ac5ca0966515b00c278bb8c6fa1df07fc66 (patch)
treeb9eaf705eeea19c7bbd218ed2a9e792fcddb7f35 /src/main.cpp
parentRemove old session code (diff)
downloadsmolbote-e4402ac5ca0966515b00c278bb8c6fa1df07fc66.tar.xz
Add --session and --pick-session
-s,--session replaces --browser.session --pick-session shows the SessionDialog instead of creating a session on startup
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 34f8a1a..7cc8757 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,6 +9,7 @@
#include "browser.h"
#include "configuration.h"
#include "session/session.h"
+#include "session/sessiondialog.h"
#include "util.h"
#include <QFile>
#include <QLibraryInfo>
@@ -205,10 +206,11 @@ int main(int argc, char **argv)
}
// command line arguments
- bool isStandalone = config->exists("no-remote");
- auto arguments = config->value<std::vector<std::string>>("args");
- auto session = config->value<QString>("browser.session");
- auto profile = config->value<QString>("profile.default");
+ const bool isStandalone = config->exists("no-remote");
+ const auto arguments = config->value<std::vector<std::string>>("args");
+ const bool pickSession = config->exists("pick-session");
+ const auto session = config->value<QString>("session");
+ const auto profile = config->value<QString>("profile.default");
app.setConfiguration(config);
app.setup(plugins);
@@ -235,7 +237,10 @@ int main(int argc, char **argv)
});
}
- {
+ if(pickSession) {
+ auto *dlg = new SessionDialog();
+ dlg->exec();
+ } else {
QJsonObject sessionData;
if(session) {
QFile sessionJson(session.value());