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

Merge branch 'library-toolbar' into 'master' 

UI changes

See merge request openlp/openlp!193
This commit is contained in:
Tim Bentley 2020-05-26 20:29:06 +00:00
parent 72657759cf 2e58939382
commit 53b58f777f
13 changed files with 818 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openlp/core/lib/mediamanageritem.py
View File

@ -154,16 +154,22 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
self.add_toolbar()
# Allow the plugin to define buttons at start of bar
self.add_start_header_bar()
# Add the middle of the tool bar (pre defined)
# Used by this common class, unless overrided
self.add_common_header_bar()
# Allow the plugin to define buttons before the spacer
self.add_middle_header_bar()
# Allow the plugin to define buttons at end of bar
# Add spacer
self.toolbar.add_spacer()
# Allow the plugin to define buttons after the spacer
self.add_end_header_bar()
# Used by this common class to add send to preview etc, unless overrided
self.add_common_end_header_bar()
# Add the list view
self.add_list_view_to_toolbar()
def add_middle_header_bar(self):
def add_common_header_bar(self):
"""
Create buttons for the media item toolbar
Create common buttons for the media item toolbar, left side
"""
toolbar_actions = []
# Import Button
@ -181,6 +187,13 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
# Delete Button
if self.has_delete_icon:
toolbar_actions.append(['Delete', StringContent.Delete, UiIcons().delete, self.on_delete_click])
self.add_actionlist_to_toolbar(toolbar_actions)
def add_common_end_header_bar(self):
"""
Create common buttons for the media item toolbar, right side
"""
toolbar_actions = []
# Preview
if self.can_preview:
toolbar_actions.append(['Preview', StringContent.Preview, UiIcons().preview, self.on_preview_click])
@ -190,11 +203,13 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
# Add to service Button
if self.can_add_to_service:
toolbar_actions.append(['Service', StringContent.Service, UiIcons().add, self.on_add_click])
self.add_actionlist_to_toolbar(toolbar_actions)
def add_actionlist_to_toolbar(self, toolbar_actions):
for action in toolbar_actions:
if action[1] == StringContent.Preview:
self.toolbar.addSeparator()
self.toolbar.add_toolbar_action('{name}{action}Action'.format(name=self.plugin.name, action=action[0]),
text=self.plugin.get_string(action[1])['title'], icon=action[2],
text=self.plugin.get_string(action[1])['title'],
icon=action[2],
tooltip=self.plugin.get_string(action[1])['tooltip'],
triggers=action[3])
@ -305,13 +320,19 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
def add_start_header_bar(self):
"""
Slot at start of toolbar for plugin to add widgets
Slot to add buttons before common buttons on toolbar, left side.
"""
pass
def add_middle_header_bar(self):
"""
Slot to add buttons after common buttons on toolbar, left side.
"""
pass
def add_end_header_bar(self):
"""
Slot at end of toolbar for plugin to add widgets
Slot to add buttons before common buttons on toolbar, right side.
"""
pass

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

Binary file not shown.

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

@ -2,10 +2,24 @@
"users": "0041",
"file-text": "0042",
"search-text": "0043",
"search-lyrcs": "0044",
"search-lyrics": "0044",
"search-CCLI": "0045",
"hdmi": "0046",
"video": "0047",
"plus_sign": "0048",
"minus_sign": "0049"
"plus-sign": "0048",
"minus-sign": "0049",
"new": "004A",
"edit": "004B",
"live": "004C",
"move-start": "004D",
"move-up": "004E",
"move-down": "004F",
"move-end": "0050",
"live-presentation": "0051",
"live-theme": "0052",
"live-black": "0053",
"live-desktop": "0054",
"play-slides": "0055",
"loop": "0056",
"stop": "0057"
}

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

