← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~suutari-olli/openlp/new-icons-for-preview-and-replace-live-bg into lp:openlp

 

Azaziah has proposed merging lp:~suutari-olli/openlp/new-icons-for-preview-and-replace-live-bg into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1536808 in OpenLP: "Add new icon for Preview and replace Live background"
  https://bugs.launchpad.net/openlp/+bug/1536808

For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/new-icons-for-preview-and-replace-live-bg/+merge/290777

This branch changes icons for Preview and Replace Live background buttons.

Currently preview button uses same icon as Blank to Theme and
Replace Live background uses same icon as Blank to black.
This is problematic because these icons don’t describe these
actions and may be confused with their other meanings.

Preview icon is replaced by system_mediamanager.png icon, which consists of
frame and is easily distinguishable from blank to icons.

Replace Live background icon now uses Blank to theme icon.
I feel like this describes it much better than “Blank to black”
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/new-icons-for-preview-and-replace-live-bg into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2015-12-31 22:46:06 +0000
+++ openlp/core/lib/mediamanageritem.py	2016-04-01 19:40:17 +0000
@@ -177,7 +177,7 @@
                                     ':/general/general_delete.png', self.on_delete_click])
         # Preview
         toolbar_actions.append(['Preview', StringContent.Preview,
-                                ':/general/general_preview.png', self.on_preview_click])
+                                ':/system/system_mediamanager.png', self.on_preview_click])
         # Live Button
         toolbar_actions.append(['Live', StringContent.Live, ':/general/general_live.png', self.on_live_click])
         # Add to service Button

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2016-01-05 18:20:47 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2016-04-01 19:40:17 +0000
@@ -194,7 +194,7 @@
         Add custom buttons to the end of the toolbar
         """
         self.replace_action = self.toolbar.add_toolbar_action('replace_action',
-                                                              icon=':/slides/slide_blank.png',
+                                                              icon=':/slides/slide_theme.png',
                                                               triggers=self.on_replace_click)
         self.reset_action = self.toolbar.add_toolbar_action('reset_action',
                                                             icon=':/system/system_close.png',

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2015-12-31 22:46:06 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2016-04-01 19:40:17 +0000
@@ -151,7 +151,7 @@
         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_blank.png',
+        self.replace_action = self.toolbar.add_toolbar_action('replace_action', icon=':/slides/slide_theme.png',
                                                               triggers=self.on_replace_click)
         if 'webkit' not in get_media_players()[0]:
             self.replace_action.setDisabled(True)


Follow ups