fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-25 00:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Lookup CD code and add Tools submenu

Browse Source
This commit is contained in:
Sophist
2017-05-14 11:58:36 +01:00
parent 126376b244
commit fa30a2e60d
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
picard/ui/mainwindow.py
View File

@@ -421,13 +421,24 @@ class MainWindow(QtWidgets.QMainWindow):
# TR: Keyboard shortcut for "Lookup CD"
self.cd_lookup_action.setShortcut(QtGui.QKeySequence(_("Ctrl+K")))
self.cd_lookup_action.triggered.connect(self.tagger.lookup_cd)
self.cd_lookup_menu = QtWidgets.QMenu(_("Lookup &CD..."))
self.cd_lookup_menu.triggered.connect(self.tagger.lookup_cd)
self.cd_lookup_action.setEnabled(False)
if discid is None:
log.warning("CDROM: discid library not found - Lookup CD functionality disabled")
elif len(get_cdrom_drives()) == 0:
log.warning("CDROM: No CD-ROM drives found - Lookup CD functionality disabled")
else:
self.cd_lookup_action.setEnabled(True)
drives = get_cdrom_drives()
if len(drives) == 0:
log.warning("CDROM: No CD-ROM drives found - Lookup CD functionality disabled")
else:
shortcut_drive = config.setting["cd_lookup_device"].split(",")[0] if len(drives) > 1 else ""
self.cd_lookup_action.setEnabled(True)
for drive in drives:
action = self.cd_lookup_menu.addAction(drive)
if drive == shortcut_drive:
action.setShortcut(QtGui.QKeySequence(_("Ctrl+K")))
self.cd_lookup_action.setShortcut(QtGui.QKeySequence())
self.analyze_action = QtWidgets.QAction(icontheme.lookup('picard-analyze'), _("&Scan"), self)
self.analyze_action.setStatusTip(_("Use AcoustID audio fingerprint to identify the files by the actual music, even if they have no metadata"))
@@ -562,7 +573,10 @@ class MainWindow(QtWidgets.QMainWindow):
menu.addAction(self.options_action)
menu = self.menuBar().addMenu(_("&Tools"))
menu.addAction(self.refresh_action)
menu.addAction(self.cd_lookup_action)
if len(self.cd_lookup_menu.actions()) > 1:
menu.addMenu(self.cd_lookup_menu)
else:
menu.addAction(self.cd_lookup_action)
menu.addAction(self.autotag_action)
menu.addAction(self.analyze_action)
menu.addAction(self.cluster_action)
@@ -610,24 +624,19 @@ class MainWindow(QtWidgets.QMainWindow):
widget.setAttribute(QtCore.Qt.WA_MacShowFocusRect)
for action in config.setting['toolbar_layout']:
if action not in ('cd_lookup_action', 'separator'):
try:
add_toolbar_action(getattr(self, action))
except AttributeError:
log.warning('Warning: Unknown action name "%r" found in config. Ignored.', action)
elif action == 'cd_lookup_action':
if action == 'cd_lookup_action':
add_toolbar_action(self.cd_lookup_action)
drives = get_cdrom_drives()
if len(drives) > 1:
self.cd_lookup_menu = QtWidgets.QMenu()
for drive in drives:
self.cd_lookup_menu.addAction(drive)
self.cd_lookup_menu.triggered.connect(self.tagger.lookup_cd)
if len(self.cd_lookup_menu.actions()) > 1:
button = toolbar.widgetForAction(self.cd_lookup_action)
button.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
button.setMenu(self.cd_lookup_menu)
elif action == 'separator':
toolbar.addSeparator()
else:
try:
add_toolbar_action(getattr(self, action))
except AttributeError:
log.warning('Warning: Unknown action name "%r" found in config. Ignored.', action)
self.show_toolbar()
def create_search_toolbar(self):