raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

finish projector

Browse Source
This commit is contained in:
Tim Bentley 2018-06-16 07:09:15 +01:00
parent b6dc37fb0b
commit 206decbb7e
13 changed files with 119 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openlp/core/projectors/manager.py
View File

@ -87,7 +87,7 @@ class UiProjectorManager(object):
# Show source/view when projector connected
self.one_toolbar.add_toolbar_action('source_view_projector',
text=translate('OpenLP.ProjectorManager', 'Select Input Source'),
icon=':/projector/projector_hdmi.png',
icon=UiIcons().projector_hdmi,
tooltip=translate('OpenLP.ProjectorManager',
'Choose input source on selected projector.'),
triggers=self.on_select_input)
@ -211,29 +211,29 @@ class UiProjectorManager(object):
self.connect_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'&Connect Projector'),
icon=':/projector/projector_connect.png',
icon=UiIcons().projector_connect,
triggers=self.on_connect_projector)
self.disconnect_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'D&isconnect Projector'),
icon=':/projector/projector_disconnect.png',
icon=UiIcons().projector_off,
triggers=self.on_disconnect_projector)
self.menu.addSeparator()
self.poweron_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'Power &On Projector'),
icon=':/projector/projector_power_on.png',
icon=UiIcons().projector_on,
triggers=self.on_poweron_projector)
self.poweroff_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'Power O&ff Projector'),
icon=':/projector/projector_power_off.png',
icon=UiIcons().projector_off,
triggers=self.on_poweroff_projector)
self.menu.addSeparator()
self.select_input_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'Select &Input'),
icon=':/projector/projector_hdmi.png',
icon=UiIcons().projector_hdmi,
triggers=self.on_select_input)
self.edit_input_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
@ -248,7 +248,7 @@ class UiProjectorManager(object):
self.show_action = create_widget_action(self.menu,
text=translate('OpenLP.ProjectorManager',
'&Show Projector Screen'),
icon=':/projector/projector_show.png',
icon=UiIcons().projector,
triggers=self.on_show_projector)
self.menu.addSeparator()
self.delete_action = create_widget_action(self.menu,
@ -288,10 +288,10 @@ class ProjectorManager(QtWidgets.QWidget, RegistryBase, UiProjectorManager, LogM
S_ON: UiIcons().projector_off,
S_COOLDOWN: UiIcons().projector_cooldown,
E_ERROR: UiIcons().projector_error,
E_NETWORK: ':/projector/projector_not_connected_error.png',
E_AUTHENTICATION: ':/projector/projector_not_connected_error.png',
E_UNKNOWN_SOCKET_ERROR: ':/projector/projector_not_connected_error.png',
E_NOT_CONNECTED: ':/projector/projector_not_connected_error.png'
E_NETWORK: UiIcons().error,
E_AUTHENTICATION: UiIcons().authentication,
E_UNKNOWN_SOCKET_ERROR: UiIcons().error,
E_NOT_CONNECTED: UiIcons().projector_disconnect
}
def bootstrap_initialise(self):

BIN
openlp/core/ui/fonts/OpenLP.ttf
View File

Binary file not shown.

3
openlp/core/ui/fonts/openlp-charmap.json
View File

@ -3,5 +3,6 @@
"file-text": "0042",
"search-text": "0043",
"search-lyrcs": "0044",
"search-CCLI": "0045"
"search-CCLI": "0045",
"hdmi": "0046"
}

106
openlp/core/ui/fonts/openlp.sfd
View File

@ -22,7 +22,7 @@ OS2Version: 3
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1328122800
ModificationTime: 1528041465
ModificationTime: 1529128498
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@ -86,7 +86,7 @@ FitToEm: 0
WinInfo: 0 27 9
BeginPrivate: 0
EndPrivate
BeginChars: 65539 712
BeginChars: 65539 713
StartChar: .notdef
Encoding: 65536 -1 0
@ -48894,6 +48894,7 @@ SplineSet
128 -128 l 1,43,-1
1408 -128 l 1,35,-1
EndSplineSet
Validated: 1
EndChar
StartChar: C
@ -48943,6 +48944,7 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,45
1920 1242 1920 1242 1920 1216 c 2,30,-1
EndSplineSet
Validated: 524329
EndChar
StartChar: D
@ -48992,12 +48994,13 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,45
1920 1242 1920 1242 1920 1216 c 2,30,-1
EndSplineSet
Validated: 524325
EndChar
StartChar: E
Encoding: 69 69 711
Width: 1920
Flags: WO
Flags: W
LayerCount: 2
Fore
SplineSet
@ -49054,6 +49057,103 @@ SplineSet
1882 1280 1882 1280 1901 1261 c 128,-1,56
1920 1242 1920 1242 1920 1216 c 2,41,-1
EndSplineSet
Validated: 524325
EndChar
StartChar: F
Encoding: 70 70 712
Width: 2304
Flags: W
LayerCount: 2
Fore
SplineSet
2288 731 m 2,0,1
2304 723 2304 723 2304 704 c 128,-1,2
2304 685 2304 685 2288 677 c 2,3,-1
1968 485 l 2,4,5
1960 480 1960 480 1952 480 c 0,6,7
1943 480 1943 480 1936 484 c 0,8,9
1920 494 1920 494 1920 512 c 2,10,-1
1920 640 l 1,11,-1
1062 640 l 1,12,13
1099 582 1099 582 1145 475 c 0,14,15
1161 438 1161 438 1169.5 420 c 128,-1,16
1178 402 1178 402 1193.5 371 c 128,-1,17
1209 340 1209 340 1220.5 324 c 128,-1,18
1232 308 1232 308 1247.5 290 c 128,-1,19
1263 272 1263 272 1279 264 c 128,-1,20
1295 256 1295 256 1312 256 c 2,21,-1
1408 256 l 1,22,-1
1408 352 l 2,23,24
1408 366 1408 366 1417 375 c 128,-1,25
1426 384 1426 384 1440 384 c 2,26,-1
1760 384 l 2,27,28
1774 384 1774 384 1783 375 c 128,-1,29
1792 366 1792 366 1792 352 c 2,30,-1
1792 32 l 2,31,32
1792 18 1792 18 1783 9 c 128,-1,33
1774 0 1774 0 1760 0 c 2,34,-1
1440 0 l 2,35,36
1426 0 1426 0 1417 9 c 128,-1,37
1408 18 1408 18 1408 32 c 2,38,-1
1408 128 l 1,39,-1
1312 128 l 2,40,41
1280 128 1280 128 1251 138 c 128,-1,42
1222 148 1222 148 1200 161.5 c 128,-1,43
1178 175 1178 175 1155 202 c 128,-1,44
1132 229 1132 229 1118 248 c 128,-1,45
1104 267 1104 267 1084.5 305 c 128,-1,46
1065 343 1065 343 1056 362.5 c 128,-1,47
1047 382 1047 382 1028 423 c 0,48,49
1005 476 1005 476 991 504.5 c 128,-1,50
977 533 977 533 955 569.5 c 128,-1,51
933 606 933 606 910.5 623 c 128,-1,52
888 640 888 640 864 640 c 2,53,-1
504 640 l 1,54,55
482 556 482 556 413 502 c 128,-1,56
344 448 344 448 256 448 c 0,57,58
150 448 150 448 75 523 c 128,-1,59
0 598 0 598 0 704 c 128,-1,60
0 810 0 810 75 885 c 128,-1,61
150 960 150 960 256 960 c 0,62,63
344 960 344 960 413 906 c 128,-1,64
482 852 482 852 504 768 c 1,65,-1
608 768 l 2,66,67
632 768 632 768 654.5 785 c 128,-1,68
677 802 677 802 699 838.5 c 128,-1,69
721 875 721 875 735 903.5 c 128,-1,70
749 932 749 932 772 985 c 0,71,72
791 1026 791 1026 800 1045.5 c 128,-1,73
809 1065 809 1065 828.5 1103 c 128,-1,74
848 1141 848 1141 862 1160 c 128,-1,75
876 1179 876 1179 899 1206 c 128,-1,76
922 1233 922 1233 944 1246.5 c 128,-1,77
966 1260 966 1260 995 1270 c 128,-1,78
1024 1280 1024 1280 1056 1280 c 2,79,-1
1163 1280 l 1,80,81
1184 1337 1184 1337 1233 1372.5 c 128,-1,82
1282 1408 1282 1408 1344 1408 c 0,83,84
1424 1408 1424 1408 1480 1352 c 128,-1,85
1536 1296 1536 1296 1536 1216 c 128,-1,86
1536 1136 1536 1136 1480 1080 c 128,-1,87
1424 1024 1424 1024 1344 1024 c 0,88,89
1282 1024 1282 1024 1233 1059.5 c 128,-1,90
1184 1095 1184 1095 1163 1152 c 1,91,-1
1056 1152 l 2,92,93
1039 1152 1039 1152 1023 1144 c 128,-1,94
1007 1136 1007 1136 991.5 1118 c 128,-1,95
976 1100 976 1100 964.5 1084 c 128,-1,96
953 1068 953 1068 937.5 1037 c 128,-1,97
922 1006 922 1006 913.5 988 c 128,-1,98
905 970 905 970 889 933 c 0,99,100
843 826 843 826 806 768 c 1,101,-1
1920 768 l 1,102,-1
1920 896 l 2,103,104
1920 914 1920 914 1936 924 c 128,-1,105
1952 934 1952 934 1968 923 c 2,106,-1
2288 731 l 2,0,1
EndSplineSet
Validated: 1
EndChar
EndChars
EndSplineFont

