From 7ef33d47156a7204b33445dfabbd10ca449880ff Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Fri, 1 Apr 2016 21:59:51 +0300 Subject: [PATCH 1/3] This branch changes icons for Preview and Replace Live background buttons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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” --- openlp/core/lib/mediamanageritem.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 2 +- openlp/plugins/media/lib/mediaitem.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 04df1d38a..0136d24b1 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -177,7 +177,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): ':/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 diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 248da94ea..a39456359 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -194,7 +194,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_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', diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 09b32b308..460ca9894 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -151,7 +151,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_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) From 6ad51f2b0ba2406b2a4c2313a12a9bb47a8b522b Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 3 Apr 2016 22:12:37 +0300 Subject: [PATCH 2/3] Added new icon for Preview. (Provided by superfly) --- openlp/core/lib/mediamanageritem.py | 2 +- resources/images/general_preview.png | Bin 815 -> 1057 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index 0136d24b1..04df1d38a 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -177,7 +177,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties): ':/general/general_delete.png', self.on_delete_click]) # Preview toolbar_actions.append(['Preview', StringContent.Preview, - ':/system/system_mediamanager.png', self.on_preview_click]) + ':/general/general_preview.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 diff --git a/resources/images/general_preview.png b/resources/images/general_preview.png index d196792bb16d0eda8e8f27cd98e4b840aa0b92d5..2d6b7b631805c094198df91affb4ec68c88e916a 100644 GIT binary patch delta 1047 zcmV+y1nB#(2B8R$8Gi!+001a04^sdD00d`2O+f$vv5yP0Dy!50Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;00K`?OjJbx z006hQx5~=O%gf8QwzkN~$j!~o#l^+W&d#8qpw-pY+S=KrrGKRW005Phm4APKtgNij z(b3b>)6vn<$H&Le(9qD((5$SiqobqN*4EY4)uN)J0000L6%}i1Ym}6fsHmuwm6d90 zY7`U{)6>({)z#M4*4Nk9*x1(L%a8hA_PF2WEP|jUclSD?0MWB~RIcho%awirjMSn&|(9qCLO-xf{Zb?~XMpa^4 zW^ZF=x>!!lm@vaZ5@jAOA{QPY1Q;a%87D+VM$gaBRaI0*RAf6xWj8}(TzFxGy?s)1 zVm}mC84@%B6d(c>A_5j80Tv`gMn=xg&O<{&HbY%2HDf3@W*&Q#4b8^}otXk8F98r6 z0udbo5`P~86d?f=B0D@iKR-VxHcJ~OPYN4J0BV8(!NmcQmI5Iv0uC4g4;lgy90C&` z0TdxOI5|2xITR>00u?9$5F`O3F9AYI0Vgj33KIbf6#)(z0T3Jk6CeN;Br-HKTU%Qy zFf=YSHZwOnI6FQ(KS4i1L_k4BGdMdhG&dlq$YXGls;Nli=7$jr*l$<50zP-iGCDlRE4 zE3c@ms;;T6t5;)aXl!b3X>Duo=3{753iMByIBD{fsne#JznzifJZ`inL!}`rzwr=BK;N;rAefy4`yLRo~0c3FVFn|Fs z-=4kvybLfPASfifZ@-ABm^f5GLh``DLx&C@kdlT9$jHjcD<~)`Da!yk041DOi4aTT RB6t7*002ovPDHLkV1iP|yQ=^I delta 803 zcmV+;1Kj+f2(Jc^8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000JJOGiWi{{a60|De66 zlK=n!32;bRa{vGXb^rhab^(3Wg3JH_00(qQO+^RV0}KxzBNk?8Pyhe|uSrBfR5;6( zl1*zQRTPGwTOVE3UESJURT-mUAh-}=LUze2I4+DkH^I&P2Y(F+ZUWgjTLmG`ABg`T zFxiO&2?U2MBm~5fh8T=Yx>HGa*GJ!~x>eUj=)?hC_`=~V4(B`BG;JbFa z9RL`Hfe->A1T$%^@4D8Sx~`E@MuWlNb8&QZbhWp)7erA+v)ROP92$)VwryjYCIEF^ zqm-g7OY%HNN`FbO*JER2BeFct3;O*&Pal0s5QcYGQ8g3_iUKMH<*X{A_?oAqpYc2| zux1zL5>3!8z$?H@VVFRbK#{>TheSeB!lc3&jHw=009XK3RUwQqxC%ZQLOX@C3H)#g zWS}MFIZ%VD5W1kM=5GNrQ;P5vmraehm@@b99YjZhzJCH@uqGtUgzG#3p^$C^t>3x_ zxUS3h!!x|ZA^By3p{HPz4PGl6-={B<=w>H#huv@hkHWd=?i> z=6jmo&PM$4XUZg=k|r62su04!vQ6?r;ARst@XvgG%(YhI1Uyt`0Q>xyYv^YYRl zl@6xWrGHQbolXbKvKUT=gk^beqEd>^!h5)H2qLRS);VKS;m!#v*~DqJsOuWjG%-z+ zZfg#u)GZ)Q(`b2lIq3KMv|25$22B#z#edV~gB1tEFer-RE Date: Sun, 3 Apr 2016 22:51:59 +0300 Subject: [PATCH 3/3] Generated the resources file.