diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 8d8d1df3d..82631ae38 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -596,7 +596,7 @@ class MainWindow(QtGui.QMainWindow): widget.setAttribute(QtCore.Qt.WA_MacShowFocusRect) for action in config.setting['toolbar_layout']: - if action not in ('cd_lookup_action', 'seperator'): + if action not in ('cd_lookup_action', 'separator'): add_toolbar_action(getattr(self, action)) elif action == 'cd_lookup_action': add_toolbar_action(self.cd_lookup_action) @@ -609,7 +609,7 @@ class MainWindow(QtGui.QMainWindow): button = toolbar.widgetForAction(self.cd_lookup_action) button.setPopupMode(QtGui.QToolButton.MenuButtonPopup) button.setMenu(self.cd_lookup_menu) - elif action == 'seperator': + elif action == 'separator': toolbar.addSeparator() def create_search_toolbar(self): diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py index e9aefec71..f081f12b5 100644 --- a/picard/ui/options/interface.py +++ b/picard/ui/options/interface.py @@ -37,35 +37,22 @@ class InterfaceOptionsPage(OptionsPage): PARENT = "advanced" SORT_ORDER = 40 ACTIVE = True - SEPERATOR = u'—'*5 - TOOLBAR_BUTTONS = {'add_directory_action': N_(u'Add Folder'), - 'add_files_action': N_(u'Add Files'), - 'cluster_action': N_(u'Cluster'), - 'autotag_action': N_(u'Lookup'), - 'analyze_action': N_(u'Scan'), - 'browser_lookup_action': N_(u'Lookup in Browser'), - 'save_action': N_(u'Save'), - 'view_info_action': N_(u'Info'), - 'remove_action': N_(u'Remove'), - 'submit_action': N_(u'Submit AcoustIDs'), - 'play_file_action': N_(u'Open in Player'), - 'cd_lookup_action': N_(u'Lookup CD...'), + SEPARATOR = u'—'*5 + TOOLBAR_BUTTONS = {'add_directory_action': {'label': N_(u'Add Folder'), 'icon': 'folder'}, + 'add_files_action': {'label': N_(u'Add Files'), 'icon': 'document-open'}, + 'cluster_action': {'label': N_(u'Cluster'), 'icon': 'picard-cluster'}, + 'autotag_action': {'label': N_(u'Lookup'), 'icon': 'picard-auto-tag'}, + 'analyze_action': {'label': N_(u'Scan'), 'icon': 'picard-analyze'}, + 'browser_lookup_action': {'label': N_(u'Lookup in Browser'), 'icon': 'lookup-musicbrainz'}, + 'save_action': {'label': N_(u'Save'), 'icon': 'document-save'}, + 'view_info_action': {'label': N_(u'Info'), 'icon': 'picard-edit-tags'}, + 'remove_action': {'label': N_(u'Remove'), 'icon': 'list-remove'}, + 'submit_action': {'label': N_(u'Submit AcoustIDs'), 'icon': 'acoustid-fingerprinter'}, + 'play_file_action': {'label': N_(u'Open in Player'), 'icon': 'play-music'}, + 'cd_lookup_action': {'label': N_(u'Lookup CD...'), 'icon': 'media-optical'}, } - TOOLBAR_ICONS = {'add_directory_action': 'folder', - 'add_files_action': 'document-open', - 'cluster_action': 'picard-cluster', - 'autotag_action': 'picard-auto-tag', - 'analyze_action': 'picard-analyze', - 'browser_lookup_action': 'lookup-musicbrainz', - 'save_action': 'document-save', - 'view_info_action': 'picard-edit-tags', - 'remove_action': 'list-remove', - 'submit_action': 'acoustid-fingerprinter', - 'play_file_action': 'play-music', - 'cd_lookup_action': 'media-optical', - } - TOOLBAR_BUTTONS_REV = dict((value, key) for key, value in TOOLBAR_BUTTONS.items()) - ACTION_NAMES = set(TOOLBAR_BUTTONS.values()) + TOOLBAR_BUTTONS_REV = dict((value['label'], key) for key, value in TOOLBAR_BUTTONS.items()) + ACTION_NAMES = set(TOOLBAR_BUTTONS_REV.keys()) options = [ config.BoolOption("setting", "toolbar_show_labels", True), config.BoolOption("setting", "toolbar_multiselect", False), @@ -76,10 +63,10 @@ class InterfaceOptionsPage(OptionsPage): config.BoolOption("setting", "starting_directory", False), config.TextOption("setting", "starting_directory_path", ""), config.ListOption("setting", "toolbar_layout", [ - 'add_directory_action', 'add_files_action', 'seperator', 'cluster_action', 'seperator', - 'autotag_action', 'analyze_action', 'browser_lookup_action', 'seperator', - 'save_action', 'view_info_action', 'remove_action', 'seperator', - 'submit_action', 'seperator', 'play_file_action']), + 'add_directory_action', 'add_files_action', 'separator', 'cluster_action', 'separator', + 'autotag_action', 'analyze_action', 'browser_lookup_action', 'separator', + 'save_action', 'view_info_action', 'remove_action', 'separator', + 'submit_action', 'separator', 'play_file_action']), ] def __init__(self, parent=None): @@ -109,7 +96,7 @@ class InterfaceOptionsPage(OptionsPage): ) self.ui.starting_directory_browse.clicked.connect(self.starting_directory_browse) self.ui.add_button.clicked.connect(self.add_to_toolbar) - self.ui.insert_seperator_button.clicked.connect(self.insert_seperator) + self.ui.insert_separator_button.clicked.connect(self.insert_separator) self.ui.remove_button.clicked.connect(self.remove_action) self.ui.up_button.clicked.connect(partial(self.move_item, 1)) self.ui.down_button.clicked.connect(partial(self.move_item, -1)) @@ -158,12 +145,12 @@ class InterfaceOptionsPage(OptionsPage): item.setText(path) def _get_icon_from_name(self, name): - return self.TOOLBAR_ICONS[self.TOOLBAR_BUTTONS_REV[name]] + return self.TOOLBAR_BUTTONS[self.TOOLBAR_BUTTONS_REV[name]]['icon'] def _insert_item(self, action, index=None): list_item = QtGui.QListWidgetItem(action) list_item.setToolTip(_(u'Drag and Drop to re-order')) - if action != self.SEPERATOR: + if action != self.SEPARATOR: list_item.setIcon(icontheme.lookup(self._get_icon_from_name(action), icontheme.ICON_SIZE_MENU)) if index: self.ui.toolbar_layout_list.insertItem(index, list_item) @@ -176,7 +163,7 @@ class InterfaceOptionsPage(OptionsPage): def _added_actions(self): actions = self._all_list_items() - actions = filter(lambda x: x != self.SEPERATOR, actions) + actions = filter(lambda x: x != self.SEPARATOR, actions) return set(actions) def _current_item(self, return_type='item'): @@ -191,9 +178,9 @@ class InterfaceOptionsPage(OptionsPage): self.ui.toolbar_layout_list.clear() for name in config.setting['toolbar_layout']: if name in self.TOOLBAR_BUTTONS.keys(): - self._insert_item(self.TOOLBAR_BUTTONS[name]) + self._insert_item(self.TOOLBAR_BUTTONS[name]['label']) else: - self._insert_item(self.SEPERATOR) + self._insert_item(self.SEPARATOR) def update_buttons(self): self.ui.add_button.setEnabled(self._added_actions() != self.ACTION_NAMES) @@ -210,9 +197,9 @@ class InterfaceOptionsPage(OptionsPage): self.ui.toolbar_layout_list.setCurrentItem(list_item) self.update_buttons() - def insert_seperator(self): + def insert_separator(self): insert_index = self._current_item('row') + 1 - self._insert_item(self.SEPERATOR, insert_index) + self._insert_item(self.SEPARATOR, insert_index) def move_item(self, offset): current_index = self._current_item('row') @@ -236,7 +223,7 @@ class InterfaceOptionsPage(OptionsPage): if action in self.TOOLBAR_BUTTONS_REV: updated_layout.append(self.TOOLBAR_BUTTONS_REV[action]) else: - updated_layout.append('seperator') + updated_layout.append('separator') config.setting['toolbar_layout'] = updated_layout self._update_toolbar() diff --git a/picard/ui/ui_options_interface.py b/picard/ui/ui_options_interface.py index ee1abb59e..2f5cff954 100644 --- a/picard/ui/ui_options_interface.py +++ b/picard/ui/ui_options_interface.py @@ -96,9 +96,9 @@ class Ui_InterfaceOptionsPage(object): self.add_button = QtGui.QToolButton(self.edit_button_box) self.add_button.setObjectName(_fromUtf8("add_button")) self.edit_box_layout.addWidget(self.add_button) - self.insert_seperator_button = QtGui.QToolButton(self.edit_button_box) - self.insert_seperator_button.setObjectName(_fromUtf8("insert_seperator_button")) - self.edit_box_layout.addWidget(self.insert_seperator_button) + self.insert_separator_button = QtGui.QToolButton(self.edit_button_box) + self.insert_separator_button.setObjectName(_fromUtf8("insert_separator_button")) + self.edit_box_layout.addWidget(self.insert_separator_button) spacerItem1 = QtGui.QSpacerItem(60, 20, QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum) self.edit_box_layout.addItem(spacerItem1) self.up_button = QtGui.QToolButton(self.edit_button_box) @@ -131,8 +131,8 @@ class Ui_InterfaceOptionsPage(object): self.customize_toolbar_box.setTitle(_("Customize Action Toolbar")) self.add_button.setToolTip(_("Add a new button to Toolbar")) self.add_button.setText(_("Add Action")) - self.insert_seperator_button.setToolTip(_("Insert a seperator")) - self.insert_seperator_button.setText(_("Add Seperator")) + self.insert_separator_button.setToolTip(_("Insert a separator")) + self.insert_separator_button.setText(_("Add Separator")) self.up_button.setToolTip(_("Move selected item up")) self.up_button.setText(_("...")) self.down_button.setToolTip(_("Move selected item down")) diff --git a/ui/options_interface.ui b/ui/options_interface.ui index 8eddf3046..4ca160c09 100644 --- a/ui/options_interface.ui +++ b/ui/options_interface.ui @@ -161,12 +161,12 @@ - + - Insert a seperator + Insert a separator - Add Seperator + Add Separator