3
openlp/core/ui/icons.py
View File

@ -66,6 +66,7 @@ class UiIcons(object):
'arrow_right': {'icon': 'fa.arrow-right'},
'arrow_up': {'icon': 'fa.arrow-up'},
'audio': {'icon': 'fa.file-sound-o'},
'authentication': {'icon': 'fa.exclamation-triangle', 'attr': 'red'},
'address': {'icon': 'fa.book'},
'back': {'icon': 'fa.step-backward'},
'bible': {'icon': 'fa.book'},
@ -86,6 +87,7 @@ class UiIcons(object):
'download': {'icon': 'fa.cloud-download'},
'edit': {'icon': 'fa.edit'},
'email': {'icon': 'fa.envelope'},
'error': {'icon': 'fa.exclamation', 'attr': 'red'},
'exception': {'icon': 'fa.times-circle'},
'exit': {'icon': 'fa.sign-out'},
'group': {'icon': 'fa.object-group'},
@ -115,6 +117,7 @@ class UiIcons(object):
'projector_cooldown': {'icon': 'fa.video-camera', 'attr': 'blue'},
'projector_disconnect': {'icon': 'fa.plug', 'attr': 'lightGray'},
'projector_error': {'icon': 'fa.video-camera', 'attr': 'red'},
'projector_hdmi': {'icon': 'op.hdmi'},
'projector_off': {'icon': 'fa.video-camera', 'attr': 'black'},
'projector_on': {'icon': 'fa.video-camera', 'attr': 'green'},
'projector_warmup': {'icon': 'fa.video-camera', 'attr': 'yellow'},

7
resources/images/openlp-2.qrc
View File

@ -55,13 +55,6 @@
<file>theme_new.png</file>
</qresource>
<qresource prefix="projector">
<file>projector_connect.png</file>
<file>projector_hdmi.png</file>
<file>projector_disconnect.png</file>
<file>projector_not_connected_error.png</file>
<file>projector_power_off.png</file>
<file>projector_power_on.png</file>
<file>projector_show.png</file>
</qresource>
<qresource prefix="remotes">
<file>app_qr.svg</file>

BIN
resources/images/projector_connect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 928 B

BIN
resources/images/projector_disconnect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 855 B

BIN
resources/images/projector_hdmi.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 351 B

BIN
resources/images/projector_not_connected_error.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
resources/images/projector_power_off.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 851 B

BIN
resources/images/projector_power_on.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 889 B

BIN
resources/images/projector_show.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 744 B