diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 2ea618e1c..bc57e3585 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -123,6 +123,8 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): icon.addFile(":/images/256x256/picard.png", QtCore.QSize(256, 256)) self.setWindowIcon(icon) + self.show_close_window = sys.platform == "darwin" + self.create_actions() self.create_statusbar() self.create_toolbar() @@ -382,6 +384,11 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): self.add_directory_action.setShortcut(QtGui.QKeySequence(_("Ctrl+D"))) self.add_directory_action.triggered.connect(self.add_directory) + if self.show_close_window: + self.close_window_action = QtWidgets.QAction(_("Close Window"), self) + self.close_window_action.setShortcut(QtGui.QKeySequence(_("Ctrl+W"))) + self.close_window_action.triggered.connect(self.close_active_window) + self.save_action = QtWidgets.QAction(icontheme.lookup('document-save'), _("&Save"), self) self.save_action.setStatusTip(_("Save selected files")) # TR: Keyboard shortcut for "Save" @@ -580,6 +587,8 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): menu = self.menuBar().addMenu(_("&File")) menu.addAction(self.add_directory_action) menu.addAction(self.add_files_action) + if self.show_close_window: + menu.addAction(self.close_window_action) menu.addSeparator() menu.addAction(self.play_file_action) menu.addAction(self.open_folder_action) @@ -828,6 +837,9 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): for directory in dir_list: self.tagger.add_directory(directory) + def close_active_window(self): + self.tagger.activeWindow().close() + def show_about(self): self.show_options("about")