forked from openlp/openlp
cleanups and more icons
This commit is contained in:
parent
39becac48e
commit
fdae4dc939
@ -576,16 +576,21 @@ class UiIcons(object):
|
||||
"""
|
||||
These are the font icons used in the code.
|
||||
"""
|
||||
self.add = qta.icon('fa.plus-circle')
|
||||
self.clone = qta.icon('fa.clone')
|
||||
self.copy = qta.icon('fa.copy')
|
||||
self.database = qta.icon('fa.database')
|
||||
self.default = qta.icon('fa.info-circle')
|
||||
self.delete = qta.icon('fa.trash')
|
||||
self.edit = qta.icon('fa.edit')
|
||||
self.download = qta.icon('fa.cloud-download')
|
||||
self.live = qta.icon('fa.camera')
|
||||
self.music = qta.icon('fa.music')
|
||||
self.new = qta.icon('fa.file')
|
||||
self.notes = qta.icon('fa.sticky-note')
|
||||
self.open = qta.icon('fa.map')
|
||||
self.presentation = qta.icon("fa.bar-chart")
|
||||
self.preview = qta.icon('fa.laptop')
|
||||
self.picture = qta.icon("fa.picture-o")
|
||||
self.print = qta.icon('fa.print')
|
||||
self.save = qta.icon('fa.save')
|
||||
|
@ -168,7 +168,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
toolbar_actions.append(['Import', StringContent.Import, UiIcons().download, self.on_import_click])
|
||||
# Load Button
|
||||
if self.has_file_icon:
|
||||
toolbar_actions.append(['Load', StringContent.Load, ':/general/general_open.png', self.on_file_click])
|
||||
toolbar_actions.append(['Load', StringContent.Load, UiIcons().open, self.on_file_click])
|
||||
# New Button
|
||||
if self.has_new_icon:
|
||||
toolbar_actions.append(['New', StringContent.New, UiIcons().new, self.on_new_click])
|
||||
@ -179,12 +179,11 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
if self.has_delete_icon:
|
||||
toolbar_actions.append(['Delete', StringContent.Delete, UiIcons().delete, self.on_delete_click])
|
||||
# Preview
|
||||
toolbar_actions.append(['Preview', StringContent.Preview,
|
||||
':/general/general_preview.png', self.on_preview_click])
|
||||
toolbar_actions.append(['Preview', StringContent.Preview, UiIcons().preview, self.on_preview_click])
|
||||
# Live Button
|
||||
toolbar_actions.append(['Live', StringContent.Live, UiIcons().live, self.on_live_click])
|
||||
# Add to service Button
|
||||
toolbar_actions.append(['Service', StringContent.Service, ':/general/general_add.png', self.on_add_click])
|
||||
toolbar_actions.append(['Service', StringContent.Service, UiIcons().add, self.on_add_click])
|
||||
for action in toolbar_actions:
|
||||
if action[0] == StringContent.Preview:
|
||||
self.toolbar.addSeparator()
|
||||
@ -205,21 +204,21 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
if self.has_edit_icon:
|
||||
create_widget_action(self.list_view,
|
||||
text=self.plugin.get_string(StringContent.Edit)['title'],
|
||||
icon1=':/general/general_edit.png',
|
||||
icon=UiIcons().edit,
|
||||
triggers=self.on_edit_click)
|
||||
create_widget_action(self.list_view, separator=True)
|
||||
create_widget_action(self.list_view,
|
||||
'listView{plugin}{preview}Item'.format(plugin=self.plugin.name.title(),
|
||||
preview=StringContent.Preview.title()),
|
||||
text=self.plugin.get_string(StringContent.Preview)['title'],
|
||||
icon1=':/general/general_preview.png',
|
||||
icon=UiIcons().preview,
|
||||
can_shortcuts=True,
|
||||
triggers=self.on_preview_click)
|
||||
create_widget_action(self.list_view,
|
||||
'listView{plugin}{live}Item'.format(plugin=self.plugin.name.title(),
|
||||
live=StringContent.Live.title()),
|
||||
text=self.plugin.get_string(StringContent.Live)['title'],
|
||||
icon1=':/general/general_live.png',
|
||||
icon=UiIcons().live,
|
||||
can_shortcuts=True,
|
||||
triggers=self.on_live_click)
|
||||
create_widget_action(self.list_view,
|
||||
@ -227,7 +226,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
service=StringContent.Service.title()),
|
||||
can_shortcuts=True,
|
||||
text=self.plugin.get_string(StringContent.Service)['title'],
|
||||
icon=':/general/general_add.png',
|
||||
icon=UiIcons().add,
|
||||
triggers=self.on_add_click)
|
||||
if self.has_delete_icon:
|
||||
create_widget_action(self.list_view, separator=True)
|
||||
@ -235,13 +234,13 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
|
||||
'listView{plugin}{delete}Item'.format(plugin=self.plugin.name.title(),
|
||||
delete=StringContent.Delete.title()),
|
||||
text=self.plugin.get_string(StringContent.Delete)['title'],
|
||||
icon=':/general/general_delete.png',
|
||||
icon=UiIcons().delete,
|
||||
can_shortcuts=True, triggers=self.on_delete_click)
|
||||
if self.add_to_service_item:
|
||||
create_widget_action(self.list_view, separator=True)
|
||||
create_widget_action(self.list_view,
|
||||
text=translate('OpenLP.MediaManagerItem', '&Add to selected Service Item'),
|
||||
icon=':/general/general_add.png',
|
||||
icon=UiIcons().add,
|
||||
triggers=self.on_add_edit_click)
|
||||
self.add_custom_context_actions()
|
||||
# Create the context menu and add all actions from the list_view.
|
||||
|
@ -168,7 +168,7 @@ class Ui_MainWindow(object):
|
||||
self.file_new_item = create_action(main_window, 'fileNewItem', icon=UiIcons().new,
|
||||
can_shortcuts=True, category=UiStrings().File,
|
||||
triggers=self.service_manager_contents.on_new_service_clicked)
|
||||
self.file_open_item = create_action(main_window, 'fileOpenItem', icon=':/general/general_open.png',
|
||||
self.file_open_item = create_action(main_window, 'fileOpenItem', icon=UiIcons().open,
|
||||
can_shortcuts=True, category=UiStrings().File,
|
||||
triggers=self.service_manager_contents.on_load_service_clicked)
|
||||
self.file_save_item = create_action(main_window, 'fileSaveItem', icon=UiIcons().save,
|
||||
@ -238,10 +238,10 @@ class Ui_MainWindow(object):
|
||||
self.mode_default_item.setChecked(True)
|
||||
action_list.add_category(UiStrings().Tools, CategoryOrder.standard_menu)
|
||||
self.tools_add_tool_item = create_action(main_window,
|
||||
'toolsAddToolItem', icon=':/tools/tools_add.png',
|
||||
'toolsAddToolItem', icon=UiIcons().add,
|
||||
category=UiStrings().Tools, can_shortcuts=True)
|
||||
self.tools_open_data_folder = create_action(main_window,
|
||||
'toolsOpenDataFolder', icon=':/general/general_open.png',
|
||||
'toolsOpenDataFolder', icon=UiIcons().open,
|
||||
category=UiStrings().Tools, can_shortcuts=True)
|
||||
self.tools_first_time_wizard = create_action(main_window,
|
||||
'toolsFirstTimeWizard', icon=':/general/general_revert.png',
|
||||
@ -271,7 +271,7 @@ class Ui_MainWindow(object):
|
||||
category=UiStrings().Settings, can_shortcuts=True)
|
||||
# Formatting Tags were also known as display tags.
|
||||
self.formatting_tag_item = create_action(main_window, 'displayTagItem',
|
||||
icon=':/system/tag_editor.png', category=UiStrings().Settings,
|
||||
icon=UiIcons().edit, category=UiStrings().Settings,
|
||||
can_shortcuts=True)
|
||||
self.settings_configure_item = create_action(main_window, 'settingsConfigureItem',
|
||||
icon=':/system/system_settings.png', can_shortcuts=True,
|
||||
|
@ -140,7 +140,7 @@ class Ui_ServiceManager(object):
|
||||
self.toolbar.add_toolbar_action('newService', text=UiStrings().NewService, icon=UiIcons().new,
|
||||
tooltip=UiStrings().CreateService, triggers=self.on_new_service_clicked)
|
||||
self.toolbar.add_toolbar_action('openService', text=UiStrings().OpenService,
|
||||
icon=':/general/general_open.png',
|
||||
icon=UiIcons().open,
|
||||
tooltip=translate('OpenLP.ServiceManager', 'Load an existing service.'),
|
||||
triggers=self.on_load_service_clicked)
|
||||
self.toolbar.add_toolbar_action('saveService', text=UiStrings().SaveService,
|
||||
@ -199,7 +199,7 @@ class Ui_ServiceManager(object):
|
||||
self.order_toolbar.addSeparator()
|
||||
self.delete_action = self.order_toolbar.add_toolbar_action(
|
||||
'delete', can_shortcuts=True,
|
||||
text=translate('OpenLP.ServiceManager', '&Delete From Service'), icon=':/general/general_delete.png',
|
||||
text=translate('OpenLP.ServiceManager', '&Delete From Service'), icon=UiIcons().delete,
|
||||
tooltip=translate('OpenLP.ServiceManager', 'Delete the selected item from the service.'),
|
||||
triggers=self.on_delete_from_service)
|
||||
self.order_toolbar.addSeparator()
|
||||
@ -216,7 +216,7 @@ class Ui_ServiceManager(object):
|
||||
self.order_toolbar.addSeparator()
|
||||
self.make_live_action = self.order_toolbar.add_toolbar_action(
|
||||
'make_live', can_shortcuts=True,
|
||||
text=translate('OpenLP.ServiceManager', 'Go Live'), icon=':/general/general_live.png',
|
||||
text=translate('OpenLP.ServiceManager', 'Go Live'), icon=UiIcons().live,
|
||||
tooltip=translate('OpenLP.ServiceManager', 'Send the selected item to Live.'),
|
||||
category=UiStrings().Service,
|
||||
triggers=self.on_make_live_action_triggered)
|
||||
@ -239,15 +239,15 @@ class Ui_ServiceManager(object):
|
||||
# build the context menu
|
||||
self.menu = QtWidgets.QMenu()
|
||||
self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Edit Item'),
|
||||
icon=':/general/general_edit.png', triggers=self.remote_edit)
|
||||
icon=UiIcons().edit, triggers=self.remote_edit)
|
||||
self.rename_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Rename...'),
|
||||
icon=':/general/general_edit.png',
|
||||
icon=UiIcons().edit,
|
||||
triggers=self.on_service_item_rename)
|
||||
self.maintain_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Reorder Item'),
|
||||
icon=':/general/general_edit.png',
|
||||
icon=UiIcons().edit,
|
||||
triggers=self.on_service_item_edit_form)
|
||||
self.notes_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Notes'),
|
||||
icon=':/services/service_notes.png',
|
||||
icon=UiIcons().notes,
|
||||
triggers=self.on_service_item_note_form)
|
||||
self.time_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Start Time'),
|
||||
icon=':/media/media_time.png', triggers=self.on_start_time_form)
|
||||
@ -259,7 +259,7 @@ class Ui_ServiceManager(object):
|
||||
self.create_custom_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ServiceManager', 'Create New &Custom '
|
||||
'Slide'),
|
||||
icon=':/general/general_edit.png',
|
||||
icon=UiIcons().clone,
|
||||
triggers=self.create_custom)
|
||||
self.menu.addSeparator()
|
||||
# Add AutoPlay menu actions
|
||||
@ -284,7 +284,7 @@ class Ui_ServiceManager(object):
|
||||
triggers=self.on_timed_slide_interval)
|
||||
self.menu.addSeparator()
|
||||
self.preview_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', 'Show &Preview'),
|
||||
icon=':/general/general_preview.png', triggers=self.make_preview)
|
||||
icon=UiIcons().preview, triggers=self.make_preview)
|
||||
# Add already existing make live action to the menu.
|
||||
self.menu.addAction(self.make_live_action)
|
||||
self.menu.addSeparator()
|
||||
|
@ -31,7 +31,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
|
||||
from openlp.core.common import SlideLimits
|
||||
from openlp.core.common.actions import ActionList, CategoryOrder
|
||||
from openlp.core.common.i18n import UiStrings, translate
|
||||
from openlp.core.common.i18n import UiStrings, UiIcons, translate
|
||||
from openlp.core.common.mixins import LogMixin, RegistryProperties
|
||||
from openlp.core.common.registry import Registry, RegistryBase
|
||||
from openlp.core.common.settings import Settings
|
||||
@ -235,7 +235,7 @@ class SlideController(DisplayController, LogMixin, RegistryProperties):
|
||||
self.hide_menu.setPopupMode(QtWidgets.QToolButton.MenuButtonPopup)
|
||||
self.hide_menu.setMenu(QtWidgets.QMenu(translate('OpenLP.SlideController', 'Hide'), self.toolbar))
|
||||
self.toolbar.add_toolbar_widget(self.hide_menu)
|
||||
self.toolbar.add_toolbar_action('goPreview', icon=':/general/general_live.png',
|
||||
self.toolbar.add_toolbar_action('goPreview', icon=UiIcons().live,
|
||||
tooltip=translate('OpenLP.SlideController', 'Move to preview.'),
|
||||
triggers=self.on_go_preview)
|
||||
# The order of the blank to modes in Shortcuts list comes from here.
|
||||
@ -307,18 +307,18 @@ class SlideController(DisplayController, LogMixin, RegistryProperties):
|
||||
self.receive_spin_delay()
|
||||
self.toolbar.add_toolbar_widget(self.delay_spin_box)
|
||||
else:
|
||||
self.toolbar.add_toolbar_action('goLive', icon=':/general/general_live.png',
|
||||
self.toolbar.add_toolbar_action('goLive', icon=UiIcons().live,
|
||||
tooltip=translate('OpenLP.SlideController', 'Move to live.'),
|
||||
triggers=self.on_go_live)
|
||||
self.toolbar.add_toolbar_action('addToService', icon=':/general/general_add.png',
|
||||
self.toolbar.add_toolbar_action('addToService', icon=UiIcons().add,
|
||||
tooltip=translate('OpenLP.SlideController', 'Add to Service.'),
|
||||
triggers=self.on_preview_add_to_service)
|
||||
self.toolbar.addSeparator()
|
||||
self.toolbar.add_toolbar_action('editSong', icon=':/general/general_edit.png',
|
||||
self.toolbar.add_toolbar_action('editSong', icon=UiIcons().edit,
|
||||
tooltip=translate('OpenLP.SlideController',
|
||||
'Edit and reload song preview.'),
|
||||
triggers=self.on_edit_song)
|
||||
self.toolbar.add_toolbar_action('clear', icon=':/general/general_delete.png',
|
||||
self.toolbar.add_toolbar_action('clear', icon=UiIcons().delete,
|
||||
tooltip=translate('OpenLP.SlideController',
|
||||
'Clear'),
|
||||
triggers=self.on_clear)
|
||||
|
@ -61,30 +61,30 @@ class Ui_ThemeManager(object):
|
||||
self.toolbar = OpenLPToolbar(widget)
|
||||
self.toolbar.setObjectName('toolbar')
|
||||
self.toolbar.add_toolbar_action('newTheme',
|
||||
text=UiStrings().NewTheme, icon=':/themes/theme_new.png',
|
||||
text=UiStrings().NewTheme, icon=UiIcons().new,
|
||||
tooltip=translate('OpenLP.ThemeManager', 'Create a new theme.'),
|
||||
triggers=self.on_add_theme)
|
||||
self.toolbar.add_toolbar_action('editTheme',
|
||||
text=translate('OpenLP.ThemeManager', 'Edit Theme'),
|
||||
icon=':/themes/theme_edit.png',
|
||||
icon=UiIcons().edit,
|
||||
tooltip=translate('OpenLP.ThemeManager', 'Edit a theme.'),
|
||||
triggers=self.on_edit_theme)
|
||||
self.delete_toolbar_action = self.toolbar.add_toolbar_action('delete_theme',
|
||||
text=translate('OpenLP.ThemeManager',
|
||||
'Delete Theme'),
|
||||
icon=':/general/general_delete.png',
|
||||
icon=UiIcons().delete,
|
||||
tooltip=translate('OpenLP.ThemeManager',
|
||||
'Delete a theme.'),
|
||||
triggers=self.on_delete_theme)
|
||||
self.toolbar.addSeparator()
|
||||
self.toolbar.add_toolbar_action('importTheme',
|
||||
text=translate('OpenLP.ThemeManager', 'Import Theme'),
|
||||
icon=build_icon(UiIcons().upload),
|
||||
icon=build_icon(UiIcons().download),
|
||||
tooltip=translate('OpenLP.ThemeManager', 'Import a theme.'),
|
||||
triggers=self.on_import_theme)
|
||||
self.toolbar.add_toolbar_action('exportTheme',
|
||||
text=translate('OpenLP.ThemeManager', 'Export Theme'),
|
||||
icon=build_icon(UiIcons().download),
|
||||
icon=build_icon(UiIcons().upload),
|
||||
tooltip=translate('OpenLP.ThemeManager', 'Export a theme.'),
|
||||
triggers=self.on_export_theme)
|
||||
self.layout.addWidget(self.toolbar)
|
||||
@ -102,24 +102,24 @@ class Ui_ThemeManager(object):
|
||||
self.menu = QtWidgets.QMenu()
|
||||
self.edit_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', '&Edit Theme'),
|
||||
icon=':/themes/theme_edit.png', triggers=self.on_edit_theme)
|
||||
icon=UiIcons().edit, triggers=self.on_edit_theme)
|
||||
self.copy_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', '&Copy Theme'),
|
||||
icon=':/themes/theme_edit.png', triggers=self.on_copy_theme)
|
||||
icon=UiIcons().copy, triggers=self.on_copy_theme)
|
||||
self.rename_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', '&Rename Theme'),
|
||||
icon=':/themes/theme_edit.png', triggers=self.on_rename_theme)
|
||||
icon=UiIcons().edit, triggers=self.on_rename_theme)
|
||||
self.delete_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', '&Delete Theme'),
|
||||
icon=':/general/general_delete.png', triggers=self.on_delete_theme)
|
||||
icon=UiIcons().delete, triggers=self.on_delete_theme)
|
||||
self.menu.addSeparator()
|
||||
self.global_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', 'Set As &Global Default'),
|
||||
icon=':/general/general_export.png',
|
||||
icon=UiIcons().default,
|
||||
triggers=self.change_global_from_screen)
|
||||
self.export_action = create_widget_action(self.menu,
|
||||
text=translate('OpenLP.ThemeManager', '&Export Theme'),
|
||||
icon=':/general/general_export.png', triggers=self.on_export_theme)
|
||||
icon=UiIcons().upload, triggers=self.on_export_theme)
|
||||
# Signals
|
||||
self.theme_list_widget.doubleClicked.connect(self.change_global_from_screen)
|
||||
self.theme_list_widget.currentItemChanged.connect(self.check_list_state)
|
||||
|
@ -95,7 +95,6 @@
|
||||
<qresource prefix="services">
|
||||
<file>service_collapse_all.png</file>
|
||||
<file>service_expand_all.png</file>
|
||||
<file>service_notes.png</file>
|
||||
<file>service_item_notes.png</file>
|
||||
<file>service_bottom.png</file>
|
||||
<file>service_down.png</file>
|
||||
@ -114,7 +113,6 @@
|
||||
<file>system_exit.png</file>
|
||||
<file>settings_plugin_list.png</file>
|
||||
<file>system_settings.png</file>
|
||||
<file>tag_editor.png</file>
|
||||
<file>system_configure.png</file>
|
||||
<file>system_edit_copy.png</file>
|
||||
<file>system_configure_shortcuts.png</file>
|
||||
@ -142,12 +140,10 @@
|
||||
<file>song_usage_inactive.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="tools">
|
||||
<file>tools_add.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="themes">
|
||||
<file>theme_new.png</file>
|
||||
<file>theme_edit.png</file>
|
||||
</qresource>
|
||||
</qresource>
|
||||
<qresource prefix="projector">
|
||||
<file>projector_blank.png</file>
|
||||
<file>projector_blank_tiled.png</file>
|
||||
|
Binary file not shown.
Before (image error) Size: 668 B |
Binary file not shown.
Before (image error) Size: 1.1 KiB |
Binary file not shown.
Before (image error) Size: 822 B |
Binary file not shown.
Before (image error) Size: 639 B |
Loading…
Reference in New Issue
Block a user