menu: move ToggleOmnipresent to workspaces

...and rename it to "Always on Visible Workspace"

Issue: #1316
This commit is contained in:
Johan Malm 2023-12-19 21:24:55 +00:00 committed by Consolatis
parent b7ee8b16f3
commit 3101b0c5b1
12 changed files with 44 additions and 33 deletions

View file

@ -15,7 +15,7 @@
<item label="Decorations">
<action name="ToggleDecorations" />
</item>
<item label="AlwaysOnTop">
<item label="Always on Top">
<action name="ToggleAlwaysOnTop" />
</item>
<!--
@ -29,6 +29,10 @@
<item label="Move right">
<action name="SendToDesktop" to="right" />
</item>
<separator />
<item label="Always on Visible Workspace">
<action name="ToggleOmnipresent" />
</item>
</menu>
<item label="Close">
<action name="Close" />

View file

@ -42,25 +42,25 @@ msgid "Decorations"
msgstr ""
#: src/menu/menu.c:724
msgid "AlwaysOnTop"
msgid "Always on Top"
msgstr ""
#: src/menu/menu.c:726
msgid "ToggleOmnipresent"
msgstr ""
#: src/menu/menu.c:731
#: src/menu/menu.c:729
msgid "Move left"
msgstr ""
#: src/menu/menu.c:738
#: src/menu/menu.c:736
msgid "Move right"
msgstr ""
#: src/menu/menu.c:741
msgid "Workspace"
msgid "Always on Visible Workspace"
msgstr ""
#: src/menu/menu.c:744
msgid "Workspace"
msgstr ""
#: src/menu/menu.c:747
msgid "Close"
msgstr ""

View file

@ -17,46 +17,50 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/menu/menu.c:631
#: src/menu/menu.c:698
msgid "Reconfigure"
msgstr "Konfigurera om"
#: src/menu/menu.c:633
#: src/menu/menu.c:700
msgid "Exit"
msgstr "Utgång"
msgstr "Avsluta"
#: src/menu/menu.c:649
#: src/menu/menu.c:716
msgid "Minimize"
msgstr "Minimera"
#: src/menu/menu.c:651
#: src/menu/menu.c:718
msgid "Maximize"
msgstr "Maximera"
#: src/menu/menu.c:653
#: src/menu/menu.c:720
msgid "Fullscreen"
msgstr "Fullskärm"
#: src/menu/menu.c:655
#: src/menu/menu.c:722
msgid "Decorations"
msgstr "Dekorationer"
#: src/menu/menu.c:657
msgid "AlwaysOnTop"
#: src/menu/menu.c:724
msgid "Always on Top"
msgstr "Alltid överst"
#: src/menu/menu.c:662
#: src/menu/menu.c:729
msgid "Move left"
msgstr "Flytta till vänster"
#: src/menu/menu.c:667
#: src/menu/menu.c:736
msgid "Move right"
msgstr "Flytta till höger"
#: src/menu/menu.c:672
#: src/menu/menu.c:741
msgid "Always on Visible Workspace"
msgstr "Alltid på aktiv arbetsyta"
#: src/menu/menu.c:744
msgid "Workspace"
msgstr "Arbetsyta"
#: src/menu/menu.c:675
#: src/menu/menu.c:747
msgid "Close"
msgstr "Stäng"

View file

@ -721,10 +721,8 @@ init_windowmenu(struct server *server)
fill_item("name.action", "ToggleFullscreen");
current_item = item_create(menu, _("Decorations"), false);
fill_item("name.action", "ToggleDecorations");
current_item = item_create(menu, _("AlwaysOnTop"), false);
current_item = item_create(menu, _("Always on Top"), false);
fill_item("name.action", "ToggleAlwaysOnTop");
current_item = item_create(menu, _("ToggleOmnipresent"), false);
fill_item("name.action", "ToggleOmnipresent");
/* Workspace sub-menu */
struct menu *workspace_menu = menu_create(server, "workspaces", "");
@ -738,6 +736,11 @@ init_windowmenu(struct server *server)
current_item = item_create(workspace_menu, _("Move right"), false);
fill_item("name.action", "SendToDesktop");
fill_item("to.action", "right");
current_item = separator_create(workspace_menu, "");
current_item = item_create(workspace_menu,
_("Always on Visible Workspace"), false);
fill_item("name.action", "ToggleOmnipresent");
current_item = item_create(menu, _("Workspace"), true);
current_item->submenu = workspace_menu;