From 4347cc2cba1049c3ca3d1c3fd55229fb5603ca76 Mon Sep 17 00:00:00 2001 From: Sophist Date: Mon, 24 Mar 2014 15:30:48 +0000 Subject: [PATCH] Address various zas comments --- picard/tagger.py | 2 +- picard/ui/itemviews.py | 6 +++--- picard/ui/mainwindow.py | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/picard/tagger.py b/picard/tagger.py index 85dbdb097..b29c1bd05 100644 --- a/picard/tagger.py +++ b/picard/tagger.py @@ -339,7 +339,7 @@ class Tagger(QtGui.QApplication): except StopIteration: return None else: - if len(files) > 0: + if files > 0: self.window.set_statusbar_message(N_("Adding %d files from '%s' ..."), len(files), root) return (os.path.join(root, f) for f in files) diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py index dddfac4f0..04a211067 100644 --- a/picard/ui/itemviews.py +++ b/picard/ui/itemviews.py @@ -248,7 +248,7 @@ class BaseTreeView(QtGui.QTreeWidget): menu.addAction(self.window.view_info_action) plugin_actions = list(_track_actions) if obj.num_linked_files == 1: - menu.addAction(self.window.open_file_action) + menu.addAction(self.window.play_file_action) menu.addAction(self.window.open_folder_action) plugin_actions.extend(_file_actions) menu.addAction(self.window.browser_lookup_action) @@ -270,7 +270,7 @@ class BaseTreeView(QtGui.QTreeWidget): elif isinstance(obj, File): if can_view_info: menu.addAction(self.window.view_info_action) - menu.addAction(self.window.open_file_action) + menu.addAction(self.window.play_file_action) menu.addAction(self.window.open_folder_action) menu.addAction(self.window.browser_lookup_action) menu.addSeparator() @@ -362,7 +362,7 @@ class BaseTreeView(QtGui.QTreeWidget): menu.addMenu(CollectionMenu(selected_albums, _("Collections"), menu)) if plugin_actions: - plugin_menu = QtGui.QMenu(_("&Plugins"), menu) + plugin_menu = QtGui.QMenu(_("P&lugins"), menu) plugin_menu.setIcon(self.panel.icon_plugins) menu.addSeparator() menu.addMenu(plugin_menu) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 1bf14b499..fe970527e 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -307,7 +307,7 @@ class MainWindow(QtGui.QMainWindow): self.add_files_action.triggered.connect(self.add_files) self.add_directory_action = QtGui.QAction(icontheme.lookup('folder'), _(u"A&dd Folder..."), self) - self.add_directory_action.setStatusTip(_(u"Add folders to the tagger")) + self.add_directory_action.setStatusTip(_(u"Add a folder to the tagger")) # TR: Keyboard shortcut for "Add Directory..." self.add_directory_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+D"))) self.add_directory_action.triggered.connect(self.add_directory) @@ -411,25 +411,25 @@ class MainWindow(QtGui.QMainWindow): self.tags_from_filenames_action = QtGui.QAction(_(u"Tags From &File Names..."), self) self.tags_from_filenames_action.triggered.connect(self.open_tags_from_filenames) - self.open_collection_in_browser_action = QtGui.QAction(_(u"&Open Collection in Browser"), self) + self.open_collection_in_browser_action = QtGui.QAction(_(u"&Open My Collections in Browser"), self) self.open_collection_in_browser_action.triggered.connect(self.open_collection_in_browser) self.open_collection_in_browser_action.setEnabled(config.setting["username"] != u'') - self.view_log_action = QtGui.QAction(_(u"View Error/Debug &Log..."), self) + self.view_log_action = QtGui.QAction(_(u"View Error/Debug &Log"), self) self.view_log_action.triggered.connect(self.show_log) - self.view_history_action = QtGui.QAction(_(u"View Activity &History..."), self) + self.view_history_action = QtGui.QAction(_(u"View Activity &History"), self) self.view_history_action.triggered.connect(self.show_history) xmlws_manager = self.tagger.xmlws.manager xmlws_manager.authenticationRequired.connect(self.show_password_dialog) xmlws_manager.proxyAuthenticationRequired.connect(self.show_proxy_dialog) - self.open_file_action = QtGui.QAction(_(u"&Open..."), self) - self.open_file_action.setStatusTip(_(u"Open the file in your default media player")) - self.open_file_action.triggered.connect(self.open_file) + self.play_file_action = QtGui.QAction(_(u"&Play file"), self) + self.play_file_action.setStatusTip(_(u"Play the file in your default media player")) + self.play_file_action.triggered.connect(self.play_file) - self.open_folder_action = QtGui.QAction(_(u"Open &Folder..."), self) + self.open_folder_action = QtGui.QAction(_(u"Open Containing &Folder"), self) self.open_folder_action.setStatusTip(_(u"Open the containing folder in your file explorer")) self.open_folder_action.triggered.connect(self.open_folder) @@ -703,7 +703,7 @@ class MainWindow(QtGui.QMainWindow): return return self.tagger.analyze(self.selected_objects) - def open_file(self): + def play_file(self): files = self.tagger.get_files_from_objects(self.selected_objects) for file in files: url = QtCore.QUrl.fromLocalFile(file.filename)