feat(gui): adding the splash screen (#743)

pactus-project · Oct 14, 2023 · ed8d0e5 · ed8d0e5
1 parent 84908cc
commit ed8d0e5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 8 deletions.
diff --git a/cmd/gtk/assets/images/logo.png b/cmd/gtk/assets/images/logo.png
diff --git a/cmd/gtk/assets/ui/dialog_about.ui b/cmd/gtk/assets/ui/dialog_about.ui
@@ -12,7 +12,6 @@
 Building Decentralized Future Together!
 Pactus is a low-cost, high-performance, and scalable decentralized blockchain protocol with a novel PoS consensus.
 </property>
-    <property name="logo">../images/logo.png</property>
     <property name="license-type">mit-x11</property>
     <child internal-child="vbox">
       <object class="GtkBox">

diff --git a/cmd/gtk/dialog_about.go b/cmd/gtk/dialog_about.go
@@ -18,7 +18,7 @@ var (
 	pactusLogo []byte
 )
 
-func showAboutDialog() {
+func aboutDialog() *gtk.AboutDialog {
 	builder, err := gtk.BuilderNewFromString(string(uiAboutDialog))
 	fatalErrorCheck(err)
 
@@ -30,5 +30,5 @@ func showAboutDialog() {
 	dlg.SetLogo(pxLogo)
 	dlg.SetVersion(version.Version())
 
-	dlg.Show()
+	return dlg
 }
diff --git a/cmd/gtk/main.go b/cmd/gtk/main.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/gotk3/gotk3/gdk"
 	"github.com/gotk3/gotk3/glib"
 	"github.com/gotk3/gotk3/gtk"
 	"github.com/pactus-project/pactus/cmd"
@@ -67,7 +68,33 @@ func main() {
 	// Connect function to application activate event
 	app.Connect("activate", func() {
 		log.Println("application activate")
-		start(workingDir, app)
+
+		// Show about dialog as splash screen
+		splashDlg := aboutDialog()
+		splashDlg.SetDecorated(false)
+		splashDlg.SetResizable(false)
+		splashDlg.SetPosition(gtk.WIN_POS_CENTER)
+		splashDlg.SetTypeHint(gdk.WINDOW_TYPE_HINT_SPLASHSCREEN)
+
+		gtk.WindowSetAutoStartupNotification(false)
+		splashDlg.ShowAll()
+		gtk.WindowSetAutoStartupNotification(true)
+
+		app.AddWindow(splashDlg)
+
+		// This might also force GTK to draw the splash screen
+		for gtk.EventsPending() {
+			gtk.MainIteration()
+		}
+
+		// Running the start-up logic in a separate goroutine
+		glib.TimeoutAdd(uint(100), func() bool {
+			start(workingDir, app)
+			splashDlg.Destroy()
+
+			// Ensures the function is not called again
+			return false
+		})
 	})
 
 	// Connect function to application shutdown event, this is not required.
@@ -92,7 +119,6 @@ func start(workingDir string, app *gtk.Application) {
 		}
 		return getWalletPassword(wallet)
 	}
-
 	node, wallet, err := cmd.StartNode(workingDir, passwordFetcher)
 	fatalErrorCheck(err)
 
@@ -109,7 +135,7 @@ func start(workingDir string, app *gtk.Application) {
 	win := buildMainWindow(nodeModel, walletModel)
 
 	// Show the Window and all of its components.
-	win.Show()
+	win.ShowAll()
 
 	walletModel.rebuildModel()
 

diff --git a/cmd/gtk/main_window.go b/cmd/gtk/main_window.go
@@ -91,7 +91,8 @@ func (mw *mainWindow) onAboutGtk() {
 }
 
 func (mw *mainWindow) onAbout() {
-	showAboutDialog()
+	dlg := aboutDialog()
+	dlg.ShowAll()
 }
 
 func (mw *mainWindow) OnTransactionTransfer() {
@@ -105,7 +106,7 @@ func (mw *mainWindow) onMenuItemActivateWebsite(_ *gtk.MenuItem) {
 }
 
 func (mw *mainWindow) onMenuItemActivateExplorer(_ *gtk.MenuItem) {
-	if err := openURLInBrowser("https://pactusscan.com/"); err != nil {
+	if err := openURLInBrowser("https://pacscan.org/"); err != nil {
 		fatalErrorCheck(err)
 	}
 }