diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index fe34522cf..5f892c4a2 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -70,6 +70,7 @@ class UiIcons(object): 'back': {'icon': 'fa.step-backward'}, 'bible': {'icon': 'fa.book'}, 'blank': {'icon': 'fa.times-circle'}, + 'blank_theme': {'icon': 'fa.file-image-o'}, 'book': {'icon': 'fa.book'}, 'bottom': {'icon': 'fa.angle-double-down'}, 'clock': {'icon': 'fa.clock-o'}, @@ -102,6 +103,7 @@ class UiIcons(object): 'optical': {'icon': 'fa.file-video-o'}, 'pause': {'icon': 'fa.pause'}, 'play': {'icon': 'fa.play'}, + 'plugin_list': {'icon': 'fa.puzzle-piece'}, 'plus': {'icon': 'fa.plus'}, 'presentation': {'icon': 'fa.bar-chart'}, 'preview': {'icon': 'fa.laptop'}, @@ -123,7 +125,7 @@ class UiIcons(object): 'square': {'icon': 'fa.square'}, 'text': {'icon': 'op.file-text'}, 'time': {'icon': 'fa.history'}, - 'theme': {'icon': 'fa.file-image-o'}, + 'theme': {'icon': 'fa.paint-brush'}, 'top': {'icon': 'fa.angle-double-up'}, 'undo': {'icon': 'fa.undo'}, 'upload': {'icon': 'fa.cloud-upload'}, diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2ddca5eb8..91d370af2 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -252,7 +252,7 @@ class Ui_MainWindow(object): action_list.add_category(UiStrings().Settings, CategoryOrder.standard_menu) self.settings_plugin_list_item = create_action(main_window, 'settingsPluginListItem', - icon=':/system/settings_plugin_list.png', + icon=UiIcons().plugin_list, can_shortcuts=True, category=UiStrings().Settings, triggers=self.on_plugin_item_clicked) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 7152e9cba..ad949e74a 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -252,7 +252,7 @@ class SlideController(DisplayController, LogMixin, RegistryProperties): triggers=self.on_hide_display) self.theme_screen = create_action(self, 'themeScreen', text=translate('OpenLP.SlideController', 'Toggle Blank to Theme'), - icon=UiIcons().theme, + icon=UiIcons().blank_theme, checked=False, can_shortcuts=True, category=self.category, triggers=self.on_theme_display) self.blank_screen = create_action(self, 'blankScreen', diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 7be3d7823..393cfdb22 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -190,8 +190,7 @@ class ImageMediaItem(MediaManagerItem): icon=UiIcons().open, triggers=self.on_file_click) create_widget_action(self.list_view, separator=True) self.replace_action_context = create_widget_action( - self.list_view, text=UiStrings().ReplaceBG, icon=':/slides/slide_theme.png', - triggers=self.on_replace_click) + self.list_view, text=UiStrings().ReplaceBG, icon=UiIcons().theme, triggers=self.on_replace_click) self.reset_action_context = create_widget_action( self.list_view, text=UiStrings().ReplaceLiveBG, icon=UiIcons().close, visible=False, triggers=self.on_reset_click) @@ -209,7 +208,7 @@ class ImageMediaItem(MediaManagerItem): Add custom buttons to the end of the toolbar """ self.replace_action = self.toolbar.add_toolbar_action('replace_action', - icon=':/slides/slide_theme.png', + icon=UiIcons().theme, triggers=self.on_replace_click) self.reset_action = self.toolbar.add_toolbar_action('reset_action', icon=UiIcons().close, diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 3a26c433b..a6356c844 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -147,7 +147,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): Adds buttons to the end of the header bar. """ # Replace backgrounds do not work at present so remove functionality. - self.replace_action = self.toolbar.add_toolbar_action('replace_action', icon=':/slides/slide_theme.png', + self.replace_action = self.toolbar.add_toolbar_action('replace_action', icon=UiIcons().theme, triggers=self.on_replace_click) if 'webkit' not in get_media_players()[0]: self.replace_action.setDisabled(True) diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index be2f008b8..176c6b6b7 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -171,7 +171,7 @@ class SongsPlugin(Plugin): self.tools_reindex_item = create_action( tools_menu, 'toolsReindexItem', text=translate('SongsPlugin', '&Re-index Songs'), - icon=':/plugins/plugin_songs.png', + icon=UiIcons().music, statustip=translate('SongsPlugin', 'Re-index the songs database to improve searching and ordering.'), triggers=self.on_tools_reindex_item_triggered) self.tools_find_duplicates = create_action( diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index a8e36c188..b7c92bc39 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -11,7 +11,6 @@ - plugin_songs.png @@ -44,7 +43,6 @@ system_volunteer.png system_servicemanager.png system_thememanager.png - settings_plugin_list.png system_edit_copy.png diff --git a/resources/images/plugin_songs.png b/resources/images/plugin_songs.png deleted file mode 100644 index cedee7700..000000000 Binary files a/resources/images/plugin_songs.png and /dev/null differ diff --git a/resources/images/settings_plugin_list.png b/resources/images/settings_plugin_list.png deleted file mode 100644 index a63300712..000000000 Binary files a/resources/images/settings_plugin_list.png and /dev/null differ