From a74d2b6bd27e65736451bbc610901d1deef5e21d Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sat, 21 Apr 2018 06:59:03 +0100 Subject: [PATCH] more cleanups --- openlp/core/ui/icons.py | 1 + openlp/core/ui/shortcutlistdialog.py | 9 +++++---- openlp/core/widgets/edits.py | 4 ++-- openlp/plugins/bibles/lib/mediaitem.py | 3 ++- openlp/plugins/songs/forms/songselectdialog.py | 6 +++--- resources/images/bibles_save_results.png | Bin 735 -> 0 bytes resources/images/clear_shortcut.png | Bin 644 -> 0 bytes resources/images/general_back.png | Bin 907 -> 0 bytes resources/images/general_find.png | Bin 942 -> 0 bytes resources/images/openlp-2.qrc | 12 +++--------- resources/images/song_search_all.png | Bin 607 -> 0 bytes resources/images/system_configure_shortcuts.png | Bin 847 -> 0 bytes 12 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 resources/images/bibles_save_results.png delete mode 100644 resources/images/clear_shortcut.png delete mode 100644 resources/images/general_back.png delete mode 100644 resources/images/general_find.png delete mode 100644 resources/images/song_search_all.png delete mode 100644 resources/images/system_configure_shortcuts.png diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 75f61f1db..567281157 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -59,6 +59,7 @@ class UiIcons(object): 'arrow_right': 'fa.arrow-right', 'arrow_up': 'fa.arrow-up', 'address': 'fa.book', + 'back': 'fa.step-backward', 'bible': 'fa.book', 'blank': 'fa.times-circle', 'bottom': 'fa.angle-double-down', diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py index 522a30022..ebf432b8a 100644 --- a/openlp/core/ui/shortcutlistdialog.py +++ b/openlp/core/ui/shortcutlistdialog.py @@ -27,6 +27,7 @@ from PyQt5 import QtCore, QtWidgets from openlp.core.common.i18n import translate from openlp.core.lib import build_icon from openlp.core.lib.ui import create_button_box +from openlp.core.ui.icons import UiIcons class CaptureShortcutButton(QtWidgets.QPushButton): @@ -101,23 +102,23 @@ class Ui_ShortcutListDialog(object): self.primary_push_button = CaptureShortcutButton(shortcutListDialog) self.primary_push_button.setObjectName('primary_push_button') self.primary_push_button.setMinimumSize(QtCore.QSize(84, 0)) - self.primary_push_button.setIcon(build_icon(':/system/system_configure_shortcuts.png')) + self.primary_push_button.setIcon(UiIcons.shortcuts) self.primary_layout.addWidget(self.primary_push_button) self.clear_primary_button = QtWidgets.QToolButton(shortcutListDialog) self.clear_primary_button.setObjectName('clear_primary_button') self.clear_primary_button.setMinimumSize(QtCore.QSize(0, 16)) - self.clear_primary_button.setIcon(build_icon(':/system/clear_shortcut.png')) + self.clear_primary_button.setIcon(UiIcons().settings) self.primary_layout.addWidget(self.clear_primary_button) self.details_layout.addLayout(self.primary_layout, 1, 1, 1, 1) self.alternate_layout = QtWidgets.QHBoxLayout() self.alternate_layout.setObjectName('alternate_layout') self.alternate_push_button = CaptureShortcutButton(shortcutListDialog) self.alternate_push_button.setObjectName('alternate_push_button') - self.alternate_push_button.setIcon(build_icon(':/system/system_configure_shortcuts.png')) + self.alternate_push_button.setIcon(UiIcons().settings) self.alternate_layout.addWidget(self.alternate_push_button) self.clear_alternate_button = QtWidgets.QToolButton(shortcutListDialog) self.clear_alternate_button.setObjectName('clear_alternate_button') - self.clear_alternate_button.setIcon(build_icon(':/system/clear_shortcut.png')) + self.clear_alternate_button.setIcon(UiIcons().settings) self.alternate_layout.addWidget(self.clear_alternate_button) self.details_layout.addLayout(self.alternate_layout, 1, 2, 1, 1) self.primary_label = QtWidgets.QLabel(shortcutListDialog) diff --git a/openlp/core/widgets/edits.py b/openlp/core/widgets/edits.py index 856307d06..130283291 100644 --- a/openlp/core/widgets/edits.py +++ b/openlp/core/widgets/edits.py @@ -63,7 +63,7 @@ class SearchEdit(QtWidgets.QLineEdit): self.settings_section = settings_section self._current_search_type = -1 self.clear_button = QtWidgets.QToolButton(self) - self.clear_button.setIcon(build_icon(':/system/clear_shortcut.png')) + self.clear_button.setIcon(UiIcons().shortcuts) self.clear_button.setCursor(QtCore.Qt.ArrowCursor) self.clear_button.setStyleSheet('QToolButton { border: none; padding: 0px; }') self.clear_button.resize(18, 18) @@ -151,7 +151,7 @@ class SearchEdit(QtWidgets.QLineEdit): action.placeholder_text = placeholder if not hasattr(self, 'menu_button'): self.menu_button = QtWidgets.QToolButton(self) - self.menu_button.setIcon(build_icon(':/system/clear_shortcut.png')) + self.menu_button.setIcon(UiIcons().shortcuts) self.menu_button.setCursor(QtCore.Qt.ArrowCursor) self.menu_button.setPopupMode(QtWidgets.QToolButton.InstantPopup) self.menu_button.setStyleSheet('QToolButton { border: none; padding: 0px 10px 0px 0px; }') diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index c2cbec7ae..a3f90f9c9 100755 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -32,6 +32,7 @@ from openlp.core.common.settings import Settings from openlp.core.lib import MediaManagerItem, ItemCapabilities, ServiceItemContext from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \ critical_error_message_box, find_and_set_in_combo_box, build_icon +from openlp.core.ui.icons import UiIcons from openlp.core.widgets.edits import SearchEdit from openlp.plugins.bibles.forms.bibleimportform import BibleImportForm from openlp.plugins.bibles.forms.editbibleform import EditBibleForm @@ -105,7 +106,7 @@ class BibleMediaItem(MediaManagerItem): :param kwargs: Keyword arguments to pass to the super method. (dict) """ self.clear_icon = build_icon(':/bibles/bibles_search_clear.png') - self.save_results_icon = build_icon(':/bibles/bibles_save_results.png') + self.save_results_icon = UiIcons.save self.sort_icon = build_icon(':/bibles/bibles_book_sort.png') self.bible = None self.second_bible = None diff --git a/openlp/plugins/songs/forms/songselectdialog.py b/openlp/plugins/songs/forms/songselectdialog.py index e3d6ab654..4b93e7e5c 100644 --- a/openlp/plugins/songs/forms/songselectdialog.py +++ b/openlp/plugins/songs/forms/songselectdialog.py @@ -112,7 +112,7 @@ class Ui_SongSelectDialog(object): self.search_combobox.setObjectName('search_combobox') self.search_input_layout.addWidget(self.search_combobox) self.search_button = QtWidgets.QPushButton(self.search_page) - self.search_button.setIcon(build_icon(':/general/general_find.png')) + self.search_button.setIcon(UiIcons().search) self.search_button.setObjectName('search_button') self.search_input_layout.addWidget(self.search_button) self.search_layout.addLayout(self.search_input_layout) @@ -149,7 +149,7 @@ class Ui_SongSelectDialog(object): self.view_spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) self.view_layout.addItem(self.view_spacer) self.view_button = QtWidgets.QPushButton(self.search_page) - self.view_button.setIcon(build_icon(':/songs/song_search_all.png')) + self.view_button.setIcon(UiIcons().search) self.view_button.setObjectName('view_button') self.view_layout.addWidget(self.view_button) self.search_layout.addLayout(self.view_layout) @@ -204,7 +204,7 @@ class Ui_SongSelectDialog(object): self.import_layout = QtWidgets.QHBoxLayout() self.import_layout.setObjectName('import_layout') self.back_button = QtWidgets.QPushButton(self.song_page) - self.back_button.setIcon(build_icon(':/general/general_back.png')) + self.back_button.setIcon(UiIcons().back) self.back_button.setObjectName('back_button') self.import_layout.addWidget(self.back_button) self.import_spacer = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, diff --git a/resources/images/bibles_save_results.png b/resources/images/bibles_save_results.png deleted file mode 100644 index ee119c39534672b3a1375114f663084a2df19412..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 735 zcmV<50wDc~P)gN){_oC^+))NOgXG{^FC*Aj?x!st*p|7`*Fw zuBn!NvuAMsOr_j+&VD)d^3uueCyx8lK>!8~!qC5}he*W;pu4=99fQL)-wSGvbg6n( z>dp|a79TsZwX1dBm9k%U<%o*LT_FgnHrh)uXbhTE#>l`zNSn!p?>u<-gt>5rj@!&_ zm8$&v?-@j{aRZmGpiIeiF~$bz02-w;TAfAS{`yEWY_k+4v{gU8Qp(2S(fi4dyL&1< z2q~DgEIeD%+qVj_c8-$k;I(>LYDd&%o!Ux+=msZ9NOSYZ#%3f+qS@)z^iBj80xZP7 zTnscCwGvg|=i5S)>0duSxFvhsFWEW>EM0QF*L$B&-Lx4&16Te&jXBC#sA$(B|LcL#hA>H(T@1;zrWHrzCO6A2l9cFn*5T975T|M3bpntkFJcRS zK~$|5hZ}Xg-;(a7J~oRXG-hJi2~?N9RH=!r$zncGU%S4nTk6%^n&@f~`v=AP4n6n- RkB|TW002ovPDHLkV1lh{OacG^ diff --git a/resources/images/clear_shortcut.png b/resources/images/clear_shortcut.png deleted file mode 100644 index 6c4b83b7ac6e451f461973dac0c9a6c53dedef25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH}&M z2FBeW%xLxI@gtz1WQl7;NpOBzNqJ&XDnogBxn5>oc5!lIL8@MUQTpt6Hc~*(*`Bv~l~6?FSDYJaY8Nv17;1UpRl|%9VTf?mc|? z@cHxSFJHcV_3G8zw{Jgu`0)Aj=PzHr{QC9l_wV0-{`@KR`o0Pn77`^ve!&d#@_Ksq z_8}pusXI=cy7Kht(+?kh{P_EqYvr0*Ks9qcT^vIsBJkEM|1so z>*;dxIy;s3ojI&$kq&AP_I<(sjrj;;EmaOqG|jHDZgh1o2e9X_zzv(yH6kdqH_fVDvtwNo z67d+$rElP`DxS9W(wZ1y?HgCmu4$Y*1%h+9+RV+24jvhJ*@BWM#*dA+Y+f~sR+g6_ z?-fBXEbeAeF>kv;s0m`k6^+>d2>KqJme8UJc24<#NfnqGcr+p2n+uqfPukAfGP zMdn@(Jm1GfF~?<45Q_VvtRyD(9=*^3E%HN?wp`q5TcmZx+={ZgaVZ$43BxczX=n;U zhL0$vA`2n3Id~9&F&}MLI`H=HSz>-SMkRncTkWV_jnhlv*aUf9rD;i+rlsL3f)h$Y zcm$PFMqnOr1dPGcQGL!0e9O3DL)!$&S=Zz-!HoJ^8$M$IA&A8QOArmG+C;-CXb6VV zAD|>q^aVZ-xajT6;C;_0XwEmVlmQfH%FX-e`BZ@8l)`o#*tSAEL10-S92zR2Kp><- zz$FSr7Uf>_Jmg)Du#rj(gAHiqUUUwo>Q|f}EU@zaTz-*PWW-|j#-wD zCZ?-5qeu|KgoxHsDfoIXY_6TOkdJnMqUy#yRZ;|Pl~vWvGv_QoDpiJLGJ!-quHhC; z)4-_%&Efolm`M;Tq1Q=_t*n4j^47=h>+1+cQ00Q1klf#`f8R3;m#lOq)-@oR(C|b& zs`}*qX0Xi55zkYMpiFlf{ZFs9xr6=l?{!{&^yFbzG!3SXC9a=MsD;r)@e2*Sxcypk zvF!1~uH)Czr^G;iUjzp+@XwSSzj#S$-O@MBM_SdSru7P==#Q@DLmxj7yC$9O{a_3Y hxzGLVyAJ#}`U0KDUItL)W}5&2002ovPDHLkV1gOknz;Y~ diff --git a/resources/images/general_find.png b/resources/images/general_find.png deleted file mode 100644 index 1b7a252803dd641279df3e3644458dfd6236afea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 942 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6%*9TgAsieWw;%dH0CG7CJR*yM z%CCbkqm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}?O9FgC zT>t<74^)o{^z`)f_4UQX#H6I81Ox;y6+lFUgoN1H*#!j!S;2srnHfkkGBU!|17(41 zCMG7JxB?ge)c{3AL_~mw14&U)Q9eFCYinyA9UXHpu(!82G&FQ}b`A*%DJ?Ap8Xg=R z6dDq2V`kLd-RSSjPM}?~qWp4la`Hl4K)s5Jib_gK$^r~3QetXqYPvFly1Kds>WXFxd=?fK zc6N4-j*c!0%U$yCFn9H*sG>^ z7^Ed7rU$uZCMV>WFy`my7lgT$xGR=hFjcsSR#a3}$2!+I^46pV)YsQHH#fJowsv-Q zc6D|2_4Q3iFqtr6!sN-5XC+zAO14^3p4n_7CO&R(@<-PWx;b{;r*{OsAY=Pz8ke&_znS06ro{rdg; zkDot({`&p<&!4}4|Neu5#9LdY08@aLr;B4q#jULqe1i@dFt}Y-$yHq9p&P()s^Rep z>6<%>j6Je_FSw5#w+*J9U$hD`;NseM zwr8a(R@OxN$NqiSD(}y#mh$M!(tK@UCS$jM0`)!|2bav(mKN*26Ro{|Q;}6_%kSb4 zUF&H+Ezj-QSBEYvJMC(`n?FG(V(S5)mg0$LoDXhLj1^SoOuLv-vzh19+00_0zGK_p wPh=~}x@si1{vex^?&HbFf0{ks_A>q>tI>mI%Ql^-pq$Cz>FVdQ&MBb@0Ez8GlK=n! diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 836defaaf..cf11e7d99 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -1,6 +1,5 @@ - song_search_all.png song_search_author.png song_search_ccli.png song_search_lyrics.png @@ -20,8 +19,7 @@ bibles_search_text.png bibles_search_reference.png bibles_search_clear.png - bibles_save_results.png - + plugin_alerts.png plugin_songs.png @@ -30,9 +28,7 @@ general_delete.png general_import.png - general_find.png - general_back.png - + slide_theme.png media_playback_start.png @@ -63,15 +59,13 @@ system_close.png - clear_shortcut.png system_mediamanager.png system_volunteer.png system_servicemanager.png system_thememanager.png settings_plugin_list.png system_edit_copy.png - system_configure_shortcuts.png - + media_time.png media_audio.png diff --git a/resources/images/song_search_all.png b/resources/images/song_search_all.png deleted file mode 100644 index cedee77007ae3f4b236a482c0c882038fef9c93a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 607 zcmV-l0-*hgP)bP>d5 z-TD)XxNzx86n{ZiE((I+O0uo4goYxBM&d`o*g}&LbXsYb{~hg|HMqv5im}D1q`M$B2W^hrA(%$;vUA5NSsS{41_q0C=v%hm&j^{ zU2wq@1@@wSbfRvrPduR!w85n~G|TOfSzSY>zM)Qr@xk6i2X4?pEaG0Dc|g}kx96(q z36xYLeCU7nwIdGZ@-)oO;og1))4>Kt;vL%hg$29FmcN!PW0t`h!%I&SH;)L^xAAmg z=4!S)RfM|uxr4+p^oW7-AOizg$17{G{9`R@O tJf2G_{lu62tqz5Wh*AIu0GEH6^Plm<$@(331Frx8002ovPDHLkV1hRG5Jvz2 diff --git a/resources/images/system_configure_shortcuts.png b/resources/images/system_configure_shortcuts.png deleted file mode 100644 index 6d9ef70af1ed22d1cfb081f1f729777f0cebaec6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcmV-V1F-ywP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXAy z6*vWsLl-Il00PfRL_t(|+KrQ2NRwe4#-DHVu$I#))1eoFj-1UFhy?|Skdp$LAoxQsSUHjgwW-1pcV)oQUkpx4ZHG?f^?BhCkflET$DJty; ze|T^H&-*;j%S&Mos;aL^^YZdF6osQsr*q@O$M<~|<&{0On@Peh`wk~Wh0ZOSnbYNy?1`OjxWMpKBPFFwL(5TCrel^tvLJb4(-%TJOCRUa} z2!Xb?4tBd8a=HA7aNqtBafrBNXz1xY0Op?pB_)LlX@pezY-}8%p~d*9 zUS4khqIof=&0yeO!KId<2;+7TM>r z8NI&k1^{bPQWAthq3;dGF+v^45e>Pd`_JvViBbaA))0t*BJaCCQf zL$BAPrltmL9I$)aU2u-tjRv(+dAO3MJ