Make keyboard shortcut defaults configurable

2 files changed, 65 insertions, 27 deletions

diff --git a/linux/.config b/linux/.config
index 8eeef64..5cc898c 100644
--- a/linux/.config
+++ b/linux/.config
@@ -1,27 +1,9 @@
 # Generated by Kconfiglib (https://github.com/ulfalizer/Kconfiglib)
 
 #
-# Build system settings
-#
-
-#
-# Install paths
-#
-CONFIG_INSTALL_BINDIR="bin"
-CONFIG_INSTALL_LIBDIR="lib64/smolbote"
-CONFIG_INSTALL_PLUGINDIR="lib64/smolbote/plugins"
-CONFIG_INSTALL_APPDIR="share/applications"
-CONFIG_INSTALL_ICONDIR="share/icons"
-
-#
-# Application Settings
-#
-
-#
 # Application
 #
 CONFIG_POI_NAME="smolbote"
-CONFIG_POI_EXE="poi"
 CONFIG_POI_ICON=":/icon.svg"
 
 #
@@ -33,6 +15,60 @@ CONFIG_PATH_PLUGINS="~/.config/smolbote/plugins.d"
 CONFIG_PATH_PROFILES="~/.config/smolbote/profiles.d"
 CONFIG_PATH_BOOKMARKS="~/.config/smolbote/bookmarks.xbel"
 CONFIG_PATH_DOWNLOADS="~/Downloads"
+
+#
+# Keyboard shortcuts
+#
+
+#
+# Main Window shortcuts
+#
+CONFIG_SHORTCUT_WINDOW_NEWGROUP="Ctrl+G"
+CONFIG_SHORTCUT_WINDOW_NEWWINDOW="Ctrl+N"
+CONFIG_SHORTCUT_WINDOW_ABOUT="Ctrl+H"
+CONFIG_SHORTCUT_WINDOW_QUIT="Ctrl+Q"
+CONFIG_SHORTCUT_WINDOW_SEARCH="F3"
+CONFIG_SHORTCUT_WINDOW_BOOKMARKS="Ctrl+B"
+CONFIG_SHORTCUT_WINDOW_DOWNLOADS="Ctrl+D"
+
+#
+# Navigation Bar shortcuts
+#
+CONFIG_SHORTCUT_NAVIGATION_BACK="Ctrl+Left"
+CONFIG_SHORTCUT_NAVIGATION_BACKMENU="Ctrl+Down"
+CONFIG_SHORTCUT_NAVIGATION_FORWARD="Ctrl+Right"
+CONFIG_SHORTCUT_NAVIGATION_FORWARDMENU="Ctrl+Up"
+CONFIG_SHORTCUT_NAVIGATION_REFRESH="F5"
+CONFIG_SHORTCUT_NAVIGATION_RELOAD="Ctrl+F5"
+CONFIG_SHORTCUT_NAVIGATION_HOME="Ctrl+Home"
+
+#
+# Address Bar shortcuts
+#
+CONFIG_SHORTCUT_ADDRESS_FOCUS="F4"
+CONFIG_SHORTCUT_ADDRESS_MENU="F2"
+
+#
+# Subwindow shortcuts
+#
+CONFIG_SHORTCUT_SUBWINDOW_MENU="F1"
+CONFIG_SHORTCUT_SUBWINDOW_TILE="F9"
+CONFIG_SHORTCUT_SUBWINDOW_CASCADE="F10"
+CONFIG_SHORTCUT_SUBWINDOW_FULLSCREEN="F11"
+CONFIG_SHORTCUT_SUBWINDOW_NEWTAB="Ctrl+T"
+CONFIG_SHORTCUT_SUBWINDOW_CLOSETAB="Ctrl+X"
+CONFIG_SHORTCUT_SUBWINDOW_TABLEFT="Ctrl+O"
+CONFIG_SHORTCUT_SUBWINDOW_MOVETABLEFT="Ctrl+Shift+O"
+CONFIG_SHORTCUT_SUBWINDOW_TABRIGHT="Ctrl+P"
+CONFIG_SHORTCUT_SUBWINDOW_MOVETABRIGHT="Ctrl+Shift+P"
+
+#
+# Profile defaults
+#
+CONFIG_PROFILE_DEFAULT=""
+CONFIG_PROFILE_DEFAULT_SEARCH="https://duckduckgo.com/?q=%1&ia=web"
+CONFIG_PROFILE_DEFAULT_HOMEPAGE="about:blank"
+CONFIG_PROFILE_DEFAULT_NEWTAB="about:blank"
 CONFIG_USEPLASMA=y
 
 #
@@ -45,5 +81,4 @@ CONFIG_WALLET_FOLDER="smolbote"
 #
 # Workarounds
 #
-CONFIG_QTBUG_62511=y
 CONFIG_QTBUG_65223=y
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index bf62f9c..fc3d16d 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -14,15 +14,13 @@ license=('GPL3')
 
 depends=('qt5-webengine>=5.11.0' 'boost-libs>=1.66.0')
 optdepends=('firejail: launch a sandboxed instance')
-makedepends=('git' 'meson' 'pkg-config' 'asciidoctor')
+makedepends=('git' 'meson' 'pkg-config' 'python-kconfiglib' 'asciidoctor')
 
 # this is the central repository
 source=("git+https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote.git"
-        "git+https://github.com/itay-grudev/SingleApplication.git"
-        "git+https://github.com/ulfalizer/Kconfiglib.git")
+        "git+https://github.com/itay-grudev/SingleApplication.git")
 
 sha512sums=('SKIP'
-            'SKIP'
             'SKIP')
 
 #validgpgkeys=(# Aqua-sama <aqua@iserlohn-fortress.net>
@@ -34,8 +32,6 @@ prepare() {
     git submodule init
     git config submodule.3rd-party/SingleApplication/SingleApplication.git.url $srcdir/SingleApplication
     git submodule update 3rd-party/SingleApplication/SingleApplication.git
-    git config submodule.tools/Kconfiglib.url $srcdir/Kconfiglib
-    git submodule update tools/Kconfiglib
 }
 
 pkgver() {
@@ -51,12 +47,19 @@ build() {
 
     # For a list of configureable options, check smolbote/meson_options.txt, or
     # run `meson configure` in $srcdir/build
-    meson --buildtype=release --prefix=/usr/local --auto-features=disabled $srcdir/build
+    # --buildtype=plain - meson won't add any flags to the command line
+    # --prefix=... - install prefix
+    # --auto-features=disabled - features should be explicitly enabled
+    meson --buildtype=plain --prefix=/usr/local --auto-features=disabled $srcdir/build
 
-    # Build
     cd $srcdir/build
+
+    # Toggle features
+    #meson configure -DBreakpad=enabled
     meson configure -DPlasma=enabled
     meson configure -Dmanpage=enabled
+
+    # Build
     ninja
 }