doc: update README and TODO

# Conflicts:
#	db_badger.go

Makefile

@@ -1,28 +1,47 @@
 SHELL:=/bin/bash
-SOURCES=$(find . -name '*.go' -type f)
+SOURCES := $(shell find . -name '*.go' -type f)
+GIT_REV := $(shell git describe --exact-match --tags 2>/dev/null || printf "%s-%s" $$(git describe --tags --abbrev=0) $$(git rev-parse HEAD | head -c8))
 .DEFAULT_GOAL := dist
+MIQT_UIC ?= ~/go/bin/miqt-uic
+MIQT_RCC ?= ~/go/bin/miqt-rcc
+MIQT_DOCKER ?= ~/go/bin/miqt-docker
+GO_WINRES ?= ~/go/bin/go-winres
 
 .PHONY: generate
 generate:
-	~/go/bin/miqt-uic -InFile mainwindow.ui -OutFile mainwindow.go -Qt6
+	$(MIQT_UIC) -InFile mainwindow.ui -OutFile mainwindow.go -Qt6
-	~/go/bin/miqt-uic -InFile connectionDialog.ui -OutFile connectionDialog.go -Qt6
+	$(MIQT_UIC) -InFile connectionDialog.ui -OutFile connectionDialog.go -Qt6
-	~/go/bin/miqt-rcc -Input embed.qrc -Qt6
+	$(MIQT_UIC) -InFile connectionManagerDialog.ui -OutFile connectionManagerDialog.go -Qt6
+	$(MIQT_RCC) -Input embed.qrc -Qt6
 	
 .PHONY: designer
 designer:
 	/usr/lib/qt6/bin/designer &
 
