From f5645f91d3f1e9efa3d050350b4823cd0e195e6e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 13 Apr 2018 21:07:09 +0100 Subject: [PATCH] more bits --- openlp/core/api/tab.py | 36 -------------------------- openlp/core/lib/ui.py | 5 ++-- openlp/core/projectors/manager.py | 4 +-- openlp/core/ui/icons.py | 3 +++ resources/images/general_print.png | Bin 880 -> 0 bytes resources/images/network_auth.png | Bin 608 -> 0 bytes resources/images/network_server.png | Bin 1133 -> 0 bytes resources/images/openlp-2.qrc | 11 ++------ resources/images/service_down.png | Bin 623 -> 0 bytes resources/images/service_up.png | Bin 672 -> 0 bytes resources/images/system_about.png | Bin 734 -> 0 bytes resources/images/system_configure.png | Bin 1101 -> 0 bytes 12 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 resources/images/general_print.png delete mode 100644 resources/images/network_auth.png delete mode 100644 resources/images/network_server.png delete mode 100644 resources/images/service_down.png delete mode 100644 resources/images/service_up.png delete mode 100644 resources/images/system_about.png delete mode 100644 resources/images/system_configure.png diff --git a/openlp/core/api/tab.py b/openlp/core/api/tab.py index 840fb0d0b..20a023ed4 100644 --- a/openlp/core/api/tab.py +++ b/openlp/core/api/tab.py @@ -41,8 +41,6 @@ class ApiTab(SettingsTab): self.icon_path = ':/plugins/plugin_remote.png' advanced_translated = translate('OpenLP.AdvancedTab', 'Advanced') super(ApiTab, self).__init__(parent, 'api', advanced_translated) - self.define_main_window_icon() - self.generate_icon() def setupUi(self): self.setObjectName('ApiTab') @@ -155,24 +153,6 @@ class ApiTab(SettingsTab): self.thumbnails_check_box.stateChanged.connect(self.on_thumbnails_check_box_changed) self.address_edit.textChanged.connect(self.set_urls) - def define_main_window_icon(self): - """ - Define an icon on the main window to show the state of the server - :return: - """ - self.remote_server_icon = QtWidgets.QLabel(self.main_window.status_bar) - size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) - size_policy.setHorizontalStretch(0) - size_policy.setVerticalStretch(0) - size_policy.setHeightForWidth(self.remote_server_icon.sizePolicy().hasHeightForWidth()) - self.remote_server_icon.setSizePolicy(size_policy) - self.remote_server_icon.setFrameShadow(QtWidgets.QFrame.Plain) - self.remote_server_icon.setLineWidth(1) - self.remote_server_icon.setScaledContents(True) - self.remote_server_icon.setFixedSize(20, 20) - self.remote_server_icon.setObjectName('remote_server_icon') - self.main_window.status_bar.insertPermanentWidget(2, self.remote_server_icon) - def retranslateUi(self): self.tab_title_visible = translate('RemotePlugin.RemoteTab', 'Remote Interface') self.server_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Server Settings')) @@ -280,19 +260,3 @@ class ApiTab(SettingsTab): # we have a set value convert to True/False if check_state == QtCore.Qt.Checked: self.thumbnails = True - - def generate_icon(self): - """ - Generate icon for main window - """ - self.remote_server_icon.hide() - icon = QtGui.QImage(':/remote/network_server.png') - icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - if Settings().value(self.settings_section + '/authentication enabled'): - overlay = QtGui.QImage(':/remote/network_auth.png') - overlay = overlay.scaled(60, 60, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - painter = QtGui.QPainter(icon) - painter.drawImage(20, 0, overlay) - painter.end() - self.remote_server_icon.setPixmap(QtGui.QPixmap.fromImage(icon)) - self.remote_server_icon.show() diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index ac8441cf3..05e0a7286 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -31,6 +31,7 @@ from openlp.core.common.actions import ActionList from openlp.core.common.i18n import UiStrings, translate from openlp.core.common.registry import Registry from openlp.core.lib import build_icon +from openlp.core.ui.icons import UiIcons log = logging.getLogger(__name__) @@ -161,10 +162,10 @@ def create_button(parent, name, **kwargs): kwargs.setdefault('text', UiStrings().Delete) kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Delete the selected item.')) elif role == 'up': - kwargs.setdefault('icon', ':/services/service_up.png') + kwargs.setdefault('icon', UiIcons().arrow_up) kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection up one position.')) elif role == 'down': - kwargs.setdefault('icon', ':/services/service_down.png') + kwargs.setdefault('icon', UiIcons().arrow_down) kwargs.setdefault('tooltip', translate('OpenLP.Ui', 'Move selection down one position.')) else: log.warning('The role "{role}" is not defined in create_push_button().'.format(role=role)) diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py index c8f1e1e1e..62712b699 100644 --- a/openlp/core/projectors/manager.py +++ b/openlp/core/projectors/manager.py @@ -127,7 +127,7 @@ class UiProjectorManager(object): triggers=self.on_select_input) self.one_toolbar.add_toolbar_action('view_projector', text=translate('OpenLP.ProjectorManager', 'View Projector'), - icon=':/system/system_about.png', + icon=UiIcons().info, tooltip=translate('OpenLP.ProjectorManager', 'View selected projector information.'), triggers=self.on_status_projector) @@ -234,7 +234,7 @@ class UiProjectorManager(object): self.status_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', '&View Projector Information'), - icon=':/system/system_about.png', + icon=UiIcons().info, triggers=self.on_status_projector) self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 1e85904b3..33af4c54b 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -90,6 +90,9 @@ class UiIcons(object): 'print': 'fa.print', 'remote': 'fa.rss', 'save': 'fa.save', + 'search': 'fa.search', + 'search_minus': 'fa.search-minus', + 'search_plus': 'fa.search-plus', 'settings': 'fa.cogs', 'shortcuts': 'fa.wrench', 'stop': 'fa.stop', diff --git a/resources/images/general_print.png b/resources/images/general_print.png deleted file mode 100644 index 8eb1c6741b62ad70bdaf4fd75d2a535d93d6d03d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 880 zcmV-$1CRWPP)-)OT5&Bd)01nK7JB8bqz-B}zf9U63KHEki(1pi_*xiLTH^n0(~c)j8uv@d*IIQhv03tcxPJZvice5)F3M!lMp}vot>R17K_;3-9@2r z#EQfUKYTvR4hNV!Ij@+xoYULeYcDDbo~8&+c|4w0wWU%Cp->1jGas0E<*ZYLGi*sN z?L$XL2P>yV?9-T$8haHVdio5u_V)JB-`|giC>o8Tr>6(Dwlm-3MzF0-w(5f|ZcF^a zLo_utg}%N%*b*k2?Q??Zk@#DHEjBG24m+)&uiUb8&J_lk+SbP0o*Ffs8SD=RC==kqO})9D|Z#^GVX8l-sOBasLn7Ib$%mdjx^mgkhg z_rmtF)sNB9q_tQsm$NPtMW*{7L@J$80|SF)1t&h;b!2t*jg&qm?I@oPRS67$DId}dwiC$+izl!n*DbuVd@mFV7f{fuWJai358$p+0R>_w(?=`@XQp(zNRTr6`JD zTAEkp{ksO;ZujtdCY#H=&xmo#D8?zHq~0av#q+hC!|52_5%i3mA6;Et$!7~`aon{F z*AN~dJVdyPjNBZNXe=V3x%;nOF2`t_Q?-rRa_Z7Xb7RP*xXG&5;V_^F)Ze>u1Ft$d+)n z_Y8$%;W1F%X&EP>0Z#l3bp8^Mc%UqV?hM_A55Oj{ z4t#=({S(CF@j2k-zi!DeJ$=2jlwK6ej77{h%yMrzC}SQ^2{7#TAP0O`e5peIjbzhV u86Urp0tWun*zuQ;F5q~}CxOPEyz4hAGR?5R1SdxT0000swx|LFf3SGE$k@yK*Te>U# z3R9R5P`Z&)XX9cjh!m!1y0BF;OpPYby!Z0nz2|oEUSeWpCMkJ01d{vCyZ3j_|D1C# zq0jN-ix+<3lf1}gGL%k#K*>Y`ni;>ndWFv(KQ_MKqGr=Em$ge%sr<=bKYNzwXI;@R zz*Vg_;xrvut6d4#bt#!lQYx9GqoX5ACK5sjNz7U(rKDy(((k%`17ydu$mMdFDHKqz z*E{o;lmGxC0+9d_VUW=`fYusXD=4iYqD_3QVUMOGfLmJ=2Y@jK0D%Y)B7DvD1Dxk) zBOnUBCj!L>02tE_Hz8?BOjQ4dX-9w%!k8EVfZGTpq(ruU8O>7oA;KUb7#tw-zCC9E zkO;%xmH@Fy5INTkAcVl{*MD^E2Frj!0N5asxu?{a84L6C;kE<_(Y6{kKp5;c!GH3? z05Ht(JP%3*!v_e001dl=R?CO)`=S1w$}mt`!*xA4jss?np%F2o)oLLK0tCUWhqrQs zK+L8mGDFP))(pPmdACI2Gad-Q>euk*#>VyaH7v`5jQW4iHilqK2*_~&q|<3kOiUn~ z%_5V@pwkw+$~2UKVK@c}{2;*f^%Yva53O}i1WW|L+JsUWjwc5o1ekSqcLInY1che+ znXp{rkRbGs!TL7I*ciC3i(2gpj^m)&Y{GF|IIcVV2(aPsP7r0e0bsPohf-pEd>s4x zzvAWoOQcdsj969-0L;*=JEf?Ug6}vOYc!yO00e?{}LeINh4eGAWZQ79DP zdLE|Vyn*Ao`25Ke%oi7MesK{`Cj>&hNf0s*AA+?8h%ol_DQ<3VVB0ntwvA@93D&Uy z071)#){K_#!w&+aMn{ofS%K%e;rXB$TIt?O8OE4<^hicO#{f(NSXf$G`k_=RnR2;o z0DJ+U7(Gh^!0gD|3yZfDHQ$*q;VX4OK5kitbBF%OxIfD@bD1UJGz`P2KjtGx4ypq zO^?n(pjxe-0C+z@tyZJ6v$IaWCn9*B2ivw$sZ`MA*uC9SN(s;NdM+hWO4RFhYmgie z_xx9-Qt1f5r|$wN7K_ifwzf9ztU&general_zoom_out.png general_zoom_in.png general_zoom_original.png - general_print.png general_email.png general_find.png general_back.png @@ -66,20 +65,16 @@ wizard_duplicateremoval.bmp - service_down.png - service_up.png - + system_close.png clear_shortcut.png - system_about.png system_mediamanager.png system_volunteer.png system_servicemanager.png system_thememanager.png settings_plugin_list.png system_settings.png - system_configure.png system_edit_copy.png system_configure_shortcuts.png @@ -97,9 +92,7 @@ - network_server.png - network_auth.png - + song_usage_active.png song_usage_inactive.png diff --git a/resources/images/service_down.png b/resources/images/service_down.png deleted file mode 100644 index 5891219e49603b6409d5479247ef1fa8a8cf71c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmV-#0+9WQP)9KeakxIdTpje7cQjq<2c!^ z`Zm_SltDZPAt&#frRYyLt2KB&-G(%{q(iVQLTLEmE7;x%Q2E-zMx_cKcr*5=`6qt_ zJ8$Qx>E38HYSm`*8wpg%DHAF6Ak@qu=tdr9ZV&@0hK{|pLTM+EAS1zES!j~^>gMV) zSJgD~g*+^)fTA^sp+W%}T|?#b>p<{m+*@08kigJI_+;7}FTlfl=m%yDpG=!Ydu;Nd zxN@f?(x%l?jNxPW8<>{Ae&FyaVOl4ItmVe>FR)CpL^X>&_z8O)@9BsigdhL_002ov JPDHLkV1jC@76SkP diff --git a/resources/images/service_up.png b/resources/images/service_up.png deleted file mode 100644 index b3d9cef97e16ca46909765c0a67091c97908660b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmV;R0$=@!P)0b000McNliru*9;vE5edJ)+6{olpPkPT$sbOg93kgUk5S3}N14Mj zJ9`2QPnU^Q!($^(CTVNfnvCJd_^zB_{%mUB`TqliV3)SpD2)!M;I1`LS5+JxL^j zO~OgoFbrKmJg8}SpP#!u{Y2f#ZY)Tn8ycjY)X_29v1zB_c}-ACQP&!9y++%+cK|hQ zcVTYU5iEd=eDJ6R!6Ub4fC}%BEHs50WXy+95J(Yr%Kip{H}1g9jtZOr0000+f;K8PVh9!*!(H4p;$7};_ilHbUDwTN z?EK+lhc`R_y!UuRN-6x01pX48Suv4qP7`BO!vpET0O+gyXuns$BFJ1;k4`)2(jOVn zLP&)@|>CnmbvB7Sn((ujcbPt6Ul@NW0;qQtu$2F_1Pn zdL+kCE`>_XhusKJI@B)-#kg}{W z9&uoQx@d3IrvW^O3=C;bfeTc%K`7r3&~Sa+c={CK54R{p0ZhOU=EcOIP2%vo zY8yFAz%)4AmW%4$u+JEjmSXz;(N?9I}Yocf`GGok!G?x%fYd3ANf{pVvMA_*YXg{cv7nZBm2@ieWNras&G3D272l_l(i Qb^rhX07*qoM6N<$g0$m2kN^Mx diff --git a/resources/images/system_configure.png b/resources/images/system_configure.png deleted file mode 100644 index 45b8fae8b8666fbf77bb3f906a6ea7b1ddb620f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1101 zcmV-T1hV^yP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L02{9W02{9XUK)`c00007bV*G`2iXAx z12Qe)4)6T{00YfQL_t(|+MSbYOp|96$IsjLZ7HMDl|)KuRd9<5th6H|V}`kQqcbDR zT*5G0HZLI{F58gxqBdEC#2ZoEvH_ctm{K$`CIp)Z*aA^hKFon8SQ#1}pk&sr7wAft zweRKG!Gy#QGqyd+KY4P_Kfm|9=R6MusRw1XTJ$E9sWCG%vz+5OaWwk(gHR}V-r;bb zy*hd=0qH=Sn-A3bp7;_R$C5}SLT2Y?$<136r0+s6Z?S#bjvi6U)ORb5>o2(n{|N*G zB>r!lEX9^cYwJ<2tn7{ZG)@12mN!vCNR=*oDQio1woJ-#958GGD2jqXxBJZa_=FwH z0TjF96{Nrw%3qehH8V2@gb-jD23Y)nN~xU2+LIM%I$&v0QBm3S^zXp342lJoVPV_$ zZIx@+t)-tenypRQ!eps$Z>o5$s;bHs42CFah7?pP72pCPBU4(44 zyW!Bn!s6j%JEjZMs=e-;Nu0*UL7&V{qK@ z-l_I@JdmTv!8xu0WuB7n?ELw+_V)IR*x60A&Z2^-B@}}q@Vu~C&969n9Fto<{)lMS zXoya)BSxc<3=R(Pdz$w2qNNZeeBolAJ=^wLHWw5YoOO2hSQL0s(HGV>!^ht^=00000NkvXXu0mjfA3OQ4