mirror of
https://github.com/wailsapp/wails.git
synced 2026-03-14 22:55:48 +01:00
Remove "WithAccellerator" methods. Now mandatory in base methods
This commit is contained in:
Lea Anthony
parent
f0c932713b
commit
a85c8ba894
4 changed files with 70 additions and 85 deletions
|
|
@ -207,12 +207,7 @@ func (m *MenuItem) insertItemAtIndex(index int, target *MenuItem) bool {
|
|||
}
|
||||
|
||||
// Text is a helper to create basic Text menu items
|
||||
func Text(label string, id string) *MenuItem {
|
||||
return TextWithAccelerator(label, id, nil)
|
||||
}
|
||||
|
||||
// TextWithAccelerator is a helper to create basic Text menu items with an accelerator
|
||||
func TextWithAccelerator(label string, id string, accelerator *Accelerator) *MenuItem {
|
||||
func Text(label string, id string, accelerator *Accelerator) *MenuItem {
|
||||
return &MenuItem{
|
||||
ID: id,
|
||||
Label: label,
|
||||
|
|
@ -228,13 +223,8 @@ func Separator() *MenuItem {
|
|||
}
|
||||
}
|
||||
|
||||
// Radio is a helper to create basic Radio menu items
|
||||
func Radio(label string, id string, selected bool) *MenuItem {
|
||||
return RadioWithAccelerator(label, id, selected, nil)
|
||||
}
|
||||
|
||||
// RadioWithAccelerator is a helper to create basic Radio menu items with an accelerator
|
||||
func RadioWithAccelerator(label string, id string, selected bool, accelerator *Accelerator) *MenuItem {
|
||||
// Radio is a helper to create basic Radio menu items with an accelerator
|
||||
func Radio(label string, id string, selected bool, accelerator *Accelerator) *MenuItem {
|
||||
return &MenuItem{
|
||||
ID: id,
|
||||
Label: label,
|
||||
|
|
@ -245,12 +235,7 @@ func RadioWithAccelerator(label string, id string, selected bool, accelerator *A
|
|||
}
|
||||
|
||||
// Checkbox is a helper to create basic Checkbox menu items
|
||||
func Checkbox(label string, id string, checked bool) *MenuItem {
|
||||
return CheckboxWithAccelerator(label, id, checked, nil)
|
||||
}
|
||||
|
||||
// CheckboxWithAccelerator is a helper to create basic Checkbox menu items with an accelerator
|
||||
func CheckboxWithAccelerator(label string, id string, checked bool, accelerator *Accelerator) *MenuItem {
|
||||
func Checkbox(label string, id string, checked bool, accelerator *Accelerator) *MenuItem {
|
||||
return &MenuItem{
|
||||
ID: id,
|
||||
Label: label,
|
||||
|
|
|
|||
|
|
@ -35,6 +35,6 @@ func (c *ContextMenu) WailsInit(runtime *wails.Runtime) error {
|
|||
|
||||
func createContextMenus() *menu.ContextMenus {
|
||||
result := menu.NewContextMenus()
|
||||
result.AddMenu("test", menu.NewMenuFromItems(menu.Text("Clicked 0 times", "Test Context Menu")))
|
||||
result.AddMenu("test", menu.NewMenuFromItems(menu.Text("Clicked 0 times", "Test Context Menu", nil)))
|
||||
return result
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,12 +68,12 @@ func (m *Menu) addMenu(mi *menu.MenuItem) {
|
|||
parent := mi.Parent()
|
||||
counter := m.incrementcounter()
|
||||
menuText := "Dynamic Menu Item " + strconv.Itoa(counter)
|
||||
parent.Append(menu.Text(menuText, menuText))
|
||||
// parent.Append(menu.TextWithAccelerator(menuText, menuText, menu.Accel("[")))
|
||||
parent.Append(menu.Text(menuText, menuText, nil))
|
||||
// parent.Append(menu.Text(menuText, menuText, menu.Accel("[")))
|
||||
|
||||
// If this is the first dynamic menu added, let's add a remove menu item
|
||||
if counter == 1 {
|
||||
removeMenu := menu.TextWithAccelerator("Remove "+menuText,
|
||||
removeMenu := menu.Text("Remove "+menuText,
|
||||
"Remove Last Item", menu.CmdOrCtrlAccel("-"))
|
||||
parent.Prepend(removeMenu)
|
||||
m.runtime.Menu.On("Remove Last Item", m.removeMenu)
|
||||
|
|
@ -116,7 +116,7 @@ func (m *Menu) removeMenu(_ *menu.MenuItem) {
|
|||
removeMenu.Label = "Remove " + menuText
|
||||
}
|
||||
|
||||
// parent.Append(menu.TextWithAccelerator(menuText, menuText, menu.Accel("[")))
|
||||
// parent.Append(menu.Text(menuText, menuText, menu.Accel("[")))
|
||||
m.runtime.Menu.Update()
|
||||
}
|
||||
|
||||
|
|
@ -124,9 +124,9 @@ func (m *Menu) createDynamicMenuTwo() {
|
|||
|
||||
// Create our submenu
|
||||
dm2 := menu.SubMenu("Dynamic Menus 2", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("Insert Before Random Menu Item",
|
||||
menu.Text("Insert Before Random Menu Item",
|
||||
"Insert Before Random", menu.CmdOrCtrlAccel("]")),
|
||||
menu.TextWithAccelerator("Insert After Random Menu Item",
|
||||
menu.Text("Insert After Random Menu Item",
|
||||
"Insert After Random", menu.CmdOrCtrlAccel("[")),
|
||||
menu.Separator(),
|
||||
})
|
||||
|
|
@ -141,7 +141,7 @@ func (m *Menu) createDynamicMenuTwo() {
|
|||
m.anotherDynamicMenuCounter = 5
|
||||
for index := 0; index < m.anotherDynamicMenuCounter; index++ {
|
||||
text := "Other Dynamic Menu Item " + strconv.Itoa(index+1)
|
||||
item := menu.Text(text, text)
|
||||
item := menu.Text(text, text, nil)
|
||||
m.dynamicMenuItems[text] = item
|
||||
dm2.Append(item)
|
||||
}
|
||||
|
|
@ -175,7 +175,7 @@ func (m *Menu) insertBeforeRandom(_ *menu.MenuItem) {
|
|||
m.anotherDynamicMenuCounter++
|
||||
text := "Other Dynamic Menu Item " + strconv.Itoa(
|
||||
m.anotherDynamicMenuCounter+1)
|
||||
newItem := menu.Text(text, text)
|
||||
newItem := menu.Text(text, text, nil)
|
||||
m.dynamicMenuItems[text] = newItem
|
||||
|
||||
item := m.runtime.Menu.GetByID(randomItemID)
|
||||
|
|
@ -210,7 +210,7 @@ func (m *Menu) insertAfterRandom(_ *menu.MenuItem) {
|
|||
m.anotherDynamicMenuCounter++
|
||||
text := "Other Dynamic Menu Item " + strconv.Itoa(
|
||||
m.anotherDynamicMenuCounter+1)
|
||||
newItem := menu.Text(text, text)
|
||||
newItem := menu.Text(text, text, nil)
|
||||
|
||||
item := m.runtime.Menu.GetByID(randomItemID)
|
||||
m.dynamicMenuItems[text] = newItem
|
||||
|
|
@ -244,61 +244,61 @@ func createApplicationMenu() *menu.Menu {
|
|||
menu.Front(),
|
||||
|
||||
menu.SubMenu("Test Submenu", []*menu.MenuItem{
|
||||
menu.Text("Plain text", "plain text"),
|
||||
menu.Text("Show Dynamic Menus 2 Submenu", "show-dynamic-menus-2"),
|
||||
menu.Text("Plain text", "plain text", nil),
|
||||
menu.Text("Show Dynamic Menus 2 Submenu", "show-dynamic-menus-2", nil),
|
||||
menu.SubMenu("Accelerators", []*menu.MenuItem{
|
||||
menu.SubMenu("Modifiers", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("Shift accelerator", "Shift", menu.ShiftAccel("o")),
|
||||
menu.TextWithAccelerator("Control accelerator", "Control", menu.ControlAccel("o")),
|
||||
menu.TextWithAccelerator("Command accelerator", "Command", menu.CmdOrCtrlAccel("o")),
|
||||
menu.TextWithAccelerator("Option accelerator", "Option", menu.OptionOrAltAccel("o")),
|
||||
menu.Text("Shift accelerator", "Shift", menu.ShiftAccel("o")),
|
||||
menu.Text("Control accelerator", "Control", menu.ControlAccel("o")),
|
||||
menu.Text("Command accelerator", "Command", menu.CmdOrCtrlAccel("o")),
|
||||
menu.Text("Option accelerator", "Option", menu.OptionOrAltAccel("o")),
|
||||
}),
|
||||
menu.SubMenu("System Keys", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("Backspace", "Backspace", menu.Accel("Backspace")),
|
||||
menu.TextWithAccelerator("Tab", "Tab", menu.Accel("Tab")),
|
||||
menu.TextWithAccelerator("Return", "Return", menu.Accel("Return")),
|
||||
menu.TextWithAccelerator("Escape", "Escape", menu.Accel("Escape")),
|
||||
menu.TextWithAccelerator("Left", "Left", menu.Accel("Left")),
|
||||
menu.TextWithAccelerator("Right", "Right", menu.Accel("Right")),
|
||||
menu.TextWithAccelerator("Up", "Up", menu.Accel("Up")),
|
||||
menu.TextWithAccelerator("Down", "Down", menu.Accel("Down")),
|
||||
menu.TextWithAccelerator("Space", "Space", menu.Accel("Space")),
|
||||
menu.TextWithAccelerator("Delete", "Delete", menu.Accel("Delete")),
|
||||
menu.TextWithAccelerator("Home", "Home", menu.Accel("Home")),
|
||||
menu.TextWithAccelerator("End", "End", menu.Accel("End")),
|
||||
menu.TextWithAccelerator("Page Up", "Page Up", menu.Accel("Page Up")),
|
||||
menu.TextWithAccelerator("Page Down", "Page Down", menu.Accel("Page Down")),
|
||||
menu.TextWithAccelerator("NumLock", "NumLock", menu.Accel("NumLock")),
|
||||
menu.Text("Backspace", "Backspace", menu.Accel("Backspace")),
|
||||
menu.Text("Tab", "Tab", menu.Accel("Tab")),
|
||||
menu.Text("Return", "Return", menu.Accel("Return")),
|
||||
menu.Text("Escape", "Escape", menu.Accel("Escape")),
|
||||
menu.Text("Left", "Left", menu.Accel("Left")),
|
||||
menu.Text("Right", "Right", menu.Accel("Right")),
|
||||
menu.Text("Up", "Up", menu.Accel("Up")),
|
||||
menu.Text("Down", "Down", menu.Accel("Down")),
|
||||
menu.Text("Space", "Space", menu.Accel("Space")),
|
||||
menu.Text("Delete", "Delete", menu.Accel("Delete")),
|
||||
menu.Text("Home", "Home", menu.Accel("Home")),
|
||||
menu.Text("End", "End", menu.Accel("End")),
|
||||
menu.Text("Page Up", "Page Up", menu.Accel("Page Up")),
|
||||
menu.Text("Page Down", "Page Down", menu.Accel("Page Down")),
|
||||
menu.Text("NumLock", "NumLock", menu.Accel("NumLock")),
|
||||
}),
|
||||
menu.SubMenu("Function Keys", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("F1", "F1", menu.Accel("F1")),
|
||||
menu.TextWithAccelerator("F2", "F2", menu.Accel("F2")),
|
||||
menu.TextWithAccelerator("F3", "F3", menu.Accel("F3")),
|
||||
menu.TextWithAccelerator("F4", "F4", menu.Accel("F4")),
|
||||
menu.TextWithAccelerator("F5", "F5", menu.Accel("F5")),
|
||||
menu.TextWithAccelerator("F6", "F6", menu.Accel("F6")),
|
||||
menu.TextWithAccelerator("F7", "F7", menu.Accel("F7")),
|
||||
menu.TextWithAccelerator("F8", "F8", menu.Accel("F8")),
|
||||
menu.TextWithAccelerator("F9", "F9", menu.Accel("F9")),
|
||||
menu.TextWithAccelerator("F10", "F10", menu.Accel("F10")),
|
||||
menu.TextWithAccelerator("F11", "F11", menu.Accel("F11")),
|
||||
menu.TextWithAccelerator("F12", "F12", menu.Accel("F12")),
|
||||
menu.TextWithAccelerator("F13", "F13", menu.Accel("F13")),
|
||||
menu.TextWithAccelerator("F14", "F14", menu.Accel("F14")),
|
||||
menu.TextWithAccelerator("F15", "F15", menu.Accel("F15")),
|
||||
menu.TextWithAccelerator("F16", "F16", menu.Accel("F16")),
|
||||
menu.TextWithAccelerator("F17", "F17", menu.Accel("F17")),
|
||||
menu.TextWithAccelerator("F18", "F18", menu.Accel("F18")),
|
||||
menu.TextWithAccelerator("F19", "F19", menu.Accel("F19")),
|
||||
menu.TextWithAccelerator("F20", "F20", menu.Accel("F20")),
|
||||
menu.Text("F1", "F1", menu.Accel("F1")),
|
||||
menu.Text("F2", "F2", menu.Accel("F2")),
|
||||
menu.Text("F3", "F3", menu.Accel("F3")),
|
||||
menu.Text("F4", "F4", menu.Accel("F4")),
|
||||
menu.Text("F5", "F5", menu.Accel("F5")),
|
||||
menu.Text("F6", "F6", menu.Accel("F6")),
|
||||
menu.Text("F7", "F7", menu.Accel("F7")),
|
||||
menu.Text("F8", "F8", menu.Accel("F8")),
|
||||
menu.Text("F9", "F9", menu.Accel("F9")),
|
||||
menu.Text("F10", "F10", menu.Accel("F10")),
|
||||
menu.Text("F11", "F11", menu.Accel("F11")),
|
||||
menu.Text("F12", "F12", menu.Accel("F12")),
|
||||
menu.Text("F13", "F13", menu.Accel("F13")),
|
||||
menu.Text("F14", "F14", menu.Accel("F14")),
|
||||
menu.Text("F15", "F15", menu.Accel("F15")),
|
||||
menu.Text("F16", "F16", menu.Accel("F16")),
|
||||
menu.Text("F17", "F17", menu.Accel("F17")),
|
||||
menu.Text("F18", "F18", menu.Accel("F18")),
|
||||
menu.Text("F19", "F19", menu.Accel("F19")),
|
||||
menu.Text("F20", "F20", menu.Accel("F20")),
|
||||
}),
|
||||
menu.SubMenu("Standard Keys", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("Backtick", "Backtick", menu.Accel("`")),
|
||||
menu.TextWithAccelerator("Plus", "Plus", menu.Accel("+")),
|
||||
menu.Text("Backtick", "Backtick", menu.Accel("`")),
|
||||
menu.Text("Plus", "Plus", menu.Accel("+")),
|
||||
}),
|
||||
}),
|
||||
menu.SubMenuWithID("Dynamic Menus 1", "Dynamic Menus 1", []*menu.MenuItem{
|
||||
menu.TextWithAccelerator("Add Menu Item", "Add Menu Item", menu.CmdOrCtrlAccel("+")),
|
||||
menu.Text("Add Menu Item", "Add Menu Item", menu.CmdOrCtrlAccel("+")),
|
||||
menu.Separator(),
|
||||
}),
|
||||
{
|
||||
|
|
@ -319,11 +319,11 @@ func createApplicationMenu() *menu.Menu {
|
|||
Accelerator: menu.CmdOrCtrlAccel("l"),
|
||||
Checked: true,
|
||||
},
|
||||
menu.Checkbox("Checkbox Menu 2", "checkbox-menu 2", false),
|
||||
menu.Checkbox("Checkbox Menu 2", "checkbox-menu 2", false, nil),
|
||||
menu.Separator(),
|
||||
menu.Radio("😀 Option 1", "😀option-1", true),
|
||||
menu.Radio("😺 Option 2", "option-2", false),
|
||||
menu.Radio("❤️ Option 3", "option-3", false),
|
||||
menu.Radio("😀 Option 1", "😀option-1", true, nil),
|
||||
menu.Radio("😺 Option 2", "option-2", false, nil),
|
||||
menu.Radio("❤️ Option 3", "option-3", false, nil),
|
||||
}),
|
||||
})
|
||||
|
||||
|
|
|
|||
|
|
@ -97,12 +97,12 @@ func (t *Tray) addMenu(mi *menu.MenuItem) {
|
|||
parent := mi.Parent()
|
||||
counter := t.incrementcounter()
|
||||
menuText := "Dynamic Menu Item " + strconv.Itoa(counter)
|
||||
parent.Append(menu.Text(menuText, menuText))
|
||||
// parent.Append(menu.TextWithAccelerator(menuText, menuText, menu.Accel("[")))
|
||||
parent.Append(menu.Text(menuText, menuText, nil))
|
||||
// parent.Append(menu.Text(menuText, menuText, menu.Accel("[")))
|
||||
|
||||
// If this is the first dynamic menu added, let's add a remove menu item
|
||||
if counter == 1 {
|
||||
removeMenu := menu.TextWithAccelerator("Remove "+menuText,
|
||||
removeMenu := menu.Text("Remove "+menuText,
|
||||
"Remove Last Item", menu.CmdOrCtrlAccel("-"))
|
||||
parent.Prepend(removeMenu)
|
||||
t.runtime.Tray.On("Remove Last Item", t.removeMenu)
|
||||
|
|
@ -145,15 +145,15 @@ func (t *Tray) removeMenu(_ *menu.MenuItem) {
|
|||
removeMenu.Label = "Remove " + menuText
|
||||
}
|
||||
|
||||
// parent.Append(menu.TextWithAccelerator(menuText, menuText, menu.Accel("[")))
|
||||
// parent.Append(menu.Text(menuText, menuText, menu.Accel("[")))
|
||||
t.runtime.Tray.Update()
|
||||
}
|
||||
|
||||
func createApplicationTray() *menu.Menu {
|
||||
trayMenu := &menu.Menu{}
|
||||
trayMenu.Append(menu.Text("Show Window", "Show Window"))
|
||||
trayMenu.Append(menu.Text("Hide Window", "Hide Window"))
|
||||
trayMenu.Append(menu.Text("Minimise Window", "Minimise Window"))
|
||||
trayMenu.Append(menu.Text("Unminimise Window", "Unminimise Window"))
|
||||
trayMenu.Append(menu.Text("Show Window", "Show Window", nil))
|
||||
trayMenu.Append(menu.Text("Hide Window", "Hide Window", nil))
|
||||
trayMenu.Append(menu.Text("Minimise Window", "Minimise Window", nil))
|
||||
trayMenu.Append(menu.Text("Unminimise Window", "Unminimise Window", nil))
|
||||
return trayMenu
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue