From cd418f7825d935ff80a1f437d107ad95cca6650c Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 8 Apr 2018 20:54:28 +0100 Subject: [PATCH] more bits --- openlp/core/common/i18n.py | 2 ++ openlp/core/projectors/manager.py | 14 +++++++------- openlp/core/ui/mainwindow.py | 8 ++++---- openlp/core/ui/servicemanager.py | 10 +++++----- resources/images/general_export.png | Bin 638 -> 0 bytes resources/images/openlp-2.qrc | 5 ----- resources/images/projector_edit.png | Bin 726 -> 0 bytes resources/images/projector_new.png | Bin 781 -> 0 bytes resources/images/service_item_notes.png | Bin 876 -> 0 bytes resources/images/system_exit.png | Bin 943 -> 0 bytes 10 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 resources/images/general_export.png delete mode 100644 resources/images/projector_edit.png delete mode 100644 resources/images/projector_new.png delete mode 100644 resources/images/service_item_notes.png delete mode 100644 resources/images/system_exit.png diff --git a/openlp/core/common/i18n.py b/openlp/core/common/i18n.py index a4abc01b7..301c27f44 100644 --- a/openlp/core/common/i18n.py +++ b/openlp/core/common/i18n.py @@ -589,6 +589,7 @@ class UiIcons(object): self.default = qta.icon('fa.info-circle') self.delete = qta.icon('fa.trash') self.edit = qta.icon('fa.edit') + self.exit = qta.icon('fa.sign-out') self.download = qta.icon('fa.cloud-download') self.live = qta.icon('fa.camera') self.minus = qta.icon('fa.minus') @@ -603,6 +604,7 @@ class UiIcons(object): self.print = qta.icon('fa.print') #self.remote = qta.icon('fa.podcast') self.save = qta.icon('fa.save') + self.settings = qta.icon('fa.cogs') self.top = qta.icon('fa.angle-double-up') self.upload = qta.icon('fa.cloud-upload') self.user = qta.icon('fa.user') diff --git a/openlp/core/projectors/manager.py b/openlp/core/projectors/manager.py index d676a0d85..3a8faca3b 100644 --- a/openlp/core/projectors/manager.py +++ b/openlp/core/projectors/manager.py @@ -29,7 +29,7 @@ import logging from PyQt5 import QtCore, QtGui, QtWidgets -from openlp.core.common.i18n import translate +from openlp.core.common.i18n import UiIcons, translate from openlp.core.common.mixins import LogMixin, RegistryProperties from openlp.core.common.registry import RegistryBase from openlp.core.common.settings import Settings @@ -103,18 +103,18 @@ class UiProjectorManager(object): self.one_toolbar = OpenLPToolbar(widget) self.one_toolbar.add_toolbar_action('new_projector', text=translate('OpenLP.ProjectorManager', 'Add Projector'), - icon=':/projector/projector_new.png', + icon=UiIcons().new, tooltip=translate('OpenLP.ProjectorManager', 'Add a new projector.'), triggers=self.on_add_projector) # Show edit/delete when projector not connected self.one_toolbar.add_toolbar_action('edit_projector', text=translate('OpenLP.ProjectorManager', 'Edit Projector'), - icon=':/general/general_edit.png', + icon=UiIcons().edit, tooltip=translate('OpenLP.ProjectorManager', 'Edit selected projector.'), triggers=self.on_edit_projector) self.one_toolbar.add_toolbar_action('delete_projector', text=translate('OpenLP.ProjectorManager', 'Delete Projector'), - icon=':/general/general_delete.png', + icon=UiIcons().delete, tooltip=translate('OpenLP.ProjectorManager', 'Delete selected projector.'), triggers=self.on_delete_projector) # Show source/view when projector connected @@ -238,7 +238,7 @@ class UiProjectorManager(object): self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', '&Edit Projector'), - icon=':/projector/projector_edit.png', + icon=UiIcons().edit, triggers=self.on_edit_projector) self.menu.addSeparator() self.connect_action = create_widget_action(self.menu, @@ -271,7 +271,7 @@ class UiProjectorManager(object): self.edit_input_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', 'Edit Input Source'), - icon=':/general/general_edit.png', + icon=UiIcons().edit, triggers=self.on_edit_input) self.blank_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', @@ -287,7 +287,7 @@ class UiProjectorManager(object): self.delete_action = create_widget_action(self.menu, text=translate('OpenLP.ProjectorManager', '&Delete Projector'), - icon=':/general/general_delete.png', + icon=UiIcons().delete, triggers=self.on_delete_projector) self.update_icons() diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2117a4d98..3c1e78d72 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -96,11 +96,11 @@ class Ui_MainWindow(object): self.recent_files_menu.setObjectName('recentFilesMenu') self.file_import_menu = QtWidgets.QMenu(self.file_menu) if not is_macosx(): - self.file_import_menu.setIcon(build_icon(u':/general/general_import.png')) + self.file_import_menu.setIcon(UiIcons().download) self.file_import_menu.setObjectName('file_import_menu') self.file_export_menu = QtWidgets.QMenu(self.file_menu) if not is_macosx(): - self.file_export_menu.setIcon(build_icon(u':/general/general_export.png')) + self.file_export_menu.setIcon(UiIcons().upload) self.file_export_menu.setObjectName('file_export_menu') # View Menu self.view_menu = QtWidgets.QMenu(self.menu_bar) @@ -180,7 +180,7 @@ class Ui_MainWindow(object): self.print_service_order_item = create_action(main_window, 'printServiceItem', can_shortcuts=True, category=UiStrings().File, triggers=lambda x: PrintServiceForm().exec()) - self.file_exit_item = create_action(main_window, 'fileExitItem', icon=':/system/system_exit.png', + self.file_exit_item = create_action(main_window, 'fileExitItem', icon=UiIcons().exit, can_shortcuts=True, category=UiStrings().File, triggers=main_window.close) # Give QT Extra Hint that this is the Exit Menu Item @@ -274,7 +274,7 @@ class Ui_MainWindow(object): icon=UiIcons().edit, category=UiStrings().Settings, can_shortcuts=True) self.settings_configure_item = create_action(main_window, 'settingsConfigureItem', - icon=':/system/system_settings.png', can_shortcuts=True, + icon=UiIcons().settings, can_shortcuts=True, category=UiStrings().Settings) # Give QT Extra Hint that this is the Preferences Menu Item self.settings_configure_item.setMenuRole(QtWidgets.QAction.PreferencesRole) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index c1b78f75a..141ce45c6 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -233,9 +233,9 @@ class Ui_ServiceManager(object): # build the drag and drop context menu self.dnd_menu = QtWidgets.QMenu() self.new_action = self.dnd_menu.addAction(translate('OpenLP.ServiceManager', '&Add New Item')) - self.new_action.setIcon(build_icon(':/general/general_edit.png')) + self.new_action.setIcon(UiIcons().edit) self.add_to_action = self.dnd_menu.addAction(translate('OpenLP.ServiceManager', '&Add to Selected Item')) - self.add_to_action.setIcon(build_icon(':/general/general_edit.png')) + self.add_to_action.setIcon(UiIcons().edit) # build the context menu self.menu = QtWidgets.QMenu() self.edit_action = create_widget_action(self.menu, text=translate('OpenLP.ServiceManager', '&Edit Item'), @@ -1169,7 +1169,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi if service_item_from_item.notes: icon = QtGui.QImage(service_item_from_item.icon) icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - overlay = QtGui.QImage(':/services/service_item_notes.png') + overlay = QtGui.QImage(UiIcons().notes) overlay = overlay.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) painter = QtGui.QPainter(icon) painter.drawImage(0, 0, overlay) @@ -1178,7 +1178,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi elif service_item_from_item.temporary_edit: icon = QtGui.QImage(service_item_from_item.icon) icon = icon.scaled(80, 80, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) - overlay = QtGui.QImage(':/general/general_export.png') + overlay = QtGui.QImage(UiIcons().upload) overlay = overlay.scaled(40, 40, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) painter = QtGui.QPainter(icon) painter.drawImage(40, 0, overlay) @@ -1187,7 +1187,7 @@ class ServiceManager(QtWidgets.QWidget, RegistryBase, Ui_ServiceManager, LogMixi else: tree_widget_item.setIcon(0, service_item_from_item.iconic_representation) else: - tree_widget_item.setIcon(0, build_icon(':/general/general_delete.png')) + tree_widget_item.setIcon(0, UiIcons().delete) tree_widget_item.setText(0, service_item_from_item.get_display_title()) tips = [] if service_item_from_item.temporary_edit: diff --git a/resources/images/general_export.png b/resources/images/general_export.png deleted file mode 100644 index d26519b7f362ef306c29e5d55e08d15ae1323b95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmV-^0)hRBP)alHwszNK zl@DM)L<{{x!FClwAP}T9eqQMG#<`CObPj93CE$%jMpcN~I?N3Mh^z zlL{iJNI)sVFr?Gz;JPl3x|6i}Q@rxoC@gVo%rRBG)k z+C_w3uU9LV%cEpOyiMRXVjMRD5kaY&(wgORNxfd@`ucingmgNMWm)~>b9!e=*yn4xxX0r+W++1YQ zbzSj1Pv-Nv1VJE+#X^?LrG#N9K@do{+m-p;mk(b)_kqWN5)njXB`}-aDd0Gc3@$I_ z{ilz8;2EGJawPEDoy|hu_az8|Edddc$#fciEq`mQI&YCh1O+@;Dc_Zta5eL9iCS*p Y57qJ{2^`p;;{X5v07*qoM6N<$f@DS=zyJUM diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index ec2025d7b..4d56a24fc 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -45,7 +45,6 @@ general_add.png general_delete.png general_edit.png - general_export.png general_import.png general_zoom_out.png general_zoom_in.png @@ -90,7 +89,6 @@ wizard_duplicateremoval.bmp - service_item_notes.png service_down.png service_up.png @@ -103,7 +101,6 @@ system_volunteer.png system_servicemanager.png system_thememanager.png - system_exit.png settings_plugin_list.png system_settings.png system_configure.png @@ -146,12 +143,10 @@ projector_cooldown.png projector_disconnect.png projector_disconnect_tiled.png - projector_edit.png projector_error.png projector_item_connect.png projector_item_disconnect.png projector_manager.png - projector_new.png projector_not_connected_error.png projector_off.png projector_on.png diff --git a/resources/images/projector_edit.png b/resources/images/projector_edit.png deleted file mode 100644 index 84e345d22430175e80c4ea1f1f17e6790649ee35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 726 zcmV;{0xA88P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00!&;00!&<9(6c100007bV*G`2iOY{ z7a2C-AH01400LG?L_t(|+KrK2NK3O( zt1}KT&;|T(yOCwtC`po#_0k7ph9JvdOL^V;h3l;{2P{)smPaJXL|`(R!U9vMn@q;+ zw^z~I)5VRZcy?}fbNa00YRQt%#X%S&(MZ=zpTpfZ^$5qeH`waqS#O@X&Ms zw`tRn7yOwXN}hd>GX8`M)jn289%?QISxBuwU-kf#VSyA%jF1G>A++hoT)FFEUQwwo zQP5J$P~{x}4q!3nf{-NOa}u0>i0#f8pNHMtJT-@T(?Mned04GhfF)xm>J5w%nu5@m zs~QJ+*X_i1bdD|CavAj%l9rZ+#bN;WdP)Ld-6BqDXxf`s^xXj$;F08tQ9#XqRju%$v` zPyayGZjop=ZFg*d4MIX8s<2elP{+t>V!O@9;PE6Ldu)&2%K}=p8+M4hI*X&D=jz@A z|Mysr#KOXYx_0fGH*&e$nX$3-3$|?^0hutyFdB_|!{KnB*IqxjbL+-itE->=w6^w3 z@;K$vrLU$pe!si6x3?>C9Lr!ZkT{N|+wDrH(~*ONP}=R5)Qd%V_^>I}YUTEoE0>P~ z*Z{|l&7F5A-B+~MPrwNxf{1wv)^QwM*L|s2EM5R`0PSV7Z(G*i24f7CWg#LYNy5SM z@>4s?}Qhld@)@PH&q==FNES}jtk6jM`Klv1RDDC#mcmO?27{qbiyQOJ14#TdiN$_mC9JkKMJWBUC*YJPsc;CbG0t+lI^Ql94#h9UL(eH!hU zetgK8S5GkMPLfWiF~$(b@zD4E``g>wH?4m@BxBq5%;MtWaxRxUp2=jM-PzsAJIZ-} zA~VtRJg=r~6@+2U2-e!pJ_BI{pzVgo6_07F3jlQ#YZa0fPa`)slf00000 LNkvXXu0mjf8=!Wf diff --git a/resources/images/service_item_notes.png b/resources/images/service_item_notes.png deleted file mode 100644 index 59991dba85e745b69fbec46267c1e6414dc506c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 876 zcmV-y1C#uTP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00LnE00LnF!7x?&00007bV*G`2igM% z6A(GBp-}Ju00QhuL_t(I%k7lSYn)XS#((GB_nkL0X3VJ37F&O1hM}?L0kxK6v3}W)Y)E)e@67Y1)`%(wR)=ejFDw3F%b9 zwe(yL&xLz2JMM8ADK#>Uva&o|d^ zA-?j};~$mEgU8ywqODk!+VJ2&xiXaHna3$+2!e@;fEff&3cDn~Lu_6qwpM0p&;I#J zKe3*l=bN(I7#gl_RY&eG57zD^E8H5I8d%&A!j@Rv1iyu(ZD14p6|D6W64p@V_~zLM zkKK~-)YMcqb8>xoxF#bq;1Ed|h9%fb@*pB$(Xg0E!LVSY7*>$%NcE}TH}^BH*X!Zu zMRz8VaJitFqPd_sXx5Ltvyz}C#qD{Pk1F=TO|1a>E%QMzZj zpap25Xzp;iLv#0XbN0}Qn^XZXck1x`kumpZHjp7sFiT*)h}26VbuUH@NSGPc5mE=t z8!4n+i#A=EzW9Ug5r6kf>HW_34!+$X?0RA+l0xcYOeCL3F<~)bsoQXIg5;pNqPgNS zS2(9LJF|y|+#c~?{*k$-A8Wi`R$q>tL<$KDh9&C`D}i9Ww`BX}iYS622qFq-O|%%_ zCtg}wN=GN}n|OGnJ&pm%Fzc0T{iHpaq%M7TIYb=d?ztf42j0|!ll*q!j+4zcA;mz9 zkrX2-L@ey>(*d`hCt@r@qgDCs-2CWU)30@2%*H=GFa5&){JpUsCl6nHLdESXL{t#x z&@3ZTiaxkz+h@&2t91E~mCE<0&hq7@Wxot;0N3mF`i-og`1FP0H_FxGW8d7`@zHIy zI{8|om91_x%ZtA*l`bw^vL)auunIKm^>g-5pU~eVT7kkm>?h0s0000jUsH-DHXFwL4yaC3>f^y%s4u~zP;>< z)CV4T4$u2Jy$?ev#Zz^3bVM2&8h-FR@0-59zAVRaf@zu`4-O7K@I3$S{QUgvX`gut zXliO2?(FP*mrN#KM59r}Vll+yafHKRc%FxgiwkRQZSBXy!^5|qZ@AAvlBDm`>Ga!F zD#a>_f_l9UN-2EbhvPU%rBaB;FH_6vW%^*E!1i? z5JGTwcL(41vA(_zhG9@B6rk%m<9XiiEiEmCjm2VIcX#(-dwV<5=`<>p3RYHDKnQ`N zC>RKxe9a1i&>xLP!Sg%_A<#4pfj|J1QV>GG^E@h*3IL#5 zts)QzARG=u5CoW}`6bIR%)g;f2#(_*7z`p53c<20Se6BrWkCpmWm)ijACe>?9*=_% z0*>S0`~EQ-33XbC- zisE0OlwxpjP#qZ=q2+R!USD6++1Xjz-``JDsT36ifws1`(us))s_Qz{G>ztRIhszV zuL1B3r4)^gjmqTY^sH%$9)m50LiA*Mg(a}**N-;Gxg`1lj?C$P< zXWRB4kFT7|<$fv_i?7bk&M-bcj^W{9xULJ^w&D9e_V)I$xVQ+%ad32W^#1tx_}gb& zD3wYt^ZEQQx3{+qmzS3i1mO{2+csF1b#``key-Q+uPCM7GXMa{vMgmXnb)!`e_2b$>fOJ^lD>jSRy8Km>sJKSuxr0oVX600sd4lWzc+{{d*FaiNg- RI~)K2002ovPDHLkV1g6TrcwX^