From 18f10fc1b480bd40adb1e2584df250ac07210ceb Mon Sep 17 00:00:00 2001 From: mappu Date: Wed, 16 Apr 2025 18:17:44 +1200 Subject: [PATCH] update to miqt 0.10, update to qt 6 --- Makefile | 19 ++++++---- go.mod | 2 +- go.sum | 9 +++-- itemwindow_ui.go | 18 ++++------ main.go | 2 +- mainwindow.go | 29 ++++++++------- mainwindow_ui.go | 90 +++++++++++++---------------------------------- resources.go | 4 +-- resources.rcc | Bin 9498 -> 9498 bytes util.go | 15 -------- 10 files changed, 68 insertions(+), 120 deletions(-) diff --git a/Makefile b/Makefile index 6528921..b9ef962 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ DOCKER := docker MIQT_UIC := miqt-uic MIQT_RCC := miqt-rcc GO_WINRES := go-winres -SOURCES := $(wildcard *.go *.ui *.qrc) resources.go mainwindow_ui.go itemwindow_ui.go rsrc_windows_amd64.syso +SOURCES := $(wildcard *.go *.ui *.qrc) resources.go resources.rcc mainwindow_ui.go itemwindow_ui.go rsrc_windows_amd64.syso .PHONY: all all: build/qbolt build/qbolt.exe @@ -18,20 +18,25 @@ dist: build/qbolt-${VERSION}-windows-x86_64.zip build/qbolt-${VERSION}-debian12- .PHONY: clean clean: - rm -f qbolt || true - rm -rf build || true - rm -f windows-manifest.json || true + rm -f qbolt + rm -rf build + mkdir -p build + touch build/.create_dir + rm -f windows-manifest.json + rm -f rsrc_windows_amd64.syso + rm -f resources.go + rm -f resources.rcc # Generated files resources.rcc resources.go: resources.qrc - $(MIQT_RCC) resources.qrc + $(MIQT_RCC) -Qt6 -Input resources.qrc mainwindow_ui.go: mainwindow.ui - $(MIQT_UIC) -InFile mainwindow.ui -OutFile mainwindow_ui.go + $(MIQT_UIC) -Qt6 -InFile mainwindow.ui -OutFile mainwindow_ui.go itemwindow_ui.go: itemwindow.ui - $(MIQT_UIC) -InFile itemwindow.ui -OutFile itemwindow_ui.go + $(MIQT_UIC) -Qt6 -InFile itemwindow.ui -OutFile itemwindow_ui.go windows-manifest.json: windows-manifest.template.json Makefile cat windows-manifest.template.json | sed -re 's_%VERSION%_$(VERSION)_' > windows-manifest.json diff --git a/go.mod b/go.mod index 63fe150..92d54bb 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module code.ivysaur.me/qbolt go 1.23 require ( - github.com/mappu/miqt v0.5.0 + github.com/mappu/miqt v0.10.0 go.etcd.io/bbolt v1.3.11 ) diff --git a/go.sum b/go.sum index 6174cd0..e178aeb 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/mappu/miqt v0.5.0 h1:BWajkNI9PWlWN6ZDgWKwv1gieBGEImRqlWS8ZqDmDfA= -github.com/mappu/miqt v0.5.0/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/mappu/miqt v0.10.0 h1:w+ucRwdoIO7xS32us34lL2Mh0+aarywNpQz6c76ZSDY= +github.com/mappu/miqt v0.10.0/go.mod h1:xFg7ADaO1QSkmXPsPODoKe/bydJpRG9fgCYyIDl/h1U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/itemwindow_ui.go b/itemwindow_ui.go index b2dfa29..948363e 100644 --- a/itemwindow_ui.go +++ b/itemwindow_ui.go @@ -1,12 +1,12 @@ // 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 itemwindow.ui -OutFile itemwindow_ui.go +//go:generate miqt-uic -Qt6 -InFile itemwindow.ui -OutFile itemwindow_ui.go package main import ( - "github.com/mappu/miqt/qt" + qt "github.com/mappu/miqt/qt6" ) type ItemWindowUi struct { @@ -22,8 +22,7 @@ type ItemWindowUi struct { func NewItemWindowUi() *ItemWindowUi { ui := &ItemWindowUi{} - ui.ItemWindow = qt.NewQDialog2(nil) - ui.ItemWindow.SetObjectName("ItemWindow") + ui.ItemWindow = qt.NewQDialog(nil) ui.ItemWindow.Resize(370, 353) ui.ItemWindow.SetWindowTitle("") icon0 := qt.NewQIcon() @@ -31,27 +30,22 @@ func NewItemWindowUi() *ItemWindowUi { ui.ItemWindow.SetWindowIcon(icon0) ui.gridLayout_2 = qt.NewQGridLayout(ui.ItemWindow.QWidget) - ui.gridLayout_2.SetObjectName("gridLayout_2") ui.gridLayout_2.SetVerticalSpacing(0) ui.gridLayout_2.SetContentsMargins(0, 0, 0, 0) ui.gridLayout_2.SetSpacing(6) - ui.contentArea = qt.NewQPlainTextEdit3(ui.ItemWindow.QWidget) - ui.contentArea.SetObjectName("contentArea") + ui.contentArea = qt.NewQPlainTextEdit(ui.ItemWindow.QWidget) ui.contentArea.SetFrameShape(qt.QFrame__NoFrame) ui.gridLayout_2.AddWidget2(ui.contentArea.QWidget, 0, 0) - ui.frame = qt.NewQFrame2(ui.ItemWindow.QWidget) - ui.frame.SetObjectName("frame") + ui.frame = qt.NewQFrame(ui.ItemWindow.QWidget) ui.gridLayout = qt.NewQGridLayout(ui.frame.QWidget) - ui.gridLayout.SetObjectName("gridLayout") ui.gridLayout.SetContentsMargins(11, 11, 11, 11) ui.gridLayout.SetSpacing(6) - ui.buttonBox = qt.NewQDialogButtonBox5(ui.frame.QWidget) - ui.buttonBox.SetObjectName("buttonBox") + ui.buttonBox = qt.NewQDialogButtonBox(ui.frame.QWidget) ui.buttonBox.SetStandardButtons(qt.QDialogButtonBox__Cancel | qt.QDialogButtonBox__Save) ui.buttonBox.OnAccepted(ui.ItemWindow.Accept) ui.buttonBox.OnRejected(ui.ItemWindow.Reject) diff --git a/main.go b/main.go index 8531fe1..17e440b 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/mappu/miqt/qt" + qt "github.com/mappu/miqt/qt6" ) var Version string = "v0.0.0-devel" diff --git a/mainwindow.go b/mainwindow.go index 4a54a26..c72ae07 100644 --- a/mainwindow.go +++ b/mainwindow.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/mappu/miqt/qt" + qt "github.com/mappu/miqt/qt6" bolt "go.etcd.io/bbolt" ) @@ -24,13 +24,13 @@ func NewMainWindow() *MainWindow { this.on_bucketTree_currentItemChanged(nil, nil) - this.databaseContext = qt.NewQMenu() + this.databaseContext = qt.NewQMenu(this.ui.MainWindow.QWidget) this.databaseContext.QWidget.AddAction(this.ui.actionRefresh_buckets) this.databaseContext.QWidget.AddAction(this.ui.actionAdd_bucket) this.databaseContext.AddSeparator() this.databaseContext.QWidget.AddAction(this.ui.actionDisconnect) - this.bucketContext = qt.NewQMenu() + this.bucketContext = qt.NewQMenu(this.ui.MainWindow.QWidget) this.bucketContext.QWidget.AddAction(this.ui.actionRefresh_buckets) this.bucketContext.QWidget.AddAction(this.ui.actionAdd_bucket) this.bucketContext.AddSeparator() @@ -68,7 +68,7 @@ var bdbs []*bolt.DB = nil func SET_BDB(top *qt.QTreeWidgetItem, bdb *bolt.DB) { idx := len(bdbs) bdbs = append(bdbs, bdb) - top.SetData(0, BdbPointerRole, qt.NewQVariant7(idx)) // Don't store a Go pointer in Qt memory + top.SetData(0, BdbPointerRole, qt.NewQVariant4(idx)) // Don't store a Go pointer in Qt memory } func GET_BDB(top *qt.QTreeWidgetItem) *bolt.DB { @@ -157,7 +157,7 @@ func (this *MainWindow) refreshBucketTree(itm *qt.QTreeWidgetItem) { child := qt.NewQTreeWidgetItem6(itm) // NewQTreeWidgetItem() child.SetText(0, getDisplayName(qba)) - child.SetData(0, BinaryDataRole, qt.NewQVariant15(MakeQByteArray(qba))) + child.SetData(0, BinaryDataRole, qt.NewQVariant12([]byte(qba))) child.SetIcon(0, qt.NewQIcon4(":/rsrc/table.png")) itm.AddChild(child) @@ -215,11 +215,11 @@ func (this *MainWindow) on_bucketTree_customContextMenuRequested(pos *qt.QPoint) if itm.Parent() != nil { // Child item, show the bucket menu - this.bucketContext.Popup(this.ui.bucketTree.Viewport().MapToGlobal(pos)) + this.bucketContext.Popup(this.ui.bucketTree.Viewport().MapToGlobalWithQPoint(pos)) } else { // Top-level item, show the database menu - this.databaseContext.Popup(this.ui.bucketTree.Viewport().MapToGlobal(pos)) + this.databaseContext.Popup(this.ui.bucketTree.Viewport().MapToGlobalWithQPoint(pos)) } } @@ -283,7 +283,7 @@ func (this *MainWindow) refreshData(bdb *bolt.DB, browse []string) { err := Bolt_ListItems(bdb, browse, func(lii ListItemInfo) error { itm := qt.NewQTreeWidgetItem() itm.SetText(0, getDisplayName(lii.Name)) - itm.SetData(0, BinaryDataRole, qt.NewQVariant15(MakeQByteArray(lii.Name))) + itm.SetData(0, BinaryDataRole, qt.NewQVariant12([]byte(lii.Name))) itm.SetText(1, fmt.Sprintf("%d", lii.DataLen)) this.ui.bucketData.AddTopLevelItem(itm) return nil @@ -328,7 +328,7 @@ func (this *MainWindow) getSelection(itm *qt.QTreeWidgetItem) windowSelection { if top.Parent() == nil { break } else { - browse = append(browse, FromQByteArray(top.Data(0, BinaryDataRole).ToByteArray())) + browse = append(browse, string(top.Data(0, BinaryDataRole).ToByteArray())) top = top.Parent() } } @@ -370,8 +370,7 @@ func (this *MainWindow) on_bucketData_doubleClicked(index *qt.QModelIndex) { // Get item key - model := index.Model() - key := FromQByteArray(model.Data2(model.Index(index.Row(), 0), BinaryDataRole).ToByteArray()) + key := string(index.DataWithRole(BinaryDataRole).ToByteArray()) // DB lookup content, err := Bolt_GetItem(ws.bdb, ws.browse, key) @@ -415,8 +414,8 @@ func (this *MainWindow) on_actionDelete_bucket_triggered() { } // Prompt for confirmation - bucketToDelete := FromQByteArray(ws.itm.Data(0, BinaryDataRole).ToByteArray()) - if qt.QMessageBox_Question4( + bucketToDelete := string(ws.itm.Data(0, BinaryDataRole).ToByteArray()) + if qt.QMessageBox_Question2( this.Widget(), "Delete bucket", fmt.Sprintf("Are you sure you want to remove the bucket '%s'?", getDisplayName(bucketToDelete)), @@ -474,13 +473,13 @@ func (this *MainWindow) on_DeleteDataButton_clicked() { } // Prompt for confirmation - if qt.QMessageBox_Question4(this.Widget(), "Delete items", fmt.Sprintf("Are you sure you want to remove %d item(s)?", len(selection)), qt.QMessageBox__Yes, qt.QMessageBox__Cancel) != int(qt.QMessageBox__Yes) { + if qt.QMessageBox_Question2(this.Widget(), "Delete items", fmt.Sprintf("Are you sure you want to remove %d item(s)?", len(selection)), qt.QMessageBox__Yes, qt.QMessageBox__Cancel) != int(qt.QMessageBox__Yes) { return } var i int = len(selection) for i > 0 { - err := Bolt_DeleteItem(ws.bdb, ws.browse, FromQByteArray(selection[i-1].Data(0, BinaryDataRole).ToByteArray())) + err := Bolt_DeleteItem(ws.bdb, ws.browse, string(selection[i-1].Data(0, BinaryDataRole).ToByteArray())) if err != nil { this.alert(fmt.Sprintf("Error removing item: %s", err.Error())) return diff --git a/mainwindow_ui.go b/mainwindow_ui.go index 2e585ba..44c434d 100644 --- a/mainwindow_ui.go +++ b/mainwindow_ui.go @@ -1,12 +1,12 @@ // 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 mainwindow.ui -OutFile mainwindow_ui.go +//go:generate miqt-uic -Qt6 -InFile mainwindow.ui -OutFile mainwindow_ui.go package main import ( - "github.com/mappu/miqt/qt" + qt "github.com/mappu/miqt/qt6" ) type MainWindowUi struct { @@ -57,8 +57,7 @@ type MainWindowUi struct { func NewMainWindowUi() *MainWindowUi { ui := &MainWindowUi{} - ui.MainWindow = qt.NewQMainWindow2(nil) - ui.MainWindow.SetObjectName("MainWindow") + ui.MainWindow = qt.NewQMainWindow(nil) ui.MainWindow.Resize(668, 405) ui.MainWindow.SetWindowTitle("QBolt") icon0 := qt.NewQIcon() @@ -66,105 +65,83 @@ func NewMainWindowUi() *MainWindowUi { ui.MainWindow.SetWindowIcon(icon0) ui.actionAbout_qbolt = qt.NewQAction() - ui.actionAbout_qbolt.SetObjectName("actionAbout_qbolt") icon1 := qt.NewQIcon() icon1.AddFile4(":/rsrc/information.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionAbout_qbolt.SetIcon(icon1) ui.actionAbout_Qt = qt.NewQAction() - ui.actionAbout_Qt.SetObjectName("actionAbout_Qt") ui.actionOpen_database = qt.NewQAction() - ui.actionOpen_database.SetObjectName("actionOpen_database") icon2 := qt.NewQIcon() icon2.AddFile4(":/rsrc/database.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionOpen_database.SetIcon(icon2) ui.actionExit = qt.NewQAction() - ui.actionExit.SetObjectName("actionExit") icon3 := qt.NewQIcon() icon3.AddFile4(":/rsrc/door_out.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionExit.SetIcon(icon3) ui.actionDisconnect = qt.NewQAction() - ui.actionDisconnect.SetObjectName("actionDisconnect") icon4 := qt.NewQIcon() icon4.AddFile4(":/rsrc/disconnect.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionDisconnect.SetIcon(icon4) ui.actionDelete_bucket = qt.NewQAction() - ui.actionDelete_bucket.SetObjectName("actionDelete_bucket") icon5 := qt.NewQIcon() icon5.AddFile4(":/rsrc/table_delete.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionDelete_bucket.SetIcon(icon5) ui.actionRefresh_buckets = qt.NewQAction() - ui.actionRefresh_buckets.SetObjectName("actionRefresh_buckets") icon6 := qt.NewQIcon() icon6.AddFile4(":/rsrc/arrow_refresh.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionRefresh_buckets.SetIcon(icon6) ui.actionClear_selection = qt.NewQAction() - ui.actionClear_selection.SetObjectName("actionClear_selection") ui.actionNew_database = qt.NewQAction() - ui.actionNew_database.SetObjectName("actionNew_database") icon7 := qt.NewQIcon() icon7.AddFile4(":/rsrc/database_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionNew_database.SetIcon(icon7) ui.actionAdd_bucket = qt.NewQAction() - ui.actionAdd_bucket.SetObjectName("actionAdd_bucket") icon8 := qt.NewQIcon() icon8.AddFile4(":/rsrc/table_add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.actionAdd_bucket.SetIcon(icon8) ui.actionOpen_database_as_read_only = qt.NewQAction() - ui.actionOpen_database_as_read_only.SetObjectName("actionOpen_database_as_read_only") - ui.centralWidget = qt.NewQWidget2(ui.MainWindow.QWidget) - ui.centralWidget.SetObjectName("centralWidget") + ui.centralWidget = qt.NewQWidget(ui.MainWindow.QWidget) ui.gridLayout = qt.NewQGridLayout(ui.centralWidget) - ui.gridLayout.SetObjectName("gridLayout") ui.gridLayout.SetContentsMargins(0, 0, 0, 0) ui.gridLayout.SetSpacing(6) - ui.splitter = qt.NewQSplitter3(ui.centralWidget) - ui.splitter.SetObjectName("splitter") + ui.splitter = qt.NewQSplitter(ui.centralWidget) ui.splitter.SetOrientation(qt.Horizontal) ui.splitter.SetChildrenCollapsible(false) - ui.bucketTree = qt.NewQTreeWidget2(ui.splitter.QWidget) - ui.bucketTree.SetObjectName("bucketTree") + ui.bucketTree = qt.NewQTreeWidget(ui.splitter.QWidget) ui.bucketTree.SetContextMenuPolicy(qt.CustomContextMenu) ui.bucketTree.SetUniformRowHeights(true) ui.splitter.AddWidget(ui.bucketTree.QWidget) - ui.stackedWidget = qt.NewQStackedWidget2(ui.splitter.QWidget) - ui.stackedWidget.SetObjectName("stackedWidget") + ui.stackedWidget = qt.NewQStackedWidget(ui.splitter.QWidget) - ui.databasePage = qt.NewQWidget2(ui.stackedWidget.QWidget) - ui.databasePage.SetObjectName("databasePage") + ui.databasePage = qt.NewQWidget(ui.stackedWidget.QWidget) ui.gridLayout_4 = qt.NewQGridLayout(ui.databasePage) - ui.gridLayout_4.SetObjectName("gridLayout_4") ui.gridLayout_4.SetContentsMargins(0, 0, 0, 0) ui.gridLayout_4.SetSpacing(6) - ui.databaseTabWidget = qt.NewQTabWidget2(ui.databasePage) - ui.databaseTabWidget.SetObjectName("databaseTabWidget") + ui.databaseTabWidget = qt.NewQTabWidget(ui.databasePage) - ui.databasePropertiesTab = qt.NewQWidget2(ui.databaseTabWidget.QWidget) - ui.databasePropertiesTab.SetObjectName("databasePropertiesTab") + ui.databasePropertiesTab = qt.NewQWidget(ui.databaseTabWidget.QWidget) ui.gridLayout_2 = qt.NewQGridLayout(ui.databasePropertiesTab) - ui.gridLayout_2.SetObjectName("gridLayout_2") ui.gridLayout_2.SetContentsMargins(3, 3, 3, 3) ui.gridLayout_2.SetSpacing(6) - ui.databasePropertiesArea = qt.NewQPlainTextEdit3(ui.databasePropertiesTab) - ui.databasePropertiesArea.SetObjectName("databasePropertiesArea") + ui.databasePropertiesArea = qt.NewQPlainTextEdit(ui.databasePropertiesTab) ui.databasePropertiesArea.SetFrameShape(qt.QFrame__NoFrame) ui.databasePropertiesArea.SetReadOnly(true) @@ -176,27 +153,21 @@ func NewMainWindowUi() *MainWindowUi { ui.gridLayout_4.AddWidget2(ui.databaseTabWidget.QWidget, 0, 0) ui.stackedWidget.AddWidget(ui.databasePage) - ui.bucketPage = qt.NewQWidget2(ui.stackedWidget.QWidget) - ui.bucketPage.SetObjectName("bucketPage") + ui.bucketPage = qt.NewQWidget(ui.stackedWidget.QWidget) ui.gridLayout_3 = qt.NewQGridLayout(ui.bucketPage) - ui.gridLayout_3.SetObjectName("gridLayout_3") ui.gridLayout_3.SetContentsMargins(0, 0, 0, 0) ui.gridLayout_3.SetSpacing(6) - ui.bucketTabWidget = qt.NewQTabWidget2(ui.bucketPage) - ui.bucketTabWidget.SetObjectName("bucketTabWidget") + ui.bucketTabWidget = qt.NewQTabWidget(ui.bucketPage) - ui.bucketPropertiesTab = qt.NewQWidget2(ui.bucketTabWidget.QWidget) - ui.bucketPropertiesTab.SetObjectName("bucketPropertiesTab") + ui.bucketPropertiesTab = qt.NewQWidget(ui.bucketTabWidget.QWidget) ui.gridLayout_5 = qt.NewQGridLayout(ui.bucketPropertiesTab) - ui.gridLayout_5.SetObjectName("gridLayout_5") ui.gridLayout_5.SetContentsMargins(3, 3, 3, 3) ui.gridLayout_5.SetSpacing(6) - ui.bucketPropertiesArea = qt.NewQPlainTextEdit3(ui.bucketPropertiesTab) - ui.bucketPropertiesArea.SetObjectName("bucketPropertiesArea") + ui.bucketPropertiesArea = qt.NewQPlainTextEdit(ui.bucketPropertiesTab) ui.bucketPropertiesArea.SetFrameShape(qt.QFrame__NoFrame) ui.bucketPropertiesArea.SetReadOnly(true) @@ -205,16 +176,13 @@ func NewMainWindowUi() *MainWindowUi { icon10.AddFile4(":/rsrc/chart_bar.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.bucketTabWidget.AddTab2(ui.bucketPropertiesTab, icon10, "") - ui.bucketDataTab = qt.NewQWidget2(ui.bucketTabWidget.QWidget) - ui.bucketDataTab.SetObjectName("bucketDataTab") + ui.bucketDataTab = qt.NewQWidget(ui.bucketTabWidget.QWidget) ui.gridLayout_6 = qt.NewQGridLayout(ui.bucketDataTab) - ui.gridLayout_6.SetObjectName("gridLayout_6") ui.gridLayout_6.SetContentsMargins(3, 3, 3, 3) ui.gridLayout_6.SetSpacing(6) - ui.bucketData = qt.NewQTreeWidget2(ui.bucketDataTab) - ui.bucketData.SetObjectName("bucketData") + ui.bucketData = qt.NewQTreeWidget(ui.bucketDataTab) ui.bucketData.SetSelectionMode(qt.QAbstractItemView__ExtendedSelection) ui.bucketData.SetIndentation(0) ui.bucketData.SetRootIsDecorated(false) @@ -223,8 +191,7 @@ func NewMainWindowUi() *MainWindowUi { ui.gridLayout_6.AddWidget3(ui.bucketData.QWidget, 0, 0, 1, 3) - ui.AddDataButton = qt.NewQPushButton4(ui.bucketDataTab) - ui.AddDataButton.SetObjectName("AddDataButton") + ui.AddDataButton = qt.NewQPushButton(ui.bucketDataTab) icon11 := qt.NewQIcon() icon11.AddFile4(":/rsrc/add.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.AddDataButton.SetIcon(icon11) @@ -232,8 +199,7 @@ func NewMainWindowUi() *MainWindowUi { ui.gridLayout_6.AddWidget2(ui.AddDataButton.QWidget, 1, 0) /* miqt-uic: no handler for spacer */ - ui.DeleteDataButton = qt.NewQPushButton4(ui.bucketDataTab) - ui.DeleteDataButton.SetObjectName("DeleteDataButton") + ui.DeleteDataButton = qt.NewQPushButton(ui.bucketDataTab) icon12 := qt.NewQIcon() icon12.AddFile4(":/rsrc/delete.png", qt.NewQSize(), qt.QIcon__Normal, qt.QIcon__Off) ui.DeleteDataButton.SetIcon(icon12) @@ -250,41 +216,35 @@ func NewMainWindowUi() *MainWindowUi { ui.gridLayout.AddWidget2(ui.splitter.QWidget, 0, 0) ui.MainWindow.SetCentralWidget(ui.centralWidget) // Set central widget - ui.menuBar = qt.NewQMenuBar2(ui.MainWindow.QWidget) - ui.menuBar.SetObjectName("menuBar") + ui.menuBar = qt.NewQMenuBar(ui.MainWindow.QWidget) ui.menuBar.Resize(668, 29) - ui.menuFile = qt.NewQMenu3(ui.menuBar.QWidget) - ui.menuFile.SetObjectName("menuFile") + ui.menuFile = qt.NewQMenu(ui.menuBar.QWidget) ui.menuFile.QWidget.AddAction(ui.actionNew_database) ui.menuFile.QWidget.AddAction(ui.actionOpen_database) ui.menuFile.QWidget.AddAction(ui.actionOpen_database_as_read_only) ui.menuFile.AddSeparator() ui.menuFile.QWidget.AddAction(ui.actionExit) - ui.menuHelp = qt.NewQMenu3(ui.menuBar.QWidget) - ui.menuHelp.SetObjectName("menuHelp") + ui.menuHelp = qt.NewQMenu(ui.menuBar.QWidget) ui.menuHelp.QWidget.AddAction(ui.actionAbout_qbolt) ui.menuHelp.QWidget.AddAction(ui.actionAbout_Qt) - ui.menuView = qt.NewQMenu3(ui.menuBar.QWidget) - ui.menuView.SetObjectName("menuView") + ui.menuView = qt.NewQMenu(ui.menuBar.QWidget) ui.menuView.QWidget.AddAction(ui.actionClear_selection) ui.menuBar.AddMenu(ui.menuFile) ui.menuBar.AddMenu(ui.menuView) ui.menuBar.AddMenu(ui.menuHelp) ui.MainWindow.SetMenuBar(ui.menuBar) - ui.mainToolBar = qt.NewQToolBar4(ui.MainWindow.QWidget) - ui.mainToolBar.SetObjectName("mainToolBar") + ui.mainToolBar = qt.NewQToolBar(ui.MainWindow.QWidget) ui.MainWindow.AddToolBar(qt.TopToolBarArea, ui.mainToolBar) /* miqt-uic: no handler for mainToolBar attribute 'toolBarBreak' */ ui.mainToolBar.QWidget.AddAction(ui.actionNew_database) ui.mainToolBar.QWidget.AddAction(ui.actionOpen_database) ui.mainToolBar.AddSeparator() - ui.statusBar = qt.NewQStatusBar2(ui.MainWindow.QWidget) - ui.statusBar.SetObjectName("statusBar") + ui.statusBar = qt.NewQStatusBar(ui.MainWindow.QWidget) ui.MainWindow.SetStatusBar(ui.statusBar) ui.Retranslate() diff --git a/resources.go b/resources.go index 20abcf2..3e7765b 100644 --- a/resources.go +++ b/resources.go @@ -1,11 +1,11 @@ package main -//go:generate miqt-rcc.sh resources.qrc +//go:generate miqt-rcc -Input "resources.qrc" -OutputGo "resources.go" -OutputRcc "resources.rcc" -Qt6 import ( "embed" - "github.com/mappu/miqt/qt" + qt "github.com/mappu/miqt/qt6" ) //go:embed resources.rcc diff --git a/resources.rcc b/resources.rcc index 0f693c56c1de4e5a25c74ffb8c5b73440ad8fe6f..3adbaded30ae026cb8b43eb580cba03e59520eb7 100644 GIT binary patch delta 279 zcmbQ`HOp%QuS)%-s6Q?o3=9mHfS7@Sk%57C9*}~HGTOjI#ZnNW3^6cKR(B-P4=_=F z4J1($m?+aUBvC$?Xg!Dlw@w8nETV-FW$1&6as(kn853Zll0`_OEHF_aPJ}4K7MLj4 UD}*Rx6Ht^N$Y)@XnFJFC0AD&PfB*mh delta 279 zcmbQ`HOp%QuS$Kzkqp5c1_p*pK+M3v$iTom4@iMTGk~-WOjIldA<7T~6J>Qr68!)Z z<<~$GHGzpTO+ympgNfFI7;x)UV8S9=P*IT6`e33QK?qUC1emB~5t0ckFi{~+geb!n Xm?+mPgeYSZP?R6YXJC+-1QP}T!pSLN diff --git a/util.go b/util.go index e66a557..5545995 100644 --- a/util.go +++ b/util.go @@ -1,11 +1,5 @@ package main -import ( - "unsafe" - - "github.com/mappu/miqt/qt" -) - // ReverseSlice reverses a slice. // @ref https://stackoverflow.com/a/28058324 func ReverseSlice[S ~[]E, E any](s S) { @@ -13,12 +7,3 @@ func ReverseSlice[S ~[]E, E any](s S) { s[i], s[j] = s[j], s[i] } } - -func MakeQByteArray(s string) *qt.QByteArray { - return qt.NewQByteArray7(s, len(s)) -} - -func FromQByteArray(qba *qt.QByteArray) string { - var rawData []byte = unsafe.Slice((*byte)(qba.Data()), qba.Length()) - return string(rawData) // copy -}