From 36664bb67a92790c224c3dc13cb1453cb792a639 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Tue, 25 Sep 2018 20:50:02 +0200 Subject: [PATCH 1/2] PICARD-1285: Add Close Window menu entry for macOS --- picard/ui/mainwindow.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 2ea618e1c..2b0e006d9 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -382,6 +382,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 sys.platform == "darwin": + 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 +585,8 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): menu = self.menuBar().addMenu(_("&File")) menu.addAction(self.add_directory_action) menu.addAction(self.add_files_action) + if sys.platform == "darwin": + menu.addAction(self.close_window_action) menu.addSeparator() menu.addAction(self.play_file_action) menu.addAction(self.open_folder_action) @@ -828,6 +835,10 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): for directory in dir_list: self.tagger.add_directory(directory) + def close_active_window(self): + print("close_active_window") + self.tagger.activeWindow().close() + def show_about(self): self.show_options("about") From 5ea90c61381a1c1837e8c80667eb3ce586437bcd Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Thu, 27 Sep 2018 22:28:08 +0200 Subject: [PATCH 2/2] PICARD-1285: Set MainWindow.show_close_window --- picard/ui/mainwindow.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 2b0e006d9..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,7 +384,7 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): self.add_directory_action.setShortcut(QtGui.QKeySequence(_("Ctrl+D"))) self.add_directory_action.triggered.connect(self.add_directory) - if sys.platform == "darwin": + 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) @@ -585,7 +587,7 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): menu = self.menuBar().addMenu(_("&File")) menu.addAction(self.add_directory_action) menu.addAction(self.add_files_action) - if sys.platform == "darwin": + if self.show_close_window: menu.addAction(self.close_window_action) menu.addSeparator() menu.addAction(self.play_file_action) @@ -836,7 +838,6 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry): self.tagger.add_directory(directory) def close_active_window(self): - print("close_active_window") self.tagger.activeWindow().close() def show_about(self):