From ae5d1c7e22f96490f41aeb32030ee71bf1f26134 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Fri, 13 Mar 2026 17:46:15 -0400 Subject: [PATCH] Align tui and gui menubars. --- qml/Components/ClideMenuBar.qml | 62 +++++---------------------------- src/tui/menu_bar.rs | 5 ++- 2 files changed, 13 insertions(+), 54 deletions(-) diff --git a/qml/Components/ClideMenuBar.qml b/qml/Components/ClideMenuBar.qml index cfd9518..c1bd532 100644 --- a/qml/Components/ClideMenuBar.qml +++ b/qml/Components/ClideMenuBar.qml @@ -18,22 +18,6 @@ MenuBar { ClideMenu { title: qsTr("&File") - ClideMenuItem { - action: Action { - id: actionNewProject - - text: qsTr("&New Project...") - } - } - ClideMenuItem { - action: Action { - id: actionOpen - - text: qsTr("&Open...") - } - - onTriggered: FileSystem.setDirectory(FileSystem.filePath) - } ClideMenuItem { action: Action { id: actionSave @@ -41,6 +25,13 @@ MenuBar { text: qsTr("&Save") } } + ClideMenuItem { + action: Action { + id: actionReload + + text: qsTr("&Reload") + } + } MenuSeparator { background: Rectangle { border.color: color @@ -67,37 +58,9 @@ MenuBar { ClideMenuItem { action: Action { - id: actionUndo + id: actionCloseTab - text: qsTr("&Undo") - } - } - ClideMenuItem { - action: Action { - id: actionRedo - - text: qsTr("&Redo") - } - } - ClideMenuItem { - action: Action { - id: actionCut - - text: qsTr("&Cut") - } - } - ClideMenuItem { - action: Action { - id: actionCopy - - text: qsTr("&Copy") - } - } - ClideMenuItem { - action: Action { - id: actionPaste - - text: qsTr("&Paste") + text: qsTr("&Close Tab") } } } @@ -132,13 +95,6 @@ MenuBar { ClideMenu { title: qsTr("&Help") - ClideMenuItem { - action: Action { - id: actionDocumentation - - text: qsTr("&Documentation") - } - } ClideMenuItem { action: Action { id: actionAbout diff --git a/src/tui/menu_bar.rs b/src/tui/menu_bar.rs index 6ca1f0e..6646e92 100644 --- a/src/tui/menu_bar.rs +++ b/src/tui/menu_bar.rs @@ -21,6 +21,7 @@ use strum::{EnumIter, FromRepr, IntoEnumIterator}; #[derive(Debug, Clone, Copy, PartialEq, Eq, FromRepr, EnumIter)] enum MenuBarItem { File, + Edit, View, Help, } @@ -68,12 +69,14 @@ impl MenuBarItem { MenuBarItem::File => "File", MenuBarItem::View => "View", MenuBarItem::Help => "Help", + MenuBarItem::Edit => "Edit", } } pub fn options(&self) -> &[MenuBarItemOption] { match self { - MenuBarItem::File => &[Save, CloseTab, Reload, Exit], + MenuBarItem::File => &[Save, Reload, Exit], + MenuBarItem::Edit => &[CloseTab], MenuBarItem::View => &[ShowHideExplorer, ShowHideLogger], MenuBarItem::Help => &[About], }