diff --git a/changes b/changes
index 1b8f2816e16c92aeb6c4e43c99ae5da89160dbfc..6c75cde89d04306c55eff1a7fa6c558a488f3d93 100644
--- a/changes
+++ b/changes
@@ -1,4 +1,5 @@
1.5.3 beta1
+ - added support for scientific octave numbers in note names
- restored charts (analysis) with updated look
- improved start wizard to handle more supported instruments
diff --git a/fonts/Scorek.otf b/fonts/Scorek.otf
index 8263772d42c6beaefacb9ffbcbb061e69af26625..bbc14f3854eae42f304545600b9782762dee89a8 100644
Binary files a/fonts/Scorek.otf and b/fonts/Scorek.otf differ
diff --git a/picts/check.png b/picts/check.png
index 98fc1c33b7e364a52226b1ace46908a3d9c1c02d..4aba074b23ac48c1fc04352f52df5f09327e0f15 100644
Binary files a/picts/check.png and b/picts/check.png differ
diff --git a/spare_parts/Scorek-Bravura.sfd b/spare_parts/Scorek-Bravura.sfd
index a389b916667fa08cdff51a1f7f8c3455ca753f8a..79f89f8cd11954bb7edc01a1077600001ccdafcb 100644
--- a/spare_parts/Scorek-Bravura.sfd
+++ b/spare_parts/Scorek-Bravura.sfd
@@ -22,7 +22,7 @@ OS2Version: 3
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1461314537
-ModificationTime: 1537015221
+ModificationTime: 1546624219
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@@ -75,13 +75,13 @@ NameList: AGL For New Fonts
DisplaySize: -128
AntiAlias: 1
FitToEm: 0
-WinInfo: 57520 8 5
+WinInfo: 416 8 5
BeginPrivate: 2
StdHW 4 [78]
StdVW 4 [90]
EndPrivate
TeXData: 1 0 0 262144 131072 87381 0 1048576 87381 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 1114115 789
+BeginChars: 1114115 801
StartChar: .notdef
Encoding: 1114112 -1 0
@@ -31683,5 +31683,493 @@ SplineSet
EndSplineSet
Validated: 1
EndChar
+
+StartChar: uhorn
+Encoding: 432 432 789
+Width: 507
+VWidth: 649
+Flags: W
+HStem: -162.6 65.5996<226.757 337.243> 351 65.5996<226.757 337.243>
+VStem: 96.4004 78.3994<-27.9322 281.932> 389.2 78.3994<-27.9322 281.932>
+LayerCount: 2
+Fore
+SplineSet
+96.400390625 127 m 0
+ 96.400390625 219.799804688 112.799804688 291.266601562 145.599609375 341.400390625 c 0
+ 178.400390625 391.533203125 223.866210938 416.599609375 282 416.599609375 c 0
+ 340.133789062 416.599609375 385.599609375 391.533203125 418.400390625 341.400390625 c 0
+ 451.200195312 291.266601562 467.599609375 219.799804688 467.599609375 127 c 0
+ 467.599609375 34.2001953125 451.200195312 -37.2666015625 418.400390625 -87.400390625 c 0
+ 385.599609375 -137.533203125 340.133789062 -162.599609375 282 -162.599609375 c 0
+ 223.866210938 -162.599609375 178.400390625 -137.533203125 145.599609375 -87.400390625 c 0
+ 112.799804688 -37.2666015625 96.400390625 34.2001953125 96.400390625 127 c 0
+389.200195312 127 m 0
+ 389.200195312 157.400390625 387.466796875 186.200195312 384 213.400390625 c 0
+ 380.533203125 240.599609375 374.666015625 264.333984375 366.400390625 284.599609375 c 0
+ 358.133789062 304.866210938 347.06640625 321 333.200195312 333 c 0
+ 319.333984375 345 302.266601562 351 282 351 c 0
+ 261.733398438 351 244.666015625 345 230.799804688 333 c 0
+ 216.93359375 321 205.866210938 304.866210938 197.599609375 284.599609375 c 0
+ 189.333984375 264.333984375 183.466796875 240.599609375 180 213.400390625 c 0
+ 176.533203125 186.200195312 174.799804688 157.400390625 174.799804688 127 c 0
+ 174.799804688 96.599609375 176.533203125 67.7998046875 180 40.599609375 c 0
+ 183.466796875 13.400390625 189.333984375 -10.333984375 197.599609375 -30.599609375 c 0
+ 205.866210938 -50.8662109375 216.93359375 -67 230.799804688 -79 c 0
+ 244.666015625 -91 261.733398438 -97 282 -97 c 0
+ 302.266601562 -97 319.333984375 -91 333.200195312 -79 c 0
+ 347.06640625 -67 358.133789062 -50.8662109375 366.400390625 -30.599609375 c 0
+ 374.666015625 -10.333984375 380.533203125 13.400390625 384 40.599609375 c 0
+ 387.466796875 67.7998046875 389.200195312 96.599609375 389.200195312 127 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni01B1
+Encoding: 433 433 790
+Width: 497
+VWidth: 649
+Flags: W
+VStem: 267 74.4004<-150.7 300.5>
+LayerCount: 2
+Fore
+SplineSet
+120.599609375 289.299804688 m 1
+ 151 301.033203125 180.599609375 316.099609375 209.400390625 334.5 c 0
+ 238.200195312 352.900390625 264.599609375 375.966796875 288.599609375 403.700195312 c 1
+ 341.400390625 403.700195312 l 1
+ 341.400390625 -150.700195312 l 1
+ 267 -150.700195312 l 1
+ 267 300.5 l 1
+ 260.599609375 294.633789062 252.733398438 288.5 243.400390625 282.099609375 c 0
+ 234.06640625 275.700195312 223.93359375 269.56640625 213 263.700195312 c 0
+ 202.06640625 257.833984375 190.599609375 252.233398438 178.599609375 246.900390625 c 0
+ 166.599609375 241.56640625 155 237.033203125 143.799804688 233.299804688 c 1
+ 120.599609375 289.299804688 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni01B2
+Encoding: 434 434 791
+Width: 505
+VWidth: 650
+Flags: W
+HStem: -149.1 63.1992<191.4 446.6> 351.7 66.3994<176.493 320.507>
+VStem: 109.8 81.6006<-85.9004 -38.8503> 349 79.2002<193.128 323.867>
+LayerCount: 2
+Fore
+SplineSet
+428.200195312 263.700195312 m 0
+ 428.200195312 244.5 424.333984375 225.966796875 416.599609375 208.099609375 c 0
+ 408.866210938 190.233398438 398.599609375 172.633789062 385.799804688 155.299804688 c 0
+ 373 137.966796875 358.599609375 120.900390625 342.599609375 104.099609375 c 0
+ 326.599609375 87.2998046875 310.599609375 70.900390625 294.599609375 54.900390625 c 0
+ 285.533203125 45.833984375 275 35.166015625 263 22.900390625 c 0
+ 251 10.6337890625 239.666015625 -2.166015625 229 -15.5 c 0
+ 218.333984375 -28.833984375 209.400390625 -41.6337890625 202.200195312 -53.900390625 c 0
+ 195 -66.166015625 191.400390625 -76.833984375 191.400390625 -85.900390625 c 1
+ 446.599609375 -85.900390625 l 1
+ 446.599609375 -149.099609375 l 1
+ 110.599609375 -149.099609375 l 1
+ 110.06640625 -145.900390625 109.799804688 -142.700195312 109.799804688 -139.5 c 2
+ 109.799804688 -130.700195312 l 2
+ 109.799804688 -105.633789062 113.93359375 -82.2998046875 122.200195312 -60.7001953125 c 0
+ 130.466796875 -39.099609375 141.266601562 -18.7001953125 154.599609375 0.5 c 0
+ 167.93359375 19.7001953125 182.866210938 37.833984375 199.400390625 54.900390625 c 0
+ 215.93359375 71.966796875 232.200195312 88.5 248.200195312 104.5 c 0
+ 261.533203125 117.299804688 274.200195312 129.966796875 286.200195312 142.5 c 0
+ 298.200195312 155.033203125 308.866210938 167.56640625 318.200195312 180.099609375 c 0
+ 327.533203125 192.633789062 335 205.56640625 340.599609375 218.900390625 c 0
+ 346.200195312 232.233398438 349 246.366210938 349 261.299804688 c 0
+ 349 277.299804688 346.466796875 290.900390625 341.400390625 302.099609375 c 0
+ 336.333984375 313.299804688 329.533203125 322.633789062 321 330.099609375 c 0
+ 312.466796875 337.56640625 302.466796875 343.033203125 291 346.5 c 0
+ 279.533203125 349.966796875 267.400390625 351.700195312 254.599609375 351.700195312 c 0
+ 239.133789062 351.700195312 225 349.56640625 212.200195312 345.299804688 c 0
+ 199.400390625 341.033203125 187.93359375 336.099609375 177.799804688 330.5 c 0
+ 167.666015625 324.900390625 159.133789062 319.033203125 152.200195312 312.900390625 c 0
+ 145.266601562 306.766601562 139.93359375 302.099609375 136.200195312 298.900390625 c 1
+ 99.400390625 351.700195312 l 1
+ 104.200195312 357.033203125 111.400390625 363.56640625 121 371.299804688 c 0
+ 130.599609375 379.033203125 142.06640625 386.366210938 155.400390625 393.299804688 c 0
+ 168.733398438 400.233398438 183.666015625 406.099609375 200.200195312 410.900390625 c 0
+ 216.733398438 415.700195312 234.599609375 418.099609375 253.799804688 418.099609375 c 0
+ 311.93359375 418.099609375 355.533203125 404.633789062 384.599609375 377.700195312 c 0
+ 413.666015625 350.766601562 428.200195312 312.766601562 428.200195312 263.700195312 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni01B3
+Encoding: 435 435 792
+Width: 505
+VWidth: 649
+Flags: W
+HStem: -162.6 66.3994<125.39 329.23> 114.2 60.7998<197.6 309.344> 351 65.5996<159.574 317.591>
+VStem: 344 76.7998<207.96 324.958> 368 77.5996<-58.7413 70.5149>
+LayerCount: 2
+Fore
+SplineSet
+235.200195312 -96.2001953125 m 0xe8
+ 282.666015625 -96.2001953125 316.666015625 -86.8662109375 337.200195312 -68.2001953125 c 0
+ 357.733398438 -49.533203125 368 -24.466796875 368 7 c 0xe8
+ 368 27.2666015625 363.733398438 44.333984375 355.200195312 58.2001953125 c 0
+ 346.666015625 72.06640625 335.466796875 83.1337890625 321.599609375 91.400390625 c 0
+ 307.733398438 99.666015625 291.599609375 105.533203125 273.200195312 109 c 0
+ 254.799804688 112.466796875 236 114.200195312 216.799804688 114.200195312 c 2
+ 197.599609375 114.200195312 l 1
+ 197.599609375 175 l 1
+ 224 175 l 2
+ 237.333984375 175 251.06640625 176.333984375 265.200195312 179 c 0
+ 279.333984375 181.666015625 292.266601562 186.466796875 304 193.400390625 c 0
+ 315.733398438 200.333984375 325.333984375 209.799804688 332.799804688 221.799804688 c 0
+ 340.266601562 233.799804688 344 248.866210938 344 267 c 0
+ 344 281.93359375 341.333984375 294.733398438 336 305.400390625 c 0
+ 330.666015625 316.06640625 323.599609375 324.866210938 314.799804688 331.799804688 c 0
+ 306 338.733398438 295.866210938 343.666015625 284.400390625 346.599609375 c 0
+ 272.93359375 349.533203125 260.799804688 351 248 351 c 0
+ 222.400390625 351 200.666015625 347.266601562 182.799804688 339.799804688 c 0
+ 164.93359375 332.333984375 149.866210938 324.599609375 137.599609375 316.599609375 c 1
+ 108.799804688 373.400390625 l 1
+ 115.200195312 377.666015625 123.333984375 382.333984375 133.200195312 387.400390625 c 0
+ 143.06640625 392.466796875 154.133789062 397.133789062 166.400390625 401.400390625 c 0
+ 178.666015625 405.666015625 191.866210938 409.266601562 206 412.200195312 c 0
+ 220.133789062 415.133789062 234.93359375 416.599609375 250.400390625 416.599609375 c 0
+ 279.733398438 416.599609375 305.06640625 413 326.400390625 405.799804688 c 0
+ 347.733398438 398.599609375 365.333984375 388.466796875 379.200195312 375.400390625 c 0
+ 393.06640625 362.333984375 403.466796875 346.866210938 410.400390625 329 c 0
+ 417.333984375 311.133789062 420.799804688 291.799804688 420.799804688 271 c 0xf0
+ 420.799804688 242.200195312 412.533203125 217.533203125 396 197 c 0
+ 379.466796875 176.466796875 359.466796875 160.866210938 336 150.200195312 c 1
+ 350.400390625 145.93359375 364.266601562 139.799804688 377.599609375 131.799804688 c 0
+ 390.93359375 123.799804688 402.533203125 113.666015625 412.400390625 101.400390625 c 0
+ 422.266601562 89.1337890625 430.266601562 75 436.400390625 59 c 0
+ 442.533203125 43 445.599609375 25.1337890625 445.599609375 5.400390625 c 0
+ 445.599609375 -18.599609375 441.466796875 -40.8662109375 433.200195312 -61.400390625 c 0
+ 424.93359375 -81.93359375 412.133789062 -99.666015625 394.799804688 -114.599609375 c 0
+ 377.466796875 -129.533203125 355.733398438 -141.266601562 329.599609375 -149.799804688 c 0
+ 303.466796875 -158.333984375 272.533203125 -162.599609375 236.799804688 -162.599609375 c 0
+ 222.93359375 -162.599609375 208.666015625 -161.533203125 194 -159.400390625 c 0
+ 179.333984375 -157.266601562 165.599609375 -154.599609375 152.799804688 -151.400390625 c 0
+ 140 -148.200195312 128.799804688 -145 119.200195312 -141.799804688 c 0
+ 109.599609375 -138.599609375 102.666015625 -135.93359375 98.400390625 -133.799804688 c 1
+ 112.799804688 -69 l 1
+ 121.866210938 -73.2666015625 136.93359375 -78.8662109375 158 -85.7998046875 c 0
+ 179.06640625 -92.7333984375 204.799804688 -96.2001953125 235.200195312 -96.2001953125 c 0xe8
+EndSplineSet
+EndChar
+
+StartChar: uni01B4
+Encoding: 436 436 793
+Width: 507
+VWidth: 649
+Flags: W
+HStem: -9.09961 60.7998<160.2 336.2 408.2 473.8>
+VStem: 336.2 72<-150.7 -9.09961 51.7002 315.7>
+LayerCount: 2
+Fore
+SplineSet
+88.2001953125 41.2998046875 m 1
+ 98.333984375 64.7666015625 112.200195312 92.099609375 129.799804688 123.299804688 c 0
+ 147.400390625 154.5 167.266601562 186.633789062 189.400390625 219.700195312 c 0
+ 211.533203125 252.766601562 235.266601562 285.299804688 260.599609375 317.299804688 c 0
+ 285.93359375 349.299804688 311.400390625 378.099609375 337 403.700195312 c 1
+ 408.200195312 403.700195312 l 1
+ 408.200195312 51.7001953125 l 1
+ 473.799804688 51.7001953125 l 1
+ 473.799804688 -9.099609375 l 1
+ 408.200195312 -9.099609375 l 1
+ 408.200195312 -150.700195312 l 1
+ 336.200195312 -150.700195312 l 1
+ 336.200195312 -9.099609375 l 1
+ 88.2001953125 -9.099609375 l 1
+ 88.2001953125 41.2998046875 l 1
+336.200195312 315.700195312 m 1
+ 320.200195312 298.633789062 304.06640625 279.56640625 287.799804688 258.5 c 0
+ 271.533203125 237.43359375 255.666015625 215.43359375 240.200195312 192.5 c 0
+ 224.733398438 169.56640625 210.200195312 146.099609375 196.599609375 122.099609375 c 0
+ 183 98.099609375 170.866210938 74.6337890625 160.200195312 51.7001953125 c 1
+ 336.200195312 51.7001953125 l 1
+ 336.200195312 315.700195312 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni01B5
+Encoding: 437 437 794
+Width: 506
+VWidth: 647
+Flags: W
+HStem: -164.2 66.4004<134.517 331.385> 127.8 60.7998<214.8 299.349> 339 63.2002<225.237 429.2>
+VStem: 370.8 77.6006<-60.8847 73.1667>
+LayerCount: 2
+Fore
+SplineSet
+214.799804688 188.599609375 m 1
+ 295.333984375 185.400390625 354.400390625 167.799804688 392 135.799804688 c 0
+ 429.599609375 103.799804688 448.400390625 60.333984375 448.400390625 5.400390625 c 0
+ 448.400390625 -19.1337890625 444.266601562 -41.7998046875 436 -62.599609375 c 0
+ 427.733398438 -83.400390625 415.200195312 -101.266601562 398.400390625 -116.200195312 c 0
+ 381.599609375 -131.133789062 360.400390625 -142.866210938 334.799804688 -151.400390625 c 0
+ 309.200195312 -159.93359375 278.799804688 -164.200195312 243.599609375 -164.200195312 c 0
+ 229.733398438 -164.200195312 215.599609375 -163.133789062 201.200195312 -161 c 0
+ 186.799804688 -158.866210938 173.466796875 -156.200195312 161.200195312 -153 c 0
+ 148.93359375 -149.799804688 138 -146.599609375 128.400390625 -143.400390625 c 0
+ 118.799804688 -140.200195312 111.866210938 -137.533203125 107.599609375 -135.400390625 c 1
+ 122 -70.599609375 l 1
+ 131.06640625 -74.8662109375 145.866210938 -80.466796875 166.400390625 -87.400390625 c 0
+ 186.93359375 -94.333984375 212.133789062 -97.7998046875 242 -97.7998046875 c 0
+ 266 -97.7998046875 286.133789062 -95.1337890625 302.400390625 -89.7998046875 c 0
+ 318.666015625 -84.466796875 331.866210938 -77.2666015625 342 -68.2001953125 c 0
+ 352.133789062 -59.1337890625 359.466796875 -48.599609375 364 -36.599609375 c 0
+ 368.533203125 -24.599609375 370.799804688 -11.93359375 370.799804688 1.400390625 c 0
+ 370.799804688 21.666015625 367.333984375 39.666015625 360.400390625 55.400390625 c 0
+ 353.466796875 71.1337890625 341.200195312 84.333984375 323.599609375 95 c 0
+ 306 105.666015625 282.533203125 113.799804688 253.200195312 119.400390625 c 0
+ 223.866210938 125 186.799804688 127.799804688 142 127.799804688 c 1
+ 145.200195312 153.93359375 147.733398438 178.466796875 149.599609375 201.400390625 c 0
+ 151.466796875 224.333984375 153.200195312 246.733398438 154.799804688 268.599609375 c 0
+ 156.400390625 290.466796875 157.733398438 312.200195312 158.799804688 333.799804688 c 0
+ 159.866210938 355.400390625 160.93359375 378.200195312 162 402.200195312 c 1
+ 429.200195312 402.200195312 l 1
+ 429.200195312 339 l 1
+ 226.799804688 339 l 1
+ 226.266601562 331 225.466796875 320.200195312 224.400390625 306.599609375 c 0
+ 223.333984375 293 222.266601562 278.866210938 221.200195312 264.200195312 c 0
+ 220.133789062 249.533203125 219.06640625 235.266601562 218 221.400390625 c 0
+ 216.93359375 207.533203125 215.866210938 196.599609375 214.799804688 188.599609375 c 1
+EndSplineSet
+EndChar
+
+StartChar: uni01B6
+Encoding: 438 438 795
+Width: 508
+VWidth: 648
+Flags: W
+HStem: -163.9 61.6006<231.528 352.693> 127.3 60.7998<195.705 357.373> 342.5 62.4004<312.736 426.4>
+VStem: 108 77.5996<-50.5542 106.225> 391.2 76.7998<-61.1737 93.1953>
+LayerCount: 2
+Fore
+SplineSet
+108 70.5 m 0
+ 108 124.366210938 115.466796875 171.966796875 130.400390625 213.299804688 c 0
+ 145.333984375 254.633789062 166.533203125 289.43359375 194 317.700195312 c 0
+ 221.466796875 345.966796875 254.799804688 367.43359375 294 382.099609375 c 0
+ 333.200195312 396.766601562 377.333984375 404.366210938 426.400390625 404.900390625 c 1
+ 432 342.5 l 1
+ 400.533203125 341.966796875 371.866210938 338.5 346 332.099609375 c 0
+ 320.133789062 325.700195312 297.06640625 315.56640625 276.799804688 301.700195312 c 0
+ 256.533203125 287.833984375 239.466796875 269.833984375 225.599609375 247.700195312 c 0
+ 211.733398438 225.56640625 201.333984375 198.233398438 194.400390625 165.700195312 c 1
+ 208.266601562 172.099609375 223.866210938 177.43359375 241.200195312 181.700195312 c 0
+ 258.533203125 185.966796875 276.533203125 188.099609375 295.200195312 188.099609375 c 0
+ 326.666015625 188.099609375 353.333984375 183.299804688 375.200195312 173.700195312 c 0
+ 397.06640625 164.099609375 414.93359375 151.43359375 428.799804688 135.700195312 c 0
+ 442.666015625 119.966796875 452.666015625 101.833984375 458.799804688 81.2998046875 c 0
+ 464.93359375 60.7666015625 468 39.2998046875 468 16.900390625 c 0
+ 468 -3.3662109375 464.533203125 -24.166015625 457.599609375 -45.5 c 0
+ 450.666015625 -66.833984375 440.133789062 -86.2998046875 426 -103.900390625 c 0
+ 411.866210938 -121.5 393.866210938 -135.900390625 372 -147.099609375 c 0
+ 350.133789062 -158.299804688 324.266601562 -163.900390625 294.400390625 -163.900390625 c 0
+ 233.599609375 -163.900390625 187.333984375 -143.099609375 155.599609375 -101.5 c 0
+ 123.866210938 -59.900390625 108 -2.56640625 108 70.5 c 0
+287.200195312 127.299804688 m 0
+ 268.533203125 127.299804688 251.200195312 125.56640625 235.200195312 122.099609375 c 0
+ 219.200195312 118.633789062 203.200195312 113.43359375 187.200195312 106.5 c 1
+ 186.666015625 100.633789062 186.266601562 94.6337890625 186 88.5 c 0
+ 185.733398438 82.3662109375 185.599609375 76.3662109375 185.599609375 70.5 c 0
+ 185.599609375 47.033203125 187.200195312 24.900390625 190.400390625 4.099609375 c 0
+ 193.599609375 -16.7001953125 199.333984375 -34.966796875 207.599609375 -50.7001953125 c 0
+ 215.866210938 -66.43359375 226.93359375 -78.966796875 240.799804688 -88.2998046875 c 0
+ 254.666015625 -97.6337890625 272.266601562 -102.299804688 293.599609375 -102.299804688 c 0
+ 311.200195312 -102.299804688 326.133789062 -98.56640625 338.400390625 -91.099609375 c 0
+ 350.666015625 -83.6337890625 360.799804688 -74.033203125 368.799804688 -62.2998046875 c 0
+ 376.799804688 -50.56640625 382.533203125 -37.900390625 386 -24.2998046875 c 0
+ 389.466796875 -10.7001953125 391.200195312 2.5 391.200195312 15.2998046875 c 0
+ 391.200195312 51.56640625 382.533203125 79.2998046875 365.200195312 98.5 c 0
+ 347.866210938 117.700195312 321.866210938 127.299804688 287.200195312 127.299804688 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni01B7
+Encoding: 439 439 796
+Width: 507
+VWidth: 649
+Flags: W
+HStem: 338.9 64.7998<104.1 373.7>
+VStem: 186.5 77.5996<-150.7 -20.3187>
+LayerCount: 2
+Fore
+SplineSet
+186.5 -150.700195312 m 1
+ 189.700195312 -108.033203125 197.299804688 -63.099609375 209.299804688 -15.900390625 c 0
+ 221.299804688 31.2998046875 236.099609375 77.166015625 253.700195312 121.700195312 c 0
+ 271.299804688 166.233398438 290.633789062 207.56640625 311.700195312 245.700195312 c 0
+ 332.766601562 283.833984375 353.43359375 314.900390625 373.700195312 338.900390625 c 1
+ 104.099609375 338.900390625 l 1
+ 104.099609375 403.700195312 l 1
+ 456.900390625 403.700195312 l 1
+ 456.900390625 342.099609375 l 1
+ 439.299804688 321.833984375 419.833984375 293.966796875 398.5 258.5 c 0
+ 377.166015625 223.033203125 357.033203125 183.299804688 338.099609375 139.299804688 c 0
+ 319.166015625 95.2998046875 302.900390625 48.3662109375 289.299804688 -1.5 c 0
+ 275.700195312 -51.3662109375 267.299804688 -101.099609375 264.099609375 -150.700195312 c 1
+ 186.5 -150.700195312 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni01B8
+Encoding: 440 440 797
+Width: 507
+VWidth: 649
+Flags: W
+HStem: -162.6 61.5996<209.089 354.98> 355 61.5996<216.183 346.362>
+VStem: 100.4 75.1992<-68.6958 61.9913> 113.2 74.3994<-79.305 -11.8507 208.578 326.928> 375.6 74.4004<-79.8402 -11.9252 200.212 326.174> 388.4 75.1992<-68.6155 51.6254>
+LayerCount: 2
+Fore
+SplineSet
+463.599609375 -6.599609375 m 0xc4
+ 463.599609375 -29 459.733398438 -49.666015625 452 -68.599609375 c 0
+ 444.266601562 -87.533203125 432.799804688 -104.06640625 417.599609375 -118.200195312 c 0
+ 402.400390625 -132.333984375 383.333984375 -143.266601562 360.400390625 -151 c 0
+ 337.466796875 -158.733398438 311.06640625 -162.599609375 281.200195312 -162.599609375 c 0
+ 246.533203125 -162.599609375 217.599609375 -157.666015625 194.400390625 -147.799804688 c 0
+ 171.200195312 -137.93359375 152.666015625 -125.533203125 138.799804688 -110.599609375 c 0
+ 124.93359375 -95.666015625 115.06640625 -79.2666015625 109.200195312 -61.400390625 c 0
+ 103.333984375 -43.533203125 100.400390625 -26.599609375 100.400390625 -10.599609375 c 0xe4
+ 100.400390625 4.8662109375 102.93359375 19.666015625 108 33.7998046875 c 0
+ 113.06640625 47.93359375 119.733398438 61.1337890625 128 73.400390625 c 0
+ 136.266601562 85.666015625 145.866210938 96.7333984375 156.799804688 106.599609375 c 0
+ 167.733398438 116.466796875 179.333984375 125.133789062 191.599609375 132.599609375 c 1
+ 139.333984375 162.466796875 113.200195312 206.466796875 113.200195312 264.599609375 c 0
+ 113.200195312 284.866210938 117.200195312 304.200195312 125.200195312 322.599609375 c 0
+ 133.200195312 341 144.533203125 357.133789062 159.200195312 371 c 0
+ 173.866210938 384.866210938 191.599609375 395.93359375 212.400390625 404.200195312 c 0
+ 233.200195312 412.466796875 256.400390625 416.599609375 282 416.599609375 c 0
+ 311.866210938 416.599609375 337.466796875 412.06640625 358.799804688 403 c 0
+ 380.133789062 393.93359375 397.599609375 382.333984375 411.200195312 368.200195312 c 0
+ 424.799804688 354.06640625 434.666015625 338.466796875 440.799804688 321.400390625 c 0
+ 446.93359375 304.333984375 450 287.799804688 450 271.799804688 c 0xd8
+ 450 256.333984375 447.733398438 241.799804688 443.200195312 228.200195312 c 0
+ 438.666015625 214.599609375 432.533203125 201.93359375 424.799804688 190.200195312 c 0
+ 417.06640625 178.466796875 408.266601562 168.06640625 398.400390625 159 c 0
+ 388.533203125 149.93359375 378.266601562 141.93359375 367.599609375 135 c 1
+ 430.533203125 105.133789062 462.533203125 57.93359375 463.599609375 -6.599609375 c 0xc4
+175.599609375 -11.400390625 m 0
+ 175.599609375 -21 177.333984375 -31 180.799804688 -41.400390625 c 0
+ 184.266601562 -51.7998046875 190.266601562 -61.400390625 198.799804688 -70.2001953125 c 0
+ 207.333984375 -79 218.266601562 -86.333984375 231.599609375 -92.2001953125 c 0
+ 244.93359375 -98.06640625 261.733398438 -101 282 -101 c 0
+ 300.133789062 -101 316 -98.333984375 329.599609375 -93 c 0
+ 343.200195312 -87.666015625 354.266601562 -80.8662109375 362.799804688 -72.599609375 c 0
+ 371.333984375 -64.333984375 377.733398438 -54.8662109375 382 -44.2001953125 c 0
+ 386.266601562 -33.533203125 388.400390625 -22.599609375 388.400390625 -11.400390625 c 0
+ 388.400390625 5.666015625 385.200195312 20.599609375 378.799804688 33.400390625 c 0
+ 372.400390625 46.2001953125 363.200195312 57.400390625 351.200195312 67 c 0
+ 339.200195312 76.599609375 324.799804688 84.7333984375 308 91.400390625 c 0
+ 291.200195312 98.06640625 272.133789062 103.799804688 250.799804688 108.599609375 c 1
+ 226.799804688 95.2666015625 208.266601562 78.7333984375 195.200195312 59 c 0
+ 182.133789062 39.2666015625 175.599609375 15.7998046875 175.599609375 -11.400390625 c 0
+375.599609375 272.599609375 m 0xd8
+ 375.599609375 280.599609375 373.866210938 289.400390625 370.400390625 299 c 0
+ 366.93359375 308.599609375 361.466796875 317.533203125 354 325.799804688 c 0
+ 346.533203125 334.06640625 336.93359375 341 325.200195312 346.599609375 c 0
+ 313.466796875 352.200195312 299.06640625 355 282 355 c 0
+ 264.93359375 355 250.400390625 352.333984375 238.400390625 347 c 0
+ 226.400390625 341.666015625 216.666015625 334.866210938 209.200195312 326.599609375 c 0
+ 201.733398438 318.333984375 196.266601562 309.266601562 192.799804688 299.400390625 c 0
+ 189.333984375 289.533203125 187.599609375 279.799804688 187.599609375 270.200195312 c 0
+ 187.599609375 258.466796875 189.733398438 246.733398438 194 235 c 0
+ 198.266601562 223.266601562 204.93359375 212.333984375 214 202.200195312 c 0
+ 223.06640625 192.06640625 234.93359375 183 249.599609375 175 c 0
+ 264.266601562 167 281.733398438 160.599609375 302 155.799804688 c 1
+ 324.400390625 169.133789062 342.266601562 184.733398438 355.599609375 202.599609375 c 0
+ 368.93359375 220.466796875 375.599609375 243.799804688 375.599609375 272.599609375 c 0xd8
+EndSplineSet
+EndChar
+
+StartChar: uni01B9
+Encoding: 441 441 798
+Width: 506
+VWidth: 650
+Flags: W
+HStem: -150.9 62.4004<130.4 252.583> 67.5 60.7998<206.1 369.749> 356.3 61.6006<211.307 333.085>
+VStem: 96 76.7998<162.228 315.864> 378.4 77.5996<149.375 303.731>
+LayerCount: 2
+Fore
+SplineSet
+456 183.5 m 0
+ 456 73.6337890625 428.666015625 -9.43359375 374 -65.7001953125 c 0
+ 319.333984375 -121.966796875 238.133789062 -150.366210938 130.400390625 -150.900390625 c 1
+ 128 -88.5 l 1
+ 161.599609375 -88.5 191.866210938 -85.2998046875 218.799804688 -78.900390625 c 0
+ 245.733398438 -72.5 269.333984375 -62.2333984375 289.599609375 -48.099609375 c 0
+ 309.866210938 -33.966796875 326.799804688 -15.7001953125 340.400390625 6.7001953125 c 0
+ 354 29.099609375 364 56.56640625 370.400390625 89.099609375 c 1
+ 356.533203125 82.7001953125 340.799804688 77.5 323.200195312 73.5 c 0
+ 305.599609375 69.5 287.466796875 67.5 268.799804688 67.5 c 0
+ 237.333984375 67.5 210.666015625 72.166015625 188.799804688 81.5 c 0
+ 166.93359375 90.833984375 149.06640625 103.366210938 135.200195312 119.099609375 c 0
+ 121.333984375 134.833984375 111.333984375 152.966796875 105.200195312 173.5 c 0
+ 99.06640625 194.033203125 96 215.5 96 237.900390625 c 0
+ 96 257.633789062 99.466796875 278.166015625 106.400390625 299.5 c 0
+ 113.333984375 320.833984375 123.866210938 340.299804688 138 357.900390625 c 0
+ 152.133789062 375.5 170.133789062 389.900390625 192 401.099609375 c 0
+ 213.866210938 412.299804688 239.733398438 417.900390625 269.599609375 417.900390625 c 0
+ 300 417.900390625 326.799804688 412.56640625 350 401.900390625 c 0
+ 373.200195312 391.233398438 392.666015625 375.766601562 408.400390625 355.5 c 0
+ 424.133789062 335.233398438 436 310.56640625 444 281.5 c 0
+ 452 252.43359375 456 219.766601562 456 183.5 c 0
+276.799804688 128.299804688 m 0
+ 295.466796875 128.299804688 313.06640625 130.033203125 329.599609375 133.5 c 0
+ 346.133789062 136.966796875 362.133789062 142.166015625 377.599609375 149.099609375 c 1
+ 378.133789062 154.966796875 378.400390625 160.700195312 378.400390625 166.299804688 c 2
+ 378.400390625 183.5 l 2
+ 378.400390625 206.43359375 376.799804688 228.43359375 373.599609375 249.5 c 0
+ 370.400390625 270.56640625 364.666015625 288.966796875 356.400390625 304.700195312 c 0
+ 348.133789062 320.43359375 337.06640625 332.966796875 323.200195312 342.299804688 c 0
+ 309.333984375 351.633789062 291.733398438 356.299804688 270.400390625 356.299804688 c 0
+ 252.799804688 356.299804688 237.866210938 352.56640625 225.599609375 345.099609375 c 0
+ 213.333984375 337.633789062 203.200195312 328.166015625 195.200195312 316.700195312 c 0
+ 187.200195312 305.233398438 181.466796875 292.700195312 178 279.099609375 c 0
+ 174.533203125 265.5 172.799804688 252.299804688 172.799804688 239.5 c 0
+ 172.799804688 203.233398438 181.466796875 175.633789062 198.799804688 156.700195312 c 0
+ 216.133789062 137.766601562 242.133789062 128.299804688 276.799804688 128.299804688 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni01BA
+Encoding: 442 442 799
+Width: 1000
+VWidth: 0
+Flags: W
+LayerCount: 2
+EndChar
+
+StartChar: Uhorn
+Encoding: 431 431 800
+Width: 497
+VWidth: 649
+Flags: W
+HStem: 48 70<26 227>
+VStem: 267 74.4004<-150.7 300.5>
+LayerCount: 2
+Fore
+SplineSet
+26 118 m 1
+ 227 118 l 1
+ 227 48 l 1
+ 26 48 l 1
+ 26 118 l 1
+120.599609375 289.299804688 m 1
+ 151 301.033203125 180.599609375 316.099609375 209.400390625 334.5 c 0
+ 238.200195312 352.900390625 264.599609375 375.966796875 288.599609375 403.700195312 c 1
+ 341.400390625 403.700195312 l 1
+ 341.400390625 -150.700195312 l 1
+ 267 -150.700195312 l 1
+ 267 300.5 l 1
+ 260.599609375 294.633789062 252.733398438 288.5 243.400390625 282.099609375 c 0
+ 234.06640625 275.700195312 223.93359375 269.56640625 213 263.700195312 c 0
+ 202.06640625 257.833984375 190.599609375 252.233398438 178.599609375 246.900390625 c 0
+ 166.599609375 241.56640625 155 237.033203125 143.799804688 233.299804688 c 1
+ 120.599609375 289.299804688 l 1
+EndSplineSet
+EndChar
EndChars
EndSplineFont
diff --git a/spare_parts/scalable/check.svg b/spare_parts/scalable/check.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a5039890ef7ce00c6c96d677ffacc04203b79259
--- /dev/null
+++ b/spare_parts/scalable/check.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="114.77363mm"
+ height="113.99545mm"
+ viewBox="0 0 114.77363 113.99546"
+ version="1.1"
+ id="svg927"
+ inkscape:version="0.92.2 2405546, 2018-03-11"
+ sodipodi:docname="check.svg"
+ inkscape:export-filename="../../picts/check.png"
+ inkscape:export-xdpi="56.595238"
+ inkscape:export-ydpi="56.595238">
+ <defs
+ id="defs921">
+ <filter
+ id="filter3151"
+ inkscape:label="Drop shadow"
+ width="1.5"
+ height="1.5"
+ x="-0.25"
+ y="-0.25">
+ <feGaussianBlur
+ id="feGaussianBlur3153"
+ in="SourceAlpha"
+ stdDeviation="3"
+ result="blur" />
+ <feColorMatrix
+ id="feColorMatrix3155"
+ result="bluralpha"
+ type="matrix"
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+ <feOffset
+ id="feOffset3157"
+ in="bluralpha"
+ dx="6"
+ dy="6"
+ result="offsetBlur" />
+ <feMerge
+ id="feMerge3159">
+ <feMergeNode
+ id="feMergeNode3161"
+ in="offsetBlur" />
+ <feMergeNode
+ id="feMergeNode3163"
+ in="SourceGraphic" />
+ </feMerge>
+ </filter>
+ <linearGradient
+ id="linearGradient2948">
+ <stop
+ style="stop-color:#66f515;stop-opacity:1"
+ offset="0"
+ id="stop2950" />
+ <stop
+ style="stop-color:#002e00;stop-opacity:1"
+ offset="1"
+ id="stop2952" />
+ </linearGradient>
+ <filter
+ inkscape:collect="always"
+ style="color-interpolation-filters:sRGB"
+ id="filter2111"
+ x="-0.036000002"
+ width="1.072"
+ y="-0.035999998"
+ height="1.072">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="1.5915928"
+ id="feGaussianBlur2113" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.7"
+ inkscape:cx="188.81197"
+ inkscape:cy="746.10641"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1600"
+ inkscape:window-height="1163"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0" />
+ <metadata
+ id="metadata924">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-15.503299,-45.260521)">
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0;paint-order:normal"
+ d="m 70.144365,46.319172 c -29.300433,-5e-5 -53.053139,23.75266 -53.05309,53.05309 -5.5e-5,29.300448 23.752653,53.053158 53.05309,53.053108 29.300437,5e-5 53.053155,-23.75266 53.053095,-53.053108 5e-5,-29.30043 -23.752662,-53.05314 -53.053095,-53.05309 z"
+ id="path2084-6"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.803;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0;paint-order:normal;filter:url(#filter2111)"
+ d="m 74.991533,50.388289 a 53.053001,53.053001 0 0 0 -53.053092,53.053101 53.053001,53.053001 0 0 0 53.053092,53.0531 53.053001,53.053001 0 0 0 53.053077,-53.0531 53.053001,53.053001 0 0 0 -53.053077,-53.053101 z m 19.91506,14.69471 7.113247,13.795541 -32.437277,62.92124 -21.61935,-36.11201 7.11222,-13.796072 c 1e-5,0 14.50713,22.312862 14.50713,22.312862 5.46845,-10.60607 25.32403,-49.121561 25.32403,-49.121561 z"
+ id="path2084-5" />
+ <path
+ style="opacity:1;fill:#00b900;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.32291663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0;paint-order:normal"
+ d="M 70.143892,46.318855 A 53.053,53.053 0 0 0 17.0908,99.371946 53.053,53.053 0 0 0 70.143892,152.42505 53.053,53.053 0 0 0 123.19699,99.371946 53.053,53.053 0 0 0 70.143892,46.318855 Z m 19.915063,14.69471 7.11326,13.795542 L 64.73492,137.73034 43.115568,101.61833 50.227795,87.822265 c 3e-6,0 14.507125,22.312855 14.507125,22.312855 5.468451,-10.606083 25.324035,-49.121555 25.324035,-49.121555 z"
+ id="path2084"
+ inkscape:connector-curvature="0" />
+ <g
+ aria-label="!"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:77.91445923px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ id="text1977"
+ transform="translate(1.5875,1.0583333)" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot1979"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ transform="matrix(0.26458333,0,0,0.26458333,16.161658,44.639513)"><flowRegion
+ id="flowRegion1981"><rect
+ id="rect1983"
+ width="35.714287"
+ height="40.714287"
+ x="549.28571"
+ y="125.5201" /></flowRegion><flowPara
+ id="flowPara1985"></flowPara></flowRoot> </g>
+</svg>
diff --git a/src/libs/core/score/tscoreobject.cpp b/src/libs/core/score/tscoreobject.cpp
index 16f60bb6c5c781801ccc7f0e10d7a75eee9e82d6..c23499dbde2697eeeea54d6b562bd6889ba40c73 100644
--- a/src/libs/core/score/tscoreobject.cpp
+++ b/src/libs/core/score/tscoreobject.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2017-2018 by Tomasz Bojczuk *
+ * Copyright (C) 2017-2019 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -564,7 +564,7 @@ void TscoreObject::setShowNoteNames(bool showNames) {
if (notesCount()) {
CHECKTIME (
for (int n = 0; n < notesCount(); ++n)
- m_segments[n]->item()->setNoteNameVisible(m_showNoteNames && m_clefType != Tclef::NoClef);
+ m_segments[n]->item()->setNoteNameVisible(m_showNoteNames && m_clefType != Tclef::NoClef && !m_singleNote);
)
}
}
@@ -587,15 +587,13 @@ void TscoreObject::setNameColor(const QColor& nameC) {
void TscoreObject::setNameStyle(int nameS) {
- if (m_nameStyle != nameS) {
- m_nameStyle = nameS;
- if (m_showNoteNames) {
- if (notesCount()) {
- CHECKTIME(
- for (int n = 0; n < notesCount(); ++n) // with hope that all items have name item created
- m_segments[n]->item()->nameItem()->setProperty("text", m_notes[n].styledName());
- )
- }
+ m_nameStyle = nameS;
+ if (m_showNoteNames) {
+ if (notesCount()) {
+ CHECKTIME(
+ for (int n = 0; n < notesCount(); ++n) // with hope that all items have name item created
+ m_segments[n]->item()->nameItem()->setProperty("text", m_notes[n].styledName());
+ )
}
}
}
diff --git a/src/libs/core/tglobals.cpp b/src/libs/core/tglobals.cpp
index 4054af0e268dc717184763eaa3623d6038c1586c..6d5408bb6172d02516d50336c9901a69517449e1 100755
--- a/src/libs/core/tglobals.cpp
+++ b/src/libs/core/tglobals.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2018 by Tomasz Bojczuk *
+ * Copyright (C) 2011-2019 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -243,6 +243,16 @@ void Tglobals::setNoteNameStyle(int nameStyle) {
}
}
+bool Tglobals::scientificOctaves() const { return S->scientificOctaves; }
+
+void Tglobals::setScientificOctaves(bool sciO) {
+ if (sciO != S->scientificOctaves) {
+ S->scientificOctaves = sciO;
+ Tnote::scientificOctaves = sciO;
+ emit noteNameStyleChanged();
+ }
+}
+
bool Tglobals::namesOnScore() const { return S->namesOnScore; }
void Tglobals::setNamesOnScore(bool showNames) {
@@ -493,6 +503,8 @@ void Tglobals::loadSettings(QSettings* cfg) {
S->tempo = cfg->value(QStringLiteral("tempo"), 120).toInt();
S->scoreScale = cfg->value(QStringLiteral("scoreScale"), 1.0).toReal();
S->lastXmlDir = cfg->value(QStringLiteral("lastXmlDir"), QDir::homePath()).toString();
+ S->scientificOctaves = cfg->value(QStringLiteral("scientificOctaves"), false).toBool();
+ Tnote::scientificOctaves = S->scientificOctaves;
#if defined (Q_OS_ANDROID)
S->lastXmlDir = cfg->value(QStringLiteral("lastXmlDir"), Tandroid::getExternalPath()).toString();
if (!QFileInfo::exists(S->lastXmlDir)) // reset if doesn't exist
@@ -762,6 +774,7 @@ void Tglobals::storeSettings(QSettings* cfg) {
cfg->setValue(QStringLiteral("tempo"), S->tempo);
cfg->setValue(QStringLiteral("scoreScale"), S->scoreScale);
cfg->setValue(QStringLiteral("lastXmlDir"), S->lastXmlDir);
+ cfg->setValue(QStringLiteral("scientificOctaves"), S->scientificOctaves);
cfg->endGroup();
cfg->beginGroup(QLatin1String("noteName"));
diff --git a/src/libs/core/tglobals.h b/src/libs/core/tglobals.h
index c96b44e28eeb27857941c05bdc54d787cfaed134..cefdc3c388b734e3c1c5c6d0af7ab901060fd752 100644
--- a/src/libs/core/tglobals.h
+++ b/src/libs/core/tglobals.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2018 by Tomasz Bojczuk *
+ * Copyright (C) 2011-2019 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -66,10 +66,11 @@ class NOOTKACORE_EXPORT Tglobals : public QObject
Q_PROPERTY(int clefType READ clefType WRITE setClefType NOTIFY clefTypeChanged)
/* Note name switches */
- Q_PROPERTY(qreal namesOnScore READ namesOnScore WRITE setNamesOnScore NOTIFY namesOnScoreChanged)
+ Q_PROPERTY(bool namesOnScore READ namesOnScore WRITE setNamesOnScore NOTIFY namesOnScoreChanged)
Q_PROPERTY(int noteNameStyle READ noteNameStyle WRITE setNoteNameStyle NOTIFY noteNameStyleChanged)
Q_PROPERTY(bool seventhIsB READ seventhIsB WRITE setSeventhIsB NOTIFY seventhIsBChanged)
Q_PROPERTY(QColor nameColor READ nameColor WRITE setNameColor NOTIFY nameColorChanged)
+ Q_PROPERTY(bool scientificOctaves READ scientificOctaves WRITE setScientificOctaves NOTIFY noteNameStyleChanged)
/* Instrument switches */
Q_PROPERTY(Tinstrument instrument READ instrument NOTIFY instrumentChanged)
@@ -195,6 +196,12 @@ public:
int noteNameStyle() const;
void setNoteNameStyle(int nameStyle);
+ /**
+ * As long as it corresponds with note name style, any change invokes @p noteNameStyleChanged() signal
+ */
+ bool scientificOctaves() const;
+ void setScientificOctaves(bool sciO);
+
/* ------------------ Instrument switches ------------------ */
QColor fingerColor() const { return GfingerColor; }
void setFingerColor(const QColor& fc);
diff --git a/src/qml/settings/ScorePage.qml b/src/qml/settings/ScorePage.qml
index b04cc04505ed0cf343cdce750d688904608b38cf..30fbaf2c25be4e3a1e4d5935ab53bc6ad7335c3c 100644
--- a/src/qml/settings/ScorePage.qml
+++ b/src/qml/settings/ScorePage.qml
@@ -1,5 +1,5 @@
/** This file is part of Nootka (http://nootka.sf.net) *
- * Copyright (C) 2017-2018 by Tomasz Bojczuk (seelook@gmail.com) *
+ * Copyright (C) 2017-2019 by Tomasz Bojczuk (seelook@gmail.com) *
* on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
import QtQuick 2.9
@@ -232,20 +232,61 @@ Column {
}
}
Tile {
- TcheckBox {
- id: namesOnScoreChB
- text: qsTr("Show names of all notes on the score")
+ ButtonGroup { id: octaveGr }
+ Column {
anchors.horizontalCenter: parent.horizontalCenter
- checked: GLOB.namesOnScore
+ width: parent.width * 0.9
+ spacing: Noo.fontSize()
+ Row {
+ anchors.horizontalCenter: parent.horizontalCenter
+ spacing: Noo.fontSize() * 2
+ Text { anchors.verticalCenter: parent.verticalCenter; text: qsTr("Octave numbers"); color: activPal.text }
+ RadioButton {
+ id: scientificRadio
+ text: qsTr("scientific")
+ ButtonGroup.group: octaveGr
+ checked: GLOB.scientificOctaves
+ }
+ RadioButton {
+ id: musicalRadio
+ text: qsTr("musical")
+ ButtonGroup.group: octaveGr
+ checked: !GLOB.scientificOctaves
+ }
+ }
+ Text {
+ anchors.horizontalCenter: parent.horizontalCenter
+ color: activPal.text; textFormat: Text.RichText; font.pixelSize: Noo.fontSize() * 0.9
+ text: "<table>"
+ + "<tr><td> <b>"+ Noo.TR("TnoteName", "Octaves") + ":</b> </td><td> <b>" + qsTr("scientific") + "</b> </td><td> <b>" + qsTr("musical") + "</b> </td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "Subcontra octave") + "</td><td align=\"center\">C<sub>0</sub></td><td align=\"center\">C<sub>2</sub></td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "Contra octave") + "</td><td align=\"center\">C<sub>1</sub></td><td align=\"center\">C<sub>1</sub></td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "Great octave") + "</td><td align=\"center\">C<sub>2</sub></td><td align=\"center\">C</td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "Small octave") + "</td><td align=\"center\">C<sub>3</sub></td><td align=\"center\">c</td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "One-line octave") + "</td><td align=\"center\">C<sub>4</sub></td><td align=\"center\">c<sup>1</sup></td></tr>"
+ + "<tr><td>"+ Noo.TR("TnoteName", "Two-line octave") + "</td><td align=\"center\">C<sub>5</sub></td><td align=\"center\">c<sup>2</sup></td></tr>"
+ + "</table>"
+ }
}
+ description: qsTr("Scientific (international) pitch notation is widely used in technical sources and tuning devices/applications, when the other notation style is used more in music publications.")
}
Tile {
- enabled: namesOnScoreChB.checked
- Row {
- spacing: Noo.fontSize()
+ Column {
anchors.horizontalCenter: parent.horizontalCenter
- TlabelText { text: qsTr("names highlight color") }
- ColorButton { id: nameColorButt; color: GLOB.nameColor; title: qsTr("names highlight color") }
+ spacing: Noo.fontSize()
+ TcheckBox {
+ id: namesOnScoreChB
+ text: qsTr("Show names of all notes on the score")
+ anchors.horizontalCenter: parent.horizontalCenter
+ checked: GLOB.namesOnScore
+ }
+ Row {
+ spacing: Noo.fontSize()
+ enabled: namesOnScoreChB.checked
+ anchors.horizontalCenter: parent.horizontalCenter
+ TlabelText { text: qsTr("names highlight color") }
+ ColorButton { id: nameColorButt; color: GLOB.nameColor; title: qsTr("names highlight color") }
+ }
}
}
Component.onCompleted: {
@@ -276,6 +317,7 @@ Column {
GLOB.updateKeySignatureNames()
}
}
+ GLOB.scientificOctaves = scientificRadio.checked
GLOB.noteNameStyle = nameStyleSel.style
GLOB.seventhIsB = is7BSelector.is7B
GLOB.namesOnScore = namesOnScoreChB.checked
@@ -292,6 +334,7 @@ Column {
clefs.selClef = GLOB.instrument.clef
enableKeyChB.checked = false
+ musicalRadio.checked = true
}
function help() { Noo.openHelpLink("score-settings") }