+.PHONY: optimize-images
+optimize-images:
+	# Strip iCCC colour chunks that libpng/Qt complain about at runtime
+	for f in assets/*.png ; do convert "$$f" -strip "$$f" ; done
+	optipng -quiet -o5 assets/*.png
+	make generate
+
 yvbolt: $(SOURCES)
-	~/go/bin/miqt-docker native -minify-build
+	# Target a debian-12 baseline build
+	sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
+	$(MIQT_DOCKER) linux64-go1.25-qt6.4-dynamic -minify-build
+	git checkout -- version.go
 	chmod 755 yvbolt
 	upx --lzma yvbolt
 
 yvbolt.exe: $(SOURCES)
-	~/go/bin/miqt-docker win64-cross-go1.24-qt6.5-static -windows-build --tags=windowsqtstatic
+	sed -i -re 's/".+"/"$(GIT_REV)"/g' version.go
+	$(MIQT_DOCKER) win64-cross-go1.24-qt6.5-static -windows-build --tags=windowsqtstatic
+	git checkout -- version.go
+	$(GO_WINRES) patch --in winres.json --no-backup --product-version git-tag --file-version git-tag yvbolt.exe
 	upx --lzma yvbolt.exe
 
 yvbolt.apk: $(SOURCES)
-	~/go/bin/miqt-docker android-armv8a-go1.23-qt6.6-dynamic -android-build
+	$(MIQT_DOCKER) android-armv8a-go1.23-qt6.6-dynamic -android-build
 	
 yvbolt.linux64.tar.xz: yvbolt
 	rm -f yvbolt.linux64.tar.xz
@@ -37,4 +56,5 @@ dist: yvbolt.linux64.tar.xz yvbolt.win64.zip
 
 .PHONY: clean
 clean:
+	git checkout -- version.go
 	rm -f yvbolt.exe yvbolt yvbolt.linux64.tar.xz yvbolt.win64.zip

README.md

@@ -11,31 +11,77 @@ A graphical interface for multiple databases.
 - Run custom SQL queries
   - Select text to run partial query
 - Safe handling for non-UTF8 key and data fields
+- Connection Manager saves connections with AEAD AES256-GCM using OS keychain
 
 See also [qbolt](https://code.ivysaur.me/qbolt) for more/different functionality.
 
 ## Supported databases
 
-Database     |Read  |Editing  |Connection options  |Context menu actions
+There are currently 11 supported databases:
--------------|------|---------|--------------------|--------
+
-Badger v4    |Yes   |No       |Encrypted, readonly, in-memory |Backup, restore, compact
+Database     |Read  |Editing  |Query |Connection options  |Context menu actions
-Bolt         |Yes   |Yes      |Readonly            |Create/delete child buckets
+-------------|------|---------|------|--------------------|--------
-Debconf      |Yes   |No       |                    |
+Badger v4    |Yes   |Yes      |No    |Encrypted, readonly, in-memory |Backup, restore, compact
-LevelDB      |Yes   |No       |Readonly            |
+Bolt         |Yes   |Yes      |No    |Readonly            |Create/delete child buckets
-Pebble       |Yes   |No       |Readonly, in-memory |
+Debconf      |Yes   |No       |No    |                    |
-Redis        |Yes   |No       |SSH tunnel, RESP v3 |
+Freedesktop.org Secret Service |Yes |No | No |            |Unlock, create new collection
-SQLite       |Yes   |Yes      |CLI driver, in-memory |Vacuum, export
+LevelDB      |Yes   |Yes      |No    |Readonly            |
+LMDB         |Yes   |Yes      |No    |Multi-DB, readonly  |Create/delete child databases
+MongoDB      |Yes   |Yes      |Yes   |SSH tunnel          |Create/delete child databases and collections
+Pebble       |Yes   |Yes      |No    |Readonly, in-memory |
+Redis        |Yes   |No       |Yes   |SSH tunnel, RESP v3 |
+SQLite       |Yes   |Yes      |Yes   |CLI driver, in-memory |Vacuum, export
+Starskey     |Yes   |Yes      |No    |Compression         |
 
 ## License
 
-The code in this project is licensed under the ISC license (see `LICENSE` file for details).
+The code in this project is licensed under the ISC license (see `LICENSE` file for details) with the following caveats:
 
-This project redistributes images from the famfamfam/silk icon set under the [CC-BY 2.5 license](http://creativecommons.org/licenses/by/2.5/).
+- This project depends on third-party libraries under additional open source licenses.
-
+- This project redistributes images from the [famfamfam/silk icon set](https://github.com/markjames/famfamfam-silk-icons) under the [CC-BY 2.5 license](http://creativecommons.org/licenses/by/2.5/).
-This project includes trademarked logo images for each supported database type.
+- This project includes trademarked logo images for each supported database type.
+- The Windows binary is released under LGPL-3+ owing to the static copy of Qt.
 
 ## Changelog
 
+Unreleased vNext
+
+- MongoDB: Initial support, including SSH tunnel, managing collections, and querying
+- Badger: Fix k/v column display, support editing
+- LMDB: Support editing
+- LevelDB: Support editing
+- Pebble: Support editing
+- Starskey: Fix k/v column display, support editing
+- Redis: Bump driver version v9.16.0 -> v9.17.2
+- Connection manager: When saving, use the database's preferred name
+- App: Use virtualized table renderer
+- App: Fix graphical flicker when editing connections on Windows
+- App: Set up icon and exe properties on Windows
+- App: Embed version number in release builds
+- App: Show unsaved-changes warning also when changing database
+- App: Fix rich text formatting appearing when pasting into the query window
+
+2025-12-02 v0.9.0
+
+- LMDB: Initial support, including multi-database mode, data editing, and managing child databases
+- Starskey: Initial support
+- Freedesktop.org Secret Service: Initial support, including unlocking collections and creating child collections
+- App: Use global toolbar style
+- App: Add connection manager, encrypting credentials with AEAD AES256-GCM using OS keychain
+- App: Offer to save valid quick-connection to the connection manager
+- App: Add 'About Qt' menu option
+- App: Fixed file extension filter for database files with no extension
+- App: Fixed background colour for Properties area on different OSes
+- App: Fixed libpng warnings about greyscale image data for embedded logo images
+- App: Fixed issue with non-UTF8 child database names
+- Debconf: Improve navigation speed by splitting applications into virtual tables
+- SSH: Redesign options to pick only one of the available auth methods
+- Fixed running release binary on Debian 12
+
+[⬇️ Download for Windows x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.win64.zip)
+
+[⬇️ Download for Linux x86_64](https://git.ivysaur.me/code.ivysaur.me/yvbolt/releases/download/v0.9.0/yvbolt.linux64.tar.xz)
+
 2025-11-23 v0.8.0
 
 - Port from [liblcl](https://github.com/ying32/liblcl) to [MIQT Qt 6](https://github.com/mappu/miqt)

TODO

@@ -1,15 +1,23 @@
+- BUG: Adding new entries to connection manager, then selecting them, opens wrong entry
+- BUG: ExecQuery being called multiple times on error?
+- Parity with QBolt, merge projects together
+- Portable mode (portable.txt or portable/ dir)
 - Syntax highlighting in editor
+- Table: quick filter
+- Cancellation
+- Loading animations for connection + queries
 - Mutation
-	- Badger: Support insert/update/delete
-	- Pebble: Support insert/update/delete
 	- Debconf: Support insert/update/delete
 	- Redis: Support insert/update/delete
+	- SecretService: Support insert/update/delete
 - Binary data viewer
 	- Detect jpg/png and show as image
+	- Prevent editing invalid-utf8 fields as text (binary data editor?)
 - More DB types
-	- MySQL
+	- MySQL (& MariaDB/TiDB)
 	- Postgres
 		- CLI using psql
+	- Lungo: Mini embeddable Mongo - https://github.com/256dpi/lungo 
 	- MSSQL (recursive navigation for instances)
 	- Other K/V stores from https://github.com/smallnest/kvbench 
 	- Windows registry
@@ -20,16 +28,33 @@
 	- Dolt
 	- Memcache
 		- Listing all keys is not well supported, needs hacks
-	- DBus SecretStore
-	- Starskey https://github.com/starskey-io/starskey
 	- Chai (built on Pebble) - https://github.com/chaisql/chai
+	- CloverDB (built on Bolt/Badger) - https://github.com/ostafen/clover
 	- APCu - need some sort of hook into the storage engine
+	- VoidDB - https://github.com/voidDB/voidDB
+	- UnisonDB - https://github.com/ankur-anand/unisondb
 	- Etcd
+		- v2: hierarchal
+		- v3: flat key namespace
+	- Tokyo Cabinet, Kyoto Cabinet, Tkrzw
+		- https://github.com/TerraTech/go-tokyocabinet needs pkg-config tokyocabinet
+		- https://github.com/estraier/tkrzw-go needs pkg-config tkrzw
+	- CSV file
+		- Allow querying with sqlite or duckDB?
+	- Parquet file
+		- Allow querying with duckDB?
+	- IRC client
+	- SSDB (Redis-compatible)
+	- Time-series DBs
+		- Prometheus
+		- VictoriaMetrics
+		- FrostDB https://github.com/polarsignals/frostdb
+	- https://dbdb.io/browse?programming=go-lang&q=
 - Connection dialog
-	- Saved connections w/ storage encryption
 	- SSH over Cockpit
 - SQLite CLI driver:
 	- Context support
+	- Write support
 	- Attach to SSH tunnel
 	- Configure binary path
 	- https://ricardoanderegg.com/posts/sqlite-remote-explorer-gui/
@@ -37,17 +62,28 @@
 - Badger:
 	- v1/v2/v3 support
 	- option to use namespace separators for virtual buckets
-- Debconf: separate groups by first slash in name
+- SQLite:
-- SQLite: drop table doesn't autorefresh nav since callback is late
+	- drop table doesn't autorefresh nav since callback is late
-- Build
+	- more accurate type handling
-	- Win32 icon resource
+	- views
+	- other special objects (triggers? udf functions?)
+- LMDB: dupsort mode (duplicate keys / entries-per-key)
+- MongoDB
+	- UI for replica sets, ssl certs, cluster, custom auth database
+	- SSH tunnel: error `ssh: tcpChan: deadline not supported` - needs workaround
+	- BSON type column with autoconfig based column editor
+	- Backup/restore
+	- drop db/collection doesn't autorefresh nav since server is asynchronous
+- SSH tunnel - option to use external/system SSH
 - Performance
 	- Warning if data table is filtered to 1000 rows, or add pagination
 	- Context/interrupt slow queries
-	- Faster virtual rendering
 - Query history
+- Query log
 - Test suite
 	- `CREATE TABLE foo (id integer primary key, aaa text not null, bbb text not null);`
 - Ability to convert database types
 - Export all data from grid
 - Export all data from all buckets within a DB
+- Reconnect
+- Connecting to multiple DBs from connection manager: if one has an error, the error popup from the others is lost

config.go

@@ -2,7 +2,11 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"os"
+	"reflect"
+	"time"
 
 	"github.com/mappu/autoconfig"
 	qt "github.com/mappu/miqt/qt6"
@@ -12,52 +16,99 @@ type DBConnector interface {
 	Connect(context.Context) (loadedDatabase, string, error)
 }
 
-type registeredDatabase struct {
+type ConnectionConfig struct {
-	label    string
+	Type autoconfig.OneOf
-	iconPath string
+
-	conn     DBConnector
+	Badger        *badgerConnection        `ylabel:"BadgerDB v4" yicon:":/assets/vendor_dgraph.png" json:",omitempty"`
+	Bolt          *boltConfig              `yicon:":/assets/vendor_github.png" json:",omitempty"`
+	Debconf       *debconfConnection       `yicon:":/assets/vendor_debian.png" json:",omitempty"`
+	SecretService *secretServiceConnection `ylabel:"Freedesktop.org Secret Service" yicon:":/assets/vendor_freedesktop.png" json:",omitempty"`
+	LevelDB       *leveldbConnection       `ylabel:"LevelDB" yicon:":/assets/vendor_leveldb.png" json:",omitempty"`
+	LMDB          *lmdbConnection          `yicon:":/assets/vendor_lmdb.png" json:",omitempty"`
+	MongoDB       *mongoConnection         `ylabel:"MongoDB" yicon:":/assets/vendor_mongodb.png" json:",omitempty"`
+	Pebble        *pebbleConnection        `yicon:":/assets/vendor_cockroach.png" json:",omitempty"`
+	Redis         *redisConnectionOptions  `yicon:":/assets/vendor_redis.png" json:",omitempty"`
+	SQLite        *sqliteConnection        `ylabel:"SQLite" yicon:":/assets/vendor_sqlite.png" json:",omitempty"`
+	Starskey      *starskeyConnection      `yicon:":/assets/vendor_starskey.png" json:",omitempty"`
 }
 
-var (
+func NewConnectionConfig() *ConnectionConfig {
-	registeredDatabases []registeredDatabase
+	return &ConnectionConfig{
-)
+		Type: "Bolt", // favouritism
-
+	}
-func registerDatabase(conn DBConnector, label, iconPath string) {
-	registeredDatabases = append(registeredDatabases, registeredDatabase{
-		label:    label,
-		iconPath: iconPath,
-		conn:     conn,
-	})
 }
 
+// Icon gets the Qt string name for the icon of this database by parsing the
+// 'yicon' struct tag with reflection.
+// If there is no selection or if it's misconfigured, falls back to a generic
+// database icon.
+func (cc *ConnectionConfig) Icon() string {
+	taginfo, ok := reflect.ValueOf(cc).Type().Elem().FieldByName(string(cc.Type))
+	if !ok {
+		return ":/assets/database.png"
+	}
+
+	yicon, ok := taginfo.Tag.Lookup("yicon")
+	if !ok {
+		return ":/assets/database.png"
+	}
+
+	return yicon
+}
+
+func (cc *ConnectionConfig) String() string {
+	if selection, err := cc.selection(); err == nil {
+		if stringer, ok := selection.(fmt.Stringer); ok {
+			return stringer.String()
+		}
+	}
+
+	if string(cc.Type) == "" {
+		return "Not configured"
+	}
+
+	return string(cc.Type)
+}
+
+func (cc *ConnectionConfig) selection() (DBConnector, error) {
+	selection := reflect.ValueOf(cc).Elem().FieldByName(string(cc.Type))
+	if !selection.IsValid() {
+		return nil, fmt.Errorf("Invalid database engine %q", cc.Type)
+	}
+
+	con, ok := selection.Interface().(DBConnector)
+	if !ok {
+		return nil, fmt.Errorf("Can't connect to database on type %q (weird)", cc.Type)
+	}
+
+	return con, nil
+}
+
+func (cc *ConnectionConfig) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	dbc, err := cc.selection()
+	if err != nil {
+		return nil, "", fmt.Errorf("Invalid database engine %q", cc.Type)
+	}
+
+	return dbc.Connect(ctx)
+}
+
+var _ DBConnector = &ConnectionConfig{}
+
 func (f *App) OnMnuConnectClick() {
+
+	// autoconfig.OpenDialog() does not give us a "yes/no" result back from the
+	// dialog, so we still have to custom construct the dialog and use the
+	// formlayout option instead
+
 	dlg := NewConnectDialogUi()
 	dlg.ConnectDialog.SetParent2(f.ui.MainWindow.QWidget, qt.Dialog)
 	dlg.ConnectDialog.SetModal(true)
 	dlg.ConnectDialog.SetAttribute(qt.WA_DeleteOnClose)
 
-	var resultingConfigs []DBConnector
+	config := NewConnectionConfig()
-	var getters []func()
 
-	for _, db := range registeredDatabases {
+	saver := autoconfig.MakeConfigArea(config, dlg.formLayout)
-		dlg.databaseEngine.AddItem2(qt.NewQIcon4(db.iconPath), db.label)
-
-		frame := qt.NewQWidget2()
-		layout := qt.NewQFormLayout(frame)
-
-		// Deep-copy the provided default object
-		// useConn := deep_copy(db.conn)
-		useConn := db.conn // FIXME can't deep copy?!
-
-		resultingConfigs = append(resultingConfigs, useConn)
-		getters = append(getters, autoconfig.MakeConfigArea(useConn, layout))
-
-		dlg.stackedWidget.AddWidget(frame)
-	}
-
-	dlg.databaseEngine.OnCurrentIndexChanged(func(index int) {
-		dlg.stackedWidget.SetCurrentIndex(index)
-	})
 
 	dlg.ConnectDialog.OnAccept(func(super func()) {
 		// Validate connection before closing
@@ -66,18 +117,14 @@ func (f *App) OnMnuConnectClick() {
 		defer dlg.buttonBox.SetEnabled(true)
 		dlg.buttonBox.Repaint()
 
-		// Selected index
-		idx := dlg.databaseEngine.CurrentIndex()
-
 		// Save changes from UI into struct
-		getters[idx]()
+		saver()
-		config := resultingConfigs[idx]
 
 		// Connect -> get ld
 		ctx := context.Background() // TODO do in background thread?
 		ld, displayName, err := config.Connect(ctx)
 		if err != nil {
-			_ = qt.QMessageBox_Critical(dlg.ConnectDialog.QWidget, APPNAME, fmt.Sprintf("Connecting to %s database: %s", registeredDatabases[idx].label, err.Error()))
+			_ = qt.QMessageBox_Critical(dlg.ConnectDialog.QWidget, APPNAME, fmt.Sprintf("Connecting to %s database: %s", config.Type, err.Error()))
 			// Prevent the dialog from closing: do not call super()
 			return
 		}
@@ -85,6 +132,12 @@ func (f *App) OnMnuConnectClick() {
 		// Add ld to mainwindow
 		f.addTopLevelDatabaseConnection(ld, displayName)
 
+		// Connection OK
+		// Offer to save into connection-manager
+		if res := qt.QMessageBox_Question2(dlg.ConnectDialog.QWidget, APPNAME, "Connection successful. Save the details into Connection Manager?", qt.QMessageBox__Save, qt.QMessageBox__Ignore); res == int(qt.QMessageBox__Save) {
+			f.TrySaveIntoConnectionManager(config, displayName)
+		}
+
 		// Default accept behaviour is: setResult(Accepted), emits onFinished; && Hide()
 		super()
 	})
@@ -92,3 +145,276 @@ func (f *App) OnMnuConnectClick() {
 	dlg.ConnectDialog.Open() // Modal, unlike .Show()
 
 }
+
+type ConnMgrLoadError struct {
+	e error
+}
+
+func (c ConnMgrLoadError) Error() string {
+	return fmt.Sprintf("Failed to load saved connections: %s", c.e)
+}
+
+func (c ConnMgrLoadError) Unwrap() error {
+	return c.e
+}
+
+type ConnMgrSaveError struct {
+	e error
+}
+
+func (c ConnMgrSaveError) Error() string {
+	return fmt.Sprintf("Failed to save connections: %s", c.e)
+}
+
+func (c ConnMgrSaveError) Unwrap() error {
+	return c.e
+}
+
+func (f *App) TrySaveIntoConnectionManager(cc *ConnectionConfig, displayName string) {
+	data, err := f.getConnectionManagerContents()
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrLoadError{err}.Error())
+	}
+
+	if displayName == "" {
+		displayName = cc.String()
+	}
+
+	data.Entries = append(data.Entries, SavedConfigEntry{
+		Description: displayName,
+		Connection:  *cc,
+	})
+
+	err = f.saveConnectionManagerContents(data)
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+	}
+}
+
+func (f *App) OnMnuConnectionManagerClick() {
+
+	data, err := f.getConnectionManagerContents()
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+		return
+	}
+
+	dlg := NewconnectionManagerDialogUi()
+	dlg.connectionManagerDialog.SetParent2(f.ui.MainWindow.QWidget, qt.Dialog)
+	dlg.connectionManagerDialog.SetModal(true)
+	dlg.connectionManagerDialog.SetAttribute(qt.WA_DeleteOnClose)
+	dlg.treeWidget.SetRootIsDecorated(false)
+	dlg.treeWidget.SetSelectionMode(qt.QAbstractItemView__ExtendedSelection)
+
+	addEntryFor := func(entry SavedConfigEntry) {
+		itm := qt.NewQTreeWidgetItem()
+		itm.SetText(0, entry.Description)
+		itm.SetIcon(0, qt.NewQIcon4(entry.Connection.Icon()))
+
+		dlg.treeWidget.AddTopLevelItem(itm)
+	}
+
+	refreshEntryFor := func(idx *qt.QModelIndex, entry SavedConfigEntry) {
+		itm := dlg.treeWidget.ItemFromIndex(idx)
+		itm.SetText(0, entry.Description)                     // Update label
+		itm.SetIcon(0, qt.NewQIcon4(entry.Connection.Icon())) // Update icon
+	}
+
+	// Populate entries
+	for _, entry := range data.Entries {
+		addEntryFor(entry)
+	}
+
+	refreshButtonState := func() {
+		ct := len(dlg.treeWidget.SelectedItems())
+
+		dlg.connectBtn.SetEnabled(ct > 0)
+		dlg.connDelete.SetEnabled(ct > 0)
+		dlg.connEdit.SetEnabled(ct == 1)
+	}
+
+	connectToItem := func(itm *qt.QTreeWidgetItem) bool {
+		ctx := context.Background() // TODO do in background thread?
+
+		dlg.connectBtn.SetEnabled(false)
+		dlg.treeWidget.SetEnabled(false)
+		defer func() {
+			dlg.connectBtn.SetEnabled(true)
+			dlg.treeWidget.SetEnabled(true) // FIXME block the other buttons too!
+		}()
+
+		entry := data.Entries[dlg.treeWidget.IndexFromItem(itm).Row()]
+
+		ld, _, err := entry.Connection.Connect(ctx)
+		if err != nil {
+			_ = qt.QMessageBox_Critical(dlg.connectionManagerDialog.QWidget, APPNAME, fmt.Sprintf("Connecting to %s database: %s", entry.Connection.Type, err.Error()))
+			return false
+		}
+
+		// Add ld to mainwindow
+		// Don't use the displayName from the Connect() function - use the saved
+		// displayname instead
+		f.addTopLevelDatabaseConnection(ld, entry.Description)
+
+		return true
+	}
+
+	dlg.treeWidget.OnItemDoubleClicked(func(itm *qt.QTreeWidgetItem, _ int) {
+		// connect to specific item
+		if connectToItem(itm) {
+			dlg.connectionManagerDialog.Accept()
+		}
+	})
+
+	dlg.connectBtn.OnClicked(func() {
+		// Based on selectedItems, not currentItem
+		itms := dlg.treeWidget.SelectedItems()
+		var ok bool = true
+		for _, itm := range itms {
+			ok = ok && connectToItem(itm) // connect to selected
+		}
+
+		if ok {
+			dlg.connectionManagerDialog.Accept()
+		}
+	})
+
+	dlg.connDelete.SetEnabled(false)
+	dlg.connEdit.SetEnabled(false)
+	dlg.treeWidget.OnItemSelectionChanged(refreshButtonState)
+
+	dlg.connDelete.OnClicked(func() {
+
+		itms := dlg.treeWidget.SelectedItems()
+		for _, itm := range itms {
+
+			idx := dlg.treeWidget.IndexFromItem(itm).Row() // n.b. will dynamically change as the item is removed
+			itm.Delete()
+
+			data.Entries = slice_remove_index(data.Entries, idx)
+
+		}
+
+		// All changes made in both ui + data model
+		// Save data model changes
+		err := f.saveConnectionManagerContents(data)
+		if err != nil {
+			qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+			return
+		}
+	})
+
+	dlg.connEdit.OnClicked(func() {
+		// Edit is based on selectedIndex, not currentIndex
+		items := dlg.treeWidget.SelectedItems()
+		if len(items) != 1 {
+			return
+		}
+
+		idx := dlg.treeWidget.IndexFromItem(items[0])
+
+		row := idx.Row()
+		props := data.Entries[row]
+
+		autoconfig.OpenDialog(&props, dlg.connectionManagerDialog.QWidget, "Editing connection", func() {
+			data.Entries[row] = props
+			refreshEntryFor(idx, props)
+
+			err := f.saveConnectionManagerContents(data)
+			if err != nil {
+				qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+				return
+			}
+
+		})
+	})
+
+	dlg.connAdd.OnClicked(func() {
+
+		obj := SavedConfigEntry{
+			Description: "New connection (" + time.Now().Format(time.DateTime) + ")",
+		}
+		vv := NewConnectionConfig()
+		obj.Connection = *vv
+
+		autoconfig.OpenDialog(&obj, dlg.connectionManagerDialog.QWidget, "New connection", func() {
+
+			data.Entries = append(data.Entries, obj)
+			addEntryFor(obj)
+
+			err := f.saveConnectionManagerContents(data)
+			if err != nil {
+				qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+				return
+			}
+
+		})
+	})
+
+	miniMenu := qt.NewQMenu(dlg.toolsBtn.QWidget)
+	exportAction := miniMenu.AddActionWithText("Export connections...")
+	importAction := miniMenu.AddActionWithText("Import connections...")
+	dlg.toolsBtn.SetMenu(miniMenu)
+	dlg.toolsBtn.SetPopupMode(qt.QToolButton__InstantPopup)
+
+	exportAction.OnTriggered(func() {
+		saveAs := qt.QFileDialog_GetSaveFileName4(dlg.toolsBtn.QWidget, "Export connections...", "", "JSON files (*.json);;All files (*)")
+		if saveAs == "" {
+			return // cancelled
+		}
+
+		jbytes, err := json.MarshalIndent(data, "", "  ")
+		if err != nil {
+			qt.QMessageBox_Warning(dlg.toolsBtn.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+			return
+		}
+
+		err = os.WriteFile(saveAs, jbytes, 0600)
+		if err != nil {
+			qt.QMessageBox_Warning(dlg.toolsBtn.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+			return
+		}
+
+		// OK
+		qt.QMessageBox_Information(dlg.toolsBtn.QWidget, APPNAME, "The connections have been exported successfully.")
+	})
+
+	importAction.OnTriggered(func() {
+		loadFile := qt.QFileDialog_GetOpenFileName4(dlg.toolsBtn.QWidget, "Import connections...", "", "JSON files (*.json);;All files (*)")
+		if loadFile == "" {
+			return // cancelled
+		}
+
+		jbytes, err := os.ReadFile(loadFile)
+		if err != nil {
+			qt.QMessageBox_Warning(dlg.toolsBtn.QWidget, APPNAME, ConnMgrLoadError{err}.Error())
+			return
+		}
+
+		var importData SavedConfig
+		err = json.Unmarshal(jbytes, &importData)
+		if err != nil {
+			qt.QMessageBox_Warning(dlg.toolsBtn.QWidget, APPNAME, ConnMgrLoadError{err}.Error())
+			return
+		}
+
+		// Add to UI
+		for _, newEntry := range importData.Entries {
+			addEntryFor(newEntry)
+		}
+
+		// Add to data model
+		data.Entries = append(data.Entries, importData.Entries...)
+
+		// Save data model to disk
+		err = f.saveConnectionManagerContents(data)
+		if err != nil {
+			qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, ConnMgrSaveError{err}.Error())
+			return
+		}
+	})
+
+	refreshButtonState()
+
+	dlg.connectionManagerDialog.Show()
+}

configSave.go

@@ -0,0 +1,200 @@
+package main
+
+import (
+	"crypto/aes"
+	"crypto/cipher"
+	"crypto/rand"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"github.com/zalando/go-keyring"
+)
+
+type SavedConfigEntry struct {
+	Description string
+	Connection  ConnectionConfig
+}
+
+type SavedConfig struct {
+	UserAgent string // APPNAME/{ver}
+	Entries   []SavedConfigEntry
+}
+
+const (
+	saveSettingsFilename = `settings.dat`
+	keychainUserName     = `settings-encryption-key`
+)
+
+func (f *App) getConnectionManagerContents() (*SavedConfig, error) {
+	cfgd, err := os.UserConfigDir()
+	if err != nil {
+		return nil, err
+	}
+
+	_ = os.MkdirAll(filepath.Join(cfgd, APPNAME), 0700)
+
+	ciphertext, err := os.ReadFile(filepath.Join(cfgd, APPNAME, saveSettingsFilename))
+	if err != nil {
+		if os.IsNotExist(err) {
+			// No file exists. Use blank
+			return &SavedConfig{
+				UserAgent: APPNAME,
+			}, nil
+		}
+
+		return nil, err
+	}
+
+	// Get decryption key from OS keychain
+	// Since we successfully loaded the file on disk, the keychain entry must exist
+
+	details, err := keyring.Get(APPNAME, keychainUserName)
+	if err != nil {
+		return nil, err
+	}
+
+	// Decrypt
+	// The encryption key is random 256 bytes, no need for a KDF
+	encryptionKeyBytes, err := hex.DecodeString(details)
+	if err != nil {
+		return nil, err
+	}
+
+	cc, err := aes.NewCipher(encryptionKeyBytes)
+	if err != nil {
+		return nil, err
+	}
+
+	cw, err := cipher.NewGCMWithRandomNonce(cc)
+	if err != nil {
+		return nil, err
+	}
+
+	plaintext, err := cw.Open(ciphertext[:0], nil, ciphertext, nil) // @ref https://pkg.go.dev/crypto/cipher#AEAD
+	if err != nil {
+		return nil, err
+	}
+
+	var ret SavedConfig
+	err = json.Unmarshal(plaintext, &ret)
+	if err != nil {
+		return nil, err
+	}
+
+	// Success
+	return &ret, nil
+}
+
+func (f *App) saveConnectionManagerContents(sc *SavedConfig) error {
+	cfgd, err := os.UserConfigDir()
+	if err != nil {
+		return err
+	}
+
+	// If the file exists already, we must have an existing encryption key
+	var exists bool
+	savePath := filepath.Join(cfgd, APPNAME, saveSettingsFilename)
+	if _, err := os.Stat(savePath); err != nil {
+		if os.IsNotExist(err) {
+
+			_ = os.MkdirAll(filepath.Join(cfgd, APPNAME), 0700)
+			exists = false
+		} else {
+			return err // some other real error
+		}
+	} else {
+		exists = true
+	}
+
+	details, err := keyring.Get(APPNAME, keychainUserName)
+	if err != nil {
+		if errors.Is(err, keyring.ErrNotFound) {
+			// Does not exist in keyring
+			// That is OK if there is no saved file yet / we can generate a random
+			// key. But if the file does already exist, this is fatal
+			if exists {
+				// File exists on disk but there is no encryption key to parse it
+				// Fatal
+				return fmt.Errorf(
+					"There is already a saved file on disk (%q), but there is no matching encryption key in the system keychain provider. Has your keychain been destroyed? To confirm, please delete the saved settings file.",
+					savePath,
+				)
+			} else {
+				// Generate new
+				// 256 bits (32 bytes) of cryto-random data, and then hex encode
+				randBuff := make([]byte, 32)
+				n, err := rand.Read(randBuff)
+				if err != nil {
+					return err
+				}
+				if n != len(randBuff) {
+					return io.ErrShortWrite
+				}
+
+				details = hex.EncodeToString(randBuff)
+				err = keyring.Set(APPNAME, keychainUserName, details)
+				if err != nil {
+					return err
+				}
+
+				// Safe
+			}
+		} else {
+			// Real keychain error
+			return err
+		}
+	}
+
+	// Force update the saved version
+	sc.UserAgent = APPNAME // TODO get app's own version
+
+	// When saving, the version that gets saved always has descriptions sorted
+	// alphabetically.
+	// But, you won't know this until you reload the contents.
+	sort.Slice(sc.Entries, func(i, j int) bool {
+		// FIXME there is probably a slightly more efficient way of doing this
+		return strings.ToLower(sc.Entries[i].Description) < strings.ToLower(sc.Entries[j].Description)
+	})
+
+	// Marshal
+
+	plaintext, err := json.Marshal(sc)
+	if err != nil {
+		return err
+	}
+
+	// Encrypt
+
+	encryptionKeyBytes, err := hex.DecodeString(details)
+	if err != nil {
+		return err
+	}
+
+	cc, err := aes.NewCipher(encryptionKeyBytes)
+	if err != nil {
+		return err
+	}
+
+	cw, err := cipher.NewGCMWithRandomNonce(cc)
+	if err != nil {
+		return err
+	}
+
+	ciphertext := cw.Seal(plaintext[:0], nil, plaintext, nil)
+
+	// Save to disk
+	err = os.WriteFile(savePath, ciphertext, 0600)
+	if err != nil {
+		return err
+	}
+
+	// Save OK
+	return nil
+}

connectionDialog.go

@@ -10,11 +10,11 @@ import (
 )
 
 type ConnectDialogUi struct {
-	ConnectDialog  *qt.QDialog
+	ConnectDialog *qt.QDialog
-	gridLayout     *qt.QGridLayout
+	gridLayout    *qt.QGridLayout
-	databaseEngine *qt.QComboBox
+	buttonBox     *qt.QDialogButtonBox
-	stackedWidget  *qt.QStackedWidget
+	formWidget    *qt.QWidget
-	buttonBox      *qt.QDialogButtonBox
+	formLayout    *qt.QFormLayout
 }
 
 // NewConnectDialogUi creates all Qt widget classes for ConnectDialog.
@@ -34,18 +34,6 @@ func NewConnectDialogUi() *ConnectDialogUi {
 	gridLayout__objectName.Delete() // setter copied value
 	ui.gridLayout.SetContentsMargins(11, 11, 11, 11)
 	ui.gridLayout.SetSpacing(6)
-	ui.databaseEngine = qt.NewQComboBox(ui.ConnectDialog.QWidget)
-	databaseEngine__objectName := qt.NewQAnyStringView3("databaseEngine")
-	ui.databaseEngine.SetObjectName(*databaseEngine__objectName)
-	databaseEngine__objectName.Delete() // setter copied value
-
-	ui.gridLayout.AddWidget2(ui.databaseEngine.QWidget, 0, 1)
-	ui.stackedWidget = qt.NewQStackedWidget(ui.ConnectDialog.QWidget)
-	stackedWidget__objectName := qt.NewQAnyStringView3("stackedWidget")
-	ui.stackedWidget.SetObjectName(*stackedWidget__objectName)
-	stackedWidget__objectName.Delete() // setter copied value
-
-	ui.gridLayout.AddWidget2(ui.stackedWidget.QWidget, 1, 1)
 	ui.buttonBox = qt.NewQDialogButtonBox(ui.ConnectDialog.QWidget)
 	buttonBox__objectName := qt.NewQAnyStringView3("buttonBox")
 	ui.buttonBox.SetObjectName(*buttonBox__objectName)
@@ -53,7 +41,19 @@ func NewConnectDialogUi() *ConnectDialogUi {
 	ui.buttonBox.SetOrientation(qt.Horizontal)
 	ui.buttonBox.SetStandardButtons(qt.QDialogButtonBox__Cancel | qt.QDialogButtonBox__Ok)
 
-	ui.gridLayout.AddWidget3(ui.buttonBox.QWidget, 2, 0, 1, 2)
+	ui.gridLayout.AddWidget2(ui.buttonBox.QWidget, 2, 0)
+	ui.formWidget = qt.NewQWidget(ui.ConnectDialog.QWidget)
+	formWidget__objectName := qt.NewQAnyStringView3("formWidget")
+	ui.formWidget.SetObjectName(*formWidget__objectName)
+	formWidget__objectName.Delete() // setter copied value
+	ui.formLayout = qt.NewQFormLayout(ui.formWidget)
+	formLayout__objectName := qt.NewQAnyStringView3("formLayout")
+	ui.formLayout.SetObjectName(*formLayout__objectName)
+	formLayout__objectName.Delete() // setter copied value
+	ui.formLayout.SetContentsMargins(0, 0, 0, 11)
+	ui.formLayout.SetSpacing(6)
+
+	ui.gridLayout.AddWidget2(ui.formWidget, 1, 0)
 
 	ui.buttonBox.OnAccepted(ui.ConnectDialog.Accept)
 	ui.buttonBox.OnRejected(ui.ConnectDialog.Reject)

connectionDialog.ui

@@ -18,13 +18,7 @@
     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
+   <item row="2" column="0">
-    <widget class="QComboBox" name="databaseEngine"/>
-   </item>
-   <item row="1" column="1">
-    <widget class="QStackedWidget" name="stackedWidget"/>
-   </item>
-   <item row="2" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Orientation::Horizontal</enum>
@@ -34,6 +28,21 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QWidget" name="formWidget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources>

connectionManagerDialog.go

@@ -0,0 +1,136 @@
+// Generated by miqt-uic. To update this file, edit the .ui file in
+// Qt Designer, and then run 'go generate'.
+//
+//go:generate miqt-uic -InFile connectionManagerDialog.ui -OutFile connectionManagerDialog.go -Qt6
+
+package main
+
+import (
+	qt "github.com/mappu/miqt/qt6"
+)
+
+type connectionManagerDialogUi struct {
+	connectionManagerDialog *qt.QDialog
+	verticalLayout_2        *qt.QVBoxLayout
+	horizontalLayout        *qt.QHBoxLayout
+	treeWidget              *qt.QTreeWidget
+	verticalLayout          *qt.QVBoxLayout
+	connAdd                 *qt.QToolButton
+	connEdit                *qt.QToolButton
+	connDelete              *qt.QToolButton
+	verticalSpacer          *qt.QSpacerItem
+	horizontalLayout_2      *qt.QHBoxLayout
+	toolsBtn                *qt.QToolButton
+	horizontalSpacer        *qt.QSpacerItem
+	connectBtn              *qt.QPushButton
+}
+
+// NewconnectionManagerDialogUi creates all Qt widget classes for connectionManagerDialog.
+func NewconnectionManagerDialogUi() *connectionManagerDialogUi {
+	ui := &connectionManagerDialogUi{}
+	ui.connectionManagerDialog = qt.NewQDialog(nil)
+	connectionManagerDialog__objectName := qt.NewQAnyStringView3("connectionManagerDialog")
+	ui.connectionManagerDialog.SetObjectName(*connectionManagerDialog__objectName)
+	connectionManagerDialog__objectName.Delete() // setter copied value
+	ui.connectionManagerDialog.Resize(332, 449)
+	ui.verticalLayout_2 = qt.NewQVBoxLayout(ui.connectionManagerDialog.QWidget)
+	verticalLayout_2__objectName := qt.NewQAnyStringView3("verticalLayout_2")
+	ui.verticalLayout_2.SetObjectName(*verticalLayout_2__objectName)
+	verticalLayout_2__objectName.Delete() // setter copied value
+	ui.verticalLayout_2.SetContentsMargins(11, 11, 11, 11)
+	ui.verticalLayout_2.SetSpacing(6)
+	ui.horizontalLayout = qt.NewQHBoxLayout2()
+	horizontalLayout__objectName := qt.NewQAnyStringView3("horizontalLayout")
+	ui.horizontalLayout.SetObjectName(*horizontalLayout__objectName)
+	horizontalLayout__objectName.Delete() // setter copied value
+	ui.horizontalLayout.SetContentsMargins(0, 0, 0, 0)
+	ui.horizontalLayout.SetSpacing(6)
+	ui.treeWidget = qt.NewQTreeWidget(ui.connectionManagerDialog.QWidget)
+	treeWidget__objectName := qt.NewQAnyStringView3("treeWidget")
+	ui.treeWidget.SetObjectName(*treeWidget__objectName)
+	treeWidget__objectName.Delete() // setter copied value
+
+	ui.horizontalLayout.AddWidget(ui.treeWidget.QWidget)
+	ui.verticalLayout = qt.NewQVBoxLayout2()
+	verticalLayout__objectName := qt.NewQAnyStringView3("verticalLayout")
+	ui.verticalLayout.SetObjectName(*verticalLayout__objectName)
+	verticalLayout__objectName.Delete() // setter copied value
+	ui.verticalLayout.SetContentsMargins(0, 0, 0, 0)
+	ui.verticalLayout.SetSpacing(6)
+	ui.connAdd = qt.NewQToolButton(ui.connectionManagerDialog.QWidget)
+	connAdd__objectName := qt.NewQAnyStringView3("connAdd")
+	ui.connAdd.SetObjectName(*connAdd__objectName)
+	connAdd__objectName.Delete() // setter copied value
+	icon0 := qt.NewQIcon()
+	icon0.AddFile4(":/assets/add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.connAdd.SetIcon(icon0)
+	ui.connAdd.SetAutoRaise(true)
+
+	ui.verticalLayout.AddWidget(ui.connAdd.QWidget)
+	ui.connEdit = qt.NewQToolButton(ui.connectionManagerDialog.QWidget)
+	connEdit__objectName := qt.NewQAnyStringView3("connEdit")
+	ui.connEdit.SetObjectName(*connEdit__objectName)
+	connEdit__objectName.Delete() // setter copied value
+	icon1 := qt.NewQIcon()
+	icon1.AddFile4(":/assets/pencil.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.connEdit.SetIcon(icon1)
+	ui.connEdit.SetAutoRaise(true)
+
+	ui.verticalLayout.AddWidget(ui.connEdit.QWidget)
+	ui.connDelete = qt.NewQToolButton(ui.connectionManagerDialog.QWidget)
+	connDelete__objectName := qt.NewQAnyStringView3("connDelete")
+	ui.connDelete.SetObjectName(*connDelete__objectName)
+	connDelete__objectName.Delete() // setter copied value
+	icon2 := qt.NewQIcon()
+	icon2.AddFile4(":/assets/delete.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.connDelete.SetIcon(icon2)
+	ui.connDelete.SetAutoRaise(true)
+
+	ui.verticalLayout.AddWidget(ui.connDelete.QWidget)
+	ui.verticalSpacer = qt.NewQSpacerItem4(20, 40, qt.QSizePolicy__Minimum, qt.QSizePolicy__Expanding)
+
+	ui.verticalLayout.AddItem(ui.verticalSpacer.QLayoutItem)
+
+	ui.horizontalLayout.AddLayout(ui.verticalLayout.QLayout)
+
+	ui.verticalLayout_2.AddLayout(ui.horizontalLayout.QLayout)
+	ui.horizontalLayout_2 = qt.NewQHBoxLayout2()
+	horizontalLayout_2__objectName := qt.NewQAnyStringView3("horizontalLayout_2")
+	ui.horizontalLayout_2.SetObjectName(*horizontalLayout_2__objectName)
+	horizontalLayout_2__objectName.Delete() // setter copied value
+	ui.horizontalLayout_2.SetContentsMargins(0, 0, 0, 0)
+	ui.horizontalLayout_2.SetSpacing(6)
+	ui.toolsBtn = qt.NewQToolButton(ui.connectionManagerDialog.QWidget)
+	toolsBtn__objectName := qt.NewQAnyStringView3("toolsBtn")
+	ui.toolsBtn.SetObjectName(*toolsBtn__objectName)
+	toolsBtn__objectName.Delete() // setter copied value
+	ui.toolsBtn.SetAutoRaise(true)
+
+	ui.horizontalLayout_2.AddWidget(ui.toolsBtn.QWidget)
+	ui.horizontalSpacer = qt.NewQSpacerItem4(40, 20, qt.QSizePolicy__Expanding, qt.QSizePolicy__Minimum)
+
+	ui.horizontalLayout_2.AddItem(ui.horizontalSpacer.QLayoutItem)
+	ui.connectBtn = qt.NewQPushButton(ui.connectionManagerDialog.QWidget)
+	connectBtn__objectName := qt.NewQAnyStringView3("connectBtn")
+	ui.connectBtn.SetObjectName(*connectBtn__objectName)
+	connectBtn__objectName.Delete() // setter copied value
+	icon3 := qt.NewQIcon()
+	icon3.AddFile4(":/assets/database_lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.connectBtn.SetIcon(icon3)
+
+	ui.horizontalLayout_2.AddWidget(ui.connectBtn.QWidget)
+
+	ui.verticalLayout_2.AddLayout(ui.horizontalLayout_2.QLayout)
+
+	ui.Retranslate()
+
+	return ui
+}
+
+// Retranslate reapplies all text translations.
+func (ui *connectionManagerDialogUi) Retranslate() {
+	ui.connectionManagerDialog.SetWindowTitle(qt.QCoreApplication_Tr("Connection Manager"))
+	ui.treeWidget.HeaderItem().SetText(0, qt.QTreeWidget_Tr("Connection"))
+	ui.toolsBtn.SetText(qt.QDialog_Tr("Tools"))
+	ui.connectBtn.SetText(qt.QDialog_Tr("Connect"))
+}

connectionManagerDialog.ui

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>connectionManagerDialog</class>
+ <widget class="QDialog" name="connectionManagerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>332</width>
+    <height>449</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Connection Manager</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QTreeWidget" name="treeWidget">
+       <column>
+        <property name="text">
+         <string>Connection</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QToolButton" name="connAdd">
+         <property name="icon">
+          <iconset resource="embed.qrc">
+           <normaloff>:/assets/add.png</normaloff>:/assets/add.png</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="connEdit">
+         <property name="icon">
+          <iconset resource="embed.qrc">
+           <normaloff>:/assets/pencil.png</normaloff>:/assets/pencil.png</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="connDelete">
+         <property name="icon">
+          <iconset resource="embed.qrc">
+           <normaloff>:/assets/delete.png</normaloff>:/assets/delete.png</iconset>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Orientation::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QToolButton" name="toolsBtn">
+       <property name="text">
+        <string>Tools</string>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Orientation::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="connectBtn">
+       <property name="text">
+        <string>Connect</string>
+       </property>
+       <property name="icon">
+        <iconset resource="embed.qrc">
+         <normaloff>:/assets/database_lightning.png</normaloff>:/assets/database_lightning.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="embed.qrc"/>
+ </resources>
+ <connections/>
+</ui>

db_badger.go

@@ -21,20 +21,17 @@ func (ld *badgerLoadedDatabase) DriverName() string {
 	return "BadgerDB v4"
 }
 
-func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *badgerLoadedDatabase) Properties(bucketPath []string) (string, error) {
-
-	// Load properties
-
 	content := fmt.Sprintf("Table statistics: %#v", ld.db.Tables())
-	f.propertiesBox.SetText(content)
+	return content, nil
+}
+
+func (ld *badgerLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 	// Badger always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
-
-	f.contentBox.SetRowCount(0)
 
 	err := ld.db.View(func(txn *badger.Txn) error {
 
@@ -48,11 +45,7 @@ func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			item := it.Item()
 			k := item.Key()
 			err := item.Value(func(v []byte) error {
-				rpos := f.contentBox.RowCount()
+				f.AddRow_PK_Data(k, k, v)
-				f.contentBox.SetRowCount(rpos + 1)
-				f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-				f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(v)))
-
 				return nil
 			})
 			if err != nil {
@@ -66,11 +59,16 @@ func (ld *badgerLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *badgerLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	return n.db.Update(func(txn *badger.Txn) error {
+		return kvstore_ApplyChanges(f, txn.Set, txn.Delete)
+	})
+}
+
 func (ld *badgerLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -134,63 +132,60 @@ func (ld *badgerLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &badgerLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &badgerLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &badgerLoadedDatabase{} // interface assertion
 
 //
 
-type badgerMemConnection struct{}
+type badgerConnection struct {
-
+	Type autoconfig.OneOf
-func (bmc *badgerMemConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	Disk *struct {
-	db, err := badger.Open(badger.DefaultOptions("").WithInMemory(true))
+		Directory         autoconfig.ExistingDirectory
-	if err != nil {
+		Readonly          bool
-		return nil, "", err
+		Encryption_Method autoconfig.EnumList `yenum:"None;;Hex (AES-128/192/256);;Passphrase (SHA256 KDF to AES-256)"`
+		Encryption_Key    autoconfig.Password
 	}
-
+	Memory *struct{}
-	return &badgerLoadedDatabase{db: db}, `:memory:`, nil // SQLite-style naming
 }
 
-//
+func (bdc *badgerConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	if bdc.Disk != nil {
+		opts := badger.DefaultOptions(string(bdc.Disk.Directory))
+		opts.ReadOnly = bdc.Disk.Readonly
+		opts.MetricsEnabled = false
 
-type badgerDirConnection struct {
+		switch bdc.Disk.Encryption_Method {
-	Directory         autoconfig.ExistingDirectory
+		case 0: // None
-	Readonly          bool
+		case 1: // Hex (AES-128/192/256) -  must be 16/24/32 bytes
-	Encryption_Method autoconfig.EnumList `yenum:"None;;Hex (AES-128/192/256);;Passphrase (SHA256 KDF to AES-256)"`
+			ehx, err := hex.DecodeString(string(bdc.Disk.Encryption_Key))
-	Encryption_Key    autoconfig.Password
+			if err != nil {
-}
+				return nil, "", err
+			}
 
-func (bdc *badgerDirConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+			if !(len(ehx) == 16 || len(ehx) == 24 || len(ehx) == 32) {
-	opts := badger.DefaultOptions(string(bdc.Directory))
+				return nil, "", fmt.Errorf("Hex encryption key must be 16/24/32 bytes long, got %d", len(ehx))
-	opts.ReadOnly = bdc.Readonly
+			}
-	opts.MetricsEnabled = false
+			opts.EncryptionKey = ehx
 
-	switch bdc.Encryption_Method {
+		case 2: // Passphrase (SHA256 KDF to AES-256)
-	case 0: // None
+			hasher := sha256.New()
-	case 1: // Hex (AES-128/192/256) -  must be 16/24/32 bytes
+			hasher.Write([]byte(bdc.Disk.Encryption_Key))
-		ehx, err := hex.DecodeString(string(bdc.Encryption_Key))
+			opts.EncryptionKey = hasher.Sum(nil)
+		}
+
+		db, err := badger.Open(opts)
 		if err != nil {
 			return nil, "", err
 		}
 
-		if !(len(ehx) == 16 || len(ehx) == 24 || len(ehx) == 32) {
+		return &badgerLoadedDatabase{db: db}, filepath.Base(string(bdc.Disk.Directory)), nil
-			return nil, "", fmt.Errorf("Hex encryption key must be 16/24/32 bytes long, got %d", len(ehx))
+	} else { // memory
+		db, err := badger.Open(badger.DefaultOptions("").WithInMemory(true))
+		if err != nil {
+			return nil, "", err
 		}
-		opts.EncryptionKey = ehx
 
-	case 2: // Passphrase (SHA256 KDF to AES-256)
+		return &badgerLoadedDatabase{db: db}, `:memory:`, nil // SQLite-style naming
-		hasher := sha256.New()
+
-		hasher.Write([]byte(bdc.Encryption_Key))
-		opts.EncryptionKey = hasher.Sum(nil)
 	}
-
-	db, err := badger.Open(opts)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return &badgerLoadedDatabase{db: db}, filepath.Base(string(bdc.Directory)), nil
-}
-
-func init() {
-	registerDatabase(&badgerMemConnection{}, "BadgerDB v4 (Memory)", `:/assets/vendor_dgraph.png`)
-	registerDatabase(&badgerDirConnection{}, "BadgerDB v4", `:/assets/vendor_dgraph.png`)
 }

db_bolt.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -21,10 +22,14 @@ type boltLoadedDatabase struct {
 }
 
 type boltConfig struct {
-	Path     autoconfig.ExistingFile `yfilter:"Bolt database (*.db);;All files (*.*)"`
+	Path     autoconfig.ExistingFile `yfilter:"Bolt database (*.db);;All files (*)"`
 	Readonly bool
 }
 
+func (bc *boltConfig) String() string { // n.b. only used for default names in connection manager
+	return filepath.Base(string(bc.Path))
+}
+
 func (bc *boltConfig) Connect(ctx context.Context) (loadedDatabase, string, error) {
 
 	opts := bbolt.Options{
@@ -50,21 +55,19 @@ func (bc *boltConfig) Connect(ctx context.Context) (loadedDatabase, string, erro
 	return ld, displayName, nil
 }
 
-func init() {
-	registerDatabase(&boltConfig{}, "Bolt", ":/assets/vendor_github.png")
-}
-
 func (ld *boltLoadedDatabase) DriverName() string {
 	return "Bolt " + version.Version
 }
 
-func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *boltLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	content := fmt.Sprintf("Selected database: %#v", ld.db.Stats())
+	return content, nil
+}
+
+func (ld *boltLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load properties
 
-	content := fmt.Sprintf("Selected database: %#v", ld.db.Stats())
-	f.propertiesBox.SetText(content)
-
 	if len(bucketPath) == 0 {
 		return nil // Can't have data outside of the top bucket
 	}
@@ -72,10 +75,7 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 	// Load data
 	// Bolt always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
-
-	f.contentBox.SetRowCount(0)
 
 	err := ld.db.View(func(tx *bbolt.Tx) error {
 		b := boltTargetBucket(tx, bucketPath)
@@ -94,10 +94,7 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 				continue
 			}
 
-			rpos := f.contentBox.RowCount()
+			f.AddRow_PK_Data(k, k, v)
-			f.contentBox.SetRowCount(rpos + 1)
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(formatUtf8(v)))
 		}
 		return nil
 	})
@@ -106,21 +103,66 @@ func (ld *boltLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string)
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
-func (n *boltLoadedDatabase) ApplyChanges(f *App, bucketPath []string) error {
+// kvstore_ApplyChanges is a helper function to apply edits to K/V stores that
-	if n.db.IsReadOnly() {
+// can use a common abstraction.
-		return errors.New("Database was opened read-only")
+// It always uses the "popupData" type i.e. []byte.
+func kvstore_ApplyChanges(f *tableState, Put func(k, v []byte) error, Delete func(k []byte) error) error {
+
+	// Edit
+	for rowid, _ /*editcells*/ := range f.updateRows {
+		k_orig := f.primaryKeys[rowid]
+		k_new := f.columns_popupData[0][rowid]
+		v := f.columns_popupData[1][rowid]
+
+		if !bytes.Equal(k_orig, k_new) {
+			// Editing the primary key
+			// Delete k_orig and only put in k_new
+			err := Delete(k_orig)
+			if err != nil {
+				return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k_orig), err)
+			}
+		}
+
+		err := Put(k_new, []byte(v))
+		if err != nil {
+			return fmt.Errorf("Updating cell %q: %w", formatUtf8(k_new), err)
+		}
 	}
 