@ -1,4 +1,4 @@
SplineFontDB: 3.0
SplineFontDB: 3.2
FontName: OpenLP
FullName: OpenLP
FamilyName: OpenLP
@ -22,7 +22,7 @@ OS2Version: 3
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1328122800
ModificationTime: 1529821956
ModificationTime: 1589737351
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@ -83,10 +83,10 @@ NameList: AGL For New Fonts
DisplaySize: -48
AntiAlias: 1
FitToEm: 0
WinInfo: 61560 27 9
WinInfo: 54 27 9
BeginPrivate: 0
EndPrivate
BeginChars: 65539 716
BeginChars: 65539 730
StartChar: .notdef
Encoding: 65536 -1 0
@ -49279,5 +49279,696 @@ SplineSet
EndSplineSet
Validated: 1
EndChar
StartChar: L
Encoding: 76 76 716
Width: 1792
Flags: WO
LayerCount: 2
Fore
SplineSet
208.29296875 1476.31445312 m 2,0,-1
1583.70800781 1476.31445312 l 2,1,2
1651.76419478 1476.31445312 1651.76419478 1476.31445312 1691.25367196 1421.19749758 c 0,3,4
1715.55685607 1386.16289519 1715.55685607 1386.16289519 1715.90234375 1344.12011719 c 2,5,-1
1715.90234375 512.881835938 l 2,6,7
1715.90234375 444.819059101 1715.90234375 444.819059101 1660.77962556 405.324337213 c 0,8,9
1626.37767666 380.67578125 1626.37767666 380.67578125 1583.70800781 380.67578125 c 2,10,-1
1530.22460938 380.67578125 l 1,11,12
1524.32368097 479.69979896 1524.32368097 479.69979896 1459.95410156 553.484375 c 1,13,-1
1546.0078125 553.484375 l 1,14,-1
1546.0078125 1303.50585938 l 1,15,-1
245.993164062 1303.50585938 l 1,16,-1
245.993164062 553.484375 l 1,17,-1
334.973632812 553.484375 l 1,18,19
270.197847523 478.699420616 270.197847523 478.699420616 264.703125 380.67578125 c 1,20,-1
208.29296875 380.67578125 l 2,21,22
140.233813827 380.67578125 140.233813827 380.67578125 100.743176089 435.806205507 c 0,23,24
76.4440702327 470.842333085 76.4440702327 470.842333085 76.0986328125 512.881835938 c 2,25,-1
76.0986328125 1344.12011719 l 2,26,27
76.0986328125 1412.17630415 76.0986328125 1412.17630415 131.215588354 1451.66578133 c 0,28,29
165.618671003 1476.31445312 165.618671003 1476.31445312 208.29296875 1476.31445312 c 2,0,-1
774.83984375 553.484375 m 1,30,-1
1020.08691406 553.484375 l 1,31,32
955.298240713 478.684920819 955.298240713 478.684920819 949.805664062 380.67578125 c 1,33,-1
845.122070312 380.67578125 l 1,34,35
839.223367767 479.685921439 839.223367767 479.685921439 774.83984375 553.484375 c 1,30,-1
1251.95605469 164.903320312 m 128,-1,37
1169.76269531 164.903320312 1169.76269531 164.903320312 1111.60742188 223.05859375 c 128,-1,38
1053.45214844 281.213867188 1053.45214844 281.213867188 1053.45214844 363.407226562 c 128,-1,39
1053.45214844 445.600585938 1053.45214844 445.600585938 1111.60742188 503.755859375 c 128,-1,40
1169.76269531 561.911132812 1169.76269531 561.911132812 1251.95605469 561.911132812 c 128,-1,41
1334.14941406 561.911132812 1334.14941406 561.911132812 1392.3046875 503.755859375 c 128,-1,42
1450.45996094 445.600585938 1450.45996094 445.600585938 1450.45996094 363.407226562 c 128,-1,43
1450.45996094 281.213867188 1450.45996094 281.213867188 1392.3046875 223.05859375 c 128,-1,36
1334.14941406 164.903320312 1334.14941406 164.903320312 1251.95605469 164.903320312 c 128,-1,37
1060.25878906 197.701171875 m 0,44,45
1060.93418716 197.728257435 1060.93418716 197.728257435 1062.32407234 197.800044541 c 0,46,47
1065.71073843 197.974964713 1065.71073843 197.974964713 1067.41894531 197.931640625 c 0,48,49
1067.88875733 197.91815578 1067.88875733 197.91815578 1068.74811673 197.951753671 c 128,-1,50
1069.60747613 197.985351562 1069.60747613 197.985351562 1069.95898438 197.985351562 c 0,51,52
1080.33165791 197.135600489 1080.33165791 197.135600489 1090.12792969 189.204101562 c 0,53,54
1131.45667072 157.649339592 1131.45667072 157.649339592 1169.99609375 141.893554688 c 0,55,56
1208.89399935 126.607978703 1208.89399935 126.607978703 1253.484375 126.168945312 c 0,57,58
1299.08119515 126.794771483 1299.08119515 126.794771483 1336.98632812 141.893554688 c 0,59,60
1376.52530095 158.241776184 1376.52530095 158.241776184 1416.85351562 189.204101562 c 0,61,62
1427.2568917 198.046529031 1427.2568917 198.046529031 1437.0234375 197.985351562 c 0,63,64
1440.23747799 197.966835259 1440.23747799 197.966835259 1446.70179873 197.702026296 c 0,65,66
1475.62657874 196.205739408 1475.62657874 196.205739408 1497.734375 187.650390625 c 0,67,68
1524.06396969 176.768290261 1524.06396969 176.768290261 1541.92382812 159.997070312 c 0,69,70
1560.2614707 141.916554559 1560.2614707 141.916554559 1573.98144531 118.1171875 c 0,71,72
1587.97671543 93.0549807601 1587.97671543 93.0549807601 1596.20507812 67.7138671875 c 0,73,74
1604.52791328 41.2337616997 1604.52791328 41.2337616997 1609.90332031 11.6357421875 c 0,75,76
1615.30719103 -19.0380129969 1615.30719103 -19.0380129969 1617.14453125 -44.7119140625 c 0,77,78
1618.92183946 -71.3728518365 1618.92183946 -71.3728518365 1618.95507812 -98.22265625 c 0,79,80
1618.95507812 -160.771484375 1618.95507812 -160.771484375 1581.20898438 -196.435546875 c 128,-1,81
1543.47314453 -232.104492188 1543.47314453 -232.104492188 1480.92871094 -232.100585938 c 2,82,-1
1477.86230469 -232.100585938 l 1,83,-1
1029.11914062 -232.100585938 l 1,84,-1
1026.05273438 -232.100585938 l 2,85,86
963.50390625 -232.100585938 963.50390625 -232.100585938 925.772460938 -196.435546875 c 128,-1,87
888.036621094 -160.768066406 888.036621094 -160.768066406 888.02734375 -98.22265625 c 0,88,89
888.094381851 -70.3531645352 888.094381851 -70.3531645352 889.837890625 -44.7119140625 c 0,90,91
891.804105854 -18.0293412726 891.804105854 -18.0293412726 897.078125 11.6357421875 c 0,92,93
902.701740353 42.2480087833 902.701740353 42.2480087833 910.77734375 67.7138671875 c 0,94,95
919.443086309 94.0472545332 919.443086309 94.0472545332 933 118.1171875 c 0,96,97
947.484553231 142.915633821 947.484553231 142.915633821 965.057617188 159.997070312 c 0,98,99
983.911117122 177.386420531 983.911117122 177.386420531 1009.26074219 187.650390625 c 0,100,101
1032.64276817 196.524736046 1032.64276817 196.524736046 1060.25878906 197.701171875 c 0,44,45
363.2109375 197.701171875 m 0,102,103
363.8869657 197.728270128 363.8869657 197.728270128 365.277710771 197.8000993 c 0,104,105
368.996795584 197.928930174 368.996795584 197.928930174 370.37109375 197.931640625 c 128,-1,106
371.850775812 197.943265364 371.850775812 197.943265364 372.911132812 197.985351562 c 0,107,108
383.28493195 197.135600489 383.28493195 197.135600489 393.080078125 189.204101562 c 0,109,110
434.408819162 157.649339592 434.408819162 157.649339592 472.948242188 141.893554688 c 0,111,112
511.846147791 126.607978703 511.846147791 126.607978703 556.436523438 126.168945312 c 0,113,114
602.034739501 126.794779701 602.034739501 126.794779701 639.938476562 141.893554688 c 0,115,116
679.480392323 158.242979606 679.480392323 158.242979606 719.805664062 189.204101562 c 0,117,118
730.209040137 198.046529031 730.209040137 198.046529031 739.975585938 197.985351562 c 0,119,120
743.190754522 197.96682876 743.190754522 197.96682876 749.65845482 197.701881646 c 0,121,122
778.578793908 196.205709979 778.578793908 196.205709979 800.686523438 187.650390625 c 0,123,124
827.015183619 176.769226593 827.015183619 176.769226593 844.875976562 159.997070312 c 0,125,126
863.211062024 141.920434923 863.211062024 141.920434923 876.934570312 118.1171875 c 0,127,128
890.93263882 93.047436687 890.93263882 93.047436687 899.157226562 67.7138671875 c 0,129,130
907.480061715 41.2337616997 907.480061715 41.2337616997 912.85546875 11.6357421875 c 0,131,132
918.25846746 -19.0251341757 918.25846746 -19.0251341757 920.096679688 -44.7119140625 c 0,133,134
921.873987898 -71.3728518365 921.873987898 -71.3728518365 921.907226562 -98.22265625 c 0,135,136
921.907226562 -160.771484375 921.907226562 -160.771484375 884.162109375 -196.435546875 c 128,-1,137
846.424804688 -232.104492188 846.424804688 -232.104492188 783.880859375 -232.100585938 c 2,138,-1
780.814453125 -232.100585938 l 1,139,-1
332.072265625 -232.100585938 l 1,140,-1
329.004882812 -232.100585938 l 2,141,142
266.456054688 -232.100585938 266.456054688 -232.100585938 228.724609375 -196.435546875 c 128,-1,143
190.988769531 -160.768066406 190.988769531 -160.768066406 190.979492188 -98.22265625 c 0,144,145
191.046477566 -70.3735377569 191.046477566 -70.3735377569 192.790039062 -44.7119140625 c 0,146,147
194.756601816 -18.0250632932 194.756601816 -18.0250632932 200.03125 11.6357421875 c 0,148,149
205.650964033 42.234563936 205.650964033 42.234563936 213.729492188 67.7138671875 c 0,150,151
222.395234746 94.0472545332 222.395234746 94.0472545332 235.952148438 118.1171875 c 0,152,153
250.437331365 142.916621514 250.437331365 142.916621514 268.010742188 159.997070312 c 0,154,155
286.862494171 177.386102912 286.862494171 177.386102912 312.212890625 187.650390625 c 0,156,157
335.594916611 196.524736046 335.594916611 196.524736046 363.2109375 197.701171875 c 0,102,103
554.908203125 164.903320312 m 128,-1,159
472.715820312 164.903320312 472.715820312 164.903320312 414.559570312 223.05859375 c 128,-1,160
356.404296875 281.213867188 356.404296875 281.213867188 356.404296875 363.407226562 c 128,-1,161
356.404296875 445.600585938 356.404296875 445.600585938 414.559570312 503.755859375 c 128,-1,162
472.715820312 561.911132812 472.715820312 561.911132812 554.908203125 561.911132812 c 128,-1,163
637.1015625 561.911132812 637.1015625 561.911132812 695.256835938 503.755859375 c 128,-1,164
753.412109375 445.600585938 753.412109375 445.600585938 753.412109375 363.407226562 c 128,-1,165
753.412109375 281.213867188 753.412109375 281.213867188 695.256835938 223.05859375 c 128,-1,158
637.1015625 164.903320312 637.1015625 164.903320312 554.908203125 164.903320312 c 128,-1,159
EndSplineSet
EndChar
StartChar: M
Encoding: 77 77 717
Width: 1792
LayerCount: 2
Fore
SplineSet
1062.95898438 399.876953125 m 2,0,1
1062.95898438 362.188371001 1062.95898438 362.188371001 1029.3981822 344.48744453 c 0,2,3
1015.21276809 337.565372132 1015.21276809 337.565372132 1000.39257812 337.311523438 c 2,4,-1
791.838867188 337.311523438 l 2,5,6
754.150454364 337.311523438 754.150454364 337.311523438 736.449573035 370.87115796 c 0,7,8
729.527292222 385.056553694 729.527292222 385.056553694 729.2734375 399.876953125 c 2,9,-1
729.2734375 584.682617188 l 1,10,-1
379.946289062 584.682617188 l 2,11,12
339.493775297 584.682617188 339.493775297 584.682617188 322.82985834 621.3741303 c 0,13,14
306.102087453 660.976948287 306.102087453 660.976948287 335.627929688 691.56640625 c 2,15,-1
851.797851562 1207.73632812 l 2,16,17
880.182676701 1236.12002212 880.182676701 1236.12002212 917.802577903 1222.25209869 c 0,18,19
930.944600699 1216.86508443 930.944600699 1216.86508443 940.43359375 1207.73632812 c 2,20,-1
1456.60351562 691.56640625 l 2,21,22
1486.90583581 660.859974408 1486.90583581 660.859974408 1469.27539343 621.514259711 c 0,23,24
1451.72015443 585.496504662 1451.72015443 585.496504662 1412.28613281 584.682617188 c 2,25,-1
1062.95898438 584.682617188 l 1,26,-1
1062.95898438 399.876953125 l 2,0,1
1471.71777344 1237.66503906 m 2,27,28
1471.71777344 1234.77284731 1471.71777344 1234.77284731 1470.67402773 1234.55825488 c 0,29,30
1469.13662424 1234.47869157 1469.13662424 1234.47869157 1468.51269531 1234.4609375 c 2,31,-1
323.487304688 1234.4609375 l 2,32,33
320.497896704 1236.62204398 320.497896704 1236.62204398 320.283203125 1237.66503906 c 2,34,-1
320.283203125 1359.484375 l 2,35,36
322.444309607 1362.47378298 322.444309607 1362.47378298 323.487304688 1362.68847656 c 2,37,-1
1468.51269531 1362.68847656 l 2,38,39
1471.5031156 1360.52780269 1471.5031156 1360.52780269 1471.71777344 1359.484375 c 2,40,-1
1471.71777344 1237.66503906 l 2,27,28
1075.34375 40.845703125 m 0,41,42
1075.34375 -44.118179572 1075.34375 -44.118179572 1009.52919346 -97.9977033861 c 0,43,44
959.404140068 -138.105218458 959.404140068 -138.105218458 896 -138.499023438 c 0,45,46
859.512593747 -138.499023438 859.512593747 -138.499023438 826.30063208 -124.295965505 c 128,-1,47
793.088670412 -110.092907573 793.088670412 -110.092907573 769.075497071 -86.0796601053 c 128,-1,48
745.062323729 -62.066412638 745.062323729 -62.066412638 730.859286865 -28.8542235617 c 128,-1,49
716.65625 4.35796551457 716.65625 4.35796551457 716.65625 40.845703125 c 0,50,51
716.65625 125.8084625 716.65625 125.8084625 782.470301433 179.687799903 c 0,52,53
832.595553651 219.79564586 832.595553651 219.79564586 896 220.189453125 c 0,54,55
980.962759375 220.189453125 980.962759375 220.189453125 1034.84209678 154.375401692 c 0,56,57
1074.94994273 104.250149474 1074.94994273 104.250149474 1075.34375 40.845703125 c 0,41,42
EndSplineSet
Validated: 33
EndChar
StartChar: N
Encoding: 78 78 718
Width: 1792
LayerCount: 2
Fore
SplineSet
1062.95898438 398.1640625 m 2,0,1
1062.95898438 360.475480376 1062.95898438 360.475480376 1029.3981822 342.774553905 c 0,2,3
1015.21276809 335.852481507 1015.21276809 335.852481507 1000.39257812 335.598632812 c 2,4,-1
791.838867188 335.598632812 l 2,5,6
754.150454364 335.598632812 754.150454364 335.598632812 736.449573035 369.158267335 c 0,7,8
729.527292222 383.343663069 729.527292222 383.343663069 729.2734375 398.1640625 c 2,9,-1
729.2734375 652.969726562 l 1,10,-1
379.946289062 652.969726562 l 2,11,12
339.493713996 652.969726562 339.493713996 652.969726562 322.82985834 689.660884443 c 0,13,14
306.102130265 729.26338293 306.102130265 729.26338293 335.627929688 759.853515625 c 2,15,-1
851.797851562 1276.0234375 l 2,16,17
880.182676701 1304.4071315 880.182676701 1304.4071315 917.802577903 1290.53920807 c 0,18,19
930.944600699 1285.1521938 930.944600699 1285.1521938 940.43359375 1276.0234375 c 2,20,-1
1456.60351562 759.853515625 l 2,21,22
1486.90578476 729.146378747 1486.90578476 729.146378747 1469.27539343 689.801013015 c 0,23,24
1451.7202128 653.783603505 1451.7202128 653.783603505 1412.28613281 652.969726562 c 2,25,-1
1062.95898438 652.969726562 l 1,26,-1
1062.95898438 398.1640625 l 2,0,1
1075.34375 40.845703125 m 0,27,28
1075.34375 -44.118179572 1075.34375 -44.118179572 1009.52919346 -97.9977033861 c 0,29,30
959.404140068 -138.105218458 959.404140068 -138.105218458 896 -138.499023438 c 0,31,32
859.512593747 -138.499023438 859.512593747 -138.499023438 826.30063208 -124.295965505 c 128,-1,33
793.088670412 -110.092907573 793.088670412 -110.092907573 769.075497071 -86.0796601053 c 128,-1,34
745.062323729 -62.066412638 745.062323729 -62.066412638 730.859286865 -28.8542235617 c 128,-1,35
716.65625 4.35796551457 716.65625 4.35796551457 716.65625 40.845703125 c 0,36,37
716.65625 125.8084625 716.65625 125.8084625 782.470301433 179.687799903 c 0,38,39
832.595553651 219.79564586 832.595553651 219.79564586 896 220.189453125 c 0,40,41
980.962759375 220.189453125 980.962759375 220.189453125 1034.84209678 154.375401692 c 0,42,43
1074.94994273 104.250149474 1074.94994273 104.250149474 1075.34375 40.845703125 c 0,27,28
EndSplineSet
Validated: 33
EndChar
StartChar: O
Encoding: 79 79 719
Width: 1792
LayerCount: 2
Fore
SplineSet
729.041015625 881.8359375 m 2,0,1
729.041015625 919.524795933 729.041015625 919.524795933 762.601817804 937.22620718 c 0,2,3
776.787265393 944.148486881 776.787265393 944.148486881 791.607421875 944.40234375 c 2,4,-1
1000.16113281 944.40234375 l 2,5,6
1037.84971494 944.40234375 1037.84971494 944.40234375 1055.55064141 910.841541571 c 0,7,8
1062.47271381 896.656127469 1062.47271381 896.656127469 1062.7265625 881.8359375 c 2,9,-1
1062.7265625 627.030273438 l 1,10,-1
1412.05371094 627.030273438 l 2,11,12
1452.506286 627.030273438 1452.506286 627.030273438 1469.17014166 590.339115557 c 0,13,14
1485.89786973 550.73661707 1485.89786973 550.73661707 1456.37207031 520.146484375 c 2,15,-1
940.202148438 3.9765625 l 2,16,17
911.817323299 -24.4071314984 911.817323299 -24.4071314984 874.197422097 -10.5392080668 c 0,18,19
861.055399301 -5.15219380089 861.055399301 -5.15219380089 851.56640625 3.9765625 c 2,20,-1
335.396484375 520.146484375 l 2,21,22
305.094215236 550.853621253 305.094215236 550.853621253 322.724606575 590.198986985 c 0,23,24
340.279787205 626.216396495 340.279787205 626.216396495 379.713867188 627.030273438 c 2,25,-1
729.041015625 627.030273438 l 1,26,-1
729.041015625 881.8359375 l 2,0,1
716.65625 1239.15429688 m 0,27,28
716.65625 1324.11817957 716.65625 1324.11817957 782.470806538 1377.99770339 c 0,29,30
832.595859932 1418.10521846 832.595859932 1418.10521846 896 1418.49902344 c 0,31,32
980.963249536 1418.49902344 980.963249536 1418.49902344 1034.84251029 1352.68429069 c 0,33,34
1074.94994843 1302.55895769 1074.94994843 1302.55895769 1075.34375 1239.15429688 c 0,35,36
1075.34375 1154.1915375 1075.34375 1154.1915375 1009.52969857 1100.3122001 c 0,37,38
959.404446349 1060.20435414 959.404446349 1060.20435414 896 1059.81054688 c 0,39,40
811.037240625 1059.81054688 811.037240625 1059.81054688 757.157903222 1125.62459831 c 0,41,42
717.050057265 1175.74985053 717.050057265 1175.74985053 716.65625 1239.15429688 c 0,27,28
EndSplineSet
Validated: 33
EndChar
StartChar: P
Encoding: 80 80 720
Width: 1792
LayerCount: 2
Fore
SplineSet
729.041015625 880.123046875 m 2,0,1
729.041015625 917.811628999 729.041015625 917.811628999 762.601817804 935.51255547 c 0,2,3
776.787231906 942.434627868 776.787231906 942.434627868 791.607421875 942.688476562 c 2,4,-1
1000.16113281 942.688476562 l 2,5,6
1037.84954564 942.688476562 1037.84954564 942.688476562 1055.55042697 909.12884204 c 0,7,8
1062.47270778 894.943446306 1062.47270778 894.943446306 1062.7265625 880.123046875 c 2,9,-1
1062.7265625 695.317382812 l 1,10,-1
1412.05371094 695.317382812 l 2,11,12
1452.5062247 695.317382812 1452.5062247 695.317382812 1469.17014166 658.6258697 c 0,13,14
1485.89791255 619.023051713 1485.89791255 619.023051713 1456.37207031 588.43359375 c 2,15,-1
940.202148438 72.263671875 l 2,16,17
911.817323299 43.8799778766 911.817323299 43.8799778766 874.197422097 57.7479013082 c 0,18,19
861.055399301 63.1349155741 861.055399301 63.1349155741 851.56640625 72.263671875 c 2,20,-1
335.396484375 588.43359375 l 2,21,22
305.09416419 619.140025592 305.09416419 619.140025592 322.724606575 658.485740289 c 0,23,24
340.279845568 694.503495338 340.279845568 694.503495338 379.713867188 695.317382812 c 2,25,-1
729.041015625 695.317382812 l 1,26,-1
729.041015625 880.123046875 l 2,0,1
320.283203125 42.3349609375 m 2,27,28
320.283203125 45.2269625305 320.283203125 45.2269625305 321.326198205 45.441656109 c 0,29,30
322.863536246 45.5212905956 322.863536246 45.5212905956 323.487304688 45.5390625 c 2,31,-1
1468.51269531 45.5390625 l 2,32,33
1471.5021033 43.3779560176 1471.5021033 43.3779560176 1471.71679688 42.3349609375 c 2,34,-1
1471.71679688 -79.484375 l 2,35,36
1469.55569039 -82.473782984 1469.55569039 -82.473782984 1468.51269531 -82.6884765625 c 2,37,-1
323.487304688 -82.6884765625 l 2,38,39
320.497896704 -80.5273700801 320.497896704 -80.5273700801 320.283203125 -79.484375 c 2,40,-1
320.283203125 42.3349609375 l 2,27,28
716.65625 1239.15429688 m 0,41,42
716.65625 1324.11817957 716.65625 1324.11817957 782.470806538 1377.99770339 c 0,43,44
832.595859932 1418.10521846 832.595859932 1418.10521846 896 1418.49902344 c 0,45,46
980.963249536 1418.49902344 980.963249536 1418.49902344 1034.84251029 1352.68429069 c 0,47,48
1074.94994843 1302.55895769 1074.94994843 1302.55895769 1075.34375 1239.15429688 c 0,49,50
1075.34375 1154.1915375 1075.34375 1154.1915375 1009.52969857 1100.3122001 c 0,51,52
959.404446349 1060.20435414 959.404446349 1060.20435414 896 1059.81054688 c 0,53,54
811.037240625 1059.81054688 811.037240625 1059.81054688 757.157903222 1125.62459831 c 0,55,56
717.050057265 1175.74985053 717.050057265 1175.74985053 716.65625 1239.15429688 c 0,41,42
EndSplineSet
Validated: 33
EndChar
StartChar: Q
Encoding: 81 81 721
Width: 1792
LayerCount: 2
Fore
SplineSet
145.063476562 1283.8046875 m 2,0,-1
1646.9375 1283.8046875 l 2,1,2
1720.07022033 1283.8046875 1720.07022033 1283.8046875 1763.26602819 1225.13211146 c 0,3,4
1790.92350933 1186.44688699 1790.92350933 1186.44688699 1791.27832031 1139.45214844 c 2,5,-1
1791.27832031 140.545898438 l 2,6,7
1791.27832031 67.4096798504 1791.27832031 67.4096798504 1732.61330773 24.209806798 c 0,8,9
1694.56724128 -3.806640625 1694.56724128 -3.806640625 1646.9375 -3.806640625 c 2,10,-1
145.063476562 -3.806640625 l 2,11,12
72.8905791797 -3.806640625 72.8905791797 -3.806640625 29.6453281153 53.6330755435 c 0,13,14
1.07321871537 92.7049645732 1.07321871537 92.7049645732 0.7109375 140.545898438 c 2,15,-1
0.7109375 1139.45214844 l 2,16,17
0.7109375 1211.62504582 0.7109375 1211.62504582 58.1506536685 1254.87029688 c 0,18,19
97.2225426982 1283.44240628 97.2225426982 1283.44240628 145.063476562 1283.8046875 c 2,0,-1
199.258789062 1082.07519531 m 1,20,-1
199.258789062 197.923828125 l 1,21,-1
1592.73046875 197.923828125 l 1,22,-1
1592.73046875 1082.07519531 l 1,23,-1
199.258789062 1082.07519531 l 1,20,-1
386.6171875 941.978515625 m 2,24,25
386.6171875 981.153960114 386.6171875 981.153960114 393.950061957 987.138504798 c 0,26,27
402.216352773 992.54061357 402.216352773 992.54061357 437.18359375 992.544921875 c 2,28,-1
1354.81640625 992.544921875 l 2,29,30
1393.99185074 992.544921875 1393.99185074 992.544921875 1399.97639542 985.212047418 c 0,31,32
1405.37850419 976.945756602 1405.37850419 976.945756602 1405.3828125 941.978515625 c 2,33,-1
1405.3828125 893.896484375 l 2,34,35
1405.3828125 854.721796461 1405.3828125 854.721796461 1398.04993804 848.737367353 c 0,36,37
1389.78364723 843.335362909 1389.78364723 843.335362909 1354.81640625 843.331054688 c 2,38,-1
437.18359375 843.331054688 l 2,39,40
398.008149261 843.331054688 398.008149261 843.331054688 392.023604577 850.663787528 c 0,41,42
386.62149597 858.929949956 386.62149597 858.929949956 386.6171875 893.896484375 c 2,43,-1
386.6171875 941.978515625 l 2,24,25
386.6171875 385.751953125 m 2,44,45
386.6171875 424.927397614 386.6171875 424.927397614 393.950061957 430.911942298 c 0,46,47
402.216352773 436.31405107 402.216352773 436.31405107 437.18359375 436.318359375 c 2,48,-1
1354.81640625 436.318359375 l 2,49,50
1393.99185074 436.318359375 1393.99185074 436.318359375 1399.97639542 428.985484918 c 0,51,52
1405.37850419 420.719194102 1405.37850419 420.719194102 1405.3828125 385.751953125 c 2,53,-1
1405.3828125 337.670898438 l 2,54,55
1405.3828125 298.495453949 1405.3828125 298.495453949 1398.04993804 292.510909264 c 0,56,57
1389.78364723 287.108800493 1389.78364723 287.108800493 1354.81640625 287.104492188 c 2,58,-1
437.18359375 287.104492188 l 2,59,60
398.008149261 287.104492188 398.008149261 287.104492188 392.023604577 294.437366644 c 0,61,62
386.621495805 302.703657461 386.621495805 302.703657461 386.6171875 337.670898438 c 2,63,-1
386.6171875 385.751953125 l 2,44,45
525.16796875 664.041015625 m 2,64,65
525.16796875 703.216460114 525.16796875 703.216460114 532.500843207 709.201004798 c 0,66,67
540.767134023 714.60311357 540.767134023 714.60311357 575.734375 714.607421875 c 2,68,-1
1216.265625 714.607421875 l 2,69,70
1255.44106949 714.607421875 1255.44106949 714.607421875 1261.42561417 707.274547418 c 0,71,72
1266.82772294 699.008256602 1266.82772294 699.008256602 1266.83203125 664.041015625 c 2,73,-1
1266.83203125 615.958984375 l 2,74,75
1266.83203125 576.783539886 1266.83203125 576.783539886 1259.49915679 570.798995202 c 0,76,77
1251.23286598 565.39688643 1251.23286598 565.39688643 1216.265625 565.392578125 c 2,78,-1
575.734375 565.392578125 l 2,79,80
536.558930511 565.392578125 536.558930511 565.392578125 530.574385827 572.725452582 c 0,81,82
525.172277055 580.991743398 525.172277055 580.991743398 525.16796875 615.958984375 c 2,83,-1
525.16796875 664.041015625 l 2,64,65
EndSplineSet
Validated: 1
EndChar
StartChar: R
Encoding: 82 82 722
Width: 1792
LayerCount: 2
Fore
SplineSet
145.063476562 1283.8046875 m 2,0,-1
1646.9375 1283.8046875 l 2,1,2
1720.07022033 1283.8046875 1720.07022033 1283.8046875 1763.26602819 1225.13211146 c 0,3,4
1790.92350933 1186.44688699 1790.92350933 1186.44688699 1791.27832031 1139.45214844 c 2,5,-1
1791.27832031 140.545898438 l 2,6,7
1791.27832031 67.4096798504 1791.27832031 67.4096798504 1732.61330773 24.209806798 c 0,8,9
1694.56724128 -3.806640625 1694.56724128 -3.806640625 1646.9375 -3.806640625 c 2,10,-1
145.063476562 -3.806640625 l 2,11,12
72.8905791797 -3.806640625 72.8905791797 -3.806640625 29.6453281153 53.6330755435 c 0,13,14
1.07321871537 92.7049645732 1.07321871537 92.7049645732 0.7109375 140.545898438 c 2,15,-1
0.7109375 1139.45214844 l 2,16,17
0.7109375 1211.62504582 0.7109375 1211.62504582 58.1506536685 1254.87029688 c 0,18,19
97.2225426982 1283.44240628 97.2225426982 1283.44240628 145.063476562 1283.8046875 c 2,0,-1
199.258789062 1082.07519531 m 1,20,-1
199.258789062 197.923828125 l 1,21,-1
1592.73046875 197.923828125 l 1,22,-1
1592.73046875 1082.07519531 l 1,23,-1
199.258789062 1082.07519531 l 1,20,-1
483.888671875 577.575195312 m 2,24,-1
602.711914062 464.076171875 l 1,25,-1
972.9765625 844.075195312 l 2,26,27
996.639512073 865.689213324 996.639512073 865.689213324 1019.25097656 845.0859375 c 2,28,-1
1503.20507812 376.495117188 l 1,29,-1
1503.20507812 287.44921875 l 1,30,-1
288.7890625 287.44921875 l 1,31,-1
288.7890625 420.0703125 l 1,32,-1
438.134765625 577.143554688 l 2,33,34
458.22425566 597.233044723 458.22425566 597.233044723 480.223075177 580.675593567 c 0,35,36
482.087753275 579.272140236 482.087753275 579.272140236 483.888671875 577.575195312 c 2,24,-1
290.244140625 822.65234375 m 0,37,38
290.244140625 889.833261606 290.244140625 889.833261606 344.764630698 929.24086955 c 0,39,40
379.76010767 953.731472239 379.76010767 953.731472239 421.673828125 954.081054688 c 0,41,42
488.854270197 954.081054688 488.854270197 954.081054688 528.262005536 899.561262167 c 0,43,44
552.752949801 864.565858339 552.752949801 864.565858339 553.102539062 822.65234375 c 0,45,46
553.102539062 755.470763702 553.102539062 755.470763702 498.58226455 716.06290187 c 0,47,48
464.216101373 691.22265625 464.216101373 691.22265625 421.673828125 691.22265625 c 0,49,50
354.492146692 691.22265625 354.492146692 691.22265625 315.084386245 745.743146323 c 0,51,52
290.593723489 780.738575301 290.593723489 780.738575301 290.244140625 822.65234375 c 0,37,38
EndSplineSet
Validated: 1
EndChar
StartChar: S
Encoding: 83 83 723
Width: 1792
LayerCount: 2
Fore
SplineSet
288.7890625 992.544921875 m 1,0,-1
1503.20507812 992.544921875 l 1,1,-1
1503.20507812 287.44921875 l 1,2,-1
288.7890625 287.44921875 l 1,3,-1
288.7890625 992.544921875 l 1,0,-1
145.063476562 1283.8046875 m 2,4,-1
1646.9375 1283.8046875 l 2,5,6
1720.07022033 1283.8046875 1720.07022033 1283.8046875 1763.26602819 1225.13211146 c 0,7,8
1790.92350933 1186.44688699 1790.92350933 1186.44688699 1791.27832031 1139.45214844 c 2,9,-1
1791.27832031 140.545898438 l 2,10,11
1791.27832031 67.4096798504 1791.27832031 67.4096798504 1732.61330773 24.209806798 c 0,12,13
1694.56724128 -3.806640625 1694.56724128 -3.806640625 1646.9375 -3.806640625 c 2,14,-1
145.063476562 -3.806640625 l 2,15,16
72.8905791797 -3.806640625 72.8905791797 -3.806640625 29.6453281153 53.6330755435 c 0,17,18
1.07321871537 92.7049645732 1.07321871537 92.7049645732 0.7109375 140.545898438 c 2,19,-1
0.7109375 1139.45214844 l 2,20,21
0.7109375 1211.62504582 0.7109375 1211.62504582 58.1506536685 1254.87029688 c 0,22,23
97.2225426982 1283.44240628 97.2225426982 1283.44240628 145.063476562 1283.8046875 c 2,4,-1
199.258789062 1082.07519531 m 1,24,-1
199.258789062 197.923828125 l 1,25,-1
1592.73046875 197.923828125 l 1,26,-1
1592.73046875 1082.07519531 l 1,27,-1
199.258789062 1082.07519531 l 1,24,-1
EndSplineSet
Validated: 1
EndChar
StartChar: T
Encoding: 84 84 724
Width: 1792
LayerCount: 2
Fore
SplineSet
145.063476562 1283.8046875 m 2,0,-1
1646.9375 1283.8046875 l 2,1,2
1720.07022033 1283.8046875 1720.07022033 1283.8046875 1763.26602819 1225.13211146 c 0,3,4
1790.92350933 1186.44688699 1790.92350933 1186.44688699 1791.27832031 1139.45214844 c 2,5,-1
1791.27832031 140.545898438 l 2,6,7
1791.27832031 67.4096798504 1791.27832031 67.4096798504 1732.61330773 24.209806798 c 0,8,9
1694.56724128 -3.806640625 1694.56724128 -3.806640625 1646.9375 -3.806640625 c 2,10,-1
145.063476562 -3.806640625 l 2,11,12
72.8905791797 -3.806640625 72.8905791797 -3.806640625 29.6453281153 53.6330755435 c 0,13,14
1.07321871537 92.7049645732 1.07321871537 92.7049645732 0.7109375 140.545898438 c 2,15,-1
0.7109375 1139.45214844 l 2,16,17
0.7109375 1211.62504582 0.7109375 1211.62504582 58.1506536685 1254.87029688 c 0,18,19
97.2225426982 1283.44240628 97.2225426982 1283.44240628 145.063476562 1283.8046875 c 2,0,-1
338.517578125 1082.07519531 m 1,20,-1
895.995117188 728.356445312 l 1,21,-1
1453.47265625 1082.07519531 l 1,22,-1
338.517578125 1082.07519531 l 1,20,-1
199.258789062 993.711914062 m 1,23,-1
199.258789062 286.286132812 l 1,24,-1
756.736328125 639.993164062 l 1,25,-1
199.258789062 993.711914062 l 1,23,-1
1592.73046875 993.711914062 m 1,26,-1
1035.25390625 639.993164062 l 1,27,-1
1592.73046875 286.286132812 l 1,28,-1
1592.73046875 993.711914062 l 1,26,-1
895.995117188 551.642578125 m 1,29,-1
338.517578125 197.923828125 l 1,30,-1
1453.47265625 197.923828125 l 1,31,-1
895.995117188 551.642578125 l 1,29,-1
EndSplineSet
Validated: 1
EndChar
StartChar: J
Encoding: 74 74 725
Width: 1796
Flags: W
LayerCount: 2
Fore
SplineSet
361.5546875 1291.33496094 m 1,0,-1
362.008789062 -65.9951171875 l 1,1,-1
1453.89648438 -65.9951171875 l 1,2,-1
1453.20117188 812.29296875 l 1,3,-1
1000.47363281 812.29296875 l 2,4,5
946.577315995 814.173245634 946.577315995 814.173245634 945.729492188 867.036132812 c 2,6,-1
945.729492188 1291.33496094 l 1,7,-1
361.5546875 1291.33496094 l 1,0,-1
1055.21679688 1251.46777344 m 1,8,-1
1055.21679688 921.779296875 l 1,9,-1
1392.17382812 921.779296875 l 1,10,-1
1055.21679688 1251.46777344 l 1,8,-1
373.135742188 1419.0703125 m 2,11,-1
1040.51855469 1419.0703125 l 2,12,13
1066.72398147 1418.29229861 1066.72398147 1418.29229861 1085.18457031 1400.85449219 c 2,14,-1
1561.734375 934.583007812 l 2,15,16
1580.47197771 915.131102827 1580.47197771 915.131102827 1580.93554688 888.93359375 c 2,17,-1
1580.93554688 -54.86328125 l 2,18,19
1580.93554688 -123.451590604 1580.93554688 -123.451590604 1525.1952524 -165.746729088 c 0,20,21
1487.24266196 -193.701153527 1487.24266196 -193.701153527 1441.7265625 -194.072265625 c 2,22,-1
373.135742188 -194.072265625 l 2,23,24
304.546893381 -194.072265625 304.546893381 -194.072265625 262.251301727 -138.331479372 c 0,25,26
234.296895414 -100.378983839 234.296895414 -100.378983839 233.92578125 -54.86328125 c 2,27,-1
233.92578125 1279.86132812 l 2,28,29
233.92578125 1348.4495271 233.92578125 1348.4495271 289.666768626 1390.74485906 c 0,30,31
327.619544398 1418.69920249 327.619544398 1418.69920249 373.135742188 1419.0703125 c 2,11,-1
EndSplineSet
Validated: 1
EndChar
StartChar: K
Encoding: 75 75 726
Width: 1792
LayerCount: 2
Fore
SplineSet
695.124023438 461.959960938 m 1,0,-1
941.384765625 280.017578125 l 1,1,-1
683.201171875 201.279296875 l 1,2,-1
695.124023438 461.959960938 l 1,0,-1
1350.45605469 1411.66308594 m 0,3,4
1367.48132281 1410.76938156 1367.48132281 1410.76938156 1380.98925781 1402.25195312 c 2,5,-1
1637.28125 1212.37890625 l 2,6,7
1665.81548251 1191.23011439 1665.81548251 1191.23011439 1657.59365953 1156.67384095 c 0,8,9
1654.51858061 1145.65216975 1654.51858061 1145.65216975 1648.47753906 1137.12988281 c 2,10,-1
1075.34082031 363.493164062 l 2,11,12
1054.18969001 334.946435674 1054.18969001 334.946435674 1019.6228452 343.176744581 c 0,13,14
1008.60096032 346.253855963 1008.60096032 346.253855963 1000.07910156 352.296875 c 2,15,-1
743.798828125 542.170898438 l 2,16,17
715.260209655 563.314507524 715.260209655 563.314507524 723.476971719 597.873198978 c 0,18,19
726.55047912 608.89596015 726.55047912 608.89596015 732.590820312 617.419921875 c 2,20,-1
1305.74023438 1391.04296875 l 2,21,22
1322.71673559 1411.61207343 1322.71673559 1411.61207343 1350.45605469 1411.66308594 c 0,3,4
321.350585938 1450.99316406 m 2,23,-1
1252.1796875 1450.99316406 l 1,24,-1
1157.74902344 1324.38085938 l 1,25,-1
305.786132812 1324.38085938 l 1,26,-1
305.786132812 -64.375 l 1,27,-1
1423.87207031 -64.375 l 1,28,-1
1423.87207031 713.44921875 l 1,29,-1
1550.49414062 881.068359375 l 1,30,-1
1550.49414062 -48.1904296875 l 2,31,32
1550.49414062 -117.779944235 1550.49414062 -117.779944235 1494.29565165 -161.282348672 c 0,33,34
1455.92136717 -190.987304688 1455.92136717 -190.987304688 1408.30664062 -190.987304688 c 2,35,-1
321.350585938 -190.987304688 l 2,36,37
251.788976584 -190.987304688 251.788976584 -190.987304688 208.529806684 -134.246327691 c 0,38,39
179.537137421 -95.1088453397 179.537137421 -95.1088453397 179.163085938 -48.1904296875 c 2,40,-1
179.163085938 1308.19628906 l 2,41,42
179.163085938 1377.78580361 179.163085938 1377.78580361 235.361574914 1421.28820805 c 0,43,44
274.361783801 1450.61432139 274.361783801 1450.61432139 321.350585938 1450.99316406 c 2,23,-1
EndSplineSet
Validated: 33
EndChar
StartChar: W
Encoding: 87 87 727
Width: 1792
Flags: W
LayerCount: 2
Fore
SplineSet
440.614257812 947.797851562 m 2,0,1
440.614257812 1042.91531276 440.614257812 1042.91531276 450.327687133 1064.09999259 c 0,2,3
462.172194853 1089.9324865 462.172194853 1089.9324865 510.502799001 1093.80228762 c 0,4,5
531.526309536 1095.38528292 531.526309536 1095.38528292 588.202148438 1095.38574219 c 2,6,-1
1203.79785156 1095.38574219 l 2,7,8
1298.91531276 1095.38574219 1298.91531276 1095.38574219 1320.09999259 1085.67231287 c 0,9,10
1345.9324865 1073.82780515 1345.9324865 1073.82780515 1349.80228762 1025.497201 c 0,11,12
1351.38528292 1004.47369046 1351.38528292 1004.47369046 1351.38574219 947.797851562 c 2,13,-1
1351.38574219 332.202148438 l 2,14,15
1351.38574219 237.084687244 1351.38574219 237.084687244 1341.67231287 215.900007412 c 0,16,17
1329.82780515 190.067513497 1329.82780515 190.067513497 1281.497201 186.197712382 c 0,18,19
1260.47369046 184.614717083 1260.47369046 184.614717083 1203.79785156 184.614257812 c 2,20,-1
588.202148438 184.614257812 l 2,21,22
493.084687244 184.614257812 493.084687244 184.614257812 471.900007412 194.327687133 c 0,23,24
446.067513497 206.172194853 446.067513497 206.172194853 442.197712382 254.502799001 c 0,25,26
440.614717083 275.526309536 440.614717083 275.526309536 440.614257812 332.202148438 c 2,27,-1
440.614257812 947.797851562 l 2,0,1
EndSplineSet
Validated: 1
EndChar
StartChar: V
Encoding: 86 86 728
Width: 1792
LayerCount: 2
Fore
SplineSet
1543.08007812 1445.96972656 m 0,0,1
1543.50302106 1445.99762851 1543.50302106 1445.99762851 1543.93115089 1445.99236982 c 128,-1,2
1544.35928072 1445.98711113 1544.35928072 1445.98711113 1544.8203125 1445.97851562 c 0,3,4
1611.00366774 1444.84166268 1611.00366774 1444.84166268 1641.18862365 1388.46346198 c 0,5,6
1656.08839193 1359.49969131 1656.08839193 1359.49969131 1655.75976562 1325.30957031 c 0,7,8
1654.74488615 1266.37612741 1654.74488615 1266.37612741 1656.94360829 1147.2444284 c 0,9,10
1659.40177283 1011.59509352 1659.40177283 1011.59509352 1657.59960938 945.034179688 c 0,11,-1
1657.59277344 944.692382812 l 2,12,13
1657.59277344 825.856681783 1657.59277344 825.856681783 1541.85977997 825.442081355 c 0,14,15
1540.60935315 825.437601842 1540.60935315 825.437601842 1539.34570312 825.447265625 c 2,16,-1
1150.390625 828.423828125 l 2,17,18
1076.14206397 826.310602347 1076.14206397 826.310602347 1045.25352724 879.746926643 c 0,19,20
1032.23195579 903.358793408 1032.23195579 903.358793408 1031.15917969 932.40234375 c 0,21,22
1029.35323598 995.728493427 1029.35323598 995.728493427 1080.33314897 1033.48220232 c 0,23,24
1111.52831591 1055.78876254 1111.52831591 1055.78876254 1149.0390625 1057.19824219 c 2,25,-1
1263.18457031 1060.4453125 l 1,26,27
1108.0993049 1188.90489569 1108.0993049 1188.90489569 906.90834779 1191.06523496 c 0,28,29
704.213101984 1193.24172691 704.213101984 1193.24172691 545.361076079 1066.24957407 c 0,30,31
525.106121217 1049.91012323 525.106121217 1049.91012323 507.080078125 1032.81445312 c 0,32,33
359.025626774 891.770258476 359.025626774 891.770258476 333.695740695 690.804799086 c 0,34,35
308.507873396 490.966106285 308.507873396 490.966106285 414.58634604 320.207859068 c 0,36,37
446.379527721 269.526902852 446.379527721 269.526902852 487.139648438 226.5546875 c 0,38,39
628.020976242 78.6817571404 628.020976242 78.6817571404 828.933957065 53.5341195441 c 0,40,41
1028.79260072 28.5184499713 1028.79260072 28.5184499713 1199.6903626 134.795089955 c 0,42,43
1250.39024002 166.632571191 1250.39024002 166.632571191 1293.39941406 207.427734375 c 0,44,45
1431.68452141 340.103470005 1431.68452141 340.103470005 1462.91113281 527.52734375 c 0,46,47
1472.53580046 585.998995167 1472.53580046 585.998995167 1525.75911046 612.238223427 c 0,48,49
1559.3859762 628.12263906 1559.3859762 628.12263906 1595.36523438 622.538085938 c 0,50,51
1653.84210051 612.913158513 1653.84210051 612.913158513 1680.08049812 559.68238116 c 0,52,53
1695.96249213 526.054748563 1695.96249213 526.054748563 1690.37597656 490.077148438 c 0,54,55
1649.18028564 239.780275611 1649.18028564 239.780275611 1469.97647577 58.2206133082 c 0,56,57
1464.00171551 52.2039490883 1464.00171551 52.2039490883 1458.94628906 47.2568359375 c 0,58,59
1452.51234256 40.4692993167 1452.51234256 40.4692993167 1448.20605469 36.6884765625 c 0,60,61
1258.39674682 -141.610539737 1258.39674682 -141.610539737 999.450753427 -173.75901441 c 0,62,63
745.499984912 -205.287325557 745.499984912 -205.287325557 521.483688935 -85.662394354 c 0,64,65
408.553647979 -24.8968695276 408.553647979 -24.8968695276 320.2265625 67.5185546875 c 0,66,67
140.727034402 255.937915576 140.727034402 255.937915576 106.948548542 514.487258772 c 0,68,69
73.768346754 768.457179593 73.768346754 768.457179593 192.249152399 993.667392006 c 0,70,71
253.621822149 1109.43780089 253.621822149 1109.43780089 348.0625 1199.69921875 c 0,72,73
536.527642358 1379.26941439 536.527642358 1379.26941439 795.041335648 1413.2741901 c 0,74,75
838.519552782 1418.88579875 838.519552782 1418.88579875 881.392578125 1419.95410156 c 0,76,77
1138.55178159 1426.04396328 1138.55178159 1426.04396328 1349.65515541 1283.19859447 c 0,78,79
1386.55524282 1258.06152002 1386.55524282 1258.06152002 1419.69238281 1229.9140625 c 1,80,-1
1421.35351562 1326.67578125 l 2,81,82
1422.44446574 1390.14236434 1422.44446574 1390.14236434 1475.25546543 1425.5096227 c 0,83,84
1506.58682851 1445.75163467 1506.58682851 1445.75163467 1543.08007812 1445.96972656 c 0,0,1
EndSplineSet
Validated: 33
EndChar
StartChar: U
Encoding: 85 85 729
Width: 1792
LayerCount: 2
Fore
SplineSet
653.391601562 966.458007812 m 2,0,1
653.391601562 1055.26264843 653.391601562 1055.26264843 713.008763674 1077.43644205 c 0,2,3
764.6565275 1096.64612623 764.6565275 1096.64612623 819.830970956 1055.5679742 c 0,4,5
822.731099879 1053.40878727 822.731099879 1053.40878727 825.551757812 1051.10253906 c 2,6,-1
1233.07324219 717.903320312 l 2,7,8
1279.84243319 679.664337555 1279.84243319 679.664337555 1273.89997513 620.895274614 c 0,9,10
1268.61572754 577.535903489 1268.61572754 577.535903489 1235.39160156 550.4453125 c 2,11,-1
827.870117188 225.931640625 l 2,12,13
778.248215268 186.416719878 778.248215268 186.416719878 719.973463588 209.968871919 c 0,14,15
668.338349954 230.837567397 668.338349954 230.837567397 656.150423765 283.963132462 c 0,16,17
653.500942375 296.53801014 653.500942375 296.53801014 653.391601562 308.73828125 c 2,18,-1
653.391601562 966.458007812 l 2,0,1
896 1303.53808594 m 0,19,20
664.254137715 1303.53808594 664.254137715 1303.53808594 483.88710158 1160.86085342 c 0,21,22
315.952059842 1028.01780454 315.952059842 1028.01780454 257.701695463 822.635892202 c 0,23,24
232.603377916 733.104669156 232.603377916 733.104669156 232.461914062 640 c 0,25,26
232.461914062 408.254137715 232.461914062 408.254137715 375.139146579 227.88710158 c 0,27,28
507.982195461 59.9520598415 507.982195461 59.9520598415 713.364107798 1.70169546329 c 0,29,30
802.895330844 -23.3966220844 802.895330844 -23.3966220844 896 -23.5380859375 c 0,31,32
1127.74586229 -23.5380859375 1127.74586229 -23.5380859375 1308.11289842 119.139146579 c 0,33,34
1476.04794016 251.982195461 1476.04794016 251.982195461 1534.29830454 457.364107798 c 0,35,36
1559.39662208 546.895330844 1559.39662208 546.895330844 1559.53808594 640 c 0,37,38
1559.53808594 871.745862285 1559.53808594 871.745862285 1416.86085342 1052.11289842 c 0,39,40
1284.01780454 1220.04794016 1284.01780454 1220.04794016 1078.6358922 1278.29830454 c 0,41,42
989.104669156 1303.39662208 989.104669156 1303.39662208 896 1303.53808594 c 0,19,20
896 1508.76855469 m 0,43,44
1176.49644265 1508.76855469 1176.49644265 1508.76855469 1403.9036872 1344.18785612 c 0,45,46
1610.95487116 1194.33938247 1610.95487116 1194.33938247 1704.40332253 957.930167119 c 0,47,48
1764.57071689 804.660311045 1764.57071689 804.660311045 1764.76855469 640 c 0,49,50
1764.76855469 359.503557354 1764.76855469 359.503557354 1600.18785612 132.096312795 c 0,51,52
1450.33938247 -74.9548711635 1450.33938247 -74.9548711635 1213.93016712 -168.403322528 c 0,53,54
1060.66031104 -228.570716891 1060.66031104 -228.570716891 896 -228.768554688 c 0,55,56
615.503557354 -228.768554688 615.503557354 -228.768554688 388.096312795 -64.1878561223 c 0,57,58
181.045128836 85.6606175298 181.045128836 85.6606175298 87.5966774723 322.069832881 c 0,59,60
27.4292831092 475.339688955 27.4292831092 475.339688955 27.2314453125 640 c 0,61,62
27.2314453125 920.496442646 27.2314453125 920.496442646 191.812143878 1147.9036872 c 0,63,64
341.66061753 1354.95487116 341.66061753 1354.95487116 578.069832881 1448.40332253 c 0,65,66
730.783943827 1508.76855469 730.783943827 1508.76855469 896 1508.76855469 c 0,43,44
EndSplineSet
Validated: 33
EndChar
EndChars
EndSplineFont

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

