mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r18267) -Codechange: make the music window big font aware

release/1.0
rubidium 2009-11-24 13:14:48 +00:00
parent 912bce0b8c
commit 5e247b6e43
53 changed files with 56 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/afrikaans.txt
View File

@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Op Bestelling 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiek Volume
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effek Volume
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/arabic_egypt.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}معدل2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}مستوى الصوت
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}مؤثرات الصوت
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}مرتفع. . . . . .منخفض
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}-----

1
src/lang/brazilian_portuguese.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personaliz. 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos efeitos
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/bulgarian.txt
View File

@ -576,7 +576,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Персонален 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Сила на музиката
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Сила на ефектите
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/catalan.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Opcional 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volum de la música
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volum dels efectes
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/croatian.txt
View File

@ -644,7 +644,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Proizvoljno 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Glasnoća glazbe
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Glasnoća zvukova
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/czech.txt
View File

@ -645,7 +645,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Volba 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Hlasitost hudby
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hlasitost efektů
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/danish.txt
View File

@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musik lydstyrke
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effekt lydstyrke
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/dutch.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Aangepast 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muziekvolume
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Geluidsvolume
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

4
src/lang/english.txt
View File

@ -579,7 +579,9 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Music Volume
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effects Volume
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_RULER_MIN :{TINYFONT}{BLACK}MIN
STR_MUSIC_RULER_MAX :{TINYFONT}{BLACK}MAX
STR_MUSIC_RULER_MARKER :{TINYFONT}{BLACK}'
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/english_US.txt
View File

@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Custom 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Music Volume
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effects Volume
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/esperanto.txt
View File

@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Propra 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muzika Volumeno
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efekta Volumeno
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}- ' ' ' ' ' ' +
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/estonian.txt
View File

@ -635,7 +635,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Omatehtud 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muusika helitugevus
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektide helitugevus
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Vähim ' ' ' ' ' ' Suurim
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/finnish.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Oma 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiikin voimakkuus
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Äänitehosteiden voimakkuus
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/french.txt
View File

@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personnalisé 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume Musique
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume Effets Sonores
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/galician.txt
View File

@ -571,7 +571,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Persoal 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos Efectos de Son
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MÍN ' ' ' ' ' ' MÁX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/german.txt
View File

@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Benutzerdef. 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musiklautstärke
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Soundlautstärke
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/greek.txt
View File

@ -674,7 +674,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Προσαρμοσμένο 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Ένταση Μουσικής
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Ένταση Εφέ
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}ΕΛΑΧ ' ' ' ' ' ' ΜΕΓ
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/hebrew.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}מותאם אישית 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}עוצמת מנגינת רקע
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}עוצמת הצלילים
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/hungarian.txt
View File

@ -612,7 +612,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}SAJÁT 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}ZENE HANGEREJE
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}HANGOK HANGEREJE
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/icelandic.txt
View File

@ -574,7 +574,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Sérval 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Tónlistarstyrkur
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hljóðstyrkur
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}LÁG ' ' ' ' ' ' HÁM
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/indonesian.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Bebas 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume Musik
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume Efek
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/italian.txt
View File

@ -581,7 +581,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personale 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume musica
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume effetti
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/japanese.txt
View File

@ -569,7 +569,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}カスタム 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}音楽の音量
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}エフェクトの音量
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/korean.txt
View File

@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}사용자 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}음량
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}효과 음량
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}최소 ' ' ' ' ' ' 최대
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/latvian.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Speciālais 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Mūzikas skaļums
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektu skaļums
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/lithuanian.txt
View File

@ -613,7 +613,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Speciali 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Muzikos garsas
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektų garsas
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}TYLU ' ' ' ' ' ' GARSU
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/luxembourgish.txt
View File

@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Benotzerdéf. 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musék Lautstärkt
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lautstärkt vun den Effekter
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/norwegian_bokmal.txt
View File

