From 5b0f0e4e511bae87512133240c13570a15dcb5e0 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 20 Apr 2022 21:33:18 +0200 Subject: [PATCH] Massive UI revamping (v7): restore menu shortcuts and ellipsis. Fixes #1208 --- sdrgui/gui/myposdialog.ui | 4 ++-- sdrgui/mainwindow.cpp | 50 +++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sdrgui/gui/myposdialog.ui b/sdrgui/gui/myposdialog.ui index 3e88ed7a6..fde93a7b0 100644 --- a/sdrgui/gui/myposdialog.ui +++ b/sdrgui/gui/myposdialog.ui @@ -7,7 +7,7 @@ 0 0 324 - 190 + 229 @@ -17,7 +17,7 @@ - Dialog + My Position diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 9995a75bc..6fcd1cc19 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -1396,78 +1396,78 @@ void MainWindow::createMenuBar() { QMenuBar *menuBar = this->menuBar(); - QMenu *fileMenu = menuBar->addMenu("File"); - QAction *exitAction = fileMenu->addAction("Exit"); + QMenu *fileMenu = menuBar->addMenu("&File"); + QAction *exitAction = fileMenu->addAction("E&xit"); exitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); exitAction->setToolTip("Exit"); QObject::connect(exitAction, &QAction::triggered, this, &QMainWindow::close); - QMenu *viewMenu = menuBar->addMenu("View"); - QAction *fullscreenAction = viewMenu->addAction("Fullscreen"); + QMenu *viewMenu = menuBar->addMenu("&View"); + QAction *fullscreenAction = viewMenu->addAction("&Fullscreen"); fullscreenAction->setShortcut(QKeySequence(Qt::Key_F11)); fullscreenAction->setToolTip("Toggle fullscreen view"); fullscreenAction->setCheckable(true); QObject::connect(fullscreenAction, &QAction::triggered, this, &MainWindow::on_action_View_Fullscreen_toggled); - QMenu *workspacesMenu = menuBar->addMenu("Workspaces"); - QAction *newWorkspaceAction = workspacesMenu->addAction("New"); + QMenu *workspacesMenu = menuBar->addMenu("&Workspaces"); + QAction *newWorkspaceAction = workspacesMenu->addAction("&New"); newWorkspaceAction->setToolTip("Add a new workspace"); QObject::connect(newWorkspaceAction, &QAction::triggered, this, &MainWindow::addWorkspace); - QAction *viewAllWorkspacesAction = workspacesMenu->addAction("View all"); + QAction *viewAllWorkspacesAction = workspacesMenu->addAction("&View all"); viewAllWorkspacesAction->setToolTip("View all workspaces"); QObject::connect(viewAllWorkspacesAction, &QAction::triggered, this, &MainWindow::viewAllWorkspaces); - QAction *removeEmptyWorkspacesAction = workspacesMenu->addAction("Remove empty"); + QAction *removeEmptyWorkspacesAction = workspacesMenu->addAction("&Remove empty"); removeEmptyWorkspacesAction->setToolTip("Remove empty workspaces"); QObject::connect(removeEmptyWorkspacesAction, &QAction::triggered, this, &MainWindow::removeEmptyWorkspaces); - QMenu *preferencesMenu = menuBar->addMenu("Preferences"); - QAction *configurationsAction = preferencesMenu->addAction("Configurations"); + QMenu *preferencesMenu = menuBar->addMenu("&Preferences"); + QAction *configurationsAction = preferencesMenu->addAction("&Configurations..."); configurationsAction->setToolTip("Manage configurations"); QObject::connect(configurationsAction, &QAction::triggered, this, &MainWindow::on_action_Configurations_triggered); - QAction *audioAction = preferencesMenu->addAction("Audio"); + QAction *audioAction = preferencesMenu->addAction("&Audio..."); audioAction->setToolTip("Audio preferences"); QObject::connect(audioAction, &QAction::triggered, this, &MainWindow::on_action_Audio_triggered); - QAction *loggingAction = preferencesMenu->addAction("Logging"); + QAction *loggingAction = preferencesMenu->addAction("&Logging..."); loggingAction->setToolTip("Logging preferences"); QObject::connect(loggingAction, &QAction::triggered, this, &MainWindow::on_action_Logging_triggered); - QAction *myPositionAction = preferencesMenu->addAction("My Position"); + QAction *myPositionAction = preferencesMenu->addAction("My &Position..."); myPositionAction->setToolTip("Set station position"); QObject::connect(myPositionAction, &QAction::triggered, this, &MainWindow::on_action_My_Position_triggered); - QAction *fftAction = preferencesMenu->addAction("FFT"); + QAction *fftAction = preferencesMenu->addAction("&FFT..."); fftAction->setToolTip("Set FFT cache"); QObject::connect(fftAction, &QAction::triggered, this, &MainWindow::on_action_FFT_triggered); #ifndef __APPLE__ - QAction *ambeAction = preferencesMenu->addAction("AMBE"); + QAction *ambeAction = preferencesMenu->addAction("A&MBE..."); ambeAction->setToolTip("AMBE options"); QObject::connect(ambeAction, &QAction::triggered, this, &MainWindow::on_action_AMBE_triggered); #endif #if defined(HAS_LIMERFEUSB) - QAction *limeRFEAction = preferencesMenu->addAction("Lime RFE"); + QAction *limeRFEAction = preferencesMenu->addAction("Lime &RFE..."); limeRFEAction->setToolTip("Lime RFE options"); QObject::connect(limeRFEAction, &QAction::triggered, this, &MainWindow::on_action_LimeRFE_triggered); #endif - QMenu *devicesMenu = preferencesMenu->addMenu("Devices"); - QAction *userArgumentsAction = devicesMenu->addAction("User arguments"); + QMenu *devicesMenu = preferencesMenu->addMenu("&Devices"); + QAction *userArgumentsAction = devicesMenu->addAction("&User arguments..."); userArgumentsAction->setToolTip("Device custom user arguments"); QObject::connect(userArgumentsAction, &QAction::triggered, this, &MainWindow::on_action_DeviceUserArguments_triggered); - QAction *commandsAction = preferencesMenu->addAction("Commands"); + QAction *commandsAction = preferencesMenu->addAction("C&ommands..."); commandsAction->setToolTip("External commands dialog"); QObject::connect(commandsAction, &QAction::triggered, this, &MainWindow::on_action_commands_triggered); - QAction *saveAllAction = preferencesMenu->addAction("Save all"); + QAction *saveAllAction = preferencesMenu->addAction("&Save all"); saveAllAction->setToolTip("Save all current settings"); QObject::connect(saveAllAction, &QAction::triggered, this, &MainWindow::on_action_saveAll_triggered); - QMenu *helpMenu = menuBar->addMenu("Help"); - QAction *quickStartAction = helpMenu->addAction("Quick start"); + QMenu *helpMenu = menuBar->addMenu("&Help"); + QAction *quickStartAction = helpMenu->addAction("&Quick start..."); quickStartAction->setToolTip("Instructions for quick start"); QObject::connect(quickStartAction, &QAction::triggered, this, &MainWindow::on_action_Quick_Start_triggered); - QAction *mainWindowAction = helpMenu->addAction("Main Window"); + QAction *mainWindowAction = helpMenu->addAction("&Main Window..."); mainWindowAction->setToolTip("Help on main window details"); QObject::connect(mainWindowAction, &QAction::triggered, this, &MainWindow::on_action_Main_Window_triggered); - QAction *loadedPluginsAction = helpMenu->addAction("Loaded plugins"); + QAction *loadedPluginsAction = helpMenu->addAction("Loaded &Plugins..."); loadedPluginsAction->setToolTip("List available plugins"); QObject::connect(loadedPluginsAction, &QAction::triggered, this, &MainWindow::on_action_Loaded_Plugins_triggered); - QAction *aboutAction = helpMenu->addAction("ABout SDRangel"); + QAction *aboutAction = helpMenu->addAction("&About SDRangel..."); aboutAction->setToolTip("SDRangel application details"); QObject::connect(aboutAction, &QAction::triggered, this, &MainWindow::on_action_About_triggered); }