-	// We have rendered row IDs, need to convert back to a bolt primary key
+	// Delete by key (affects rowids after re-render)
-	// TODO stash the real key inside f.contentBox.Objects()
+	for rowid, _ := range f.deleteRows {
-	// FIXME breaks if you try and edit the primary key(!)
+		k := f.primaryKeys[rowid]
-	primaryKeyForRendered := func(rowid int) []byte {
+		err := Delete(k)
-		return []byte(f.ui.contentBox.Item(rowid, 0).Text())
+		if err != nil {
+			return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k), err)
+		}
+	}
+
+	// Insert all new entries
+	for rowid, _ := range f.insertRows {
+		// Newly inserted rows will not have a valid value stashed in the
+		// f.primaryKeys slice
+		// Have to get it from the data content of the cell directly
+
+		k := f.columns_popupData[0][rowid]
+		v := f.columns_popupData[1][rowid] // There's only one value cell
+		err := Put(k, v)
+		if err != nil {
+			return fmt.Errorf("Inserting cell %q: %w", formatUtf8(k), err)
+		}
+	}
+
+	// Done
+	return nil
+}
+
+func (n *boltLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	if n.db.IsReadOnly() {
+		return errors.New("Database was opened read-only")
 	}
 
 	return n.db.Update(func(tx *bbolt.Tx) error {
@@ -128,37 +170,7 @@ func (n *boltLoadedDatabase) ApplyChanges(f *App, bucketPath []string) error {
 		// Get current bucket handle
 		b := boltTargetBucket(tx, bucketPath)
 
-		// Edit
+		return kvstore_ApplyChanges(f, b.Put, b.Delete)
-		for rowid, _ /*editcells*/ := range f.updateRows {
-			k := primaryKeyForRendered(rowid)
-			v := f.ui.contentBox.Item(rowid, 1).Text() // There's only one value cell
-			err := b.Put(k, []byte(v))
-			if err != nil {
-				return fmt.Errorf("Updating cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Delete by key (affects rowids after re-render)
-		for rowid, _ := range f.deleteRows {
-			k := primaryKeyForRendered(rowid)
-			err := b.Delete(k)
-			if err != nil {
-				return fmt.Errorf("Deleting cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Insert all new entries
-		for rowid, _ := range f.insertRows {
-			k := primaryKeyForRendered(rowid)
-			v := f.ui.contentBox.Item(rowid, 1).Text() // There's only one value cell
-			err := b.Put(k, []byte(v))
-			if err != nil {
-				return fmt.Errorf("Inserting cell %q: %w", formatUtf8(k), err)
-			}
-		}
-
-		// Done
-		return nil
 	})
 }
 
@@ -201,6 +213,8 @@ func (ld *boltLoadedDatabase) AddChildBucket(sender *qt.QTreeWidgetItem, bucketP
 }
 
 func (ld *boltLoadedDatabase) DeleteBucket(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	// TODO add confirmation
+
 	err := ld.db.Update(func(tx *bbolt.Tx) error {
 		// Find parent of this bucket.
 		if len(bucketPath) >= 2 {

db_debconf.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 
 	"yvbolt/debconf"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 )
 
 type debconfLoadedDatabase struct {
@@ -20,43 +20,62 @@ func (ld *debconfLoadedDatabase) DriverName() string {
 	return "debconf"
 }
 
-func (ld *debconfLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *debconfLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	content := fmt.Sprintf("Applications: %d\nUnique attributes: %d\n", len(ld.db.Entries), len(ld.db.AllColumnNames))
+	return content, nil
+}
 
-	// Load properties
+func (ld *debconfLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
-
-	content := fmt.Sprintf("Entries: %d\nUnique attributes: %d\n", len(ld.db.Entries), len(ld.db.AllColumnNames))
-	f.propertiesBox.SetText(content)
 
 	// Load data
 
+	if len(bucketPath) == 0 {
+		return nil // No data at root level
+	}
+
+	// Find application entry for bucketPath
+
+	appInfo, ok := ld.db.FindApplicationByName(bucketPath[0])
+	if !ok {
+		return fmt.Errorf("Invalid application %q", bucketPath[0])
+	}
+
+	// Process entries for specific application
+
 	indexes := make(map[string]int)
 
-	f.contentBox.SetColumnCount(len(ld.db.AllColumnNames))
+	f.SetupColumns(slice_repeat(columnType_inlineText, len(ld.db.AllColumnNames)), ld.db.AllColumnNames)
-	f.contentBox.SetHorizontalHeaderLabels(ld.db.AllColumnNames)
 
 	for i, cname := range ld.db.AllColumnNames {
 		indexes[cname] = i
 	}
 
-	for _, entry := range ld.db.Entries {
+	for _, entry := range appInfo.Entries {
 
-		rpos := f.contentBox.RowCount()
+		rpos := f.AddRow()
-		f.contentBox.SetRowCount(rpos + 1)
+		f.SetCell(rpos, 0, entry.Name)
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(entry.Name))
 
 		for _, proppair := range entry.Properties {
-			f.contentBox.SetItem(rpos, indexes[proppair[0]], qt.NewQTableWidgetItem2(proppair[1]))
+			f.SetCell(rpos, indexes[proppair[0]], proppair[1])
 		}
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
 func (ld *debconfLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
-	return []string{}, nil // No children
+	if len(bucketPath) == 0 {
+		ret := make([]string, 0, len(ld.db.Entries))
+		for _, app := range ld.db.Entries {
+			ret = append(ret, app.Name)
+		}
+		return ret, nil
+
+	} else {
+		return []string{}, nil // No further children
+	}
 }
 
 func (ld *debconfLoadedDatabase) NavContext(bucketPath []string) ([]contextAction, error) {
@@ -73,7 +92,13 @@ var _ loadedDatabase = &debconfLoadedDatabase{} // interface assertion
 //
 
 type debconfConnection struct {
-	Database autoconfig.ExistingFile `yfilter:"Debconf database (*.dat);;All files (*.*)"`
+	Database autoconfig.ExistingFile `yfilter:"Debconf database (*.dat);;All files (*)"`
+}
+
+func (dc *debconfConnection) Reset() {
+	if runtime.GOOS == "linux" {
+		dc.Database = "/var/cache/debconf/config.dat" // Prefill default path
+	}
 }
 
 func (dc *debconfConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
@@ -90,9 +115,3 @@ func (dc *debconfConnection) Connect(ctx context.Context) (loadedDatabase, strin
 
 	return &debconfLoadedDatabase{db: db}, filepath.Base(string(dc.Database)), nil
 }
-
-func init() {
-	registerDatabase(&debconfConnection{
-		Database: "/var/cache/debconf/config.dat", // Prefill default path
-	}, "Debconf", `:/assets/vendor_debian.png`)
-}

db_leveldb.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
@@ -19,43 +18,55 @@ func (ld *leveldbLoadedDatabase) DriverName() string {
 	return "LevelDB"
 }
 
-func (ld *leveldbLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *leveldbLoadedDatabase) Properties(bucketPath []string) (string, error) {
-
-	// Load properties
 
 	var s leveldb.DBStats
 	err := ld.db.Stats(&s)
 	if err != nil {
-		return fmt.Errorf("Stats: %w", err)
+		return "", fmt.Errorf("Stats: %w", err)
 	}
 
 	content := fmt.Sprintf("LevelDB stats: %#v", s)
-	f.propertiesBox.SetText(content)
+	return content, nil
+}
+
+func (ld *leveldbLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	// Load data
 	// leveldb always uses Key + Value as the columns
-
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetColumnCount(2)
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	itn := ld.db.NewIterator(nil, nil)
 	defer itn.Release()
 
 	for itn.Next() {
-
+		f.AddRow_PK_Data(itn.Key(), itn.Key(), itn.Value())
-		rpos := f.contentBox.RowCount()
-		f.contentBox.SetRowCount(rpos + 1)
-
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(string(itn.Key())))
-		f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(string(itn.Value())))
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *leveldbLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	txn, err := n.db.OpenTransaction()
+	if err != nil {
+		return fmt.Errorf("OpenTransaction: %w", err)
+	}
+
+	err = kvstore_ApplyChanges(
+		f,
+		func(k, v []byte) error { return txn.Put(k, v, nil) },
+		func(k []byte) error { return txn.Delete(k, nil) },
+	)
+	if err != nil {
+		txn.Discard()
+		return err
+	}
+
+	return txn.Commit()
+}
+
 func (ld *leveldbLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -68,16 +79,17 @@ func (ld *leveldbLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &leveldbLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &leveldbLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &leveldbLoadedDatabase{} // interface assertion
 
 //
 
-type leveldbDirConnection struct {
+type leveldbConnection struct {
 	Directory autoconfig.ExistingDirectory
 	Readonly  bool
 }
 
-func (pdc *leveldbDirConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+func (pdc *leveldbConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
 	var o opt.Options
 	o.ReadOnly = pdc.Readonly
 
@@ -88,7 +100,3 @@ func (pdc *leveldbDirConnection) Connect(ctx context.Context) (loadedDatabase, s
 
 	return &leveldbLoadedDatabase{db: db}, filepath.Base(string(pdc.Directory)), nil
 }
-
-func init() {
-	registerDatabase(&leveldbDirConnection{}, "LevelDB", `:/assets/vendor_leveldb.png`)
-}

db_lmdb.go

@@ -0,0 +1,271 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"github.com/ledgerwatch/lmdb-go/lmdb"
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+)
+
+type lmdbDatabase struct {
+	db      *lmdb.Env
+	isMulti bool
+}
+
+func (ld *lmdbDatabase) DriverName() string {
+	return lmdb.VersionString() // Already includes "LMDB" prefix
+}
+
+func (ld *lmdbDatabase) Properties(bucketPath []string) (string, error) {
+	info, err := ld.db.Info()
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("LMDB info: %#v", info), nil
+}
+
+func (ld *lmdbDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+
+	if ld.isMulti && len(bucketPath) == 0 {
+		// In multi-database mode, the only things in the root DB are keys
+		// naming the child databases
+		// Show no data, it will be shown in the nav area instead
+		return nil
+	}
+
+	// LMDB always uses Key + Value as the columns
+
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	err := ld.db.View(func(txn *lmdb.Txn) error {
+		var dbi lmdb.DBI
+		var err error
+
+		if len(bucketPath) == 0 {
+			dbi, err = txn.OpenRoot(0)
+		} else {
+			dbi, err = txn.OpenDBI(bucketPath[0], 0)
+		}
+		if err != nil {
+			return err
+		}
+		// defer ld.db.CloseDBI(dbi)
+
+		itn, err := txn.OpenCursor(dbi)
+		defer itn.Close()
+		if err != nil {
+			return err
+		}
+
+		// FIXME is this correct?
+		kbuff := make([]byte, ld.db.MaxKeySize())
+		vbuff := make([]byte, 4096)
+
+		var op uint = lmdb.First
+		for {
+			key, val, err := itn.Get(kbuff, vbuff, op)
+			if err != nil {
+				if lmdb.IsNotFound(err) {
+					break // reached end of iteration
+				}
+				return err // a real error
+			}
+
+			op = lmdb.Next
+			f.AddRow_PK_Data(key, key, val)
+		}
+
+		// Done
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (ld *lmdbDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+	return ld.db.Update(func(txn *lmdb.Txn) error {
+		var dbi lmdb.DBI
+		var err error
+
+		if len(bucketPath) == 0 {
+			dbi, err = txn.OpenRoot(0)
+		} else {
+			dbi, err = txn.OpenDBI(bucketPath[0], 0)
+		}
+		if err != nil {
+			return err
+		}
+
+		return kvstore_ApplyChanges(
+			f,
+			func(k, v []byte) error { return txn.Put(dbi, k, v, 0) },
+			func(k []byte) error { return txn.Del(dbi, k, nil) },
+		)
+	})
+}
+
+func (ld *lmdbDatabase) NavChildren(bucketPath []string) ([]string, error) {
+	// """To use named databases (with name != NULL), mdb_env_set_maxdbs() must
+	// be called before opening the environment. Database names are keys in the
+	// unnamed database, and may be read but not written."""
+
+	if len(bucketPath) == 0 && ld.isMulti {
+
+		// Read all keys from root DB
+		var allKeys []string
+		err := ld.db.View(func(txn *lmdb.Txn) error {
+			dbi, err := txn.OpenRoot(0)
+			if err != nil {
+				return err
+			}
+			//defer ld.db.CloseDBI(dbi)
+
+			itn, err := txn.OpenCursor(dbi)
+			defer itn.Close()
+			if err != nil {
+				return err
+			}
+
+			kbuff := make([]byte, ld.db.MaxKeySize())
+
+			var op uint = lmdb.First
+			for {
+				key, _, err := itn.Get(kbuff, nil, op)
+				if err != nil {
+					if lmdb.IsNotFound(err) {
+						break // reached end of iteration
+					}
+					return err // a real error
+				}
+
+				op = lmdb.Next
+
+				allKeys = append(allKeys, string(key))
+			}
+
+			// Done
+			return nil
+		})
+		return allKeys, err
+
+	} else {
+		return []string{}, nil // No children
+	}
+}
+
+func (ld *lmdbDatabase) createChildDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	// Prompt for child database name
+	ok := false
+	childDbName := qt.QInputDialog_GetText4(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the child database:", qt.QLineEdit__Normal, "", &ok)
+	if !ok {
+		return nil // Cancelled
+	}
+
+	return ld.db.Update(func(txn *lmdb.Txn) error {
+		_, err := txn.CreateDBI(childDbName)
+		return err
+	})
+}
+
+//func (ld *lmdbDatabase) truncateAllContent(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+// TODO add warning
+//}
+
+func (ld *lmdbDatabase) deleteChildDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+
+	// TODO add warning
+	return ld.db.Update(func(txn *lmdb.Txn) error {
+		dbi, err := txn.OpenDBI(bucketPath[0], 0)
+		if err != nil {
+			return err
+		}
+
+		return txn.Drop(dbi, true)
+	})
+}
+
+func (ld *lmdbDatabase) NavContext(bucketPath []string) ([]contextAction, error) {
+
+	if ld.isMulti {
+		// Allow create/delete databases
+		if len(bucketPath) == 0 {
+			return []contextAction{
+				contextAction{"Add child database...", ld.createChildDatabase},
+			}, nil
+		} else {
+			return []contextAction{
+				contextAction{"Remove child database...", ld.deleteChildDatabase},
+			}, nil
+		}
+	}
+
+	return nil, nil // No special actions are supported
+}
+
+func (ld *lmdbDatabase) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &lmdbDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &lmdbDatabase{} // interface assertion
+
+//
+
+type lmdbConnection struct {
+	Storage struct {
+		Type      autoconfig.OneOf
+		Directory *autoconfig.ExistingDirectory
+		File      *struct {
+			Path autoconfig.ExistingFile `yfilter:"LMDB database (*.mdb);;All files (*)"`
+		}
+	}
+	MultiDB *struct {
+		Slots int
+	} `ylabel:"Multiple databases mode"`
+	Readonly bool
+}
+
+func (pdc *lmdbConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	env, err := lmdb.NewEnv()
+	if err != nil {
+		return nil, "", err
+	}
+
+	var openPath string
+	var flags uint = 0
+	if pdc.Readonly {
+		flags |= lmdb.Readonly
+	}
+	if pdc.Storage.Directory != nil {
+		openPath = string(*pdc.Storage.Directory)
+	} else if pdc.Storage.File != nil {
+		openPath = string(pdc.Storage.File.Path)
+		flags |= lmdb.NoSubdir
+	}
+
+	isMulti := false
+	if pdc.MultiDB != nil {
+		env.SetMaxDBs(pdc.MultiDB.Slots)
+		isMulti = true
+	}
+
+	err = env.Open(openPath, flags, 0644)
+	if err != nil {
+		_ = env.Close()
+		return nil, "", err
+	}
+
+	return &lmdbDatabase{db: env, isMulti: isMulti}, filepath.Base(openPath), nil
+}

db_mongo.go

@@ -0,0 +1,344 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"golang.org/x/crypto/ssh"
+
+	"github.com/mappu/autoconfig"
+	qt "github.com/mappu/miqt/qt6"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
+	"go.mongodb.org/mongo-driver/v2/version"
+)
+
+// MongoDB support
+// To test:
+//   sudo docker run --rm  -p 127.0.0.1:27017:27017 -e MONGO_INITDB_ROOT_USERNAME=root -e MONGO_INITDB_ROOT_PASSWORD=toor mongo:latest
+
+type mongoLdb struct {
+	client *mongo.Client
+	sshc   *ssh.Client
+}
+
+func (ld *mongoLdb) DriverName() string {
+	return "MongoDB " + version.Driver
+}
+
+func (ld *mongoLdb) Properties(bucketPath []string) (string, error) {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return "", nil // no properties
+
+	} else if len(bucketPath) == 1 {
+		// Database is selected
+		db := ld.client.Database(bucketPath[0])
+		return "Database " + db.Name(), nil
+
+	} else if len(bucketPath) == 2 {
+		// Collection is selected
+		db := ld.client.Database(bucketPath[0])
+		coll := db.Collection(bucketPath[1])
+
+		info := "Database " + db.Name() + "\n"
+		info += "Collection " + coll.Name() + "\n"
+
+		count, err := coll.EstimatedDocumentCount(ctx)
+		if err != nil {
+			return "", err
+		}
+		info += fmt.Sprintf("Estimated document count: %d", count) + "\n"
+
+		// TODO return more details
+
+		return info, nil
+
+	} else {
+		return "", errors.New("??")
+	}
+}
+
+func (ld *mongoLdb) RenderForNav(f *tableState, bucketPath []string) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 || len(bucketPath) == 1 {
+		// Leave the table disabled
+		return nil
+
+	} else if len(bucketPath) == 2 {
+
+		f.SetupColumns([]columnType{columnType_inlineText, columnType_popupData}, []string{"_id", "Document"})
+
+		db := ld.client.Database(bucketPath[0])
+		coll := db.Collection(bucketPath[1])
+
+		cur, err := coll.Find(ctx, bson.D{}) // An empty document as filter = find all results
+		if err != nil {
+			return fmt.Errorf("Find: %w", err)
+		}
+
+		defer cur.Close(ctx)
+		return ld.populateRows(ctx, cur, f)
+
+	} else {
+		return errors.New("??")
+
+	}
+}
+
+func (ld *mongoLdb) populateRows(ctx context.Context, cur *mongo.Cursor, f *tableState) error {
+
+	for cur.Next(ctx) {
+		var result bson.D
+		if err := cur.Decode(&result); err != nil {
+			return fmt.Errorf("Decode: %w", err)
+		}
+
+		// The document is always an ordered map[string]any.
+		// MongoDB enforces there is an "_id" key.
+		var idValue string
+		for _, pair := range result {
+			if pair.Key == "_id" {
+				idValue = pair.Value.(string)
+				break
+			}
+		}
+		if idValue == "" {
+			return errors.New("Surprised to find a document missing an '_id' field")
+		}
+
+		jb, err := result.MarshalJSON()
+		if err != nil {
+			return fmt.Errorf("MarshalJSON for document %q: %w", idValue, err)
+		}
+
+		f.AddRow_PK_Data([]byte(idValue), idValue, jb)
+	}
+	if err := cur.Err(); err != nil {
+		return fmt.Errorf("Cursor: %w", err)
+	}
+
+	// Done
+	f.Ready()
+	return nil
+}
+
+func (ld *mongoLdb) NavChildren(bucketPath []string) ([]string, error) {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return ld.client.ListDatabaseNames(ctx, bson.D{})
+
+	} else if len(bucketPath) == 1 {
+		db := ld.client.Database(bucketPath[0])
+		return db.ListCollectionNames(ctx, bson.D{})
+
+	}
+
+	return []string{}, nil // No children
+}
+
+func (ld *mongoLdb) actionNewDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	dbName := qt.QInputDialog_GetText(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the new database:")
+	if dbName == "" {
+		return nil // cancel
+	}
+
+	// MongoDB: databases just start to exist when you write to them
+	newDb := ld.client.Database(dbName)
+	return newDb.CreateCollection(ctx, "my.new.collection")
+}
+
+func (ld *mongoLdb) actionNewCollection(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	collName := qt.QInputDialog_GetText(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the new collection:")
+	if collName == "" {
+		return nil // cancel
+	}
+
+	// MongoDB: databases just start to exist when you write to them
+	newDb := ld.client.Database(bucketPath[0])
+	return newDb.CreateCollection(ctx, collName)
+}
+
+func (ld *mongoLdb) actionDropDatabase(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	// FIXME add warning
+	db := ld.client.Database(bucketPath[0])
+	return db.Drop(ctx)
+}
+
+func (ld *mongoLdb) actionDropCollection(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	ctx := context.Background()
+
+	// FIXME add warning
+	db := ld.client.Database(bucketPath[0])
+	coll := db.Collection(bucketPath[1])
+	return coll.Drop(ctx)
+}
+
+func (ld *mongoLdb) ExecQuery(query string, bucketPath []string, resultArea *tableState) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
+		return errors.New("Please select a database first.")
+	}
+
+	db := ld.client.Database(bucketPath[0])
+
+	// The query should be JSON, e.g.
+	//  { "hello": 1 } or
+	//  { "explain": { "count": "system.users" } } or
+	//  { "listDatabases": 1 }
+
+	doc := bson.D{}
+	err := doc.UnmarshalJSON([]byte(query))
+	if err != nil {
+		return fmt.Errorf("Parsing JSON query: %w", err)
+	}
+
+	// FIXME how to tell if the response will have a cursor or a singleResult?
+
+	if false {
+		// Cursor
+		cur, err := db.RunCommandCursor(ctx, doc)
+		if err != nil {
+			return fmt.Errorf("Running command: %w", err)
+		}
+
+		defer cur.Close(ctx)
+		return ld.populateRows(ctx, cur, resultArea)
+
+	} else {
+		// Single result
+
+		res := db.RunCommand(ctx, doc)
+
+		response := bson.D{}
+		err = res.Decode(&response)
+		if err != nil {
+			return fmt.Errorf("Decoding response: %w", err)
+		}
+
+		responseJson, err := response.MarshalJSON()
+		if err != nil {
+			return fmt.Errorf("Decoding response: %w", err)
+		}
+
+		resultArea.SetupColumns([]columnType{columnType_popupData}, []string{"Response"})
+		resultArea.AddRowData(responseJson)
+		resultArea.Ready()
+		return nil
+	}
+}
+
+func (ld *mongoLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	if len(bucketPath) == 0 {
+		// Top-level connection
+		return []contextAction{
+			{"Create database...", ld.actionNewDatabase},
+		}, nil
+
+	} else if len(bucketPath) == 1 {
+		// Database selected
+		return []contextAction{
+			{"Create collection...", ld.actionNewCollection},
+			{"Drop database...", ld.actionDropDatabase},
+		}, nil
+
+	} else if len(bucketPath) == 2 {
+		// Collection selected
+		return []contextAction{
+			{"Drop collection...", ld.actionDropCollection},
+		}, nil
+
+	} else {
+		return nil, errors.New("???")
+	}
+}
+
+func (ld *mongoLdb) Close() {
+	_ = ld.client.Disconnect(context.Background())
+	if ld.sshc != nil {
+		_ = ld.sshc.Close()
+	}
+}
+
+var _ loadedDatabase = &mongoLdb{}          // interface assertion
+var _ queryableLoadedDatabase = &mongoLdb{} // interface assertion
+
+//
+
+type mongoConnection struct {
+	Conn struct {
+		Mode autoconfig.OneOf
+
+		Connection_String *string
+	}
+
+	SSH_Tunnel *SSHTunnel
+}
+
+func (moc *mongoConnection) Reset() {
+	moc.Conn.Mode = "Connection_String"
+	moc.Conn.Connection_String = address_of("mongodb://localhost:27017")
+}
+
+func (moc *mongoConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	ctx, _ = context.WithTimeout(ctx, 5*time.Second) // shadow parent ctx
+
+	opts := options.Client().ApplyURI(string(*moc.Conn.Connection_String))
+
+	// Our used library supports all compressors
+	opts.SetCompressors([]string{"zstd", "snappy", "zlib"})
+
+	ret := mongoLdb{}
+
+	if moc.SSH_Tunnel != nil {
+		sshc, err := moc.SSH_Tunnel.Open(ctx)
+		if err != nil {
+			return nil, "", err
+		}
+
+		opts.Dialer = sshc // interface implements DialContext()
+		ret.sshc = sshc
+
+		// The crypto/ssh library does not support deadlines over tcp tunnels
+		// Go-redis has a workaround for this, but go-mongo does not
+	}
+
+	//
+
+	client, err := mongo.Connect(opts)
+	if err != nil {
+		return nil, "", err
+	}
+	ret.client = client
+
+	// Connect() does not block for server discovery. Check that the server really
+	// is reachable
+
+	err = client.Ping(ctx, readpref.Primary())
+	if err != nil {
+		return nil, "", err
+	}
+
+	// We should be able to ListDatabases - there may be an authentication error
+	_, err = client.ListDatabaseNames(ctx, bson.D{})
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &ret, "MongoDB", nil
+}

db_none.go

@@ -6,8 +6,10 @@ func (n *noLoadedDatabase) DriverName() string {
 	return "No database selected"
 }
 
-func (n *noLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (n *noLoadedDatabase) Properties(bucketPath []string) (string, error) {
-	f.propertiesBox.SetText("Open a database to get started...")
+	return "Open a database to get started...", nil
+}
+func (n *noLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 	return nil
 }
 

db_pebble.go

@@ -10,7 +10,6 @@ import (
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/vfs"
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 )
 
 type pebbleLoadedDatabase struct {
@@ -45,20 +44,19 @@ func (ld *pebbleLoadedDatabase) DriverName() string {
 	return "Pebble " + pebbleDriverVersion() // Parsed from embedded go.mod copy
 }
 
-func (ld *pebbleLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *pebbleLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	content := fmt.Sprintf("Pebble metrics: %#v", ld.db.Metrics())
+	return content, nil
+}
+
+func (ld *pebbleLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
 
 	ctx := context.Background()
 
-	// Load properties
-
-	content := fmt.Sprintf("Pebble metrics: %#v", ld.db.Metrics())
-	f.propertiesBox.SetText(content)
-
 	// Load data
 	// pebble always uses Key + Value as the columns
 
-	f.contentBox.SetColumnCount(2)
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
-	f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Value"})
 
 	itr, err := ld.db.NewIterWithContext(ctx, nil)
 	if err != nil {
@@ -73,19 +71,29 @@ func (ld *pebbleLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load data for key %q: %w", formatAny(k), err)
 		}
 
-		rpos := f.contentBox.RowCount()
+		f.AddRow_PK_Data(k, k, v)
-		f.contentBox.SetRowCount(rpos + 1)
-
-		f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8(k)))
-		f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(formatUtf8(v)))
 	}
 
 	// Valid
-	f.contentBox.ResizeColumnsToContents()
+	f.Ready()
-	f.contentBox.SetEnabled(true)
 	return nil
 }
 
+func (n *pebbleLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) error {
+
+	txn := n.db.NewBatch()
+
+	err := kvstore_ApplyChanges(
+		f,
+		func(k, v []byte) error { return txn.Set(k, v, nil) },
+		func(k []byte) error { return txn.Delete(k, nil) },
+	)
+	if err != nil {
+		return err
+	}
+	return txn.Commit(nil)
+}
+
 func (ld *pebbleLoadedDatabase) NavChildren(bucketPath []string) ([]string, error) {
 	return []string{}, nil // No children
 }
@@ -98,41 +106,41 @@ func (ld *pebbleLoadedDatabase) Close() {
 	_ = ld.db.Close()
 }
 
-var _ loadedDatabase = &pebbleLoadedDatabase{} // interface assertion
+var _ loadedDatabase = &pebbleLoadedDatabase{}         // interface assertion
+var _ editableLoadedDatabase = &pebbleLoadedDatabase{} // interface assertion
 
 //
 
-type pebbleMemConnection struct{}
+type pebbleConnection struct {
+	Type autoconfig.OneOf
 
-func (pmc *pebbleMemConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	Disk *struct {
-	db, err := pebble.Open("", &pebble.Options{FS: vfs.NewMem()})
+		Directory autoconfig.ExistingDirectory
-	if err != nil {
+		Readonly  bool
-		return nil, "", err
 	}
-
+	Memory *struct{}
-	return &pebbleLoadedDatabase{db: db}, `:memory:`, nil // SQLite-style naming
 }
 
-//
+func (pdc *pebbleConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
-
-type pebbleDirConnection struct {
-	Directory autoconfig.ExistingDirectory
-	Readonly  bool
-}
-
-func (pdc *pebbleDirConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
 	opts := (&pebble.Options{}).EnsureDefaults()
-	opts.ReadOnly = pdc.Readonly
 
-	db, err := pebble.Open(string(pdc.Directory), opts)
+	if pdc.Disk != nil {
-	if err != nil {
+		opts.ReadOnly = pdc.Disk.Readonly
-		return nil, "", err
+
+		db, err := pebble.Open(string(pdc.Disk.Directory), opts)
+		if err != nil {
+			return nil, "", err
+		}
+
+		return &pebbleLoadedDatabase{db: db}, filepath.Base(string(pdc.Disk.Directory)), nil
+
+	} else {
+		// Memory != nil
+		db, err := pebble.Open("", &pebble.Options{FS: vfs.NewMem()})
+		if err != nil {
+			return nil, "", err
+		}
+
+		return &pebbleLoadedDatabase{db: db}, `:memory:`, nil // SQLite-style naming
 	}
-
-	return &pebbleLoadedDatabase{db: db}, filepath.Base(string(pdc.Directory)), nil
-}
-
-func init() {
-	registerDatabase(&pebbleMemConnection{}, "Pebble (Memory)", `:/assets/vendor_cockroach.png`)
-	registerDatabase(&pebbleDirConnection{}, "Pebble", `:/assets/vendor_cockroach.png`)
 }

db_redis.go

@@ -8,7 +8,6 @@ import (
 	"yvbolt/lexer"
 
 	"github.com/mappu/autoconfig"
-	qt "github.com/mappu/miqt/qt6"
 	"github.com/redis/go-redis/v9"
 	"golang.org/x/crypto/ssh"
 )
@@ -20,10 +19,8 @@ type redisConnectionOptions struct {
 	SSH_Tunnel *SSHTunnel
 }
 
-func init() {
+func (config *redisConnectionOptions) Reset() {
-	registerDatabase(&redisConnectionOptions{
+	config.Address.Port = 6379
-		Address: autoconfig.AddressPort{Port: 6379}, // default value
-	}, "Redis", ":/assets/vendor_redis.png")
 }
 
 func (config *redisConnectionOptions) Connect(ctx context.Context) (loadedDatabase, string, error) {
@@ -105,18 +102,27 @@ func (ld *redisLoadedDatabase) DriverName() string {
 	return "Redis " + ld.serverVersion
 }
 
-func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *redisLoadedDatabase) Properties(bucketPath []string) (string, error) {
 	ctx := context.Background()
 
 	if len(bucketPath) == 0 {
 		// Top-level: Show info() on main Properties tab
 		infostr, err := ld.db.Info(ctx).Result()
 		if err != nil {
-			return fmt.Errorf("Retreiving database info: %w", err)
+			return "", fmt.Errorf("Retreiving database info: %w", err)
 		}
 
-		f.propertiesBox.SetText(infostr)
+		return infostr, nil
 
+	} else {
+		return "Database " + bucketPath[0], nil
+	}
+}
+
+func (ld *redisLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+	ctx := context.Background()
+
+	if len(bucketPath) == 0 {
 		// Leave data tab disabled (default behaviour)
 		return nil
 
@@ -133,12 +139,12 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 			return fmt.Errorf("Listing keys in database %q: %w", bucketPath[0], err)
 		}
 
-		f.propertiesBox.SetText(fmt.Sprintf("Database %s\nTotal keys: %d\n", bucketPath[0], len(allKeys)))
+		// Redis always uses Key string, Type string, Value []byte as the columns
 
-		// Redis always uses Key + Value as the columns
+		f.SetupColumns(
-
+			[]columnType{columnType_popupData, columnType_inlineText, columnType_popupData},
-		f.contentBox.SetColumnCount(3)
+			[]string{"Key", "Type", "Value"},
-		f.contentBox.SetHorizontalHeaderLabels([]string{"Key", "Type", "Value"})
+		)
 
 		for _, key := range allKeys {
 			typeName, err := ld.db.Type(ctx, key).Result()
@@ -146,10 +152,9 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 			}
 
-			rpos := f.contentBox.RowCount()
+			rpos := f.AddRow()
-			f.contentBox.SetRowCount(rpos + 1)
+			f.SetCell(rpos, 0, key)
-			f.contentBox.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8([]byte(key))))
+			f.SetCell(rpos, 1, typeName)
-			f.contentBox.SetItem(rpos, 1, qt.NewQTableWidgetItem2(typeName))
 
 			switch typeName {
 			case "string":
@@ -157,7 +162,8 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				if err != nil {
 					return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 				}
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2(val))
+
+				f.SetCell(rpos, 2, []byte(val))
 
 			case "hash":
 				val, err := ld.db.HGetAll(ctx, key).Result()
@@ -165,7 +171,7 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 					return fmt.Errorf("Loading %q/%q: %w", bucketPath[0], key, err)
 				}
 				// It's a map[string]string
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2(formatAny(val)))
+				f.SetCell(rpos, 2, []byte(formatAny(val)))
 
 			case "lists":
 				fallthrough
@@ -177,14 +183,13 @@ func (ld *redisLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string
 				fallthrough
 
 			default:
-				f.contentBox.SetItem(rpos, 2, qt.NewQTableWidgetItem2("<<<other object type>>>"))
+				f.SetCell(rpos, 2, []byte("<<<other object type>>>"))
 			}
 
 		}
 
 		// Valid
-		f.contentBox.ResizeColumnsToContents()
+		f.Ready()
-		f.contentBox.SetEnabled(true)
 		return nil
 
 	} else {
@@ -219,7 +224,7 @@ func (ld *redisLoadedDatabase) NavContext(bucketPath []string) ([]contextAction,
 	return nil, nil // No special actions are supported
 }
 
-func (ld *redisLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidget) error {
+func (ld *redisLoadedDatabase) ExecQuery(query string, _ []string, resultArea *tableState) error {
 	ctx := context.Background()
 
 	// Need to parse the query into separate string+args fields for the protocol
@@ -235,32 +240,23 @@ func (ld *redisLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidg
 		return fmt.Errorf("The redis query returned an error: %w", err)
 	}
 
-	vcl_clear_grid(resultArea)
+	resultArea.SetupColumns([]columnType{columnType_inlineText}, []string{"Result"})
-	resultArea.SetColumnCount(1)
-	resultArea.SetHorizontalHeaderLabels([]string{"Result"})
 
 	// The result is probably a single value or a string slice
 	switch ret := ret.(type) {
 	case []string:
 		// Multiple values
 		for _, single := range ret {
-
+			resultArea.AddRowData(single)
-			rpos := resultArea.RowCount()
-			resultArea.SetRowCount(rpos + 1)
-			resultArea.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatUtf8([]byte(single))))
 		}
 
 	default:
 		// Single value
-		rpos := resultArea.RowCount()
+		// Unknown object type
-		resultArea.SetRowCount(rpos + 1)
+		resultArea.AddRowData(formatAny(ret)) // formatUtf8
-		resultArea.SetItem(rpos, 0, qt.NewQTableWidgetItem2(formatAny(ret))) // formatUtf8
-
 	}
 
-	resultArea.ResizeColumnsToContents()
+	resultArea.Ready()
-	resultArea.SetEnabled(true)
-
 	return nil
 }
 

db_secretsvc_linux.go

@@ -0,0 +1,190 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"strings"
+
+	dbus "github.com/godbus/dbus/v5"
+	qt "github.com/mappu/miqt/qt6"
+	secretservice "github.com/zalando/go-keyring/secret_service"
+)
+
+type secretServiceDb struct {
+	svc     *secretservice.SecretService
+	session dbus.BusObject
+}
+
+func (ld *secretServiceDb) DriverName() string {
+	return "FreeDesktop.org Secret Service"
+}
+
+func (ld *secretServiceDb) Properties(bucketPath []string) (string, error) {
+	return "", nil // No properties
+}
+
+func (ld *secretServiceDb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	const (
+		collectionBasePath = "/org/freedesktop/secrets/collection/"
+		itemInterface      = "org.freedesktop.Secret.Item"
+		serviceName        = "org.freedesktop.secrets"
+	)
+
+	if len(bucketPath) == 0 {
+		// No data
+	} else if len(bucketPath) == 1 {
+
+		f.SetupColumns(
+			slice_repeat(columnType_inlineText, 6),
+			[]string{"ID", "Label", "Attributes", "ContentType", "Parameters", "Value"},
+		)
+
+		// Collection is selected
+		collection := ld.svc.GetCollection(bucketPath[0])
+
+		// Perform an empty search to find all items
+		allItems, err := ld.svc.SearchItems(collection, map[string]string{})
+		if err != nil {
+			return err
+		}
+
+		for _, item := range allItems {
+
+			//
+
+			obj := ld.svc.Object(serviceName, item)
+			label, err := obj.GetProperty(itemInterface + ".Label")
+			if err != nil {
+				return fmt.Errorf("Reading label %q: %w", item, err)
+			}
+
+			// Attributes: a map[string]string{}
+			// Is this optional?
+			// Calling attrs.String() gives a JSON representation
+			attrs, err := obj.GetProperty(itemInterface + ".Attributes")
+			if err != nil {
+				return fmt.Errorf("Reading attributes %q: %w", item, err)
+			}
+
+			secr, err := ld.svc.GetSecret(item, ld.session.Path())
+			if err != nil {
+				return fmt.Errorf("Reading secret %q: %w", item, err)
+			}
+
+			f.AddRowData(
+				// All strings
+				string(item),            // ID
+				label.Value().(string),  // Label
+				attrs.String(),          // Attributes (JSON)
+				secr.ContentType,        // ContentType
+				string(secr.Parameters), // Parameters
+				string(secr.Value),      // Value
+			)
+		}
+
+		// Valid
+		f.Ready()
+	}
+
+	return nil
+}
+
+func (ld *secretServiceDb) listCollections() ([]string, error) {
+
+	const (
+		serviceName          = "org.freedesktop.secrets"
+		servicePath          = "/org/freedesktop/secrets"
+		collectionsInterface = "org.freedesktop.Secret.Service.Collections"
+		collectionBasePath   = "/org/freedesktop/secrets/collection/"
+	)
+
+	obj := ld.svc.Conn.Object(serviceName, servicePath)
+
+	val, err := obj.GetProperty(collectionsInterface)
+	if err != nil {
+		return nil, err
+	}
+	paths := val.Value().([]dbus.ObjectPath)
+
+	ret := make([]string, 0, len(paths))
+	for _, p := range paths {
+		// They are expected to have {collectionBasePath} as prefix
+		colName := string(p)
+		if strings.HasPrefix(colName, collectionBasePath) {
+			colName = colName[len(collectionBasePath):]
+		}
+		ret = append(ret, colName)
+	}
+	return ret, nil
+}
+
+func (ld *secretServiceDb) NavChildren(bucketPath []string) ([]string, error) {
+	if len(bucketPath) == 0 {
+		return ld.listCollections()
+	}
+
+	return []string{}, nil // No children
+}
+
+func (ld *secretServiceDb) newCollection(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	name := qt.QInputDialog_GetText(sender.TreeWidget().QWidget, APPNAME, "Enter a name for the new collection:")
+	if name == "" {
+		return nil // cancelled
+	}
+
+	_, err := ld.svc.CreateCollection(name)
+	return err
+}
+
+func (ld *secretServiceDb) unlockKeychain(sender *qt.QTreeWidgetItem, bucketPath []string) error {
+	if len(bucketPath) != 1 {
+		return errors.New("Invalid selection")
+	}
+
+	coll := ld.svc.GetCollection(bucketPath[0])
+	return ld.svc.Unlock(coll.Path())
+}
+
+func (ld *secretServiceDb) NavContext(bucketPath []string) ([]contextAction, error) {
+	if len(bucketPath) == 0 {
+		return []contextAction{
+			contextAction{"Create collection...", ld.newCollection},
+		}, nil
+
+	} else if len(bucketPath) == 1 {
+		return []contextAction{
+			contextAction{"Unlock", ld.unlockKeychain},
+		}, nil
+
+	} else {
+		return nil, nil // Unreachable
+	}
+}
+
+func (ld *secretServiceDb) Close() {
+	_ = ld.svc.Close(ld.session)
+}
+
+var _ loadedDatabase = &secretServiceDb{} // interface assertion
+
+//
+
+type secretServiceConnection struct {
+}
+
+func (ssc *secretServiceConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	svc, err := secretservice.NewSecretService()
+	if err != nil {
+		return nil, "", err
+	}
+
+	session, err := svc.OpenSession()
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &secretServiceDb{svc: svc, session: session}, "dbus://SessionBus/org.freedesktop.secrets", nil
+}

db_secretsvc_other.go

@@ -0,0 +1,19 @@
+//go:build !linux
+// +build !linux
+
+package main
+
+import (
+	"context"
+	"errors"
+
+	"github.com/mappu/autoconfig"
+)
+
+type secretServiceConnection struct {
+	H1 autoconfig.Header `ylabel:"Not supported on this operating system"`
+}
+
+func (ssc *secretServiceConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	return nil, "", errors.New("Not supported on this operating system")
+}

db_sqlite.go

@@ -32,22 +32,12 @@ func (ld *sqliteLoadedDatabase) DriverName() string {
 	return "SQLite " + ver1
 }
 
-func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []string) error {
+func (ld *sqliteLoadedDatabase) Properties(bucketPath []string) (string, error) {
+	if len(bucketPath) == 0 || len(bucketPath) == 1 {
+		return "Please select...", nil // No properties
 
-	ctx := context.TODO()
+	} else {
 
-	if len(bucketPath) == 0 {
-		// Top-level
-		f.propertiesBox.SetText("Please select...")
-		return nil
-
-	} else if len(bucketPath) == 1 {
-		// Category (tables, ...)
-		f.propertiesBox.SetText("Please select...")
-		return nil
-
-	} else if len(bucketPath) == 2 && bucketPath[0] == sqliteTablesCaption {
-		// Render for specific table
 		tableName := bucketPath[1]
 
 		// Get some basic properties
@@ -59,7 +49,24 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 		}
 
 		// Display table properties
-		f.propertiesBox.SetText(fmt.Sprintf("Selected table %q\n\nSchema:\n\n%s", tableName, schemaStmt))
+		return fmt.Sprintf("Selected table %q\n\nSchema:\n\n%s", tableName, schemaStmt), nil
+	}
+}
+
+func (ld *sqliteLoadedDatabase) RenderForNav(f *tableState, bucketPath []string) error {
+
+	ctx := context.TODO()
+
+	if len(bucketPath) == 0 {
+		return nil
+
+	} else if len(bucketPath) == 1 {
+		// Category (tables, ...)
+		return nil
+
+	} else if len(bucketPath) == 2 && bucketPath[0] == sqliteTablesCaption {
+		// Render for specific table
+		tableName := bucketPath[1]
 
 		// Load column details
 		// Use SELECT form instead of common PRAGMA table_info so we can just get names
@@ -70,7 +77,7 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load columns for table %q: %w", tableName, err)
 		}
 
-		populateColumns(columnNames, f.contentBox)
+		populateColumns(columnNames, f)
 
 		// Find primary key, if any
 		var primaryKeyIdx int = -1
@@ -89,11 +96,14 @@ func (ld *sqliteLoadedDatabase) RenderForNav(f *MainWindowUi, bucketPath []strin
 			return fmt.Errorf("Failed to load data for table %q: %w", tableName, err)
 		}
 		defer datar.Close()
-		populateRows(datar, f.contentBox, primaryKeyIdx)
+
+		err = populateRows(datar, f, primaryKeyIdx)
+		if err != nil {
+			return err
+		}
 
 		// We successfully populated the data grid
-		f.contentBox.ResizeColumnsToContents()
+		f.Ready()
-		f.contentBox.SetEnabled(true)
 		return nil
 
 	} else {
@@ -130,14 +140,14 @@ func (ld *sqliteLoadedDatabase) sqliteGetColumnNamesForTable(tableName string) (
 	return ret, nil
 }
 
-func populateColumns(names []string, dest *qt.QTableWidget) {
+func populateColumns(names []string, dest *tableState) {
-	dest.SetColumnCount(len(names))
+	// FIXME better column types?
-	dest.SetHorizontalHeaderLabels(names)
+	dest.SetupColumns(slice_repeat(columnType_inlineText, len(names)), names)
 }
 
-func populateRows(rr *sql.Rows, dest *qt.QTableWidget, pk_index int) {
+func populateRows(rr *sql.Rows, dest *tableState, pk_index int) error {
 
-	numColumns := int(dest.ColumnCount())
+	numColumns := len(dest.currentColumns)
 
 	for rr.Next() {
 		fields := make([]interface{}, numColumns)
@@ -148,34 +158,23 @@ func populateRows(rr *sql.Rows, dest *qt.QTableWidget, pk_index int) {
 
 		err := rr.Scan(pfields...)
 		if err != nil {
-			qt.QMessageBox_Warning(dest.QWidget, APPNAME, fmt.Sprintf("Failed to load data: %s", err.Error()))
+			return fmt.Errorf("Scan: %w", err)
-			return
 		}
 
-		rpos := dest.RowCount()
+		rpos := dest.AddRow()
-		dest.SetRowCount(rpos + 1)
 		for i := 0; i < len(fields); i += 1 {
+			dest.SetCell(rpos, i, formatAny(fields[i])) // FIXME stop doing string conversion here
+		}
 
-			cellItem := qt.NewQTableWidgetItem2(formatAny(fields[i]))
+		if pk_index >= 0 {
-			if i == pk_index {
+			dest.SetRowPrimaryKey(rpos, []byte(formatAny(fields[pk_index]))) // FIXME stop doing string conversion here
-				cellItem.SetData(DataPrimaryKeyRole, qt.NewQVariant11(formatAny(fields[i]))) // FIXME stop doing string conversion here
-			} else if pk_index < 0 {
-				// We do not have a primary key for this table
-				// Therefore - disable editing
-				cellItem.SetFlags(cellItem.Flags() & ^qt.ItemIsEditable)
-			}
-
-			dest.SetItem(rpos, i, cellItem)
 		}
 
 	}
-	if rr.Err() != nil {
+	return rr.Err()
-		qt.QMessageBox_Warning(dest.QWidget, APPNAME, fmt.Sprintf("Failed to load data: %s", rr.Err().Error()))
-		return
-	}
 }
 
-func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWidget) error {
+func (ld *sqliteLoadedDatabase) ExecQuery(query string, _ []string, resultArea *tableState) error {
 	rr, err := ld.db.Query(query)
 	if err != nil {
 		return err
@@ -183,8 +182,6 @@ func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWid
 
 	defer rr.Close()
 
-	vcl_clear_grid(resultArea)
-
 	columns, err := rr.Columns()
 	if err != nil {
 		return err
@@ -192,11 +189,12 @@ func (ld *sqliteLoadedDatabase) ExecQuery(query string, resultArea *qt.QTableWid
 
 	populateColumns(columns, resultArea)
 
-	populateRows(rr, resultArea, -1)
+	err = populateRows(rr, resultArea, -1)
+	if err != nil {
+		return err
+	}
 
-	resultArea.ResizeColumnsToContents()
+	resultArea.Ready()
-	resultArea.SetEnabled(true)
-	resultArea.EditTriggers()
 	return nil
 }
 
@@ -210,17 +208,13 @@ func (n *sqliteLoadedDatabase) getPrimaryKeyForTable(ctx context.Context, tx Row
 	return primaryColumnName, err
 }
 
-func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr error) {
+func (n *sqliteLoadedDatabase) ApplyChanges(f *tableState, bucketPath []string) (retErr error) {
 
 	if len(bucketPath) != 2 {
 		return errors.New("invalid selection")
 	}
 	tableName := bucketPath[1]
 
-	// We have rendered row IDs, need to convert back to an SQLite primary key
-	// TODO stash the real key inside f.ui.contentBox.Objects()
-	// FIXME breaks if you try and edit the primary key(!) because the previous
-
 	ctx := context.Background()
 
 	tx, err := n.db.BeginTx(ctx, nil)
@@ -238,24 +232,12 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 		}
 	}()
 
-	// Data grid properties
-	var columnNames []string
-	for i := 0; i < f.ui.contentBox.ColumnCount(); i++ {
-		columnNames = append(columnNames, f.ui.contentBox.HorizontalHeaderItem(i).Text())
-	}
-
 	// Query sqlite table metadata to determine which of these is the PRIMARY KEY
 	primaryColumnName, err := n.getPrimaryKeyForTable(ctx, tx, tableName)
 	if err != nil {
 		return fmt.Errorf("Finding primary key for update: %w", err)
 	}
 
-	// Convert it to an index
-	primaryColumnIdx, ok := slice_find(columnNames, primaryColumnName)
-	if !ok {
-		return fmt.Errorf("Primary key %q missing from available columns", primaryColumnName)
-	}
-
 	// SQLite can only LIMIT 1 on update/delete if it was compiled with
 	// SQLITE_ENABLE_UPDATE_DELETE_LIMIT, which isn't the case for the mattn
 	// cgo library
@@ -263,22 +245,20 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Edit
 	for rowid, editcells := range f.updateRows {
-		stmt := `UPDATE "` + tableName + `" SET `
+		stmt := `UPDATE [` + tableName + `] SET `
 		params := []interface{}{} // FIXME reinstate types for the driver (although SQLite doesn't mind)
 
 		for ct, cell := range editcells {
 			if ct > 0 {
 				stmt += `, `
 			}
-			stmt += `"` + columnNames[cell] + `" = ?`
+			stmt += `[` + f.columnLabels[cell] + `] = ?`
-			params = append(params, f.ui.contentBox.Item(rowid, cell).Text())
+			params = append(params, f.columns_inlineText[cell][rowid]) // FIXME stop doing string conversion
 		}
-		stmt += ` WHERE "` + primaryColumnName + `" = ?`
+		stmt += ` WHERE [` + primaryColumnName + `] = ?`
 
-		// The primary key was stashed in DataPrimaryKeyRole, on the pk_idx'th
+		// Update by primary key (stored separately)
-		// column, as a QString qvariant
+		pkVal := string(f.primaryKeys[rowid]) // FIXME avoid string marshalling
-		// FIXME avoid string marshalling
-		pkVal := f.ui.contentBox.Item(rowid, primaryColumnIdx).Data(DataPrimaryKeyRole).ToString()
 		params = append(params, pkVal)
 
 		_, err = tx.ExecContext(ctx, stmt, params...)
@@ -289,9 +269,9 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Delete by key (affects rowids after re-render)
 	for rowid, _ := range f.deleteRows {
-		pkVal := f.ui.contentBox.Item(rowid, primaryColumnIdx).Text()
+		pkVal := string(f.primaryKeys[rowid]) // FIXME avoid string marshalling
 
-		stmt := `DELETE FROM "` + tableName + `" WHERE "` + primaryColumnName + `" = ?`
+		stmt := `DELETE FROM [` + tableName + `] WHERE [` + primaryColumnName + `] = ?`
 
 		_, err = tx.ExecContext(ctx, stmt, pkVal)
 		if err != nil {
@@ -301,15 +281,15 @@ func (n *sqliteLoadedDatabase) ApplyChanges(f *App, bucketPath []string) (retErr
 
 	// Insert all new entries
 	for rowid, _ := range f.insertRows {
-		stmt := `INSERT INTO "` + tableName + `" (` + strings.Join(columnNames, `, `) + `) VALUES (`
+		stmt := `INSERT INTO [` + tableName + `] ([` + strings.Join(f.columnLabels, `], [`) + `]) VALUES (`
 		params := []interface{}{} // FIXME reinstate types for the driver (although SQLite doesn't mind)
 
-		for colid := 0; colid < len(columnNames); colid++ {
+		for colid := 0; colid < len(f.columnLabels); colid++ {
 			if colid > 0 {
 				stmt += `, `
 			}
 			stmt += "?"
-			params = append(params, f.ui.contentBox.Item(rowid, colid).Text())
+			params = append(params, f.columns_inlineText[colid][rowid]) // FIXME stop doing string conversion
 		}
 		stmt += `)`
 
@@ -422,37 +402,34 @@ var _ queryableLoadedDatabase = &sqliteLoadedDatabase{} // interface assertion
 //
 
 type sqliteConnection struct {
-	Database  autoconfig.ExistingFile `yfilter:"SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*.*)"`
+	Type autoconfig.OneOf
-	CliDriver bool                    `ylabel:"Use experimental CLI driver"`
+	Disk *struct {
+		Database  autoconfig.ExistingFile `yfilter:"SQLite database (*.db *.db3 *.sqlite *.sqlite3);;All files (*)"`
+		CliDriver bool                    `ylabel:"Use experimental CLI driver"`
+	}
+	Memory *struct{}
 }
 
 func (sc *sqliteConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+	if sc.Disk != nil {
+		driver := "sqlite3"
+		if sc.Disk.CliDriver {
+			driver = "sqliteclidriver"
+		}
 
-	driver := "sqlite3"
+		db, err := sql.Open(driver, string(sc.Disk.Database))
-	if sc.CliDriver {
+		if err != nil {
-		driver = "sqliteclidriver"
+			return nil, "", err
+		}
+
+		return &sqliteLoadedDatabase{db: db}, filepath.Base(string(sc.Disk.Database)), nil
+
+	} else { // memory
+		db, err := sql.Open("sqlite3", ":memory:")
+		if err != nil {
+			return nil, "", err
+		}
+
+		return &sqliteLoadedDatabase{db: db}, ":memory:", nil
 	}
-
-	db, err := sql.Open(driver, string(sc.Database))
-	if err != nil {
-		return nil, "", err
-	}
-
-	return &sqliteLoadedDatabase{db: db}, filepath.Base(string(sc.Database)), nil
-}
-
-type sqliteMemoryConnection struct{}
-
-func (sc *sqliteMemoryConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
-	db, err := sql.Open("sqlite3", ":memory:")
-	if err != nil {
-		return nil, "", err
-	}
-
-	return &sqliteLoadedDatabase{db: db}, ":memory:", nil
-}
-
-func init() {
-	registerDatabase(&sqliteConnection{}, "SQLite", `:/assets/vendor_sqlite.png`)
-	registerDatabase(&sqliteMemoryConnection{}, "SQLite (Memory)", `:/assets/vendor_sqlite.png`)
 }

db_starskey.go

@@ -0,0 +1,115 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+
+	"github.com/mappu/autoconfig"
+	"github.com/starskey-io/starskey"
+)
+
+type starskeyLdb struct {
+	db *starskey.Starskey
+}
+
+func (ld *starskeyLdb) DriverName() string {
+	return "Starskey"
+}
+
+func (ld *starskeyLdb) Properties(bucketPath []string) (string, error) {
+	return "", nil // No properties
+}
+
+func (ld *starskeyLdb) RenderForNav(f *tableState, bucketPath []string) error {
+
+	// Load data
+	// Starskey always uses Key + Value as the columns
+
+	f.SetupColumns([]columnType{columnType_popupData, columnType_popupData}, []string{"Key", "Value"})
+
+	// It's possible to create a transaction in Starskey, but you can't enumerate keys
+	// within the transaction - doesn't really help us
+
+	var allKeys [][]byte
+	_, err := ld.db.FilterKeys(func(key []byte) bool {
+		allKeys = append(allKeys, slice_dup(key))
+		return false // don't get value in here
+	})
+	if err != nil {
+		return fmt.Errorf("FilterKeys: %w", err)
+	}
+
+	for _, key := range allKeys {
+		val, err := ld.db.Get(key)
+		if err != nil {
+			// We get <nil, nil> if not found, so any error is a real error
+			return fmt.Errorf("Reading key %q: %w", string(key), err)
+		}
+		if val == nil {
+			// Key not found
+			// The hack to use FilterKeys() means this can happen if the key is
+			// pointing to a tombstone
+			continue
+		}
+
+		f.AddRow_PK_Data(key, key, val)
+	}
+
+	// Valid
+	f.Ready()
+	return nil
+}
+
+func (n *starskeyLdb) ApplyChanges(f *tableState, bucketPath []string) error {
+	return kvstore_ApplyChanges(f, n.db.Put, n.db.Delete)
+}
+
+func (ld *starskeyLdb) NavChildren(bucketPath []string) ([]string, error) {
+	return []string{}, nil // No children
+}
+
+func (ld *starskeyLdb) NavContext(bucketPath []string) ([]contextAction, error) {
+	return nil, nil // No special actions are supported
+}
+
+func (ld *starskeyLdb) Close() {
+	_ = ld.db.Close()
+}
+
+var _ loadedDatabase = &starskeyLdb{}         // interface assertion
+var _ editableLoadedDatabase = &starskeyLdb{} // interface assertion
+
+//
+
+type starskeyConnection struct {
+	Directory   autoconfig.ExistingDirectory
+	Compression autoconfig.EnumList `yenum:"No compression;;Snappy;;S2"`
+}
+
+func (pdc *starskeyConnection) Connect(ctx context.Context) (loadedDatabase, string, error) {
+
+	cfg := starskey.Config{
+		Permission:     0755,
+		Directory:      string(pdc.Directory),
+		FlushThreshold: (1024 * 1024) * 24, // Upstream default (24 MiB)
+		MaxLevel:       3,                  // Upstream default
+		SizeFactor:     10,                 // Upstream default
+	}
+
+	if pdc.Compression == 0 {
+	} else if pdc.Compression == 1 {
+		cfg.Compression = true
+		cfg.CompressionOption = starskey.SnappyCompression
+	} else if pdc.Compression == 2 {
+		cfg.Compression = true
+		cfg.CompressionOption = starskey.S2Compression
+	}
+
+	db, err := starskey.Open(&cfg)
+	if err != nil {
+		return nil, "", err
+	}
+
+	return &starskeyLdb{db: db}, filepath.Base(string(pdc.Directory)), nil
+}

debconf/debconf.go

@@ -18,11 +18,26 @@ type Entry struct {
 	Properties [][2]string
 }
 
+type Application struct {
+	Name    string
+	Entries []Entry
+}
+
 type Database struct {
-	Entries        []Entry
+	Entries        []Application
 	AllColumnNames []string
 }
 
+func (d *Database) FindApplicationByName(search string) (*Application, bool) {
+	for idx, app := range d.Entries {
+		if app.Name == search {
+			return &d.Entries[idx], true // TODO faster lookup?
+		}
+	}
+
+	return nil, false
+}
+
 func Parse(r io.Reader) (*Database, error) {
 	sc := bufio.NewScanner(r)
 
@@ -87,8 +102,31 @@ func Parse(r io.Reader) (*Database, error) {
 		entries = append(entries, wip)
 	}
 
+	// Group all entries by Application
+
+	apps := make([]Application, 0)
+	appIndexes := make(map[string]int, 0)
+
+	for _, entry := range entries {
+		spos := strings.Index(entry.Name, `/`)
+		appName := entry.Name[0:spos]
+
+		idx, ok := appIndexes[appName]
+		if !ok {
+			appIndexes[appName] = len(apps)
+			apps = append(apps, Application{
+				Name:    appName,
+				Entries: []Entry{entry},
+			})
+		} else {
+			tmp := apps[idx]
+			tmp.Entries = append(tmp.Entries, entry)
+			apps[idx] = tmp
+		}
+	}
+
 	return &Database{
-		Entries:        entries,
+		Entries:        apps,
 		AllColumnNames: discoveredColumns,
 	}, nil
 }

embed.qrc

@@ -1,5 +1,10 @@
 <RCC>
   <qresource prefix="/">
+    <file>assets/vendor_qt.png</file>
+    <file>assets/connect.png</file>
+    <file>assets/disconnect.png</file>
+    <file>assets/database_key.png</file>
+    <file>assets/help.png</file>
     <file>assets/add.png</file>
     <file>assets/arrow_refresh.png</file>
     <file>assets/chart_bar.png</file>
@@ -23,10 +28,14 @@
     <file>assets/vendor_cockroach.png</file>
     <file>assets/vendor_debian.png</file>
     <file>assets/vendor_dgraph.png</file>
+    <file>assets/vendor_freedesktop.png</file>
     <file>assets/vendor_github.png</file>
     <file>assets/vendor_leveldb.png</file>
+    <file>assets/vendor_lmdb.png</file>
+    <file>assets/vendor_mongodb.png</file>
     <file>assets/vendor_mysql.png</file>
     <file>assets/vendor_redis.png</file>
     <file>assets/vendor_sqlite.png</file>
+    <file>assets/vendor_starskey.png</file>
   </qresource>
 </RCC>

go.mod

@@ -7,18 +7,24 @@ toolchain go1.24.4
 require (
 	github.com/cockroachdb/pebble v1.1.5
 	github.com/dgraph-io/badger/v4 v4.8.0
+	github.com/godbus/dbus/v5 v5.2.0
 	github.com/google/uuid v1.6.0
-	github.com/mappu/autoconfig v0.2.0
+	github.com/ledgerwatch/lmdb-go v1.18.2
+	github.com/mappu/autoconfig v0.4.1
 	github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf
 	github.com/mattn/go-sqlite3 v1.14.32
-	github.com/redis/go-redis/v9 v9.16.0
+	github.com/redis/go-redis/v9 v9.17.2
+	github.com/starskey-io/starskey v0.1.9
 	github.com/stretchr/testify v1.11.1
 	github.com/syndtr/goleveldb v1.0.0
+	github.com/zalando/go-keyring v0.2.6
 	go.etcd.io/bbolt v1.4.3
-	golang.org/x/crypto v0.44.0
+	go.mongodb.org/mongo-driver/v2 v2.4.1
+	golang.org/x/crypto v0.46.0
 )
 
 require (
+	al.essio.dev/pkg/shellescape v1.6.0 // indirect
 	github.com/DataDog/zstd v1.5.7 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -27,17 +33,19 @@ require (
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
 	github.com/cockroachdb/redact v1.1.6 // indirect
 	github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb // indirect
+	github.com/danieljoos/wincred v1.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgraph-io/ristretto/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/getsentry/sentry-go v0.36.2 // indirect
+	github.com/getsentry/sentry-go v0.40.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.9.23+incompatible // indirect
-	github.com/klauspost/compress v1.18.1 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
+	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -45,18 +53,25 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.2 // indirect
+	github.com/prometheus/common v0.67.4 // indirect
 	github.com/prometheus/procfs v0.19.2 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.2.0 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	go.mongodb.org/mongo-driver v1.17.6 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/otel v1.38.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
-	go.opentelemetry.io/otel/metric v1.38.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
-	go.opentelemetry.io/otel/trace v1.38.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
-	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
+	golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 // indirect
-	golang.org/x/net v0.46.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,3 +1,5 @@
+al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA=
+al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
 github.com/DataDog/zstd v1.5.7 h1:ybO8RBeh29qrxIhCA9E8gKY6xfONU9T6G6aP9DTKfLE=
 github.com/DataDog/zstd v1.5.7/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -23,6 +25,8 @@ github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ
 github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb h1:3bCgBvB8PbJVMX1ouCcSIxvsqKPYM7gs72o0zC76n9g=
 github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
+github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgraph-io/badger/v4 v4.8.0 h1:JYph1ChBijCw8SLeybvPINizbDKWZ5n/GYbz2yhN/bs=
@@ -36,8 +40,8 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/getsentry/sentry-go v0.36.2 h1:uhuxRPTrUy0dnSzTd0LrYXlBYygLkKY0hhlG5LXarzM=
+github.com/getsentry/sentry-go v0.40.0 h1:VTJMN9zbTvqDqPwheRVLcp0qcUcM+8eFivvGocAaSbo=
-github.com/getsentry/sentry-go v0.36.2/go.mod h1:p5Im24mJBeruET8Q4bbcMfCQ+F+Iadc4L48tB1apo2c=
+github.com/getsentry/sentry-go v0.40.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -45,6 +49,8 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/godbus/dbus/v5 v5.2.0 h1:3WexO+U+yg9T70v9FdHr9kCxYlazaAXUhx2VMkbfax8=
+github.com/godbus/dbus/v5 v5.2.0/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -55,24 +61,26 @@ github.com/google/flatbuffers v25.9.23+incompatible h1:rGZKv+wOb6QPzIdkM2KxhBZCD
 github.com/google/flatbuffers v25.9.23+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
-github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
+github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mappu/autoconfig v0.1.0 h1:T740iW7/rkqi+pxJIlP+WB433h34jNRjqqG9ABTSScs=
+github.com/ledgerwatch/lmdb-go v1.18.2 h1:6YKp/KYcqGunNRHKZBBhiYADcIcWKzvu5QZv89RhnFQ=
-github.com/mappu/autoconfig v0.1.0/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
+github.com/ledgerwatch/lmdb-go v1.18.2/go.mod h1:NKRpCxksoTQPyxsUcBiVOe0135uqnJsnf6cElxmOL0o=
-github.com/mappu/autoconfig v0.2.0 h1:5auhryqiubVBFq9CdY+VHU36bysG70tRGPpyT+M4ycs=
+github.com/mappu/autoconfig v0.4.1 h1:ekO7mzN+beFu7VhNfJxNlL/5wkYcP9PAl9VTG4EDxYs=
-github.com/mappu/autoconfig v0.2.0/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
+github.com/mappu/autoconfig v0.4.1/go.mod h1:kca6kaYjqOwkZnY9z5YKo0oI/7Bxe2fMIHhYzXwGHEE=
-github.com/mappu/miqt v0.12.0 h1:bBMBDeACmV8TbdLfoN51la7kF6QT3sNAcG+ZdRDgmxU=
-github.com/mappu/miqt v0.12.0/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U=
 github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf h1:SmBzNUevLUzu1msJ5xzWH/Kot+GtOtoz0u9la42dRU4=
 github.com/mappu/miqt v0.12.1-0.20251106063543-466b60e47edf/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U=
 github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
@@ -95,31 +103,54 @@ github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h
 github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
+github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
-github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
+github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
 github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
 github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
-github.com/redis/go-redis/v9 v9.16.0 h1:OotgqgLSRCmzfqChbQyG1PHC3tLNR89DG4jdOERSEP4=
+github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
-github.com/redis/go-redis/v9 v9.16.0/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
+github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/starskey-io/starskey v0.1.9 h1:lABmD5KQgkpJZTCwSt+BHSOPXe82B9smbuScRL6T8Zk=
+github.com/starskey-io/starskey v0.1.9/go.mod h1:qly4ec2C/4Y45jhpL+q4m+Uxzg3mjj0t7RjpJslB3ao=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
+github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8=
+github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
+github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8ua9s=
+github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
 go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
 go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
+go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
+go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
+go.mongodb.org/mongo-driver/v2 v2.4.1 h1:hGDMngUao03OVQ6sgV5csk+RWOIkF+CuLsTPobNMGNI=
+go.mongodb.org/mongo-driver/v2 v2.4.1/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
@@ -127,41 +158,55 @@ go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 h1:MDfG8Cvcqlt9XXrmEiD4epKn7VJHZO84hejP9Jmp0MM=
+golang.org/x/exp v0.0.0-20251209150349-8475f28825e9/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

loadedDatabase.go

@@ -16,16 +16,17 @@ type contextAction struct {
 // loadedDatabase is a DB-agnostic interface for each loaded database.
 type loadedDatabase interface {
 	DriverName() string
-	RenderForNav(f *MainWindowUi, bucketPath []string) error
+	Properties(bucketPath []string) (string, error)
+	RenderForNav(f *tableState, bucketPath []string) error
 	NavChildren(bucketPath []string) ([]string, error)
 	NavContext(bucketPath []string) ([]contextAction, error)
 	Close()
 }
 
 type queryableLoadedDatabase interface {
-	ExecQuery(query string, resultArea *qt.QTableWidget) error
+	ExecQuery(query string, bucketPath []string, resultArea *tableState) error
 }
 
 type editableLoadedDatabase interface {
-	ApplyChanges(f *App, bucketPath []string) error
+	ApplyChanges(f *tableState, bucketPath []string) error
 }

main.go

@@ -1,40 +1,33 @@
 package main
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"os"
 	"runtime"
 	"runtime/debug"
-	"sort"
 	"strings"
 
+	"github.com/mappu/miqt/qt/mainthread"
+
 	qt "github.com/mappu/miqt/qt6"
 )
 
 const (
 	APPNAME      = "yvbolt"
 	HOMEPAGE_URL = "https://code.ivysaur.me/yvbolt"
-
-	CO_INSERT        = qt.Yellow
-	CO_EDIT_IMPLICIT = qt.Green
-	CO_EDIT_EXPLICIT = qt.DarkGreen
-	CO_DELETE        = qt.Red
 )
 
 type App struct {
 	ui *MainWindowUi
 
+	contentTbl *tableState
+	resultsTbl *tableState
+
 	none *noLoadedDatabase
 
 	dbs_next int
 	dbs      map[int]loadedDatabase
-
-	isEditing  bool
-	updateRows map[int][]int // row => []column
-	insertRows map[int]struct{}
-	deleteRows map[int]struct{}
 }
 
 func newApp() *App {
@@ -44,33 +37,16 @@ func newApp() *App {
 	a.dbs_next = 0
 	a.dbs = make(map[int]loadedDatabase, 0)
 
-	a.isEditing = false
-	a.updateRows = make(map[int][]int, 0)
-	a.insertRows = make(map[int]struct{}, 0)
-	a.deleteRows = make(map[int]struct{}, 0)
-
 	a.ui = NewMainWindowUi()
 
-	// "Midlight" is pretty close on Breeze but wrong on Fusion and Windows
+	// Using stylesheet works better than picking a palette colour across all
-	// AlternateBase ^
+	// different QStyles
-	// Window --> too dark
+	a.ui.propertiesBox.SetStyleSheet("background-color: transparent;")
-	// Button --> too light on Breeze; close on Fusion; too light on Windows
-	// Light --> too light on Breeze; correct on Fusion; too light on Windows
-
-	currentStyle := strings.ToLower(qt.QApplication_Style().Name())
-
-	effectiveTabBackground := qt.QPalette__Window // correct on Windows
-	if currentStyle == "fusion" {
-		effectiveTabBackground = qt.QPalette__Light
-	} else if currentStyle == "breeze" {
-		effectiveTabBackground = qt.QPalette__Midlight // ?? how does this look on dark mode...?
-	}
-
-	a.ui.propertiesBox.Viewport().SetBackgroundRole(effectiveTabBackground)
 
 	//
 
 	a.ui.actionConnect.OnTriggered(a.OnMnuConnectClick)
+	a.ui.actionConnectionManager.OnTriggered(a.OnMnuConnectionManagerClick)
 
 	a.ui.actionE_xit.OnTriggered(a.OnMnuFileExitClick)
 
@@ -99,43 +75,47 @@ func newApp() *App {
 
 	//
 
-	a.ui.dataRefreshBtn.OnClicked(a.RefreshCurrentItem)
+	a.ui.actionRefresh.OnTriggered(a.RefreshCurrentItem)
-	a.ui.dataInsertBtn.OnClicked(a.OnDataInsertClick)
-	a.ui.dataDelRowBtn.OnClicked(a.OnDataDeleteRowClick)
-	a.ui.dataCommitBtn.OnClicked(a.OnDataCommitClick)
 
-	// contentBox: set editable
+	a.ui.actionAbout_Qt.OnTriggered(func() {
-	vcl_clear_grid(a.ui.contentBox)
+		qt.QMessageBox_AboutQt2(a.ui.MainWindow.QWidget, APPNAME)
-	a.ui.contentBox.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	})
-	a.ui.contentBox.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+
-	a.ui.contentBox.OnCellChanged(a.OnDataCellEdited)
+	a.contentTbl = NewTableState(a.ui.contentBox)
+	a.contentTbl.OnEdited = func() {
+		a.ui.actionApply_changes.SetEnabled(a.contentTbl.AnyChanges())
+	}
+	a.ui.actionDelete_row.OnTriggered(func() {
+		a.contentTbl.DeleteSelectedRows()
+	})
+	a.ui.actionAddRow.OnTriggered(func() {
+		a.contentTbl.InsertNewRow()
+	})
+	a.ui.actionApply_changes.OnTriggered(a.OnDataCommitClick)
 
 	// a.ui.queryInput.OnTextChanged(a.OnQueryTextChanged) // apply syntax highlighting
 
-	a.ui.queryExecBtn.OnClicked(a.OnQueryExecute)
+	a.ui.mnuExecute.OnTriggered(a.OnQueryExecute)
 
 	if runtime.GOOS == "windows" {
-		a.ui.queryInput.SetFontFamily("Consolas")
+		a.ui.queryInput.SetFont(qt.NewQFont2("Consolas"))
 	} else {
-		a.ui.queryInput.SetFontFamily("monospace")
+		a.ui.queryInput.SetFont(qt.NewQFont2("monospace"))
 	}
 
-	vcl_clear_grid(a.ui.queryResult)
+	a.resultsTbl = NewTableState(a.ui.queryResult)
-	a.ui.queryResult.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
-	a.ui.queryResult.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
 
 	a.none = &noLoadedDatabase{}
-	a.OnNavChange(nil, nil) // calls f.none.RenderForNav and sets up status bar content
+	a.refreshContent(nil) // calls f.none.RenderForNav and sets up status bar content
 
 	return a
 }
 
 func main() {
-	qt.NewQApplication(os.Args)
+	// Qt 6 already uses PassThrough as the default fractional scaling policy,
+	// no need to change anything here
 
-	sort.Slice(registeredDatabases, func(i, j int) bool {
+	qt.NewQApplication(os.Args)
-		return registeredDatabases[i].label < registeredDatabases[j].label
-	}) // might not have been done yet
 
 	app := newApp()
 	app.ui.MainWindow.Show()
@@ -179,7 +159,7 @@ func (f *App) OnMenuHelpVersion() {
 		}
 	}
 
-	qt.QMessageBox_About(f.ui.MainWindow.QWidget, APPNAME, info)
+	qt.QMessageBox_About(f.ui.MainWindow.QWidget, APPNAME+" "+appVersion, info)
 }
 
 func (f *App) OnNavContextPopup(pos *qt.QPoint) {
@@ -247,18 +227,8 @@ func (f *App) RefreshCurrentItem() {
 		return // nothing to do
 	}
 
-	// If there were any edited rows, refreshing will lose them
-	// Prompt for confirmation first
-	// FIXME this should also trigger when changing selection on LHS nav??
-	if len(f.deleteRows) > 0 || len(f.updateRows) > 0 || len(f.deleteRows) > 0 {
-		ok := qt.QMessageBox_Warning2(f.ui.MainWindow.QWidget, APPNAME, "Your modifications have not been applied. Continue without applying?", qt.QMessageBox__Ok, qt.QMessageBox__Cancel)
-		if ok != int(qt.QMessageBox__Ok) {
-			return
-		}
-	}
-
 	f.OnNavContextRefresh(curItem)  // Refresh LHS pane/children
-	f.OnNavChange(curItem, curItem) // Refresh RHS pane/data content
+	f.OnNavChange(curItem, curItem) // Refresh RHS pane/data content and warn if unsaved changes
 }
 
 func (f *App) OnNavContextRefresh(item *qt.QTreeWidgetItem) {
@@ -283,90 +253,17 @@ func (f *App) OnNavContextRefresh(item *qt.QTreeWidgetItem) {
 	item.SetExpanded(isExpanded)
 }
 
-func (f *App) OnDataCellEdited(aRow, aCol int) {
-
-	if !f.isEditing {
-		return // current in full table refresh, this signal is not a true edit
-	}
-
-	// If this is an insert row, no need to patch updateRows
-	if _, ok := f.insertRows[aRow]; ok {
-		return // nothing to do
-	}
-
-	if chk, ok := f.updateRows[aRow]; ok {
-		if slice_contains(chk, aCol) {
-			// nothing to do
-		} else {
-			chk = append(chk, aCol)
-			f.updateRows[aRow] = chk
-		}
-	} else {
-		f.updateRows[aRow] = []int{aCol}
-	}
-
-	// If this row was marked for deletion, this new edit takes priority
-	delete(f.deleteRows, aRow)
-
-	// Recolour the row
-	explicitCol := qt.NewQBrush4(CO_EDIT_EXPLICIT)
-	implicitCol := qt.NewQBrush4(CO_EDIT_IMPLICIT)
-
-	numCols := f.ui.contentBox.ColumnCount()
-	for i := 0; i < numCols; i++ {
-		cell := f.ui.contentBox.Item(aRow, i)
-
-		if i == aCol {
-			cell.SetBackground(explicitCol)
-		} else {
-			cell.SetBackground(implicitCol) // FIXME preserve explicitCol for other changed cells too!
-		}
-	}
-}
-
-func (f *App) OnDataInsertClick() {
-	if !f.ui.contentBox.IsEnabled() {
-		return // Not an active data view
-	}
-
-	rpos := f.ui.contentBox.RowCount()
-	f.ui.contentBox.SetRowCount(rpos + 1)
-
-	f.insertRows[rpos] = struct{}{}
-
-	// Create the cells, so they're not nil when we try and set the bgcolor
-	colCt := f.ui.contentBox.ColumnCount()
-	for i := 0; i < colCt; i++ {
-		f.ui.contentBox.SetItem(rpos, i, qt.NewQTableWidgetItem())
-	}
-
-	// Repaint cells
-	vcl_grid_set_row_colour(f.ui.contentBox, rpos, qt.NewQBrush4(CO_INSERT))
-
-	// Scroll to bottom
-	f.ui.contentBox.ScrollToBottom()
-}
-
-func (f *App) OnDataDeleteRowClick() {
-	if !f.ui.contentBox.IsEnabled() {
-		return // Not an active data view
-	}
-
-	rpos := f.ui.contentBox.CurrentRow()
-	f.deleteRows[rpos] = struct{}{}
-
-	// If this row was marked for edit, this takes priority
-	delete(f.updateRows, rpos)
-
-	// Repaint cells
-	vcl_grid_set_row_colour(f.ui.contentBox, rpos, qt.NewQBrush4(CO_DELETE))
-}
-
 func (f *App) OnDataCommitClick() {
 	if !f.ui.contentBox.IsEnabled() {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Can't apply changes: editing is disabled")
 		return // Not an active data view
 	}
 
+	if !f.contentTbl.allowEdit {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Can't apply changes: database is not editable")
+		return // ??? Shouldn't be able to reach this point
+	}
+
 	node := f.ui.Buckets.CurrentItem()
 	if node == nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "No database selected")
@@ -386,13 +283,16 @@ func (f *App) OnDataCommitClick() {
 		return
 	}
 
-	err = editableLd.ApplyChanges(f, bucketPath)
+	err = editableLd.ApplyChanges(f.contentTbl, bucketPath)
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
+		// fallthrough to refresh
 	}
 
 	// Refresh content
-	f.OnNavChange(node, node) // Refresh RHS pane/data content
+	// This disables the 'apply changes' button again as there are no remaining edits
+	// Don't call onNavChange here because we don't want to warn about changes
+	f.refreshContent(node) // Refresh RHS pane/data content
 
 	// Preserve scroll position
 	// TODO
@@ -486,57 +386,109 @@ func (f *App) OnQueryExecute() {
 
 	ld := f.getLoadedDatabaseFor(node)
 
+	// bucketPath is only used for some databases, not for others
+	bucketPath, err := f.getBucketPathFor(node)
+	if err != nil {
+		panic(err) // shouldn't happen
+	}
+
 	queryableLd, ok := ld.(queryableLoadedDatabase)
 	if !ok {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, "Unsupported action for this database")
 		return
 	}
 
-	err := queryableLd.ExecQuery(queryString, f.ui.queryResult)
+	f.resultsTbl.Wipeout()
+	err = queryableLd.ExecQuery(queryString, bucketPath, f.resultsTbl)
 	if err != nil {
 		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
 		return
 	}
 }
 
-func (f *App) OnNavChange(node *qt.QTreeWidgetItem, _ *qt.QTreeWidgetItem) {
+func (f *App) OnNavChange(node *qt.QTreeWidgetItem, prev *qt.QTreeWidgetItem) {
+
+	// If there are unsaved changes, we may want to block this change / switch
+	// back to the previous selection
+	// Prompt for confirmation first
+	if f.contentTbl.AnyChanges() {
+		ok := qt.QMessageBox_Warning2(f.ui.MainWindow.QWidget, APPNAME, "Your changes have not been saved.", qt.QMessageBox__Ok, qt.QMessageBox__Discard)
+		if ok != int(qt.QMessageBox__Discard) {
+
+			// We want to stop this change
+			if prev == nil {
+				return // that's enough
+			}
+
+			// We need to block recursive triggering
+			// First time, to update , but doesn't update selection stat
+			f.ui.Buckets.BlockSignals(true)
+			f.ui.Buckets.SetCurrentItem(prev) // Also sets selection
+			f.ui.Buckets.BlockSignals(false)
+
+			f.ui.Buckets.SetEnabled(false)
+
+			// On next event loop tick:
+			mainthread.Start(func() {
+
+				// Second time
+				// Since it's already set, won't trigger onNavChange
+				f.ui.Buckets.SetCurrentItem(prev)
+				f.ui.Buckets.SetEnabled(true)
+			})
+			return
+		}
+	}
+
+	// OK, continue with change
+	f.refreshContent(node)
+}
+
+func (f *App) refreshContent(node *qt.QTreeWidgetItem) {
 
 	var ld loadedDatabase = f.none
 	var bucketPath []string = nil
 
 	if node != nil {
 		ld = f.getLoadedDatabaseFor(node)
-		bucketPath, _ = f.getBucketPathFor(node) // FIXME suppressing error
+		var err error
+		bucketPath, err = f.getBucketPathFor(node)
+		if err != nil {
+			panic(err) // shouldn't happen
+		}
 	}
 
-	// Reset some controls that the render function is expected to populate
-	f.insertRows = make(map[int]struct{})
-	f.updateRows = make(map[int][]int)
-	f.deleteRows = make(map[int]struct{})
-	f.isEditing = false
 	f.ui.propertiesBox.Clear()
-	vcl_clear_grid(f.ui.contentBox)
+	propertiesText, err := ld.Properties(bucketPath)
-
-	err := ld.RenderForNav(f.ui, bucketPath) // Handover to the database type's own renderer function
 	if err != nil {
-		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, err.Error())
+		f.ui.propertiesBox.SetPlainText("Error loading properties: " + err.Error())
+	} else {
+		f.ui.propertiesBox.SetPlainText(propertiesText)
+	}
+
+	// Load database content
+	f.contentTbl.Wipeout()
+	err = ld.RenderForNav(f.contentTbl, bucketPath) // Handover to the database type's own renderer function
+	if err != nil {
+		qt.QMessageBox_Warning(f.ui.MainWindow.QWidget, APPNAME, fmt.Sprintf("Loading contents of bucket %v: %s", bucketPath, err.Error()))
 
 		// Ensure elements are disabled
 		f.ui.contentBox.SetEnabled(false)
 	}
 
 	// Toggle the Edit functionality
-	_, ok := ld.(editableLoadedDatabase)
+	// Do this *after* RenderForNav as it disables editing by default.
-	f.ui.dataCommitBtn.SetEnabled(ok)
+	_, editable := ld.(editableLoadedDatabase)
-	f.ui.dataDelRowBtn.SetEnabled(ok)
+	f.ui.actionApply_changes.SetEnabled(false) // will be enabled after add/delete/edit
-	f.ui.dataInsertBtn.SetEnabled(ok)
+	f.ui.actionDelete_row.SetEnabled(editable)
-	f.isEditing = ok
+	f.ui.actionAddRow.SetEnabled(editable)
+	f.contentTbl.SetAllowEditing(editable)
 
 	// Toggle the Query functionality
-	_, ok = ld.(queryableLoadedDatabase)
+	_, queryable := ld.(queryableLoadedDatabase)
-	f.ui.queryInput.SetEnabled(ok)
+	f.ui.queryInput.SetEnabled(queryable)
-	f.ui.queryResult.SetEnabled(ok)
+	f.ui.queryResult.SetEnabled(queryable)
-	f.ui.queryExecBtn.SetEnabled(ok)
+	f.ui.mnuExecute.SetEnabled(queryable)
 
 	// We're in charge of common status bar text updates
 	// Find database displayname
@@ -561,7 +513,11 @@ func (f *App) DatabaseDisplayName(item *qt.QTreeWidgetItem) string {
 	return item.Text(0)
 }
 
-func (f *App) OnNavExpanding(item *qt.QTreeWidgetItem) {
+func (f *App) handleNavExpansion(item *qt.QTreeWidgetItem, recurseDepth int) {
+
+	if item == nil {
+		panic("Expanding a nil item?")
+	}
 
 	if item.ChildCount() > 0 {
 		// We've already virtual-expanded this item once, don't repeat it
@@ -590,21 +546,26 @@ func (f *App) OnNavExpanding(item *qt.QTreeWidgetItem) {
 		return
 	}
 
-	// While we're here - preload one single level deep (not any deeper)
+	if recurseDepth > 0 {
-	// This makes it "seem" like we don't have empty virtual subfolders most of the time
+		// While we're here - preload one single level deep (not any deeper)
+		// This makes it "seem" like we don't have empty virtual subfolders most of the time
 
-	childCt := item.ChildCount()
+		childCt := item.ChildCount()
-	for i := 0; i < childCt; i++ {
+		for i := 0; i < childCt; i++ {
 
-		cc := item.Child(i)
+			cc := item.Child(i)
-		f.OnNavExpanding(cc)
+			f.handleNavExpansion(cc, recurseDepth-1)
+		}
 	}
+}
 
+func (f *App) OnNavExpanding(item *qt.QTreeWidgetItem) {
+	f.handleNavExpansion(item, 1)
 }
 
 const (
 	LoadedDatabaseIdRole = int(qt.UserRole + 100)
-	BucketPathStringRole = int(qt.UserRole + 101)
+	BucketPathBSliceRole = int(qt.UserRole + 101)
 	DataPrimaryKeyRole   = int(qt.UserRole + 102) // sqlite
 )
 
@@ -616,15 +577,9 @@ func (f *App) getLoadedDatabaseFor(item *qt.QTreeWidgetItem) loadedDatabase {
 
 // getBucketPathFor gets the bucketPath array out of a child nav item.
 func (f *App) getBucketPathFor(item *qt.QTreeWidgetItem) ([]string, error) {
-	bucketPathJsonArr := item.Data(0, BucketPathStringRole).ToString()
+	bucketPathJsonArr := item.Data(0, BucketPathBSliceRole).ToByteArray()
 
-	var ret []string
+	return pathlist_decode(bucketPathJsonArr)
-	err := json.Unmarshal([]byte(bucketPathJsonArr), &ret)
-	if err != nil {
-		return nil, err
-	}
-
-	return ret, nil
 }
 
 func (f *App) NavLoadChildren(item *qt.QTreeWidgetItem, bucketPath []string) error {
@@ -652,10 +607,13 @@ func (f *App) NavLoadChildren(item *qt.QTreeWidgetItem, bucketPath []string) err
 		childPath = append(childPath, bucketPath...)
 		childPath = append(childPath, bucketName)
 
-		childPathJson, _ := json.Marshal(childPath)
+		childPathJson, err := pathlist_encode(childPath)
+		if err != nil {
+			panic(err) // Shouldn't happen
+		}
 
 		node.SetData(0, LoadedDatabaseIdRole, qt.NewQVariant4(ldID))
-		node.SetData(0, BucketPathStringRole, qt.NewQVariant11(string(childPathJson)))
+		node.SetData(0, BucketPathBSliceRole, qt.NewQVariant12(childPathJson))
 
 		item.AddChild(node)
 	}
@@ -675,10 +633,16 @@ func (f *App) addTopLevelDatabaseConnection(ld loadedDatabase, displayName strin
 	f.dbs_next++
 	f.dbs[ldID] = ld
 
+	emptyData, err := pathlist_encode([]string{}) // Initial browse position
+	if err != nil {
+		panic(err) // can't happen
+	}
+
 	nav.SetData(0, LoadedDatabaseIdRole, qt.NewQVariant4(ldID))
-	nav.SetData(0, BucketPathStringRole, qt.NewQVariant11(`[]`)) // empty array
+	nav.SetData(0, BucketPathBSliceRole, qt.NewQVariant12(emptyData))
 
 	f.ui.Buckets.AddTopLevelItem(nav)
 	f.ui.Buckets.SetCurrentItem(nav) // Select new element
 
+	f.handleNavExpansion(nav, 0) // Load child contents but do not recurse further
 }

mainwindow.go

@@ -10,54 +10,41 @@ import (
 )
 
 type MainWindowUi struct {
-	MainWindow                  *qt.QMainWindow
+	MainWindow              *qt.QMainWindow
-	centralwidget               *qt.QWidget
+	centralwidget           *qt.QWidget
-	gridLayout                  *qt.QGridLayout
+	gridLayout              *qt.QGridLayout
-	splitter                    *qt.QSplitter
+	splitter                *qt.QSplitter
-	Buckets                     *qt.QTreeWidget
+	Buckets                 *qt.QTreeWidget
-	tabWidget                   *qt.QTabWidget
+	tabWidget               *qt.QTabWidget
-	tabProperties               *qt.QWidget
+	tabProperties           *qt.QWidget
-	gridLayout_2                *qt.QGridLayout
+	gridLayout_2            *qt.QGridLayout
-	propertiesBox               *qt.QTextEdit
+	propertiesBox           *qt.QTextEdit
-	tabData                     *qt.QWidget
+	tabData                 *qt.QWidget
-	verticalLayout              *qt.QVBoxLayout
+	verticalLayout          *qt.QVBoxLayout
-	horizontalLayout            *qt.QHBoxLayout
+	contentBox              *qt.QTableView
-	dataRefreshBtn              *qt.QToolButton
+	tabQuery                *qt.QWidget
-	dataInsertBtn               *qt.QToolButton
+	verticalLayout_2        *qt.QVBoxLayout
-	dataDelRowBtn               *qt.QToolButton
+	splitter_2              *qt.QSplitter
-	dataCommitBtn               *qt.QToolButton
+	queryInput              *qt.QPlainTextEdit
-	horizontalSpacer            *qt.QSpacerItem
+	queryResult             *qt.QTableView
-	contentBox                  *qt.QTableWidget
+	menubar                 *qt.QMenuBar
-	tabQuery                    *qt.QWidget
+	menu_File               *qt.QMenu
-	verticalLayout_2            *qt.QVBoxLayout
+	menu_Query              *qt.QMenu
-	horizontalLayout_2          *qt.QHBoxLayout
+	menu_Help               *qt.QMenu
-	queryExecBtn                *qt.QToolButton
+	menu_Data               *qt.QMenu
-	horizontalSpacer_2          *qt.QSpacerItem
+	statusbar               *qt.QStatusBar
-	splitter_2                  *qt.QSplitter
+	toolBar                 *qt.QToolBar
-	queryInput                  *qt.QTextEdit
+	actionE_xit             *qt.QAction
-	queryResult                 *qt.QTableWidget
+	mnuExecute              *qt.QAction
-	menubar                     *qt.QMenuBar
+	mnuDriverVersions       *qt.QAction
-	menu_File                   *qt.QMenu
+	mnuHelpAbout            *qt.QAction
-	menu_Query                  *qt.QMenu
+	actionConnect           *qt.QAction
-	menu_Help                   *qt.QMenu
+	actionRefresh           *qt.QAction
-	statusbar                   *qt.QStatusBar
+	actionAbout_Qt          *qt.QAction
-	actionE_xit                 *qt.QAction
+	actionAddRow            *qt.QAction
-	mnuBadgerOpen               *qt.QAction
+	actionDelete_row        *qt.QAction
-	mnuBadgerNewInMemory        *qt.QAction
+	actionApply_changes     *qt.QAction
-	mnuBoltNew                  *qt.QAction
+	actionConnectionManager *qt.QAction
-	mnuBoltOpenDatabase         *qt.QAction
-	mnuBoltOpenDatabaseReadonly *qt.QAction
-	mnuDebconfOpen              *qt.QAction
-	mnuPebbleOpenDatabase       *qt.QAction
-	mnuPebbleNewInMemory        *qt.QAction
-	mnuRedisConnect             *qt.QAction
-	mnuSqliteOpenDatabase       *qt.QAction
-	mnuSqliteNewInMemory        *qt.QAction
-	mnuSqliteExperimentalDriver *qt.QAction
-	mnuExecute                  *qt.QAction
-	mnuDriverVersions           *qt.QAction
-	mnuHelpAbout                *qt.QAction
-	actionConnect               *qt.QAction
 }
 
 // NewMainWindowUi creates all Qt widget classes for MainWindow.
@@ -75,95 +62,14 @@ func NewMainWindowUi() *MainWindowUi {
 	actionE_xit__objectName := qt.NewQAnyStringView3("actionE_xit")
 	ui.actionE_xit.SetObjectName(*actionE_xit__objectName)
 	actionE_xit__objectName.Delete() // setter copied value
-	ui.mnuBadgerOpen = qt.NewQAction()
+	/* miqt-uic: no handler for QAction property 'menuRole' */
-	mnuBadgerOpen__objectName := qt.NewQAnyStringView3("mnuBadgerOpen")
-	ui.mnuBadgerOpen.SetObjectName(*mnuBadgerOpen__objectName)
-	mnuBadgerOpen__objectName.Delete() // setter copied value
-	icon1 := qt.NewQIcon()
-	icon1.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuBadgerOpen.SetIcon(icon1)
-	ui.mnuBadgerNewInMemory = qt.NewQAction()
-	mnuBadgerNewInMemory__objectName := qt.NewQAnyStringView3("mnuBadgerNewInMemory")
-	ui.mnuBadgerNewInMemory.SetObjectName(*mnuBadgerNewInMemory__objectName)
-	mnuBadgerNewInMemory__objectName.Delete() // setter copied value
-	icon2 := qt.NewQIcon()
-	icon2.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuBadgerNewInMemory.SetIcon(icon2)
-	ui.mnuBoltNew = qt.NewQAction()
-	mnuBoltNew__objectName := qt.NewQAnyStringView3("mnuBoltNew")
-	ui.mnuBoltNew.SetObjectName(*mnuBoltNew__objectName)
-	mnuBoltNew__objectName.Delete() // setter copied value
-	icon3 := qt.NewQIcon()
-	icon3.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuBoltNew.SetIcon(icon3)
-	ui.mnuBoltOpenDatabase = qt.NewQAction()
-	mnuBoltOpenDatabase__objectName := qt.NewQAnyStringView3("mnuBoltOpenDatabase")
-	ui.mnuBoltOpenDatabase.SetObjectName(*mnuBoltOpenDatabase__objectName)
-	mnuBoltOpenDatabase__objectName.Delete() // setter copied value
-	icon4 := qt.NewQIcon()
-	icon4.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuBoltOpenDatabase.SetIcon(icon4)
-	ui.mnuBoltOpenDatabaseReadonly = qt.NewQAction()
-	mnuBoltOpenDatabaseReadonly__objectName := qt.NewQAnyStringView3("mnuBoltOpenDatabaseReadonly")
-	ui.mnuBoltOpenDatabaseReadonly.SetObjectName(*mnuBoltOpenDatabaseReadonly__objectName)
-	mnuBoltOpenDatabaseReadonly__objectName.Delete() // setter copied value
-	icon5 := qt.NewQIcon()
-	icon5.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuBoltOpenDatabaseReadonly.SetIcon(icon5)
-	ui.mnuDebconfOpen = qt.NewQAction()
-	mnuDebconfOpen__objectName := qt.NewQAnyStringView3("mnuDebconfOpen")
-	ui.mnuDebconfOpen.SetObjectName(*mnuDebconfOpen__objectName)
-	mnuDebconfOpen__objectName.Delete() // setter copied value
-	icon6 := qt.NewQIcon()
-	icon6.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuDebconfOpen.SetIcon(icon6)
-	ui.mnuPebbleOpenDatabase = qt.NewQAction()
-	mnuPebbleOpenDatabase__objectName := qt.NewQAnyStringView3("mnuPebbleOpenDatabase")
-	ui.mnuPebbleOpenDatabase.SetObjectName(*mnuPebbleOpenDatabase__objectName)
-	mnuPebbleOpenDatabase__objectName.Delete() // setter copied value
-	icon7 := qt.NewQIcon()
-	icon7.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuPebbleOpenDatabase.SetIcon(icon7)
-	ui.mnuPebbleNewInMemory = qt.NewQAction()
-	mnuPebbleNewInMemory__objectName := qt.NewQAnyStringView3("mnuPebbleNewInMemory")
-	ui.mnuPebbleNewInMemory.SetObjectName(*mnuPebbleNewInMemory__objectName)
-	mnuPebbleNewInMemory__objectName.Delete() // setter copied value
-	icon8 := qt.NewQIcon()
-	icon8.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuPebbleNewInMemory.SetIcon(icon8)
-	ui.mnuRedisConnect = qt.NewQAction()
-	mnuRedisConnect__objectName := qt.NewQAnyStringView3("mnuRedisConnect")
-	ui.mnuRedisConnect.SetObjectName(*mnuRedisConnect__objectName)
-	mnuRedisConnect__objectName.Delete() // setter copied value
-	icon9 := qt.NewQIcon()
-	icon9.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuRedisConnect.SetIcon(icon9)
-	ui.mnuSqliteOpenDatabase = qt.NewQAction()
-	mnuSqliteOpenDatabase__objectName := qt.NewQAnyStringView3("mnuSqliteOpenDatabase")
-	ui.mnuSqliteOpenDatabase.SetObjectName(*mnuSqliteOpenDatabase__objectName)
-	mnuSqliteOpenDatabase__objectName.Delete() // setter copied value
-	icon10 := qt.NewQIcon()
-	icon10.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuSqliteOpenDatabase.SetIcon(icon10)
-	ui.mnuSqliteNewInMemory = qt.NewQAction()
-	mnuSqliteNewInMemory__objectName := qt.NewQAnyStringView3("mnuSqliteNewInMemory")
-	ui.mnuSqliteNewInMemory.SetObjectName(*mnuSqliteNewInMemory__objectName)
-	mnuSqliteNewInMemory__objectName.Delete() // setter copied value
-	icon11 := qt.NewQIcon()
-	icon11.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuSqliteNewInMemory.SetIcon(icon11)
-	ui.mnuSqliteExperimentalDriver = qt.NewQAction()
-	mnuSqliteExperimentalDriver__objectName := qt.NewQAnyStringView3("mnuSqliteExperimentalDriver")
-	ui.mnuSqliteExperimentalDriver.SetObjectName(*mnuSqliteExperimentalDriver__objectName)
-	mnuSqliteExperimentalDriver__objectName.Delete() // setter copied value
-	/* miqt-uic: no handler for QAction property 'checkable' */
 	ui.mnuExecute = qt.NewQAction()
 	mnuExecute__objectName := qt.NewQAnyStringView3("mnuExecute")
 	ui.mnuExecute.SetObjectName(*mnuExecute__objectName)
 	mnuExecute__objectName.Delete() // setter copied value
-	icon12 := qt.NewQIcon()
+	icon1 := qt.NewQIcon()
-	icon12.AddFile4(":/assets/resultset_next.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon1.AddFile4(":/assets/resultset_next.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.mnuExecute.SetIcon(icon12)
+	ui.mnuExecute.SetIcon(icon1)
 	ui.mnuDriverVersions = qt.NewQAction()
 	mnuDriverVersions__objectName := qt.NewQAnyStringView3("mnuDriverVersions")
 	ui.mnuDriverVersions.SetObjectName(*mnuDriverVersions__objectName)
@@ -172,13 +78,65 @@ func NewMainWindowUi() *MainWindowUi {
 	mnuHelpAbout__objectName := qt.NewQAnyStringView3("mnuHelpAbout")
 	ui.mnuHelpAbout.SetObjectName(*mnuHelpAbout__objectName)
 	mnuHelpAbout__objectName.Delete() // setter copied value
+	icon2 := qt.NewQIcon()
+	icon2.AddFile4(":/assets/help.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.mnuHelpAbout.SetIcon(icon2)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
 	ui.actionConnect = qt.NewQAction()
 	actionConnect__objectName := qt.NewQAnyStringView3("actionConnect")
 	ui.actionConnect.SetObjectName(*actionConnect__objectName)
 	actionConnect__objectName.Delete() // setter copied value
-	icon13 := qt.NewQIcon()
+	icon3 := qt.NewQIcon()
-	icon13.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon3.AddFile4(":/assets/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.actionConnect.SetIcon(icon13)
+	ui.actionConnect.SetIcon(icon3)
+	ui.actionRefresh = qt.NewQAction()
+	actionRefresh__objectName := qt.NewQAnyStringView3("actionRefresh")
+	ui.actionRefresh.SetObjectName(*actionRefresh__objectName)
+	actionRefresh__objectName.Delete() // setter copied value
+	icon4 := qt.NewQIcon()
+	icon4.AddFile4(":/assets/arrow_refresh.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionRefresh.SetIcon(icon4)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionAbout_Qt = qt.NewQAction()
+	actionAbout_Qt__objectName := qt.NewQAnyStringView3("actionAbout_Qt")
+	ui.actionAbout_Qt.SetObjectName(*actionAbout_Qt__objectName)
+	actionAbout_Qt__objectName.Delete() // setter copied value
+	icon5 := qt.NewQIcon()
+	icon5.AddFile4(":/assets/vendor_qt.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionAbout_Qt.SetIcon(icon5)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionAddRow = qt.NewQAction()
+	actionAddRow__objectName := qt.NewQAnyStringView3("actionAddRow")
+	ui.actionAddRow.SetObjectName(*actionAddRow__objectName)
+	actionAddRow__objectName.Delete() // setter copied value
+	icon6 := qt.NewQIcon()
+	icon6.AddFile4(":/assets/add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionAddRow.SetIcon(icon6)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionDelete_row = qt.NewQAction()
+	actionDelete_row__objectName := qt.NewQAnyStringView3("actionDelete_row")
+	ui.actionDelete_row.SetObjectName(*actionDelete_row__objectName)
+	actionDelete_row__objectName.Delete() // setter copied value
+	icon7 := qt.NewQIcon()
+	icon7.AddFile4(":/assets/delete.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionDelete_row.SetIcon(icon7)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionApply_changes = qt.NewQAction()
+	actionApply_changes__objectName := qt.NewQAnyStringView3("actionApply_changes")
+	ui.actionApply_changes.SetObjectName(*actionApply_changes__objectName)
+	actionApply_changes__objectName.Delete() // setter copied value
+	icon8 := qt.NewQIcon()
+	icon8.AddFile4(":/assets/pencil_go.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionApply_changes.SetIcon(icon8)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
+	ui.actionConnectionManager = qt.NewQAction()
+	actionConnectionManager__objectName := qt.NewQAnyStringView3("actionConnectionManager")
+	ui.actionConnectionManager.SetObjectName(*actionConnectionManager__objectName)
+	actionConnectionManager__objectName.Delete() // setter copied value
+	icon9 := qt.NewQIcon()
+	icon9.AddFile4(":/assets/database_key.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	ui.actionConnectionManager.SetIcon(icon9)
+	/* miqt-uic: no handler for QAction property 'menuRole' */
 	ui.centralwidget = qt.NewQWidget(ui.MainWindow.QWidget)
 	centralwidget__objectName := qt.NewQAnyStringView3("centralwidget")
 	ui.centralwidget.SetObjectName(*centralwidget__objectName)
@@ -234,9 +192,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.propertiesBox.SetReadOnly(true)
 
 	ui.gridLayout_2.AddWidget2(ui.propertiesBox.QWidget, 0, 0)
-	icon14 := qt.NewQIcon()
+	icon10 := qt.NewQIcon()
-	icon14.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon10.AddFile4(":/assets/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabProperties, icon14, "")
+	ui.tabWidget.AddTab2(ui.tabProperties, icon10, "")
 	ui.tabData = qt.NewQWidget(ui.tabWidget.QWidget)
 	tabData__objectName := qt.NewQAnyStringView3("tabData")
 	ui.tabData.SetObjectName(*tabData__objectName)
@@ -247,58 +205,7 @@ func NewMainWindowUi() *MainWindowUi {
 	verticalLayout__objectName.Delete() // setter copied value
 	ui.verticalLayout.SetContentsMargins(11, 11, 11, 11)
 	ui.verticalLayout.SetSpacing(6)
-	ui.horizontalLayout = qt.NewQHBoxLayout2()
+	ui.contentBox = qt.NewQTableView(ui.tabData)
-	horizontalLayout__objectName := qt.NewQAnyStringView3("horizontalLayout")
-	ui.horizontalLayout.SetObjectName(*horizontalLayout__objectName)
-	horizontalLayout__objectName.Delete() // setter copied value
-	ui.horizontalLayout.SetContentsMargins(0, 0, 0, 0)
-	ui.horizontalLayout.SetSpacing(6)
-	ui.dataRefreshBtn = qt.NewQToolButton(ui.tabData)
-	dataRefreshBtn__objectName := qt.NewQAnyStringView3("dataRefreshBtn")
-	ui.dataRefreshBtn.SetObjectName(*dataRefreshBtn__objectName)
-	dataRefreshBtn__objectName.Delete() // setter copied value
-	icon15 := qt.NewQIcon()
-	icon15.AddFile4(":/assets/arrow_refresh.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.dataRefreshBtn.SetIcon(icon15)
-	ui.dataRefreshBtn.SetAutoRaise(true)
-
-	ui.horizontalLayout.AddWidget(ui.dataRefreshBtn.QWidget)
-	ui.dataInsertBtn = qt.NewQToolButton(ui.tabData)
-	dataInsertBtn__objectName := qt.NewQAnyStringView3("dataInsertBtn")
-	ui.dataInsertBtn.SetObjectName(*dataInsertBtn__objectName)
-	dataInsertBtn__objectName.Delete() // setter copied value
-	icon16 := qt.NewQIcon()
-	icon16.AddFile4(":/assets/add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.dataInsertBtn.SetIcon(icon16)
-	ui.dataInsertBtn.SetAutoRaise(true)
-
-	ui.horizontalLayout.AddWidget(ui.dataInsertBtn.QWidget)
-	ui.dataDelRowBtn = qt.NewQToolButton(ui.tabData)
-	dataDelRowBtn__objectName := qt.NewQAnyStringView3("dataDelRowBtn")
-	ui.dataDelRowBtn.SetObjectName(*dataDelRowBtn__objectName)
-	dataDelRowBtn__objectName.Delete() // setter copied value
-	icon17 := qt.NewQIcon()
-	icon17.AddFile4(":/assets/delete.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.dataDelRowBtn.SetIcon(icon17)
-	ui.dataDelRowBtn.SetAutoRaise(true)
-
-	ui.horizontalLayout.AddWidget(ui.dataDelRowBtn.QWidget)
-	ui.dataCommitBtn = qt.NewQToolButton(ui.tabData)
-	dataCommitBtn__objectName := qt.NewQAnyStringView3("dataCommitBtn")
-	ui.dataCommitBtn.SetObjectName(*dataCommitBtn__objectName)
-	dataCommitBtn__objectName.Delete() // setter copied value
-	icon18 := qt.NewQIcon()
-	icon18.AddFile4(":/assets/pencil_go.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.dataCommitBtn.SetIcon(icon18)
-	ui.dataCommitBtn.SetAutoRaise(true)
-
-	ui.horizontalLayout.AddWidget(ui.dataCommitBtn.QWidget)
-	ui.horizontalSpacer = qt.NewQSpacerItem4(40, 20, qt.QSizePolicy__Expanding, qt.QSizePolicy__Minimum)
-
-	ui.horizontalLayout.AddItem(ui.horizontalSpacer.QLayoutItem)
-
-	ui.verticalLayout.AddLayout(ui.horizontalLayout.QLayout)
-	ui.contentBox = qt.NewQTableWidget(ui.tabData)
 	contentBox__objectName := qt.NewQAnyStringView3("contentBox")
 	ui.contentBox.SetObjectName(*contentBox__objectName)
 	contentBox__objectName.Delete() // setter copied value
@@ -306,9 +213,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.contentBox.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
 
 	ui.verticalLayout.AddWidget(ui.contentBox.QWidget)
-	icon19 := qt.NewQIcon()
+	icon11 := qt.NewQIcon()
-	icon19.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon11.AddFile4(":/assets/table.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabData, icon19, "")
+	ui.tabWidget.AddTab2(ui.tabData, icon11, "")
 	ui.tabQuery = qt.NewQWidget(ui.tabWidget.QWidget)
 	tabQuery__objectName := qt.NewQAnyStringView3("tabQuery")
 	ui.tabQuery.SetObjectName(*tabQuery__objectName)
@@ -319,40 +226,19 @@ func NewMainWindowUi() *MainWindowUi {
 	verticalLayout_2__objectName.Delete() // setter copied value
 	ui.verticalLayout_2.SetContentsMargins(11, 11, 11, 11)
 	ui.verticalLayout_2.SetSpacing(6)
-	ui.horizontalLayout_2 = qt.NewQHBoxLayout2()
-	horizontalLayout_2__objectName := qt.NewQAnyStringView3("horizontalLayout_2")
-	ui.horizontalLayout_2.SetObjectName(*horizontalLayout_2__objectName)
-	horizontalLayout_2__objectName.Delete() // setter copied value
-	ui.horizontalLayout_2.SetContentsMargins(0, 0, 0, 0)
-	ui.horizontalLayout_2.SetSpacing(6)
-	ui.queryExecBtn = qt.NewQToolButton(ui.tabQuery)
-	queryExecBtn__objectName := qt.NewQAnyStringView3("queryExecBtn")
-	ui.queryExecBtn.SetObjectName(*queryExecBtn__objectName)
-	queryExecBtn__objectName.Delete() // setter copied value
-	icon20 := qt.NewQIcon()
-	icon20.AddFile4(":/assets/resultset_next.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.queryExecBtn.SetIcon(icon20)
-	ui.queryExecBtn.SetAutoRaise(true)
-
-	ui.horizontalLayout_2.AddWidget(ui.queryExecBtn.QWidget)
-	ui.horizontalSpacer_2 = qt.NewQSpacerItem4(40, 20, qt.QSizePolicy__Expanding, qt.QSizePolicy__Minimum)
-
-	ui.horizontalLayout_2.AddItem(ui.horizontalSpacer_2.QLayoutItem)
-
-	ui.verticalLayout_2.AddLayout(ui.horizontalLayout_2.QLayout)
 	ui.splitter_2 = qt.NewQSplitter(ui.tabQuery)
 	splitter_2__objectName := qt.NewQAnyStringView3("splitter_2")
 	ui.splitter_2.SetObjectName(*splitter_2__objectName)
 	splitter_2__objectName.Delete() // setter copied value
 	ui.splitter_2.SetOrientation(qt.Vertical)
 	ui.splitter_2.SetChildrenCollapsible(false)
-	ui.queryInput = qt.NewQTextEdit(ui.splitter_2.QWidget)
+	ui.queryInput = qt.NewQPlainTextEdit(ui.splitter_2.QWidget)
 	queryInput__objectName := qt.NewQAnyStringView3("queryInput")
 	ui.queryInput.SetObjectName(*queryInput__objectName)
 	queryInput__objectName.Delete() // setter copied value
 	/* miqt-uic: no handler for queryInput property 'font' */
 	ui.splitter_2.AddWidget(ui.queryInput.QWidget)
-	ui.queryResult = qt.NewQTableWidget(ui.splitter_2.QWidget)
+	ui.queryResult = qt.NewQTableView(ui.splitter_2.QWidget)
 	queryResult__objectName := qt.NewQAnyStringView3("queryResult")
 	ui.queryResult.SetObjectName(*queryResult__objectName)
 	queryResult__objectName.Delete() // setter copied value
@@ -361,9 +247,9 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.splitter_2.AddWidget(ui.queryResult.QWidget)
 
 	ui.verticalLayout_2.AddWidget(ui.splitter_2.QWidget)
-	icon21 := qt.NewQIcon()
+	icon12 := qt.NewQIcon()
-	icon21.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
+	icon12.AddFile4(":/assets/lightning.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off)
-	ui.tabWidget.AddTab2(ui.tabQuery, icon21, "")
+	ui.tabWidget.AddTab2(ui.tabQuery, icon12, "")
 	ui.splitter.AddWidget(ui.tabWidget.QWidget)
 
 	ui.gridLayout.AddWidget2(ui.splitter.QWidget, 0, 0)
@@ -377,6 +263,7 @@ func NewMainWindowUi() *MainWindowUi {
 	menu_File__objectName := qt.NewQAnyStringView3("menu_File")
 	ui.menu_File.SetObjectName(*menu_File__objectName)
 	menu_File__objectName.Delete() // setter copied value
+	ui.menu_File.QWidget.AddAction(ui.actionConnectionManager)
 	ui.menu_File.QWidget.AddAction(ui.actionConnect)
 	ui.menu_File.AddSeparator()
 	ui.menu_File.QWidget.AddAction(ui.actionE_xit)
@@ -390,8 +277,20 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.menu_Help.SetObjectName(*menu_Help__objectName)
 	menu_Help__objectName.Delete() // setter copied value
 	ui.menu_Help.QWidget.AddAction(ui.mnuDriverVersions)
+	ui.menu_Help.AddSeparator()
+	ui.menu_Help.QWidget.AddAction(ui.actionAbout_Qt)
 	ui.menu_Help.QWidget.AddAction(ui.mnuHelpAbout)
+	ui.menu_Data = qt.NewQMenu(ui.menubar.QWidget)
+	menu_Data__objectName := qt.NewQAnyStringView3("menu_Data")
+	ui.menu_Data.SetObjectName(*menu_Data__objectName)
+	menu_Data__objectName.Delete() // setter copied value
+	ui.menu_Data.QWidget.AddAction(ui.actionRefresh)
+	ui.menu_Data.AddSeparator()
+	ui.menu_Data.QWidget.AddAction(ui.actionAddRow)
+	ui.menu_Data.QWidget.AddAction(ui.actionDelete_row)
+	ui.menu_Data.QWidget.AddAction(ui.actionApply_changes)
 	ui.menubar.AddMenu(ui.menu_File)
+	ui.menubar.AddMenu(ui.menu_Data)
 	ui.menubar.AddMenu(ui.menu_Query)
 	ui.menubar.AddMenu(ui.menu_Help)
 	ui.MainWindow.SetMenuBar(ui.menubar)
@@ -400,6 +299,23 @@ func NewMainWindowUi() *MainWindowUi {
 	ui.statusbar.SetObjectName(*statusbar__objectName)
 	statusbar__objectName.Delete() // setter copied value
 	ui.MainWindow.SetStatusBar(ui.statusbar)
+	ui.toolBar = qt.NewQToolBar(ui.MainWindow.QWidget)
+	toolBar__objectName := qt.NewQAnyStringView3("toolBar")
+	ui.toolBar.SetObjectName(*toolBar__objectName)
+	toolBar__objectName.Delete() // setter copied value
+	/* miqt-uic: no handler for toolBar property 'iconSize' */
+	ui.toolBar.SetToolButtonStyle(qt.ToolButtonIconOnly)
+	ui.MainWindow.AddToolBar(qt.TopToolBarArea, ui.toolBar)
+	/* miqt-uic: no handler for toolBar attribute 'toolBarBreak' */
+	ui.toolBar.QWidget.AddAction(ui.actionConnectionManager)
+	ui.toolBar.QWidget.AddAction(ui.actionConnect)
+	ui.toolBar.AddSeparator()
+	ui.toolBar.QWidget.AddAction(ui.actionRefresh)
+	ui.toolBar.QWidget.AddAction(ui.actionAddRow)
+	ui.toolBar.QWidget.AddAction(ui.actionDelete_row)
+	ui.toolBar.QWidget.AddAction(ui.actionApply_changes)
+	ui.toolBar.AddSeparator()
+	ui.toolBar.QWidget.AddAction(ui.mnuExecute)
 
 	ui.Retranslate()
 
@@ -412,18 +328,6 @@ func NewMainWindowUi() *MainWindowUi {
 func (ui *MainWindowUi) Retranslate() {
 	ui.MainWindow.SetWindowTitle(qt.QCoreApplication_Tr("yvbolt"))
 	ui.actionE_xit.SetText(qt.QMainWindow_Tr("E&xit"))
-	ui.mnuBadgerOpen.SetText(qt.QMainWindow_Tr("Open database..."))
-	ui.mnuBadgerNewInMemory.SetText(qt.QMainWindow_Tr("New in-memory database"))
-	ui.mnuBoltNew.SetText(qt.QMainWindow_Tr("New database..."))
-	ui.mnuBoltOpenDatabase.SetText(qt.QMainWindow_Tr("Open database..."))
-	ui.mnuBoltOpenDatabaseReadonly.SetText(qt.QMainWindow_Tr("Open database (read-only)..."))
-	ui.mnuDebconfOpen.SetText(qt.QMainWindow_Tr("Open database..."))
-	ui.mnuPebbleOpenDatabase.SetText(qt.QMainWindow_Tr("Open database..."))
-	ui.mnuPebbleNewInMemory.SetText(qt.QMainWindow_Tr("New in-memory database"))
-	ui.mnuRedisConnect.SetText(qt.QMainWindow_Tr("Connect..."))
-	ui.mnuSqliteOpenDatabase.SetText(qt.QMainWindow_Tr("Open database..."))
-	ui.mnuSqliteNewInMemory.SetText(qt.QMainWindow_Tr("New in-memory database"))
-	ui.mnuSqliteExperimentalDriver.SetText(qt.QMainWindow_Tr("Connect using CLI driver (experimental)"))
 	ui.mnuExecute.SetText(qt.QMainWindow_Tr("E&xecute"))
 	ui.mnuExecute.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F9")))
 	ui.mnuDriverVersions.SetText(qt.QMainWindow_Tr("Driver versions..."))
@@ -431,16 +335,21 @@ func (ui *MainWindowUi) Retranslate() {
 	ui.mnuHelpAbout.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F1")))
 	ui.actionConnect.SetText(qt.QMainWindow_Tr("Connect..."))
 	ui.actionConnect.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("Ctrl+O")))
+	ui.actionRefresh.SetText(qt.QMainWindow_Tr("Refresh"))
+	ui.actionRefresh.SetShortcut(qt.NewQKeySequence2(qt.QMainWindow_Tr("F5")))
+	ui.actionAbout_Qt.SetText(qt.QMainWindow_Tr("About Qt"))
+	ui.actionAddRow.SetText(qt.QMainWindow_Tr("Add row"))
+	ui.actionAddRow.SetToolTip(qt.QMainWindow_Tr("Add row"))
+	ui.actionDelete_row.SetText(qt.QMainWindow_Tr("Delete row"))
+	ui.actionApply_changes.SetText(qt.QMainWindow_Tr("Apply changes"))
+	ui.actionConnectionManager.SetText(qt.QMainWindow_Tr("Connection Manager"))
+	ui.actionConnectionManager.SetToolTip(qt.QMainWindow_Tr("Connection Manager"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabProperties), qt.QTabWidget_Tr("Properties"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabData), qt.QTabWidget_Tr("Data"))
-	ui.dataRefreshBtn.SetToolTip(qt.QWidget_Tr("Refresh"))
-	ui.dataRefreshBtn.SetShortcut(qt.NewQKeySequence2(qt.QWidget_Tr("F5")))
-	ui.dataInsertBtn.SetToolTip(qt.QWidget_Tr("Insert"))
-	ui.dataDelRowBtn.SetToolTip(qt.QWidget_Tr("Delete Row"))
-	ui.dataCommitBtn.SetToolTip(qt.QWidget_Tr("Commit"))
 	ui.tabWidget.SetTabText(ui.tabWidget.IndexOf(ui.tabQuery), qt.QTabWidget_Tr("Query"))
-	ui.queryExecBtn.SetText(qt.QWidget_Tr("Execute"))
 	ui.menu_File.SetTitle(qt.QMenuBar_Tr("&File"))
 	ui.menu_Query.SetTitle(qt.QMenuBar_Tr("&Query"))
 	ui.menu_Help.SetTitle(qt.QMenuBar_Tr("&Help"))
+	ui.menu_Data.SetTitle(qt.QMenuBar_Tr("&Data"))
+	ui.toolBar.SetWindowTitle(qt.QMainWindow_Tr("toolBar"))
 }

mainwindow.ui

@@ -84,83 +84,7 @@
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout">
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
+          <widget class="QTableView" name="contentBox">
-           <item>
-            <widget class="QToolButton" name="dataRefreshBtn">
-             <property name="toolTip">
-              <string>Refresh</string>
-             </property>
-             <property name="icon">
-              <iconset resource="embed.qrc">
-               <normaloff>:/assets/arrow_refresh.png</normaloff>:/assets/arrow_refresh.png</iconset>
-             </property>
-             <property name="shortcut">
-              <string>F5</string>
-             </property>
-             <property name="autoRaise">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="dataInsertBtn">
-             <property name="toolTip">
-              <string>Insert</string>
-             </property>
-             <property name="icon">
-              <iconset resource="embed.qrc">
-               <normaloff>:/assets/add.png</normaloff>:/assets/add.png</iconset>
-             </property>
-             <property name="autoRaise">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="dataDelRowBtn">
-             <property name="toolTip">
-              <string>Delete Row</string>
-             </property>
-             <property name="icon">
-              <iconset resource="embed.qrc">
-               <normaloff>:/assets/delete.png</normaloff>:/assets/delete.png</iconset>
-             </property>
-             <property name="autoRaise">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QToolButton" name="dataCommitBtn">
-             <property name="toolTip">
-              <string>Commit</string>
-             </property>
-             <property name="icon">
-              <iconset resource="embed.qrc">
-               <normaloff>:/assets/pencil_go.png</normaloff>:/assets/pencil_go.png</iconset>
-             </property>
-             <property name="autoRaise">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer">
-             <property name="orientation">
-              <enum>Qt::Orientation::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QTableWidget" name="contentBox">
            <property name="verticalScrollMode">
             <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
            </property>
@@ -180,37 +104,6 @@
          <string>Query</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <item>
-            <widget class="QToolButton" name="queryExecBtn">
-             <property name="text">
-              <string>Execute</string>
-             </property>
-             <property name="icon">
-              <iconset resource="embed.qrc">
-               <normaloff>:/assets/resultset_next.png</normaloff>:/assets/resultset_next.png</iconset>
-             </property>
-             <property name="autoRaise">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Orientation::Horizontal</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>40</width>
-               <height>20</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
          <item>
           <widget class="QSplitter" name="splitter_2">
            <property name="orientation">
@@ -219,14 +112,14 @@
            <property name="childrenCollapsible">
             <bool>false</bool>
            </property>
-           <widget class="QTextEdit" name="queryInput">
+           <widget class="QPlainTextEdit" name="queryInput">
             <property name="font">
              <font>
               <family>Monospace</family>
              </font>
             </property>
            </widget>
-           <widget class="QTableWidget" name="queryResult">
+           <widget class="QTableView" name="queryResult">
             <property name="verticalScrollMode">
              <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
             </property>
@@ -256,6 +149,7 @@
     <property name="title">
      <string>&amp;File</string>
     </property>
+    <addaction name="actionConnectionManager"/>
     <addaction name="actionConnect"/>
     <addaction name="separator"/>
     <addaction name="actionE_xit"/>
@@ -271,123 +165,61 @@
      <string>&amp;Help</string>
     </property>
     <addaction name="mnuDriverVersions"/>
+    <addaction name="separator"/>
+    <addaction name="actionAbout_Qt"/>
     <addaction name="mnuHelpAbout"/>
    </widget>
+   <widget class="QMenu" name="menu_Data">
+    <property name="title">
+     <string>&amp;Data</string>
+    </property>
+    <addaction name="actionRefresh"/>
+    <addaction name="separator"/>
+    <addaction name="actionAddRow"/>
+    <addaction name="actionDelete_row"/>
+    <addaction name="actionApply_changes"/>
+   </widget>
    <addaction name="menu_File"/>
+   <addaction name="menu_Data"/>
    <addaction name="menu_Query"/>
    <addaction name="menu_Help"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>16</width>
+     <height>16</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionConnectionManager"/>
+   <addaction name="actionConnect"/>
+   <addaction name="separator"/>
+   <addaction name="actionRefresh"/>
+   <addaction name="actionAddRow"/>
+   <addaction name="actionDelete_row"/>
+   <addaction name="actionApply_changes"/>
+   <addaction name="separator"/>
+   <addaction name="mnuExecute"/>
+  </widget>
   <action name="actionE_xit">
    <property name="text">
     <string>E&amp;xit</string>
    </property>
-  </action>
+   <property name="menuRole">
-  <action name="mnuBadgerOpen">
+    <enum>QAction::MenuRole::QuitRole</enum>
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database...</string>
-   </property>
-  </action>
-  <action name="mnuBadgerNewInMemory">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>New in-memory database</string>
-   </property>
-  </action>
-  <action name="mnuBoltNew">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>New database...</string>
-   </property>
-  </action>
-  <action name="mnuBoltOpenDatabase">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database...</string>
-   </property>
-  </action>
-  <action name="mnuBoltOpenDatabaseReadonly">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database (read-only)...</string>
-   </property>
-  </action>
-  <action name="mnuDebconfOpen">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database...</string>
-   </property>
-  </action>
-  <action name="mnuPebbleOpenDatabase">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database...</string>
-   </property>
-  </action>
-  <action name="mnuPebbleNewInMemory">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>New in-memory database</string>
-   </property>
-  </action>
-  <action name="mnuRedisConnect">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Connect...</string>
-   </property>
-  </action>
-  <action name="mnuSqliteOpenDatabase">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open database...</string>
-   </property>
-  </action>
-  <action name="mnuSqliteNewInMemory">
-   <property name="icon">
-    <iconset resource="embed.qrc">
-     <normaloff>:/assets/database_add.png</normaloff>:/assets/database_add.png</iconset>
-   </property>
-   <property name="text">
-    <string>New in-memory database</string>
-   </property>
-  </action>
-  <action name="mnuSqliteExperimentalDriver">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Connect using CLI driver (experimental)</string>
    </property>
   </action>
   <action name="mnuExecute">
@@ -408,12 +240,19 @@
    </property>
   </action>
   <action name="mnuHelpAbout">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/help.png</normaloff>:/assets/help.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;About yvbolt</string>
    </property>
    <property name="shortcut">
     <string>F1</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::AboutRole</enum>
+   </property>
   </action>
   <action name="actionConnect">
    <property name="icon">
@@ -427,6 +266,87 @@
     <string>Ctrl+O</string>
    </property>
   </action>
+  <action name="actionRefresh">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/arrow_refresh.png</normaloff>:/assets/arrow_refresh.png</iconset>
+   </property>
+   <property name="text">
+    <string>Refresh</string>
+   </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionAbout_Qt">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/vendor_qt.png</normaloff>:/assets/vendor_qt.png</iconset>
+   </property>
+   <property name="text">
+    <string>About Qt</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::AboutQtRole</enum>
+   </property>
+  </action>
+  <action name="actionAddRow">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/add.png</normaloff>:/assets/add.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add row</string>
+   </property>
+   <property name="toolTip">
+    <string>Add row</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionDelete_row">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/delete.png</normaloff>:/assets/delete.png</iconset>
+   </property>
+   <property name="text">
+    <string>Delete row</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionApply_changes">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/pencil_go.png</normaloff>:/assets/pencil_go.png</iconset>
+   </property>
+   <property name="text">
+    <string>Apply changes</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionConnectionManager">
+   <property name="icon">
+    <iconset resource="embed.qrc">
+     <normaloff>:/assets/database_key.png</normaloff>:/assets/database_key.png</iconset>
+   </property>
+   <property name="text">
+    <string>Connection Manager</string>
+   </property>
+   <property name="toolTip">
+    <string>Connection Manager</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="embed.qrc"/>

sshTunnel.go

@@ -12,15 +12,26 @@ import (
 )
 
 type SSHTunnel struct {
-	Server             autoconfig.AddressPort
+	Server   autoconfig.AddressPort
-	Username           string
+	Username string
-	Password           autoconfig.Password
+	H1       autoconfig.Header `ylabel:"Authentication:" json:",omitempty"`
-	PrivateKeyContent  autoconfig.MultiLineString
+	Auth     struct {
-	PrivateKeyFile     autoconfig.ExistingFile
+		Type     autoconfig.OneOf
-	PrivateKeyPassword autoconfig.Password
+		Password *struct {
+			Password autoconfig.Password
+		}
+		PrivateKeyExternal *struct {
+			PrivateKeyFile         autoconfig.ExistingFile `ylabel:"Private Key"`
+			PrivateKeyFilePassword autoconfig.Password     `ylabel:"Password (optional)"`
+		} `ylabel:"Private key (External)"`
+		PrivateKeyInternal *struct {
+			PrivateKeyContent         autoconfig.MultiLineString `ylabel:"Private Key"`
+			PrivateKeyContentPassword autoconfig.Password        `ylabel:"Password (optional)"`
+		} `ylabel:"Private key (Internal)"`
+	}
 }
 
-func (s *SSHTunnel) InitDefaults() { // Used by autoconfig package when creating a new value
+func (s *SSHTunnel) Reset() { // Used by autoconfig package when creating a new value
 	s.Server.Port = 22
 }
 
@@ -49,25 +60,28 @@ func (s SSHTunnel) Open(ctx context.Context) (*ssh.Client, error) {
 		User:            s.Username,
 	}
 
-	if s.Password != "" {
+	if s.Auth.Password != nil {
-		cfg.Auth = append(cfg.Auth, ssh.Password(string(s.Password)))
+		cfg.Auth = append(cfg.Auth, ssh.Password(string(s.Auth.Password.Password)))
-	}
 
-	if s.PrivateKeyContent != "" {
+	} else if s.Auth.PrivateKeyInternal != nil {
-		signer, err := parseMaybePasswordedKey([]byte(s.PrivateKeyContent), []byte(s.PrivateKeyPassword))
+
+		signer, err := parseMaybePasswordedKey(
+			[]byte(s.Auth.PrivateKeyInternal.PrivateKeyContent),
+			[]byte(s.Auth.PrivateKeyInternal.PrivateKeyContentPassword),
+		)
 		if err != nil {
 			return nil, fmt.Errorf("Parsing private key: %w", err)
 		}
 		cfg.Auth = append(cfg.Auth, ssh.PublicKeys(signer))
-	}
 
-	if s.PrivateKeyFile != "" {
+	} else if s.Auth.PrivateKeyExternal != nil {
-		keyBytes, err := os.ReadFile(string(s.PrivateKeyFile))
+
+		keyBytes, err := os.ReadFile(string(s.Auth.PrivateKeyExternal.PrivateKeyFile))
 		if err != nil {
 			return nil, fmt.Errorf("Loading private key: %w", err)
 		}
 
-		signer, err := parseMaybePasswordedKey(keyBytes, []byte(s.PrivateKeyPassword))
+		signer, err := parseMaybePasswordedKey(keyBytes, []byte(s.Auth.PrivateKeyExternal.PrivateKeyFilePassword))
 		if err != nil {
 			return nil, fmt.Errorf("Parsing private key: %w", err)
 		}

table.go

@@ -0,0 +1,450 @@
+package main
+
+import (
+	qt "github.com/mappu/miqt/qt6"
+)
+
+const (
+	CO_INSERT        = qt.Yellow
+	CO_EDIT_IMPLICIT = qt.Green
+	CO_EDIT_EXPLICIT = qt.DarkGreen
+	CO_DELETE        = qt.Red
+)
+
+type columnType int
+
+const (
+	columnType_invalid columnType = iota
+	columnType_inlineText
+	columnType_popupData
+	// TODO add a column type for map[string]string that can show content in a mini popup?? (Useful for redis + secretsvc)
+)
+
+type tableState struct {
+	rowCount           int
+	columns_inlineText [][]string // Sized to include all columns, but, inner vectors are not allocated for unused entries
+	columns_popupData  [][][]byte
+	currentColumns     []columnType
+	columnLabels       []string
+
+	primaryKeys [][]byte
+
+	allowEdit  bool
+	updateRows map[int][]int // row => []column
+	insertRows map[int]struct{}
+	deleteRows map[int]struct{}
+	OnEdited   func()
+
+	model *qt.QAbstractTableModel
+	tbl   *qt.QTableView
+}
+
+// SetupColumns resets the table's content.
+// It preserves the OnEdited callback
+func (ts *tableState) SetupColumns(columns []columnType, labels []string) {
+
+	if ts.tbl.IsEnabled() {
+		ts.tbl.SetEnabled(false)
+		ts.model.BeginResetModel()
+	}
+
+	ts.currentColumns = columns
+	ts.columnLabels = labels
+	ts.rowCount = 0
+
+	ts.columns_inlineText = make([][]string, len(columns))
+	ts.columns_popupData = make([][][]byte, len(columns))
+
+	ts.SetAllowEditing(false)
+	ts.updateRows = make(map[int][]int, 0)
+	ts.insertRows = make(map[int]struct{}, 0)
+	ts.deleteRows = make(map[int]struct{}, 0)
+	ts.primaryKeys = nil
+
+	for i, ctype := range columns {
+		switch ctype {
+		case columnType_inlineText:
+			ts.columns_inlineText[i] = make([]string, 0)
+		case columnType_popupData:
+			ts.columns_popupData[i] = make([][]byte, 0)
+		default:
+			panic("bad columnType")
+		}
+	}
+
+}
+
+func (ts *tableState) SetAllowEditing(allow bool) {
+	ts.allowEdit = allow
+	if allow {
+		ts.tbl.SetEditTriggers(qt.QAbstractItemView__DoubleClicked | qt.QAbstractItemView__EditKeyPressed)
+	} else {
+		ts.tbl.SetEditTriggers(qt.QAbstractItemView__NoEditTriggers)
+	}
+}
+
+func (ts *tableState) AnyChanges() bool {
+	return len(ts.insertRows) > 0 || len(ts.updateRows) > 0 || len(ts.deleteRows) > 0
+}
+
+// AddRow inserts a new row.
+// It's assumed to be initial data. For user-modified data, use InsertNewRow.
+func (ts *tableState) AddRow() int {
+	newRowId := ts.rowCount
+	ts.SetRowCount(ts.rowCount + 1)
+	return newRowId
+}
+
+// AddRowData inserts a new row.
+// It's assumed to be initial data. For user-modified data, use InsertNewRow.
+func (ts *tableState) AddRowData(cells ...any) {
+	aRow := ts.AddRow()
+	for aCol, cellData := range cells {
+		ts.SetCell(aRow, aCol, cellData)
+	}
+}
+
+func (ts *tableState) AddRow_PK_Data(pk []byte, cells ...any) {
+	aRow := ts.AddRow()
+
+	ts.SetRowPrimaryKey(aRow, pk)
+
+	for aCol, cellData := range cells {
+		ts.SetCell(aRow, aCol, cellData)
+	}
+}
+
+func (ts *tableState) SetRowCount(newlen int) {
+	if ts.rowCount == newlen {
+		return // no change
+	}
+	ts.rowCount = newlen
+
+	for i, ctype := range ts.currentColumns {
+		switch ctype {
+		case columnType_inlineText:
+			ts.columns_inlineText[i] = slice_set_len(ts.columns_inlineText[i], newlen)
+		case columnType_popupData:
+			ts.columns_popupData[i] = slice_set_len(ts.columns_popupData[i], newlen)
+		default:
+			panic("bad columnType")
+		}
+	}
+
+	// We don't know if editing will be enabled until after the whole RenderForNav
+	// has completed. Set up primary key support regardless.
+	ts.primaryKeys = slice_set_len(ts.primaryKeys, newlen)
+}
+
+func (ts *tableState) SetCell(aRow, aCol int, data any) {
+	if aRow >= ts.rowCount {
+		panic("SetCell with too large row")
+	}
+
+	ctype := ts.currentColumns[aCol]
+	switch ctype {
+	case columnType_inlineText:
+		// data must be a string
+		strData, ok := data.(string)
+		if !ok {
+			panic("wrong type for string column")
+		}
+		ts.columns_inlineText[aCol][aRow] = strData
+
+	case columnType_popupData: // data must be a []byte
+		bslcData, ok := data.([]byte)
+		if !ok {
+			panic("wrong type for []byte column")
+		}
+
+		// We are probably passed only a view
+		// Copy the data
+		ts.columns_popupData[aCol][aRow] = slice_dup(bslcData)
+	default:
+		panic("bad columnType")
+	}
+}
+
+// SetRowPrimaryKey
+// The slice data will be copied.
+func (ts *tableState) SetRowPrimaryKey(aRow int, data []byte) {
+	if len(ts.primaryKeys) != ts.rowCount {
+		panic("messed up")
+	}
+	if aRow >= ts.rowCount {
+		panic("SetRowPrimaryKey with too large row")
+	}
+
+	ts.primaryKeys[aRow] = slice_dup(data)
+}
+
+func (ts *tableState) Wipeout() {
+	ts.SetupColumns(
+		[]columnType{
+			columnType_inlineText,
+			columnType_popupData,
+		},
+		[]string{"Key", "Value"},
+	)
+}
+
+func (ts *tableState) Ready() {
+	ts.model.EndResetModel()
+
+	ts.tbl.ResizeColumnsToContents()
+	ts.tbl.SetEnabled(true)
+}
+
+// DeleteSelectedRows marks the selected rows for deletion.
+func (ts *tableState) DeleteSelectedRows() {
+	rows := ts.tbl.SelectionModel().SelectedRows()
+	// n.b. if the selection model for the table allows single-cell selection,
+	// this won't find all rows, just fully-selected rows from clicking on the
+	// vertical header bar
+
+	for _, row := range rows {
+		row_ := row.Row() // your boat
+
+		// Mark for deletion
+		ts.deleteRows[row_] = struct{}{}
+
+		// This supersedes any updates in the row
+		if _, ok := ts.updateRows[row_]; ok {
+			delete(ts.updateRows, row_)
+		}
+
+		// Refresh background colour
+		ts.model.DataChanged(&row, &row)
+	}
+
+	if len(rows) > 0 {
+		ts.OnEdited()
+	}
+}
+
+// InsertNewRow is the user action of inserting a new row at the bottom of the
+// table.
+func (ts *tableState) InsertNewRow() {
+	rowId := ts.rowCount
+
+	ts.model.BeginInsertRows(qt.NewQModelIndex(), rowId, rowId)
+
+	ts.AddRow()
+	ts.insertRows[rowId] = struct{}{}
+
+	ts.model.EndInsertRows()
+
+	// Scroll to bottom (only works after EndInsertRows has caused the view to
+	// refresh)
+	ts.tbl.ScrollToBottom()
+
+	// There are currently some edits again
+	ts.OnEdited()
+}
+
+func NewTableState(tbl *qt.QTableView) *tableState {
+
+	// Stylistic changes
+	tbl.SetHorizontalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	tbl.SetVerticalScrollMode(qt.QAbstractItemView__ScrollPerPixel)
+	tbl.VerticalHeader().Hide() // Table row IDs do not match data IDs
+	tbl.SetSelectionBehavior(qt.QAbstractItemView__SelectRows)
+
+	// @ref https://doc.qt.io/qt-6/qabstracttablemodel.html#subclassing
+	model := qt.NewQAbstractTableModel2(tbl.QObject)
+
+	var ts tableState
+	ts.model = model
+	ts.tbl = tbl
+	ts.OnEdited = func() {} // no-op
+	ts.Wipeout()
+
+	model.OnRowCount(func(parent *qt.QModelIndex) int {
+		return ts.rowCount
+	})
+
+	model.OnColumnCount(func(parent *qt.QModelIndex) int {
+		return len(ts.currentColumns)
+	})
+
+	model.OnHeaderData(func(super func(section int, orientation qt.Orientation, role int) *qt.QVariant, section int, orientation qt.Orientation, role int) *qt.QVariant {
+		if role == int(qt.DisplayRole) && orientation == qt.Horizontal {
+			if section >= len(ts.columnLabels) {
+				return qt.NewQVariant() // invalid request
+			}
+
+			return qt.NewQVariant11(ts.columnLabels[section])
+		}
+
+		return super(section, orientation, role)
+	})
+
+	model.OnFlags(func(super func(index *qt.QModelIndex) qt.ItemFlag, index *qt.QModelIndex) qt.ItemFlag {
+		ret := super(index)
+		if ts.allowEdit {
+			ret |= qt.ItemIsEditable
+		}
+		return ret
+	})
+
+	model.OnData(func(index *qt.QModelIndex, role int) *qt.QVariant {
+		if !index.IsValid() {
+			return qt.NewQVariant() // invalid
+		}
+
+		aCol := index.Column()
+		aRow := index.Row()
+
+		switch role {
+		case int(qt.DisplayRole):
+
+			// Formatting for display, return a QVariant of plain string type
+
+			ctype := ts.currentColumns[aCol]
+			switch ctype {
+			case columnType_inlineText:
+				return qt.NewQVariant11(ts.columns_inlineText[aCol][aRow])
+			case columnType_popupData:
+				return qt.NewQVariant11(formatUtf8(ts.columns_popupData[aCol][aRow]))
+			default:
+				panic("bad columnType")
+			}
+
+		case int(qt.EditRole):
+
+			// Supplying to the editor, return a QVariant of raw editing type
+
+			ctype := ts.currentColumns[aCol]
+			switch ctype {
+			case columnType_inlineText:
+				return qt.NewQVariant11(ts.columns_inlineText[aCol][aRow])
+			case columnType_popupData:
+				return qt.NewQVariant12(ts.columns_popupData[aCol][aRow])
+			default:
+				panic("bad columnType")
+			}
+
+		case int(qt.BackgroundRole):
+
+			if _, ok := ts.deleteRows[aRow]; ok {
+				return qt.NewQColor2(CO_DELETE).ToQVariant()
+			}
+
+			if _, ok := ts.insertRows[aRow]; ok {
+				return qt.NewQColor2(CO_INSERT).ToQVariant()
+			}
+
+			if cells, ok := ts.updateRows[aRow]; ok {
+				if slice_contains(cells, aCol) {
+					return qt.NewQColor2(CO_EDIT_EXPLICIT).ToQVariant()
+				} else {
+					return qt.NewQColor2(CO_EDIT_IMPLICIT).ToQVariant()
+				}
+			}
+
+			// Row is not modified
+			return qt.NewQVariant() // trigger default behaviour
+
+		default:
+			return qt.NewQVariant() // invalid
+		}
+	})
+
+	model.OnSetData(func(super func(index *qt.QModelIndex, value *qt.QVariant, role int) bool, index *qt.QModelIndex, value *qt.QVariant, role int) bool {
+
+		if !index.IsValid() {
+			return super(index, value, role) // invalid
+		}
+
+		aCol := index.Column()
+		aRow := index.Row()
+
+		switch role {
+		case int(qt.EditRole):
+			// Update content
+			ctype := ts.currentColumns[aCol]
+			switch ctype {
+			case columnType_inlineText:
+				ts.columns_inlineText[aCol][aRow] = value.ToString()
+			case columnType_popupData:
+				ts.columns_popupData[aCol][aRow] = value.ToByteArray()
+			default:
+				panic("bad columnType")
+			}
+
+			// If this is an insert row, no need to patch updateRows
+			if _, ok := ts.insertRows[aRow]; ok {
+				// nothing to do
+
+			} else {
+
+				// If this row was marked for deletion, this new edit takes priority
+				delete(ts.deleteRows, aRow)
+
+				// Set background colour
+				cells, ok := ts.updateRows[aRow]
+				if !ok {
+					cells = make([]int, 0, 1)
+				}
+				if slice_contains(cells, aCol) {
+					// already ok
+				} else {
+					cells = append(cells, aCol)
+				}
+				ts.updateRows[aRow] = cells
+			}
+
+			// Emit signal
+			// TODO ideally this would run after this function returned?
+			ts.OnEdited()
+
+			// Done
+			return true
+
+		default:
+			return super(index, value, role)
+		}
+
+	})
+
+	// Set target QTableView's model
+
+	tbl.SetModel(model.QAbstractItemModel)
+
+	//
+
+	/*
+		zombie := qt.NewQStyledItemDelegate2(tbl.QObject)
+		zombie.OnCreateEditor(func(super func(parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget, parent *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) *qt.QWidget {
+			// return a custom editor widget
+			foo := qt.NewQPushButton(parent)
+			return foo.QWidget
+
+			// return the default editor widget
+			//return super(parent, option, index)
+		})
+
+		zombie.OnSetEditorData(func(super func(editor *qt.QWidget, index *qt.QModelIndex), editor *qt.QWidget, index *qt.QModelIndex) {
+			// populate the custom editor with the table's current data
+
+			super(editor, index)
+		})
+
+		zombie.OnSetModelData(func(super func(editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex), editor *qt.QWidget, model *qt.QAbstractItemModel, index *qt.QModelIndex) {
+			// the table has requested to save data from the editor back into the model
+
+			super(editor, model, index)
+		})
+
+		zombie.OnUpdateEditorGeometry(func(super func(editor *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex), editor *qt.QWidget, option *qt.QStyleOptionViewItem, index *qt.QModelIndex) {
+			// after having created our custom editor, set the widget's size as per the table column
+			editor.SetGeometryWithGeometry(option.Rect())
+
+			// super(editor, option, index)
+		})
+
+		tbl.SetItemDelegate(zombie.QAbstractItemDelegate) // for all rows? just some columns/...
+	*/
+
+	return &ts
+}

util_types.go

@@ -1,5 +1,10 @@
 package main
 
+import (
+	"bytes"
+	"encoding/gob"
+)
+
 // box_interface creates a slice where all elements of the input slice are boxed
 // in an interface{} type.
 func box_interface[T any](input []T) []interface{} {
@@ -10,6 +15,24 @@ func box_interface[T any](input []T) []interface{} {
 	return ret
 }
 
+func slice_repeat[T any](value T, count int) []T {
+	ret := make([]T, count)
+	for i := 0; i < count; i++ {
+		ret[i] = value
+	}
+	return ret
+}
+
+func address_of[T any](value T) *T {
+	return &value
+}
+
+func slice_dup[T any](src []T) []T {
+	ret := make([]T, len(src))
+	copy(ret, src)
+	return ret
+}
+
 func slice_contains[T comparable](haystack []T, needle T) bool {
 	_, ok := slice_find(haystack, needle)
 	return ok
@@ -24,3 +47,38 @@ func slice_find[T comparable](haystack []T, needle T) (int, bool) {
 
 	return -1, false
 }
+
+func slice_remove_index[T comparable](slice []T, s int) []T {
+	return append(slice[:s], slice[s+1:]...)
+}
+
+// slice_set_len sets the length of the slice. Use it like append -
+// x = slice_set_len(x, 10)
+func slice_set_len[T any](slice []T, newlen int) []T {
+
+	if newlen > len(slice) {
+		// Extending length
+		return append(slice, make([]T, newlen-len(slice))...)
+	}
+
+	// Truncating
+	return slice[0:newlen]
+}
+
+func pathlist_encode(bp []string) ([]byte, error) {
+	buff := bytes.Buffer{}
+	enc := gob.NewEncoder(&buff)
+	err := enc.Encode(bp)
+	if err != nil {
+		return nil, err
+	}
+
+	return buff.Bytes(), nil
+}
+
+func pathlist_decode(input []byte) ([]string, error) {
+	dec := gob.NewDecoder(bytes.NewReader(input))
+	var ret []string
+	err := dec.Decode(&ret)
+	return ret, err
+}

util_types_test.go

@@ -0,0 +1,33 @@
+package main
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestPathlistEncode(t *testing.T) {
+	// Ensure that invalid UTF-8 data is not corrupted in a pathlist encoding
+	// roundtrip
+
+	input := []string{
+		"\x00\x01\x02\x03\x04\x05\x06\x07",
+		"\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7",
+		"\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7",
+		"hello",
+		"world",
+	}
+
+	buff, err := pathlist_encode(input)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ret, err := pathlist_decode(buff)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if !reflect.DeepEqual(input, ret) {
+		t.Error("Mismatch")
+	}
+}

util_vcl.go

@@ -4,13 +4,6 @@ import (
 	qt "github.com/mappu/miqt/qt6"
 )
 
-func vcl_clear_grid(grid *qt.QTableWidget) {
-	grid.Clear()           // clears header labels
-	grid.SetColumnCount(0) // clears content
-	grid.SetRowCount(0)    // clears content
-	grid.SetEnabled(false)
-}
-
 func vcl_confirm_dialog(parent *qt.QWidget, title string, message string) bool {
 
 	ret := qt.QMessageBox_Question2(parent, title, message,
@@ -19,12 +12,3 @@ func vcl_confirm_dialog(parent *qt.QWidget, title string, message string) bool {
 
 	return ret == int(qt.QMessageBox__Apply)
 }
-
-func vcl_grid_set_row_colour(grid *qt.QTableWidget, rowId int, colour *qt.QBrush) {
-
-	numCols := grid.ColumnCount()
-	for i := 0; i < numCols; i++ {
-		cell := grid.Item(rowId, i)
-		cell.SetBackground(colour)
-	}
-}

version.go

@@ -0,0 +1,3 @@
+package main
+
+const appVersion = "v0.0.0-devel"

winres.json

@@ -0,0 +1,54 @@
+{
+  "RT_GROUP_ICON": {
+    "APP": {
+      "0000": "assets/database_lightning.png"
+    }
+  },
+  "RT_VERSION": {
+    "#1": {
+      "0000": {
+        "fixed": {
+          "file_version": "0.0.0.0",
+          "product_version": "0.0.0.0"
+        },
+        "info": {
+          "0409": {
+            "Comments": "",
+            "CompanyName": "code.ivysaur.me",
+            "FileDescription": "yvbolt Database Editor",
+            "FileVersion": "0.0.0.0",
+            "LegalCopyright": "code.ivysaur.me",
+            "LegalTrademarks": "",
+            "ProductName": "yvbolt",
+            "ProductVersion": "0.0.0"
+          }
+        }
+      }
+    }
+  },
+  "RT_MANIFEST": {
+    "#1": {
+      "0409": {
+        "identity": {
+          "name": "",
+          "version": ""
+        },
+        "description": "",
+        "minimum-os": "win7",
+        "execution-level": "as invoker",
+        "ui-access": false,
+        "auto-elevate": false,
+        "dpi-awareness": "per monitor v2",
+        "disable-theming": false,
+        "disable-window-filtering": false,
+        "high-resolution-scrolling-aware": false,
+        "ultra-high-resolution-scrolling-aware": false,
+        "long-path-aware": false,
+        "printer-driver-isolation": false,
+        "gdi-scaling": false,
+        "segment-heap": false,
+        "use-common-controls-v6": true
+      }
+    }
+  }
+}