From e4402ac5ca0966515b00c278bb8c6fa1df07fc66 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Thu, 29 Nov 2018 15:44:40 +0100
Subject: Add --session and --pick-session

-s,--session replaces --browser.session
--pick-session shows the SessionDialog instead of creating a session on
startup
---
 lib/configuration/Kconfig           |  4 +++-
 lib/configuration/configuration.cpp | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/configuration/Kconfig b/lib/configuration/Kconfig
index 3e77434..b165093 100644
--- a/lib/configuration/Kconfig
+++ b/lib/configuration/Kconfig
@@ -1,4 +1,3 @@
-
 menu "Configuration defaults"
     config PATH_CONFIG
         string "Configuration location"
@@ -18,6 +17,9 @@ menu "Configuration defaults"
     config PATH_DOWNLOADS
         string "Downloads location"
         default "~/Downloads"
+    config PATH_SESSION
+        string "Session location"
+        default "~/.config/smolbote/session.d"
 endmenu
 
 menu "Keyboard shortcuts"
diff --git a/lib/configuration/configuration.cpp b/lib/configuration/configuration.cpp
index 398044b..98ab20a 100644
--- a/lib/configuration/configuration.cpp
+++ b/lib/configuration/configuration.cpp
@@ -37,13 +37,16 @@ Configuration::Configuration(QObject *parent)
     , m_homePath(QStandardPaths::writableLocation(QStandardPaths::HomeLocation).toStdString())
 {
     commandLine_desc.add_options()
-        ("help,h", "Display this help.")
+        ("help,h", "Display command-line options list.")
         ("version,v", "Display version information.")
-        ("build", "Display build branch and commit.")
+        ("build", "Display build commit.")
 
         ("config,c", po::value<std::string>()->default_value(defaultUserConfigLocation()), "Set the configuration file.")
         ("no-remote", "Do not accept or send remote commands.")
 
+        ("session,s", po::value<std::string>(), "Open the selected session.")
+        ("pick-session", "Show all available sessions and select which one to open.")
+
         ("args", po::value<std::vector<std::string>>(), "Command(s) and/or URL(s).")
         ;
 
@@ -51,11 +54,11 @@ Configuration::Configuration(QObject *parent)
 
     configuration_desc.add_options()
         ("browser.stylesheet", po::value<std::string>())
-        ("browser.session", po::value<std::string>(), "Load session data from specified arg.")
         ("browser.locale", po::value<std::string>(), "Set Qt localization.")
         ("browser.translation", po::value<std::string>(), "Set application localization.")
 
-        ("browser.session.path", po::value<std::string>()->default_value("~/.config/smolbote/session.d"))
+        // sessions
+        ("browser.session.path", po::value<std::string>()->default_value(CONFIG_PATH_SESSION))
 
 #ifdef CONFIG_USEBREAKPAD
         ("browser.crash.path", po::value<std::string>()->default_value(CONFIG_PATH_CRASHDUMP))
-- 
cgit v1.2.1