Commit 720a9d0e authored by ROOL's avatar ROOL 🤖
Browse files

User interface overhaul

Detail:
  Largely rewritten interface, designed to be more Style Guide compliant, as well as enabling easy addition of new features. Key changes are:
  * New templates, sprites, messages and supporting Wimp code. Some bugs squashed. Menus and dialogue boxes redesigned
  * Keypresses and input focus added
  * Breve, semibreve and minim rests are now properly distinguished and given their own sprites and positions
  * Double barlines can be added
  * The only other functional change is that if MIDI is present Maestro no longer sends music to both the internal system and the MIDI device when playing. The user can select which one to use from the Instruments window, and there is a tidier method of selecting MIDI channels.
Admin:
  Submission from Chris Wraight.

Version 2.10. Tagged as 'Maestro-2_10'
parent fae7eb14
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -2,12 +2,12 @@
| This application is 1989, 1990, 1991, 1992, 1993 Acorn Computers Ltd.
| All Rights Reserved.
|
If "<Maestro$Running>"="Yes" Then Error Only one copy of !Maestro can be run at a time
If "<Maestro$Running>"="Yes" Then Error Only one copy of Maestro can be run at a time
RMEnsure UtilityModule 3.10 Error This application is only suitable for use with RISC OS 3.10 or later versions
Set Maestro$Dir <Obey$Dir>
IconSprites <Maestro$Dir>.Themes.!Sprites
Set Alias$@RunType_AF1 Run <Maestro$Dir>.!Run %%*0
Set File$Type_AF1 Music
Run <Maestro$Dir>.EnsureRMA
WimpSlot -min 256k -max 640k
WimpSlot -min 256k -max 720k
Run <Maestro$Dir>.!RunImage %*0
# Messages file for Maestro
# General text
_Version:Substituted by awk
JobFailed:Printer job failed
SpriteName:!Maestro
SpriteName:!maestro
Maestro:Maestro
Save:Save
Untitled:<untitled>
Yes:Yes
No:No
MusicFile:MusicFile
# Menu text
Info:Info
Help:Help...
Quit:Quit
File:File
Clear:Clear
Staves:Staves
Instruments:Instruments
FInfo:Info
Save:Save F3
Print:Print... PRINT
Edit:Edit
Goto:Goto F5
Clear:Clear all
Score:Score
Staves:Staves... ^S
Instruments:Instruments... ^I
Voices:Voices
Volume:Volume
V0:ppp
V1:pp
V2:p
V3:mp
V4:mf
V5:f
V6:ff
V7:fff
Tempo:Tempo
TimeSig:Time sig.
KeySig:Key sig.
Goto:Goto
T0:Largissimo
T1:Largo
T2:Larghetto
T3:Grave
T4:Adagio
T5:Adagietto
T6:Andante
T7:Andantino
T8:Moderato
T9:Allegretto
T10:Allegro
T11:Vivace
T12:Veloce
T13:Presto
T14:Prestissimo
Play:Play
Staves:Staves
StaveNum:???
Percussion:+percussion
Volume:Volume
ppp:ppp
pp:pp
p:p
mp:mp
mf:mf
f:f
ff:ff
fff:fff
Tempo:Tempo
Largissimo:Largissimo
Largo:Largo
Larghetto:Larghetto
Grave:Grave
Adagio:Adagio
Adagietto:Adagietto
Andante:Andante
Andantino:Andantino
Moderato:Moderato
Allegretto:Allegretto
Allegro:Allegro
Vivace:Vivace
Veloce:Veloce
Presto:Presto
Prestissimo:Prestissimo
KeySig:Key sig.
Major:Major
Maj:maj
MJ0:Cb
MJ1:Gb
MJ2:Db
MJ3:Ab
MJ4:Eb
MJ5:Bb
MJ6:F
MJ7:C
MJ8:G
MJ9:D
MJ10:A
MJ11:E
MJ12:B
MJ13:F#
MJ14:C#
Minor:Minor
Cb:Cb
Gb:Gb
Db:Db
Ab:Ab
Eb:Eb
Bb:Bb
F:F
C:C
G:G
D:D
A:A
E:E
B:B
Fs:F#
Cs:C#
Gs:G#
Ds:D#
As:A#
Info:Info
Quit:Quit
Untitled:<untitled>
Stave1:1st stave
Stave2:2nd stave
Stave3:3rd stave
Stave4:4th stave
Perc:Perc
Perc1:1st Perc.
Perc2:2nd Perc.
FullL:Full L.
Left:Left
CentreL:Centre L.
Centre:Centre
CentreR:Centre R.
Right:Right
FullR:Full R.
StereoPos:Stereo position (%0)
Min:min
MN0:Ab
MN1:Eb
MN2:Bb
MN3:F
MN4:C
MN5:G
MN6:D
MN7:A
MN8:E
MN9:B
MN10:F#
MN11:C#
MN12:G#
MN13:D#
MN14:A#
TimeSig:Time sig.
S1:1st stave
S2:2nd stave
S3:3rd stave
S4:4th stave
S5:Percussion
Output:Audio output
OT0:Internal 8-bit sound system
OT1:MIDI device
MIDI:MIDI
Channel:Channel
MIDIvoice:MIDI channel %0
# Error messages
BadData:Data transfer failed: Receiver died
Unsaved:Unsaved music. Do you really want to quit?
NoSound:Sound is not enabled. You cannot play
......@@ -87,74 +117,8 @@ BadName:Invalid filename
BadFile:Invalid or locked file
InvMusic:Invalid music file
ToSave:To save, drag the icon to a directory display.
NoSoundQuit:Sound is not enabled. Continue to load !Maestro?
NoSoundQuit:Sound is not enabled. Continue to load Maestro?
Fatal:Error: %0. Program will exit.
IconHelp:This is the Maestro icon.|MClick SELECT to open score.
ScoreHelp0:Click SELECT to place item in score
ScoreHelp1:Select an item in a pane to place on the score
Breve:breve
Semibreve:semibreve
Minim:minim
Crochet:crochet
Quaver:quaver
Semiquaver:semiquaver
Demisemiquaver:demisemiquaver
Hemidemisemiquaver:hemidemisemiquaver
Natural:natural
Sharp:sharp
Flat:flat
DoubleSharp:double-sharp
DoubleFlat:double-flat
NaturalisedSharp:naturalised sharp
NaturalisedFlat:naturalised flat
Dot:dot
DoubleDot:double-dot
TripleDot:triple-dot
Tie:tie
BarLine:bar line
TrebleClef:treble clef
BassClef:bass clef
KeySignature:key signature
TimeSignature:time signature
BreveRest:breve rest
SemibreveRest:semibreve rest
MinimRest:minim rest
CrochetRest:crochet rest
QuaverRest:quaver rest
SemiquaverRest:semiquaver rest
DemisemiquaverRest:demisemiquaver rest
HemidemisemiquaverRest:hemidemisemiquaver rest
SelectNote:Click SELECT to select a %0.
InstrHelp0:Use SELECT and ADJUST to select an instrument for this stave
InstrHelp1:Use SELECT and ADJUST to set the volume of this channel
InstrHelp2:Use SELECT and ADJUST to set the stereo position of this channel
SaveHelp0:Drag this icon into a directory window to save it in that directory
SaveHelp1:Fill in the file name and then drag the icon into a filer directory window to save it
TimeSigHelp:Use SELECT and ADJUST on each field to set a time signature
AbortHelp:Click DISCARD to terminate Maestro, CANCEL to abort this action
CancelExit:Click here to cancel this action
DiscardExit:Click here to discard any changes and exit Maestro
IconHelp0:Move the pointer right for version information
IconHelp1:Click SELECT to quit !Maestro
MainHelp0:Move the pointer right to save this score
MainHelp1:Move the pointer right for information about this score
MainHelp2:Click SELECT to clear this score
MainHelp3:Move the pointer right to set the number of staves
MainHelp4:Move the pointer right to set the type of instrument, volume and stereo position for each stave
MainHelp5:Move the pointer right to set the overall volume for the score
MainHelp6:Move the pointer right to set the tempo for the score
MainHelp7:Move the pointer right to set the time signature for the score
MainHelp8:Move the pointer right to set the key signature for the score
MainHelp9:Move the pointer right to get to a specified bar number
MainHelp10:Click SELECT to play the score
PrintHelp:Move the pointer right to print the score
StaveHelp0:Enter the number of staves required and press Return
StaveHelp1:Click SELECT to add/remove a percussion stave
VolumeHelp:Click SELECT to set the volume
TempoHelp:Click SELECT to set the tempo
MajorKeyHelp:Move the pointer right to set a Major key
MinorKeyHelp:Move the pointer right to set a Minor key
KeySigHelp:Click SELECT to set the key signature
NoVoices:No sound voices are installed
SpriteLoad:loading sprite data.
OutMem1:Not enough memory to load window templates
......@@ -164,18 +128,126 @@ SSIU:Sound system in use by Maestro
IntErr:%0 (internal error %1)
ExProg: - exit program?
NotMusic:'%0' is not a valid music file
Yes:Yes
No:No
MusicFile:MusicFile
Print:Print
NoPrinter:No Printer Driver
LoRes:Printer '%0' is set to %1 by %2 dpi. For good results, set it to 120 by 144 dpi or greater. Continue printing?
ClearHelp:Click 'Save' to save this file, 'Discard' to discard changes, or 'Cancel' to cacnel this operation
SaveB:Click here to save this score
DiscardB:Click here to discard any changes
CancelB:Click here to cancel this action
ClickToPrint:Click on this icon to print this score
PrintName:This is the name of the currently selected printer
PrintDb:This dialogue box controls printing
TooBig:Not enough room for this music file
MIDIvoice:<MIDI only>
JobFailed:Printer job failed
# Help text
IconHelp:\TMaestro icon.|MClick SELECT to open score.
ScoreHelp0:\Tscore window.|M\Splace the selected object on the score.
ScoreHelp1:\Tscore window.|MClick SELECT on a toolbar to select an object.
# Score objects
NH1:breve
NH2:semibreve
NH3:minim
NH4:crochet
NH5:quaver
NH6:semiquaver
NH7:demisemiquaver
NH8:hemidemisemiquaver
NH9:breve rest
NH10:semibreve rest
NH11:minim rest
NH12:crochet rest
NH13:quaver rest
NH14:semiquaver rest
NH15:demisemiquaver rest
NH16:hemidemisemiquaver rest
AH2:natural
AH3:sharp
AH4:flat
AH5:double-sharp
AH6:double-flat
AH7:naturalised sharp
AH8:naturalised flat
AH9:dot
AH10:double-dot
AH11:triple-dot
AH12:tie
AH14:\Sopen the bar lines menu.
AH16:\Sopen the clefs menu.
AH17:key signature
AH18:\Sopen the key signatures menu.
AH19:time signature
AH20:\Sopen the time signatures menu.
B0:bar line
B1:double bar line
C0:treble clef
C1:bass clef
SelectObject:\Sselect a %0.
# Instruments dialogue box
IH:\TInstruments dialogue box.|MHere you can assign instruments to staves, and control volume/stereo settings.
IH0:\Sopen the menu of available voices.
IH1:\Sopen the volume menu.
IH2:\Sset the stereo position of this channel.
IH62:\Schoose the audio output type.
IH63:\Sclose the Instruments dialogue box without making changes.
IH64:\Smake changes and close the Instruments dialogue box.
# Staves dialogue box
SH:\TStaves dialogue box.|MHere you can change the number and type of staves in a score.
SH1:\Sselect a stave structure.
SH6:\Sselect or remove a single percussion stave.
SH7:\Sclose the Staves dialogue box without making changes.
SH8:\Smake changes and close the Staves dialogue box.
# Print dialogue box
PH:\TPrint dialogue box.
PH1:This is the name of the currently selected printer.
PH2:\Sprint the score.
# QuitQuery dialogue box
QH:Click 'Discard' to terminate Maestro, or 'Cancel' to abort this action.
QH0:\Scancel this action.
QH2:\Sdiscard any changes and exit Maestro.
# ClearQuery dialogue box
CH:Click 'Save' to save this file, 'Discard' to discard changes, or 'Cancel' to abort this operation.
CH0:\Ssave this score.
CH2:\Sdiscard any changes.
CH3:\Scancel this action.
# Save dialogue box
SVH:\TSave dialogue box.
SVH0:\Ssave the file.
SVH1:Type a file name here.
SVH2:Drag this icon to a directory window to save.
# Time signature dialogue box
TS:\TTime Signature picker.
TS2:\Sdecrease the notes value.
TS3:\Sincrease the notes value.
TS4:\Sdecrease the beats value.
TS5:\Sincrease the beats value.
TS6:\Sset the time signature.
# Menus
MH0:\Ropen the File menu.
MH1:\Ropen the Edit menu.
MH2:\Ropen the Score menu.
MH3:\Splay the score.
MH0.0:\Ropen the File Info box.
MH0.1:\Ropen the Save dialogue box.
MH0.2:\Sopen the Print dialogue box.
MH1.0:\Rjump to a bar.
MH1.1:\Sclear the current score of all objects.
MH2.0:\Sopen the Staves dialogue box.
MH2.1:\Sopen the Instruments dialogue box.
MH2.2:\Ropen the Volume menu.
MH2.3:\Ropen the Tempo menu.
MH2.2.0:\Schoose a Volume level for the score.
MH2.3.0:\Schoose a Tempo for the score.
ICH0:\Rget information about this version of Maestro.
ICH1:\Sopen the Help file.
ICH2:\Squit Maestro.
/* (2.05)
/* (2.10)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.05
#define Module_MajorVersion_CMHG 2.10
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Mar 2018
#define Module_Date_CMHG 08 Dec 2018
#define Module_MajorVersion "2.05"
#define Module_Version 205
#define Module_MajorVersion "2.10"
#define Module_Version 210
#define Module_MinorVersion ""
#define Module_Date "22 Mar 2018"
#define Module_Date "08 Dec 2018"
#define Module_ApplicationDate "22-Mar-18"
#define Module_ApplicationDate "08-Dec-18"
#define Module_ComponentName "Maestro"
#define Module_ComponentPath "castle/RiscOS/Sources/Apps/Maestro"
#define Module_ComponentPath "apache/RiscOS/Sources/Apps/Maestro"
#define Module_FullVersion "2.05"
#define Module_HelpVersion "2.05 (22 Mar 2018)"
#define Module_LibraryVersionInfo "2:5"
#define Module_FullVersion "2.10"
#define Module_HelpVersion "2.10 (08 Dec 2018)"
#define Module_LibraryVersionInfo "2:10"
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment