From 7487721e265fb9e01f76ada0a0aebc91941cb2cf Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Sun, 22 Apr 2018 08:17:38 +0100 Subject: [PATCH] more gone --- openlp/core/ui/icons.py | 1 + openlp/core/ui/media/mediacontroller.py | 9 +++++---- .../media/forms/mediaclipselectordialog.py | 4 ++-- .../plugins/media/forms/mediaclipselectorform.py | 11 ++++------- openlp/plugins/presentations/lib/mediaitem.py | 5 +---- openlp/plugins/songs/forms/songselectdialog.py | 3 +-- resources/images/general_delete.png | Bin 666 -> 0 bytes resources/images/general_import.png | Bin 628 -> 0 bytes resources/images/media_playback_pause.png | Bin 484 -> 0 bytes resources/images/media_playback_start.png | Bin 501 -> 0 bytes resources/images/media_playback_stop.png | Bin 499 -> 0 bytes resources/images/media_repeat.png | Bin 884 -> 0 bytes resources/images/openlp-2.qrc | 6 ------ 13 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 resources/images/general_delete.png delete mode 100644 resources/images/general_import.png delete mode 100644 resources/images/media_playback_pause.png delete mode 100644 resources/images/media_playback_start.png delete mode 100644 resources/images/media_playback_stop.png delete mode 100644 resources/images/media_repeat.png diff --git a/openlp/core/ui/icons.py b/openlp/core/ui/icons.py index 5e4fd91ba..6c9171994 100644 --- a/openlp/core/ui/icons.py +++ b/openlp/core/ui/icons.py @@ -97,6 +97,7 @@ class UiIcons(object): 'picture': 'fa.picture-o', 'print': 'fa.print', 'remote': 'fa.rss', + 'repeat': 'fa.repeat', 'save': 'fa.save', 'search': 'fa.search', 'search_minus': 'fa.search-minus', diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index dbb6adfdb..297c8f4b8 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -38,6 +38,7 @@ from openlp.core.common.settings import Settings from openlp.core.lib import ItemCapabilities from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui import DisplayControllerType +from openlp.core.ui.icons import UiIcons from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players, \ parse_optical_path from openlp.core.ui.media.endpoint import media_endpoint @@ -283,19 +284,19 @@ class MediaController(RegistryBase, LogMixin, RegistryProperties): # Build a Media ToolBar controller.mediabar = OpenLPToolbar(controller) controller.mediabar.add_toolbar_action('playbackPlay', text='media_playback_play', - icon=':/slides/media_playback_start.png', + icon=UiIcons().play, tooltip=translate('OpenLP.SlideController', 'Start playing media.'), triggers=controller.send_to_plugins) controller.mediabar.add_toolbar_action('playbackPause', text='media_playback_pause', - icon=':/slides/media_playback_pause.png', + icon=UiIcons().pause, tooltip=translate('OpenLP.SlideController', 'Pause playing media.'), triggers=controller.send_to_plugins) controller.mediabar.add_toolbar_action('playbackStop', text='media_playback_stop', - icon=':/slides/media_playback_stop.png', + icon=UiIcons().stop, tooltip=translate('OpenLP.SlideController', 'Stop playing media.'), triggers=controller.send_to_plugins) controller.mediabar.add_toolbar_action('playbackLoop', text='media_playback_loop', - icon=':/media/media_repeat.png', checked=False, + icon=UiIcons().repeat, checked=False, tooltip=translate('OpenLP.SlideController', 'Loop playing media.'), triggers=controller.send_to_plugins) controller.position_label = QtWidgets.QLabel() diff --git a/openlp/plugins/media/forms/mediaclipselectordialog.py b/openlp/plugins/media/forms/mediaclipselectordialog.py index 22f239cf5..3c32df553 100644 --- a/openlp/plugins/media/forms/mediaclipselectordialog.py +++ b/openlp/plugins/media/forms/mediaclipselectordialog.py @@ -24,7 +24,7 @@ from PyQt5 import QtCore, QtWidgets from openlp.core.common.i18n import translate -from openlp.core.lib import build_icon +from openlp.core.ui.icons import UiIcons class Ui_MediaClipSelector(object): @@ -106,7 +106,7 @@ class Ui_MediaClipSelector(object): self.controls_layout = QtWidgets.QHBoxLayout() self.controls_layout.setObjectName('controls_layout') self.play_button = QtWidgets.QToolButton(media_clip_selector) - self.play_button.setIcon(build_icon(':/slides/media_playback_start.png')) + self.play_button.setIcon(UiIcons().play) self.play_button.setObjectName('play_button') self.controls_layout.addWidget(self.play_button) self.position_slider = QtWidgets.QSlider(media_clip_selector) diff --git a/openlp/plugins/media/forms/mediaclipselectorform.py b/openlp/plugins/media/forms/mediaclipselectorform.py index 7c0db8db7..83d9763fc 100644 --- a/openlp/plugins/media/forms/mediaclipselectorform.py +++ b/openlp/plugins/media/forms/mediaclipselectorform.py @@ -25,13 +25,14 @@ import re from datetime import datetime from time import sleep -from PyQt5 import QtCore, QtGui, QtWidgets +from PyQt5 import QtCore, QtWidgets from openlp.core.common import is_win, is_linux, is_macosx from openlp.core.common.i18n import translate from openlp.core.common.mixins import RegistryProperties from openlp.core.common.path import Path from openlp.core.lib.ui import critical_error_message_box +from openlp.core.ui.icons import UiIcons from openlp.core.ui.media.vlcplayer import get_vlc from openlp.plugins.media.forms.mediaclipselectordialog import Ui_MediaClipSelector @@ -66,12 +67,8 @@ class MediaClipSelectorForm(QtWidgets.QDialog, Ui_MediaClipSelector, RegistryPro self.media_item = media_item self.setupUi(self) # setup play/pause icon - self.play_icon = QtGui.QIcon() - self.play_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_start.png"), QtGui.QIcon.Normal, - QtGui.QIcon.Off) - self.pause_icon = QtGui.QIcon() - self.pause_icon.addPixmap(QtGui.QPixmap(":/slides/media_playback_pause.png"), QtGui.QIcon.Normal, - QtGui.QIcon.Off) + self.play_icon = UiIcons().play + self.pause_icon = UiIcons().pause def reject(self): """ diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 09cd45537..b0072ce83 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -37,9 +37,6 @@ from openlp.plugins.presentations.lib.pdfcontroller import PDF_CONTROLLER_FILETY log = logging.getLogger(__name__) -ERROR_IMAGE = QtGui.QImage(':/general/general_delete.png') - - class PresentationMediaItem(MediaManagerItem): """ This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and @@ -175,7 +172,7 @@ class PresentationMediaItem(MediaManagerItem): file_name = file_path.name if not file_path.exists(): item_name = QtWidgets.QListWidgetItem(file_name) - item_name.setIcon(build_icon(ERROR_IMAGE)) + item_name.setIcon(UiIcons().delete) item_name.setData(QtCore.Qt.UserRole, path_to_str(file_path)) item_name.setToolTip(str(file_path)) self.list_view.addItem(item_name) diff --git a/openlp/plugins/songs/forms/songselectdialog.py b/openlp/plugins/songs/forms/songselectdialog.py index 4b93e7e5c..ebccdac8b 100644 --- a/openlp/plugins/songs/forms/songselectdialog.py +++ b/openlp/plugins/songs/forms/songselectdialog.py @@ -26,7 +26,6 @@ The :mod:`~openlp.plugins.songs.forms.songselectdialog` module contains the user from PyQt5 import QtCore, QtWidgets from openlp.core.common.i18n import translate -from openlp.core.lib import build_icon from openlp.core.ui import SingleColumnTableWidget from openlp.core.ui.icons import UiIcons from openlp.core.widgets.edits import HistoryComboBox @@ -211,7 +210,7 @@ class Ui_SongSelectDialog(object): QtWidgets.QSizePolicy.Minimum) self.import_layout.addItem(self.import_spacer) self.import_button = QtWidgets.QPushButton(self.song_page) - self.import_button.setIcon(build_icon(':/general/general_import.png')) + self.import_button.setIcon(UiIcons().download) self.import_button.setObjectName('import_button') self.import_layout.addWidget(self.import_button) self.song_layout.addLayout(self.import_layout, 5, 0, 1, 5) diff --git a/resources/images/general_delete.png b/resources/images/general_delete.png deleted file mode 100644 index ef8e685e2edc2bd322bc20b3930b3b8a4a956692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmV;L0%iS)P)EpEu1Bn~z?SOH%W3`5?j4Qac4I15gKU`L5t>eN996dfGWy$GdT78e~1IEWxDihex7vOw4eG#$fZhali~XI|dwy2)5q7?kev-7Va?i{8#`0ED~iS znPE8+jBfgBF#tb?!0r|!;|Uxhh~`JWR^bpU8u7y9}-^q*}IfB~Nq%ySBz{^kAz z3q)BlA;{zV9S&*>ZND1?U{GxVemB-UgWbmGokGcyqSwMaQBF)n)gu5F4?Uh4@^Ycw-*5-~sCaop*i?$X&F0Mt&l~Qb zfY1*WGoB%i7sW@t*o-kS#!v>NY9h9$NM~6&ozmxk>*nk(P@GSvbVZtA)kJKs3`pjz z2QVQIGtrHEzzyrW3909E+g3AU>}ZYus}ujmzk3qv7);hk;Q#;t07*qoM6N<$f=kC8 Ao&W#< diff --git a/resources/images/general_import.png b/resources/images/general_import.png deleted file mode 100644 index 0ee7892692c346a987d8d9df3a905465f4aa3601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 628 zcmV-)0*n2LP)o5qwr=?b48Q_wRfMv&X%)2+RVZT=(E(#S_Vc?ewXta#xY8Y-^v=2GoU5xu z1OTPf17L&ytBF&1Y|Q8Lx4(jb@pw$#^VsZkSXo&?DTPuh8w7yX8gF%VPZ#N|z~`eQ zI-8rUt*tSgPRSHzUo|^+g8`J*+^bgi9AM|*;GmR@wH9kFl}d$&?KWwe zqP4y=i;{(+S8hHlrO;ZVwJrg(a)3|!`}-veylfInNFvYB#9Vf#26!Kn&u7cmMkd1bzK&V1#uh`1Oe@K`%dpg3q|v6 zZ*OyWc!=kD^!xo=;bj3Qi4nk-6(~imR%0+2*b|9dH(DI=mJ_qN?Ujw zgrQw7my#q&i9kf;$Mv;+_4>`1o5?!EslqwmzhVAs(Ro?m1o$R}3;PYi<1e$QX`AB! O0000MzCV_|S* zE^l&Yo9;Xs0004FNklB9I38p(Iz6IO^dEMQjt>}>^t3llMXiwcw)!{H|)}++uwH(K|-~|IrqGh@yQpO zH=a3ThfpD++=dBxU5K?1eFDKBVp?BowuED$I} zkR>PRm)K&!hzw1}kQOC^{*qJ33LIZ~rbLxp_E@EaXM7bn6PpN9cKz5(7SqMlOZ>Pz a(ftDwiElIZXxcXb0000MzCV_|S* zE^l&Yo9;Xs0004WNkl zYnIH1=*_xx>SF|Ngh5}Rs6lxM@#19}#d-$sFy8p}`-Kof9M%r9Ebou{qbxtj4r@XP z5kmBny|h<$Z0qaW*3m2X(taXDh~1<&*z(MYp&!nCcVfqu-e5NoA-d^?SHAga?8-ld zU(Oxd&`m|8wav2Y)E}jHu1r-X3KzC*mT4{4vt=LsR+>6?KYoWuxj3n8IOEc8GB)A6pN#dQ-vvRyY8A>?)zk_@Y3Qa+WC^9 zu?lzGbVJ8qRK}iY=h4m@-n%rxJ$HQoOq^+G@5jShvwZ4Yq4Guns1&-I<-=NtRyya% zg~CK-sxnb{YfdW_Ar_L>VAh(UOJjwxGaa*9gM~zd5Ur$<*2`Ioc0Bjkta{lYIBdh20qxn%iZ)DAy5JLP1do6CCFD*BW00000NkvXXu0mjf%^}{d diff --git a/resources/images/media_playback_stop.png b/resources/images/media_playback_stop.png deleted file mode 100644 index 180280e8ba359d2a4389e93284454cf943b27dbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVMzCV_|S* zE^l&Yo9;Xs0004UNklyX+scBW;@{ixB;GHteD? zi4zVk%KMm2d+-vpg@ZO1m$9PhNBs_CwvU6gp6B-T^cklp z%LPGv>rmBAl^Q-iHLBFjq4KSMp<&gV+w9V!%@Z9SXtBdK^=89D1o6}c7u@qo%qL%H z-gxGm4LpU2vNw&#BOe&P>Cq!4LGwb5O`~jC4;H!Q9m5r89H7`jk)mm{$oi2~!WHh& zq+HUVf=iBBAfd||l~Br&N1K?GJ(kHa#W>SIO3XgxNJ>$aM>IXMj535U#3;~1b3iGQ zVp#4kxJ)p@Fe6O#7nUi8QVbk!=#sF+43ms8$qbOt!J&90^LD|k@{A_sUnv@of|<7k zaaER6UeF|@gCDNR;wnUtIm>NkSffps7)?xvDjD47oYjZrT8_$_3?+8hV}T5L<0#h} p&_s}e?F9KS7v-XS=mdoU?jMapX0!E+{+R#(002ovPDHLkV1o6$+0Fm} diff --git a/resources/images/media_repeat.png b/resources/images/media_repeat.png deleted file mode 100644 index 78330449af4814602c103ea9f16f9cb95f1821c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmV-)1B?8LP)(Q2y*3PKw2PiWkU8H9jLmUgnw zLWGQ$1&v@8G2C$TeR;obI=0hIpVhlK=iMA0f&Y-rW~0oUWabHG z9tQv-st{3`hzjX+`j3C-#n)qJXGbvehEnQ-@B1zQ1Ofp7faiGt0LO8frfI$>qL16# z+xqQ6CX*3b>(8F&Em)R?>FH^NLLs=W3nGH=`?$Ni!^On~lu`%;0$+p>KV>o*Z2~~6 z)!Jw_n+pR21DKhaK~GN)9LIrS7!X2$nGp(w5Q#)^e0+?Xo0|pKbvFR~YHV$7MWvKS zrfFI$D=P?x!w3e0a9tO!>tc0v6~n{B7#tjgZQB?c8bYN~fl_L6YHI3;q?Ad|^W6FQ zdGz-7qEsp&5C~vwYz(-@pv4zZKG5wp|i6Si9`aP=ebhKpGitNVHgIwy1HOl z7M7QnvAMa4TCIjuDuq}qhSSqiq|<3EE-u1#U4+A7Se6AT<@cnN8V?48AR;g`TCEn= z*Vo@>y1cx^?CdO($s~N=2NA)xZFF~cLn$>*N+~ciEXx8B;r|dqyycWqAgy)f`S}@A zN-#5Q+eV>Kz}eXuMn^~Aiu?Qfa2y9(YcMk&9v+~zu9(bR_I>}ydcBTtIE-Skh`G5r zWV2ZSKrWX~>nj|``JJ@Z1tMymoSdN1XdoVsLn(!Fxs0Wy zC8Sa*)M_&X5$g3iUS3{c7)Fzb z-V@QsgM$P8jg4PfTU(22t&_|=p|u|Wd%6k{m4y(6!^6XGbp8wBPh`rEMqk+g0000< KMNUMnLSTaUX^95_ diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc index 244cf00b0..e0e52503c 100644 --- a/resources/images/openlp-2.qrc +++ b/resources/images/openlp-2.qrc @@ -24,14 +24,9 @@ plugin_songusage.png - general_delete.png - general_import.png slide_theme.png - media_playback_start.png - media_playback_stop.png - media_playback_pause.png openlp-logo.svg @@ -66,7 +61,6 @@ media_time.png - media_repeat.png slidecontroller_multimedia.png auto-start_active.png auto-start_inactive.png