@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Egendefinert 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikkvolum
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lydeffektvolum
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/norwegian_nynorsk.txt
View File

@ -571,7 +571,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Eigendefinert 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikkvolum
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lydeffektvolum
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/polish.txt
View File

@ -958,7 +958,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Własny 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Głośność muzyki
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Głośność efektów
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/portuguese.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personaliz. 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volume da Música
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volume dos efeitos
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/romanian.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personale 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volumul muzicii
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volumul efectelor sonore
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/russian.txt
View File

@ -716,7 +716,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Пользоват. 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Громкость музыки
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Громкость звука
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}МИН ' ' ' ' ' ' МАКС
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/serbian.txt
View File

@ -757,7 +757,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Lični raspored 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Jačina muzike
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Jačina ambijenta
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/simplified_chinese.txt
View File

@ -578,7 +578,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}自定义2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}音乐音量
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}音效音量
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}小' ' '' ' '大
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/slovak.txt
View File

@ -642,7 +642,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Vlastné 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Hlasitost hudby
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hlasitost zvuk. efektov
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/slovenian.txt
View File

@ -615,7 +615,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Po meri 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Glasnost glasbe
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Glasnost zvokov
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/spanish.txt
View File

@ -580,7 +580,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personal 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Volumen música
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Volumen efectos
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/swedish.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Personlig 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikvolym
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effektvolym
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/traditional_chinese.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}自訂二
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}背景音樂音量
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}音效音量
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}最小 ' ' ' ' ' ' 最大
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/turkish.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Özel 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Müzik Sesi
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efekt Sesi
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Düşük ' ' ' ' ' ' Yüksek
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/ukrainian.txt
View File

@ -704,7 +704,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Набір 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Гучність музики
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Гучність ефектів
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}Мін ' ' ' ' ' ' Макс
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/basque.txt
View File

@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Pertsonalizatua 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musikaren Bolumena
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Efektuen Bolumena
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/frisian.txt
View File

@ -496,7 +496,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Eigen 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Musyk Folume
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Effekten Folume
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAKS
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/macedonian.txt
View File

@ -431,7 +431,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Свое 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Гласност на музка
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Гласност на ефекти
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}МИН ' ' ' ' ' ' МАКС
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/malay.txt
View File

@ -463,7 +463,6 @@ STR_MUSIC_PLAYLIST_NEW_STYLE :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_EZY_STREET :{TINYFONT}{BLACK}Lorong Ezy
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Kekuatan muzik
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Kekuatan Kesan Bunyi
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/persian.txt
View File

@ -475,7 +475,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}انتخابی 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}شدت صدای موسیقی
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}شدت صدای محیط
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}حد اکثر . . . . . . . . . حد اقل
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/thai.txt
View File

@ -531,7 +531,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}กำหนดเอง 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}ระดับเสียงดนตรี
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}ระดับเสียงเอฟเฟกต์
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}เงียบ ' ' ' ' ' ' ดัง
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/unfinished/vietnamese.txt
View File

@ -579,7 +579,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Tự Chọn 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Âm Lượng
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Hiệu Ứng Tiếng
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}MIN ' ' ' ' ' ' MAX
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

1
src/lang/welsh.txt
View File