@ -85,7 +85,7 @@ class UiIcons(metaclass=Singleton):
'delete': {'icon': 'fa.trash'},
'device_stream': {'icon': 'fa.video-camera'},
'download': {'icon': 'fa.download'},
'edit': {'icon': 'fa.edit'},
'edit': {'icon': 'op.edit'},
'email': {'icon': 'fa.envelope'},
'error': {'icon': 'fa.exclamation', 'attr': 'red'},
'exception': {'icon': 'fa.times-circle'},
@ -95,13 +95,22 @@ class UiIcons(metaclass=Singleton):
'info': {'icon': 'fa.info'},
'italic': {'icon': 'fa.italic'},
'light_bulb': {'icon': 'fa.lightbulb-o'},
'live': {'icon': 'fa.eye'},
'live': {'icon': 'op.live'},
'live_presentation': {'icon': 'op.live-presentation'},
'live_theme': {'icon': 'op.live-theme'},
'live_black': {'icon': 'op.live-black'},
'live_desktop': {'icon': 'op.live-desktop'},
'loop': {'icon': 'op.loop'},
'manual': {'icon': 'fa.graduation-cap'},
'media': {'icon': 'fa.fax'},
'minus': {'icon': 'fa.minus'},
'move_start': {'icon': 'op.move-start'},
'move_up': {'icon': 'op.move-up'},
'move_down': {'icon': 'op.move-down'},
'move_end': {'icon': 'op.move-end'},
'music': {'icon': 'fa.music'},
'network_stream': {'icon': 'fa.link'},
'new': {'icon': 'fa.file'},
'new': {'icon': 'op.new'},
'new_group': {'icon': 'fa.folder'},
'notes': {'icon': 'fa.sticky-note'},
'open': {'icon': 'fa.folder-open'},
@ -110,6 +119,7 @@ class UiIcons(metaclass=Singleton):
'planning_center': {'icon': 'fa.cloud-download'},
'play': {'icon': 'fa.play'},
'player': {'icon': 'fa.tablet'},
'play_slides': {'icon': 'op.play-slides'},
'plugin_list': {'icon': 'fa.puzzle-piece'},
'plus': {'icon': 'fa.plus'},
'presentation': {'icon': 'fa.bar-chart'},
@ -135,7 +145,7 @@ class UiIcons(metaclass=Singleton):
'search': {'icon': 'fa.search'},
'search_ccli': {'icon': 'op.search-CCLI'},
'search_comb': {'icon': 'fa.columns'},
'search_lyrcs': {'icon': 'op.search-lyrcs'},
'search_lyrics': {'icon': 'op.search-lyrics'},
'search_minus': {'icon': 'fa.search-minus'},
'search_plus': {'icon': 'fa.search-plus'},
'search_ref': {'icon': 'fa.institution'},
@ -145,10 +155,10 @@ class UiIcons(metaclass=Singleton):
'settings': {'icon': 'fa.cogs'},
'shortcuts': {'icon': 'fa.wrench'},
'song_usage': {'icon': 'fa.line-chart'},
'song_usage_active': {'icon': 'op.plus_sign'},
'song_usage_inactive': {'icon': 'op.minus_sign'},
'song_usage_active': {'icon': 'op.plus-sign'},
'song_usage_inactive': {'icon': 'op.minus-sign'},
'sort': {'icon': 'fa.sort'},
'stop': {'icon': 'fa.stop'},
'stop': {'icon': 'op.stop'},
'square': {'icon': 'fa.square'},
'text': {'icon': 'op.file-text'},
'time': {'icon': 'fa.history'},

