From d796821f8304306dbe088701724243b39e8eb358 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 16 Apr 2018 17:07:36 +0200
Subject: Multiple subwindows interface

Subwindows are similar to tab groups.
- Rewrote Browser and MainWindow, so they should be somewhat cleaner now
- Moved AboutDialog to lib/about

What's broken:
- loading bar
- search box
- address bar bookmark suggestions
- plugins
---
 lib/configuration/configuration.cpp | 42 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'lib/configuration')

diff --git a/lib/configuration/configuration.cpp b/lib/configuration/configuration.cpp
index 959dfc2..8cbcee0 100644
--- a/lib/configuration/configuration.cpp
+++ b/lib/configuration/configuration.cpp
@@ -20,33 +20,29 @@ Configuration::Configuration()
     // create description
     desc.add_options()
 
-        // Browser default settings
-        // default profile name the browser should use; "" is off-the-record
-        ("browser.profile", po::value<std::string>()->default_value(""))
-
-        // default window size
-        ("browser.window.height", po::value<int>()->default_value(720))
-        ("browser.window.width", po::value<int>()->default_value(1280))
-        ("browser.window.maximized", po::value<bool>()->default_value(true))
-        ("browser.window.title", po::value<std::string>()->default_value("title — smolbote [profile]"))
+        // main window ui
+        ("mainwindow.height", po::value<int>()->default_value(720))
+        ("mainwindow.width", po::value<int>()->default_value(1280))
+        ("mainwindow.maximized", po::value<bool>()->default_value(true))
+        ("mainwindow.title", po::value<std::string>()->default_value(" — smolbote"))
 
-        // window ui
-        ("browser.ui.navtoolbarMovable", po::value<bool>()->default_value(false))
-        ("browser.ui.tabtoolbarMovable", po::value<bool>()->default_value(false))
+        // main window shortcuts
+        ("mainwindow.shortcuts.newTab", po::value<std::string>()->default_value("Ctrl+T"))
+        ("mainwindow.shortcuts.newGroup", po::value<std::string>()->default_value("Ctrl+G"))
+        ("mainwindow.shortcuts.newWindow", po::value<std::string>()->default_value("Ctrl+N"))
 
-        // browser shortcuts
+        ("mainwindow.shortcuts.about", po::value<std::string>()->default_value("F1"))
+        ("mainwindow.shortcuts.quit", po::value<std::string>()->default_value("Ctrl+Q"))
 
-        // browser menu
-        ("browser.shortcuts.newWindow", po::value<std::string>()->default_value("Ctrl+N"))
-        ("browser.shortcuts.about", po::value<std::string>()->default_value("F1"))
-        ("browser.shortcuts.quit", po::value<std::string>()->default_value("Ctrl+Q"))
+        ("mainwindow.shortcuts.tileWindows", po::value<std::string>()->default_value("F9"))
 
         // navigation
-        ("browser.shortcuts.back", po::value<std::string>()->default_value("Ctrl+Left"))
-        ("browser.shortcuts.forward", po::value<std::string>()->default_value("Ctrl+Right"))
-        ("browser.shortcuts.refresh", po::value<std::string>()->default_value("F5"))
-        ("browser.shortcuts.reload", po::value<std::string>()->default_value("Ctrl+F5"))
-        ("browser.shortcuts.home", po::value<std::string>()->default_value("Ctrl+Home"))
+        ("navigation.movable", po::value<bool>()->default_value(false))
+        ("navigation.shortcuts.back", po::value<std::string>()->default_value("Ctrl+Left"))
+        ("navigation.shortcuts.forward", po::value<std::string>()->default_value("Ctrl+Right"))
+        ("navigation.shortcuts.refresh", po::value<std::string>()->default_value("F5"))
+        ("navigation.shortcuts.reload", po::value<std::string>()->default_value("Ctrl+F5"))
+        ("navigation.shortcuts.home", po::value<std::string>()->default_value("Ctrl+Home"))
 
         // address bar
         ("addressbar.shortcuts.focus", po::value<std::string>()->default_value("F4"))
@@ -73,6 +69,8 @@ Configuration::Configuration()
         ("plugins.path", po::value<std::string>()->default_value("~/.config/smolbote/plugins.d"))
 
         // Profile settings
+        // default profile name the browser should use; "" is off-the-record
+        ("profile.default", po::value<std::string>()->default_value(""))
         ("profile.path", po::value<std::string>()->default_value("~/.config/smolbote/profiles.d"))
         ("profile.search", po::value<std::string>()->default_value("https://duckduckgo.com/?q=$term&ia=web"))
         ("profile.homepage", po::value<std::string>()->default_value("about:blank"))
-- 
cgit v1.2.1