@ -573,7 +573,6 @@ STR_MUSIC_PLAYLIST_CUSTOM_1 :{TINYFONT}{BLAC
STR_MUSIC_PLAYLIST_CUSTOM_2 :{TINYFONT}{BLACK}Cyfaddas 2
STR_MUSIC_MUSIC_VOLUME :{TINYFONT}{BLACK}Lefel Sain Cerddoriaeth
STR_MUSIC_EFFECTS_VOLUME :{TINYFONT}{BLACK}Lefel Sain Effeithiau
STR_MUSIC_MIN_MAX_RULER :{TINYFONT}{BLACK}ISAF ' ' ' ' ' ' MWYAF
STR_MUSIC_TRACK_NONE :{TINYFONT}{DKGREEN}--
STR_MUSIC_TRACK_DIGIT :{TINYFONT}{DKGREEN}{ZEROFILL_NUM}
STR_MUSIC_TITLE_NONE :{TINYFONT}{DKGREEN}------

71
src/music_gui.cpp
View File

@ -451,8 +451,6 @@ enum MusicWidgets {
};
struct MusicWindow : public Window {
static const int slider_bar_height = 4;
static const int slider_height = 7;
static const int slider_width = 3;
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window()
@ -525,7 +523,7 @@ struct MusicWindow : public Window {
StringID str = STR_MUSIC_TRACK_NONE;
if (_song_is_active != 0 && _music_wnd_cursong != 0) {
SetDParam(0, _music_wnd_cursong);
SetDParam(0, 2);
SetDParam(1, 2);
str = STR_MUSIC_TRACK_DIGIT;
}
DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, str);
@ -543,11 +541,7 @@ struct MusicWindow : public Window {
} break;
case MW_MUSIC_VOL: case MW_EFFECT_VOL: {
DrawString(r.left, r.right, r.top + 1, (widget == MW_MUSIC_VOL) ? STR_MUSIC_MUSIC_VOLUME : STR_MUSIC_EFFECTS_VOLUME, TC_FROMSTRING, SA_CENTER);
int y = (r.top + r.bottom - slider_bar_height) / 2;
DrawFrameRect(r.left, y, r.right, y + slider_bar_height, COLOUR_GREY, FR_LOWERED);
DrawString(r.left, r.right, r.bottom - FONT_HEIGHT_SMALL, STR_MUSIC_MIN_MAX_RULER, TC_FROMSTRING, SA_CENTER);
y = (r.top + r.bottom - slider_height) / 2;
DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED);
byte volume = (widget == MW_MUSIC_VOL) ? msf.music_vol : msf.effect_vol;
int x = (volume * (r.right - r.left) / 127);
if (_dynlang.text_dir == TD_RTL) {
@ -555,7 +549,7 @@ struct MusicWindow : public Window {
} else {
x += r.left;
}
DrawFrameRect(x, y, x + slider_width, y + slider_height, COLOUR_GREY, FR_NONE);
DrawFrameRect(x, r.top, x + slider_width, r.bottom, COLOUR_GREY, FR_NONE);
} break;
}
}
@ -650,31 +644,68 @@ static const NWidgetPart _nested_music_window_widgets[] = {
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_SLIDERS),
NWidget(NWID_HORIZONTAL), SetPIP(20, 0, 20),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_MUSIC_VOL), SetMinimalSize(67, 22), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_MUSIC_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_MUSIC_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MAX, STR_NULL),
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_GAUGE), SetMinimalSize(16, 20), SetPadding(1, 11, 1, 11), SetFill(0, 0), EndContainer(),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_EFFECT_VOL), SetMinimalSize(67, 22), SetFill(0, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_SPACER), SetFill(1, 0),
NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_EFFECTS_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_EFFECT_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MAX, STR_NULL),
EndContainer(),
EndContainer(),
EndContainer(),
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_BACKGROUND),
NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3),
NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetDataTip(STR_MUSIC_TRACK, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetFill(0, 0), SetDataTip(STR_MUSIC_TRACK, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NR), EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0),
NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK_TITLE), SetFill(1, 0), SetDataTip(STR_MUSIC_XTITLE, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), SetFill(1, 0), EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MW_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MW_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),

3
src/widget.cpp
View File

@ -1693,7 +1693,8 @@ Dimension NWidgetLeaf::closebox_dimension = {0, 0};
*/
NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data, StringID tip) : NWidgetCore(tp, colour, 1, 1, data, tip)
{
this->SetIndex(index);
assert(index >= 0 || tp == WWT_LABEL || tp == WWT_TEXT);
if (index >= 0) this->SetIndex(index);
this->SetMinimalSize(0, 0);
this->SetResize(0, 0);