diff --git a/qt_ui/windows/QLiberationWindow.py b/qt_ui/windows/QLiberationWindow.py index 382b3289..4641be37 100644 --- a/qt_ui/windows/QLiberationWindow.py +++ b/qt_ui/windows/QLiberationWindow.py @@ -69,27 +69,31 @@ class QLiberationWindow(QMainWindow): GameUpdateSignal.get_instance().debriefingReceived.connect(self.onDebriefing) def initActions(self): - self.newGameAction = QAction("New Game", self) + self.newGameAction = QAction("&New Game", self) self.newGameAction.setIcon(QIcon(CONST.ICONS["New"])) self.newGameAction.triggered.connect(self.newGame) + self.newGameAction.setShortcut('CTRL+N') - self.openAction = QAction("Open", self) + self.openAction = QAction("&Open", self) self.openAction.setIcon(QIcon(CONST.ICONS["Open"])) self.openAction.triggered.connect(self.openFile) + self.openAction.setShortcut('CTRL+O') - self.saveGameAction = QAction("Save", self) + self.saveGameAction = QAction("&Save", self) self.saveGameAction.setIcon(QIcon(CONST.ICONS["Save"])) self.saveGameAction.triggered.connect(self.saveGame) + self.saveGameAction.setShortcut('CTRL+S') - self.saveAsAction = QAction("Save As", self) + self.saveAsAction = QAction("Save &As", self) self.saveAsAction.setIcon(QIcon(CONST.ICONS["Save"])) self.saveAsAction.triggered.connect(self.saveGameAs) + self.saveAsAction.setShortcut('CTRL+A') self.showAboutDialogAction = QAction("About DCS Liberation", self) self.showAboutDialogAction.setIcon(QIcon.fromTheme("help-about")) self.showAboutDialogAction.triggered.connect(self.showAboutDialog) - self.showLiberationPrefDialogAction = QAction("Preferences", self) + self.showLiberationPrefDialogAction = QAction("&Preferences", self) self.showLiberationPrefDialogAction.setIcon(QIcon.fromTheme("help-about")) self.showLiberationPrefDialogAction.triggered.connect(self.showLiberationDialog) @@ -102,27 +106,17 @@ class QLiberationWindow(QMainWindow): def initMenuBar(self): self.menu = self.menuBar() - file_menu = self.menu.addMenu("File") + file_menu = self.menu.addMenu("&File") file_menu.addAction(self.newGameAction) file_menu.addAction(self.openAction) + file_menu.addSeparator() file_menu.addAction(self.saveGameAction) file_menu.addAction(self.saveAsAction) file_menu.addSeparator() file_menu.addAction(self.showLiberationPrefDialogAction) file_menu.addSeparator() #file_menu.addAction("Close Current Game", lambda: self.closeGame()) # Not working - file_menu.addAction("Exit" , lambda: self.exit()) - - help_menu = self.menu.addMenu("Help") - help_menu.addAction("Discord Server", lambda: webbrowser.open_new_tab("https://" + "discord.gg" + "/" + "bKrt" + "rkJ")) - help_menu.addAction("Github Repository", lambda: webbrowser.open_new_tab("https://github.com/khopa/dcs_liberation")) - help_menu.addAction("Releases", lambda: webbrowser.open_new_tab("https://github.com/Khopa/dcs_liberation/releases")) - help_menu.addAction("Online Manual", lambda: webbrowser.open_new_tab(URLS["Manual"])) - help_menu.addAction("ED Forum Thread", lambda: webbrowser.open_new_tab(URLS["ForumThread"])) - help_menu.addAction("Report an issue", lambda: webbrowser.open_new_tab(URLS["Issues"])) - - help_menu.addSeparator() - help_menu.addAction(self.showAboutDialogAction) + file_menu.addAction("E&xit" , lambda: self.exit()) displayMenu = self.menu.addMenu("Display") @@ -164,6 +158,17 @@ class QLiberationWindow(QMainWindow): displayMenu.addAction(tg_sam_visibility) displayMenu.addAction(tg_flight_path_visibility) + help_menu = self.menu.addMenu("&Help") + help_menu.addAction("Discord Server", lambda: webbrowser.open_new_tab("https://" + "discord.gg" + "/" + "bKrt" + "rkJ")) + help_menu.addAction("Github Repository", lambda: webbrowser.open_new_tab("https://github.com/khopa/dcs_liberation")) + help_menu.addAction("Releases", lambda: webbrowser.open_new_tab("https://github.com/Khopa/dcs_liberation/releases")) + help_menu.addAction("Online Manual", lambda: webbrowser.open_new_tab(URLS["Manual"])) + help_menu.addAction("ED Forum Thread", lambda: webbrowser.open_new_tab(URLS["ForumThread"])) + help_menu.addAction("Report an issue", lambda: webbrowser.open_new_tab(URLS["Issues"])) + + help_menu.addSeparator() + help_menu.addAction(self.showAboutDialogAction) + def newGame(self): wizard = NewGameWizard(self) wizard.show()