Remove a ton of unused code

v2/internal/app/desktop.go

@@ -114,11 +114,7 @@ func (a *App) Run() error {
 		return err
 	}
 
-	// Start the runtime
+	runtimesubsystem, err := subsystem.NewRuntime(a.servicebus, a.logger)
-	applicationMenu := options.GetApplicationMenu(a.options)
-	contextMenus := options.GetContextMenus(a.options)
-
-	runtimesubsystem, err := subsystem.NewRuntime(a.servicebus, a.logger, contextMenus)
 	if err != nil {
 		return err
 	}
@@ -176,17 +172,15 @@ func (a *App) Run() error {
 		return err
 	}
 
-	// Optionally start the menu subsystem
+	// Start the menu subsystem
-	if applicationMenu != nil {
+	menusubsystem, err := subsystem.NewMenu(a.servicebus, a.logger, a.menuManager)
-		menusubsystem, err := subsystem.NewMenu(a.servicebus, a.logger, a.menuManager)
+	if err != nil {
-		if err != nil {
+		return err
-			return err
+	}
-		}
+	a.menu = menusubsystem
-		a.menu = menusubsystem
+	err = a.menu.Start()
-		err = a.menu.Start()
+	if err != nil {
-		if err != nil {
+		return err
-			return err
-		}
 	}
 
 	// Start the call subsystem

v2/internal/ffenestri/ffenestri_client.go

@@ -185,22 +185,14 @@ func (c *Client) DarkModeEnabled(callbackID string) {
 	C.DarkModeEnabled(c.app.app, c.app.string2CString(callbackID))
 }
 
-func (c *Client) UpdateMenu(menuJSON string) {
+func (c *Client) SetApplicationMenu(applicationMenuJSON string) {
-	C.SetApplicationMenu(c.app.app, c.app.string2CString(menuJSON))
+	C.SetApplicationMenu(c.app.app, c.app.string2CString(applicationMenuJSON))
 }
 
 func (c *Client) UpdateTrayMenu(trayMenuJSON string) {
 	C.UpdateTrayMenu(c.app.app, c.app.string2CString(trayMenuJSON))
 }
 
-func (c *Client) UpdateTrayLabel(label string) {
-	C.UpdateTrayLabel(c.app.app, c.app.string2CString(label))
-}
-
-func (c *Client) UpdateTrayIcon(name string) {
-	C.UpdateTrayIcon(c.app.app, c.app.string2CString(name))
-}
-
 func (c *Client) UpdateContextMenus(contextMenus *menu.ContextMenus) {
 	//
 	//	// Guard against nil contextMenus

v2/internal/messagedispatcher/dispatchclient.go

@@ -32,9 +32,7 @@ type Client interface {
 	WindowUnFullscreen()
 	WindowSetColour(colour int)
 	DarkModeEnabled(callbackID string)
-	UpdateMenu(menuJSON string)
+	SetApplicationMenu(menuJSON string)
-	UpdateTrayLabel(label string)
-	UpdateTrayIcon(name string)
 	UpdateTrayMenu(menuJSON string)
 	UpdateContextMenus(contextMenus *menu.ContextMenus)
 }

v2/internal/messagedispatcher/messagedispatcher.go

@@ -452,7 +452,7 @@ func (d *Dispatcher) processMenuMessage(result *servicebus.Message) {
 		// TODO: Work out what we mean in a multi window environment...
 		// For now we will just pick the first one
 		for _, client := range d.clients {
-			client.frontend.UpdateMenu(updatedMenu)
+			client.frontend.SetApplicationMenu(updatedMenu)
 		}
 
 	case "updatetraymenu":

v2/internal/runtime/runtime.go

@@ -2,35 +2,32 @@ package runtime
 
 import (
 	"github.com/wailsapp/wails/v2/internal/servicebus"
-	"github.com/wailsapp/wails/v2/pkg/menu"
 )
 
 // Runtime is a means for the user to interact with the application at runtime
 type Runtime struct {
-	Browser     Browser
+	Browser Browser
-	Events      Events
+	Events  Events
-	Window      Window
+	Window  Window
-	Dialog      Dialog
+	Dialog  Dialog
-	System      System
+	System  System
-	Menu        Menu
+	Menu    Menu
-	ContextMenu ContextMenus
+	Store   *StoreProvider
-	Store       *StoreProvider
+	Log     Log
-	Log         Log
+	bus     *servicebus.ServiceBus
-	bus         *servicebus.ServiceBus
 }
 
 // New creates a new runtime
-func New(serviceBus *servicebus.ServiceBus, contextMenus *menu.ContextMenus) *Runtime {
+func New(serviceBus *servicebus.ServiceBus) *Runtime {
 	result := &Runtime{
-		Browser:     newBrowser(),
+		Browser: newBrowser(),
-		Events:      newEvents(serviceBus),
+		Events:  newEvents(serviceBus),
-		Window:      newWindow(serviceBus),
+		Window:  newWindow(serviceBus),
-		Dialog:      newDialog(serviceBus),
+		Dialog:  newDialog(serviceBus),
-		System:      newSystem(serviceBus),
+		System:  newSystem(serviceBus),
-		Menu:        newMenu(serviceBus),
+		Menu:    newMenu(serviceBus),
-		ContextMenu: newContextMenus(serviceBus, contextMenus),
+		Log:     newLog(serviceBus),
-		Log:         newLog(serviceBus),
+		bus:     serviceBus,
-		bus:         serviceBus,
 	}
 	result.Store = newStore(result)
 	return result

v2/internal/subsystem/runtime.go

@@ -2,7 +2,6 @@ package subsystem
 
 import (
 	"fmt"
-	"github.com/wailsapp/wails/v2/pkg/menu"
 	"strings"
 
 	"github.com/wailsapp/wails/v2/internal/logger"
@@ -24,7 +23,7 @@ type Runtime struct {
 }
 
 // NewRuntime creates a new runtime subsystem
-func NewRuntime(bus *servicebus.ServiceBus, logger *logger.Logger, contextMenus *menu.ContextMenus) (*Runtime, error) {
+func NewRuntime(bus *servicebus.ServiceBus, logger *logger.Logger) (*Runtime, error) {
 
 	// Register quit channel
 	quitChannel, err := bus.Subscribe("quit")
@@ -42,7 +41,7 @@ func NewRuntime(bus *servicebus.ServiceBus, logger *logger.Logger, contextMenus
 		quitChannel:    quitChannel,
 		runtimeChannel: runtimeChannel,
 		logger:         logger.CustomLogger("Runtime Subsystem"),
-		runtime:        runtime.New(bus, contextMenus),
+		runtime:        runtime.New(bus),
 	}
 
 	return result, nil