8
openlp/core/ui/servicemanager.py
View File

@ -184,22 +184,22 @@ class Ui_ServiceManager(object):
action_list.add_category(UiStrings().Service, CategoryOrder.standard_toolbar)
self.move_top_action = self.order_toolbar.add_toolbar_action(
'moveTop',
text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=UiIcons().top,
text=translate('OpenLP.ServiceManager', 'Move to &top'), icon=UiIcons().move_start,
tooltip=translate('OpenLP.ServiceManager', 'Move item to the top of the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_top)
self.move_up_action = self.order_toolbar.add_toolbar_action(
'moveUp',
text=translate('OpenLP.ServiceManager', 'Move &up'), icon=UiIcons().arrow_up,
text=translate('OpenLP.ServiceManager', 'Move &up'), icon=UiIcons().move_up,
tooltip=translate('OpenLP.ServiceManager', 'Move item up one position in the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_up)
self.move_down_action = self.order_toolbar.add_toolbar_action(
'moveDown',
text=translate('OpenLP.ServiceManager', 'Move &down'), icon=UiIcons().arrow_down,
text=translate('OpenLP.ServiceManager', 'Move &down'), icon=UiIcons().move_down,
tooltip=translate('OpenLP.ServiceManager', 'Move item down one position in the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_down)
self.move_bottom_action = self.order_toolbar.add_toolbar_action(
'moveBottom',
text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=UiIcons().bottom,
text=translate('OpenLP.ServiceManager', 'Move to &bottom'), icon=UiIcons().move_end,
tooltip=translate('OpenLP.ServiceManager', 'Move item to the end of the service.'),
can_shortcuts=True, category=UiStrings().Service, triggers=self.on_service_end)
self.order_toolbar.addSeparator()

74
openlp/core/ui/slidecontroller.py
View File

@ -123,12 +123,7 @@ class InfoLabel(QtWidgets.QLabel):
painter = QtGui.QPainter(self)
metrics = QtGui.QFontMetrics(self.font())
elided = metrics.elidedText(self.text(), QtCore.Qt.ElideRight, self.width())
# If the text is elided align it left to stop it jittering as the label is resized
if elided == self.text():
alignment = QtCore.Qt.AlignCenter
else:
alignment = QtCore.Qt.AlignLeft
painter.drawText(self.rect(), alignment, elided)
painter.drawText(self.rect(), QtCore.Qt.AlignLeft, elided)
def setText(self, text):
"""
@ -213,19 +208,32 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.panel_layout = QtWidgets.QVBoxLayout(self.panel)
self.panel_layout.setSpacing(0)
self.panel_layout.setContentsMargins(0, 0, 0, 0)
# Type label at the top of the slide controller
# Type label at the top of the slide controller with icon
self.top_label_horizontal = QtWidgets.QHBoxLayout()
self.panel_layout.addLayout(self.top_label_horizontal)
self.top_label_vertical = QtWidgets.QVBoxLayout()
if self.is_live:
icon = UiIcons().live
else:
icon = UiIcons().preview
pixmap = icon.pixmap(QtCore.QSize(34, 34))
self.top_icon = QtWidgets.QLabel()
self.top_icon.setPixmap(pixmap)
self.top_icon.setStyleSheet("padding: 0 10 0 25px;")
self.top_icon.setAlignment(QtCore.Qt.AlignRight)
self.top_label_horizontal.addWidget(self.top_icon, 1)
self.top_label_horizontal.addLayout(self.top_label_vertical, 100)
self.type_label = QtWidgets.QLabel(self.panel)
self.type_label.setStyleSheet('font-weight: bold; font-size: 12pt;')
self.type_label.setAlignment(QtCore.Qt.AlignCenter)
if self.is_live:
self.type_label.setText(UiStrings().Live)
else:
self.type_label.setText(UiStrings().Preview)
self.panel_layout.addWidget(self.type_label)
# Info label for the title of the current item, at the top of the slide controller
self.info_label = InfoLabel(self.panel)
self.info_label.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred)
self.panel_layout.addWidget(self.info_label)
self.top_label_vertical.addWidget(self.type_label)
self.top_label_vertical.addWidget(self.info_label)
# Splitter
self.splitter = QtWidgets.QSplitter(self.panel)
self.splitter.setOrientation(QtCore.Qt.Vertical)
@ -250,14 +258,14 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.toolbar.setSizePolicy(size_toolbar_policy)
self.previous_item = create_action(self, 'previousItem_' + self.type_prefix,
text=translate('OpenLP.SlideController', 'Previous Slide'),
icon=UiIcons().arrow_left,
icon=UiIcons().arrow_up,
tooltip=translate('OpenLP.SlideController', 'Move to previous.'),
can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
category=self.category, triggers=self.on_slide_selected_previous)
self.toolbar.addAction(self.previous_item)
self.next_item = create_action(self, 'nextItem_' + self.type_prefix,
text=translate('OpenLP.SlideController', 'Next Slide'),
icon=UiIcons().arrow_right,
icon=UiIcons().arrow_down,
tooltip=translate('OpenLP.SlideController', 'Move to next.'),
can_shortcuts=True, context=QtCore.Qt.WidgetWithChildrenShortcut,
category=self.category, triggers=self.on_slide_selected_next_action)
@ -276,28 +284,28 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
# The order of the blank to modes in Shortcuts list comes from here.
self.show_screen = create_action(self, 'showScreen',
text=translate('OpenLP.SlideController', 'Show Presentation'),
icon=UiIcons().live,
icon=UiIcons().live_presentation,
checked=False, can_shortcuts=True, category=self.category,
triggers=self.on_show_display)
self.desktop_screen = create_action(self, 'setDesktopScreen',
text=translate('OpenLP.SlideController', 'Show Desktop'),
icon=UiIcons().desktop,
checked=False, can_shortcuts=False, category=self.category,
triggers=self.on_hide_display)
self.theme_screen = create_action(self, 'setThemeScreen',
text=translate('OpenLP.SlideController', 'Show Theme'),
icon=UiIcons().blank_theme,
icon=UiIcons().live_theme,
checked=False, can_shortcuts=False, category=self.category,
triggers=self.on_theme_display)
self.blank_screen = create_action(self, 'setBlankScreen',
text=translate('OpenLP.SlideController', 'Show Black'),
icon=UiIcons().blank,
icon=UiIcons().live_black,
checked=False, can_shortcuts=False, category=self.category,
triggers=self.on_blank_display)
self.desktop_screen = create_action(self, 'setDesktopScreen',
text=translate('OpenLP.SlideController', 'Show Desktop'),
icon=UiIcons().live_desktop,
checked=False, can_shortcuts=False, category=self.category,
triggers=self.on_hide_display)
self.hide_menu.setDefaultAction(self.show_screen)
self.hide_menu.menu().addAction(self.show_screen)
self.hide_menu.menu().addAction(self.blank_screen)
self.hide_menu.menu().addAction(self.theme_screen)
self.hide_menu.menu().addAction(self.blank_screen)
self.hide_menu.menu().addAction(self.desktop_screen)
# Add togglable actions for keyboard shortcuts
self.controller.addAction(create_action(self, 'desktopScreen',
@ -320,14 +328,14 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.show_screen_button.setObjectName('show_screen_button')
self.toolbar.add_toolbar_widget(self.show_screen_button)
self.show_screen_button.setDefaultAction(self.show_screen)
self.blank_screen_button = QtWidgets.QToolButton(self.toolbar)
self.blank_screen_button.setObjectName('blank_screen_button')
self.toolbar.add_toolbar_widget(self.blank_screen_button)
self.blank_screen_button.setDefaultAction(self.blank_screen)
self.theme_screen_button = QtWidgets.QToolButton(self.toolbar)
self.theme_screen_button.setObjectName('theme_screen_button')
self.toolbar.add_toolbar_widget(self.theme_screen_button)
self.theme_screen_button.setDefaultAction(self.theme_screen)
self.blank_screen_button = QtWidgets.QToolButton(self.toolbar)
self.blank_screen_button.setObjectName('blank_screen_button')
self.toolbar.add_toolbar_widget(self.blank_screen_button)
self.blank_screen_button.setDefaultAction(self.blank_screen)
self.desktop_screen_button = QtWidgets.QToolButton(self.toolbar)
self.desktop_screen_button.setObjectName('desktop_screen_button')
self.toolbar.add_toolbar_widget(self.desktop_screen_button)
@ -342,10 +350,10 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.toolbar))
self.toolbar.add_toolbar_widget(self.play_slides_menu)
self.play_slides_loop = create_action(self, 'playSlidesLoop', text=UiStrings().PlaySlidesInLoop,
icon=UiIcons().clock, checked=False, can_shortcuts=True,
icon=UiIcons().loop, checked=False, can_shortcuts=True,
category=self.category, triggers=self.on_play_slides_loop)
self.play_slides_once = create_action(self, 'playSlidesOnce', text=UiStrings().PlaySlidesToEnd,
icon=UiIcons().clock, checked=False, can_shortcuts=True,
icon=UiIcons().play_slides, checked=False, can_shortcuts=True,
category=self.category, triggers=self.on_play_slides_once)
if self.settings.value(self.main_window.advanced_settings_section + '/slide limits') == SlideLimits.Wrap:
self.play_slides_menu.setDefaultAction(self.play_slides_loop)
@ -761,10 +769,10 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
self.toolbar.set_widget_visible('song_menu', False)
# Reset the button
self.play_slides_once.setChecked(False)
self.play_slides_once.setIcon(UiIcons().clock)
self.play_slides_once.setIcon(UiIcons().play_slides)
self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
self.play_slides_loop.setChecked(False)
self.play_slides_loop.setIcon(UiIcons().clock)
self.play_slides_loop.setIcon(UiIcons().loop)
self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
if item.is_text():
if (self.settings.value(self.main_window.songs_settings_section + '/display songbar') and
@ -1347,14 +1355,14 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
if checked:
self.play_slides_loop.setIcon(UiIcons().stop)
self.play_slides_loop.setText(UiStrings().StopPlaySlidesInLoop)
self.play_slides_once.setIcon(UiIcons().clock)
self.play_slides_once.setIcon(UiIcons().play_slides)
self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
self.play_slides_menu.setDefaultAction(self.play_slides_loop)
self.play_slides_once.setChecked(False)
if self.settings.value('core/click live slide to unblank'):
Registry().execute('slidecontroller_live_unblank')
else:
self.play_slides_loop.setIcon(UiIcons().clock)
self.play_slides_loop.setIcon(UiIcons().loop)
self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
self.on_toggle_loop()
@ -1372,14 +1380,14 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties):
if checked:
self.play_slides_once.setIcon(UiIcons().stop)
self.play_slides_once.setText(UiStrings().StopPlaySlidesToEnd)
self.play_slides_loop.setIcon(UiIcons().clock)
self.play_slides_loop.setIcon(UiIcons().loop)
self.play_slides_loop.setText(UiStrings().PlaySlidesInLoop)
self.play_slides_menu.setDefaultAction(self.play_slides_once)
self.play_slides_loop.setChecked(False)
if self.settings.value('core/click live slide to unblank'):
Registry().execute('slidecontroller_live_unblank')
else:
self.play_slides_once.setIcon(UiIcons().clock)
self.play_slides_once.setIcon(UiIcons().play_slides)
self.play_slides_once.setText(UiStrings().PlaySlidesToEnd)
self.on_toggle_loop()

7
openlp/core/widgets/toolbar.py
View File

@ -106,3 +106,10 @@ class OpenLPToolbar(QtWidgets.QToolBar):
self.removeAction(act)
except KeyError:
log.warning(f'No handle {name} in actions list.')
def add_spacer(self):
size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
separator = QtWidgets.QWidget()
separator.setSizePolicy(size_policy)
self.addWidget(separator)
pass

2
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -140,7 +140,7 @@ class BibleMediaItem(MediaManagerItem):
self.has_delete_icon = True
self.add_to_service_item = False
def add_end_header_bar(self):
def add_middle_header_bar(self):
self.search_tab_bar = QtWidgets.QTabBar(self)
self.search_tab_bar.setExpanding(False)
self.page_layout.addWidget(self.search_tab_bar)

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -199,7 +199,7 @@ class ImageMediaItem(MediaManagerItem):
self.list_view, text=UiStrings().ReplaceLiveBG, icon=UiIcons().close,
visible=False, triggers=self.on_reset_click)
def add_start_header_bar(self):
def add_middle_header_bar(self):
"""
Add custom buttons to the start of the toolbar.
"""

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -105,7 +105,7 @@ class PresentationMediaItem(MediaManagerItem):
self.has_new_icon = False
self.has_edit_icon = False
def add_end_header_bar(self):
def add_middle_header_bar(self):
"""
Display custom media manager items for presentations.
"""

4
openlp/plugins/songs/lib/mediaitem.py
View File

@ -86,7 +86,7 @@ class SongMediaItem(MediaManagerItem):
song.media_files.append(MediaFile.populate(weight=i, file_path=dest_path))
self.plugin.manager.save_object(song, True)
def add_end_header_bar(self):
def add_middle_header_bar(self):
self.toolbar.addSeparator()
# Song Maintenance Button
self.maintenance_action = self.toolbar.add_toolbar_action('maintenance_action',
@ -139,7 +139,7 @@ class SongMediaItem(MediaManagerItem):
(SongSearch.Titles, UiIcons().search_text,
translate('SongsPlugin.MediaItem', 'Titles'),
translate('SongsPlugin.MediaItem', 'Search Titles...')),
(SongSearch.Lyrics, UiIcons().search_lyrcs,
(SongSearch.Lyrics, UiIcons().search_lyrics,
translate('SongsPlugin.MediaItem', 'Lyrics'),
translate('SongsPlugin.MediaItem', 'Search Lyrics...')),
(SongSearch.Authors, UiIcons().user, SongStrings.Authors,

4
tests/functional/openlp_core/ui/test_slidecontroller.py
View File

@ -1025,8 +1025,8 @@ def test_paint_event_text_fits():
info_label.width.return_value = metrics.boundingRect(test_string).width() + 20
info_label.paintEvent(MagicMock())
# THEN: The text should be drawn centered with the complete test_string
mocked_qpainter().drawText.assert_called_once_with(mocked_rect(), QtCore.Qt.AlignCenter, test_string)
# THEN: The text should be drawn left with the complete test_string
mocked_qpainter().drawText.assert_called_once_with(mocked_rect(), QtCore.Qt.AlignLeft, test_string)
def test_paint_event_text_doesnt_fit():