diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 40c4db5..fec521b 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -437,7 +437,6 @@ STR_TOOLBAR_SOUND_MUSIC :Klank/musiek ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Laaste boodskap/nuus verslag -STR_NEWS_MENU_MESSAGE_SETTINGS :Boodskap opsies STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Boodskap Geskidenis ############ range ends here diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index d3049c6..0829bcd 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :الموسيق ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :الرسالة الأخيرة/التقرير الجديد -STR_NEWS_MENU_MESSAGE_SETTINGS :اعدادات الرسائل STR_NEWS_MENU_MESSAGE_HISTORY_MENU :الرسائل السابقة ############ range ends here diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 786fe1c..3af7fd4 100644 --- a/src/lang/basque.txt +++ b/src/lang/basque.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :Soinua/musika ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Azken mezua/albiste erreportaia -STR_NEWS_MENU_MESSAGE_SETTINGS :Mezu ezarpenak STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mezuen historia ############ range ends here diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 71b96a2..bec2074 100644 --- a/src/lang/belarusian.txt +++ b/src/lang/belarusian.txt @@ -752,7 +752,6 @@ STR_TOOLBAR_SOUND_MUSIC :Гукі/муз ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Апошняе паведамленьне -STR_NEWS_MENU_MESSAGE_SETTINGS :Наладкi паведамленьняў STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Гісторыя паведамленьняў ############ range ends here diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 77b845c..7f9bc5e 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -437,7 +437,6 @@ STR_TOOLBAR_SOUND_MUSIC :Som/música ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensagem/notícia -STR_NEWS_MENU_MESSAGE_SETTINGS :Definições de mensagem STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de Mensagens ############ range ends here diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 1a78095..2cb0d2a 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -434,7 +434,6 @@ STR_TOOLBAR_SOUND_MUSIC :Звук/муз ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последно съобщение/новини -STR_NEWS_MENU_MESSAGE_SETTINGS :Настройки на съобщенията STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История на съобщенията ############ range ends here diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 7ce3964..107be98 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -440,7 +440,6 @@ STR_TOOLBAR_SOUND_MUSIC :So/música ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Darrer missatge/notícia -STR_NEWS_MENU_MESSAGE_SETTINGS :Preferències dels Missatges STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de Missatges ############ range ends here diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 8d580f4..e52385a 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -535,7 +535,6 @@ STR_TOOLBAR_SOUND_MUSIC :Zvuk/glazba ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslijednja poruka/vijest -STR_NEWS_MENU_MESSAGE_SETTINGS :Postavke poruka STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Povijest poruka ############ range ends here diff --git a/src/lang/czech.txt b/src/lang/czech.txt index af7d4e7..a5efcb3 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -508,7 +508,6 @@ STR_TOOLBAR_SOUND_MUSIC :Zvuk/Hudba ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslední zpráva nebo článek -STR_NEWS_MENU_MESSAGE_SETTINGS :Nastavení zpráv STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historie zpráv ############ range ends here diff --git a/src/lang/danish.txt b/src/lang/danish.txt index fed4adb..2831a76 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Lyd/Musik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Seneste besked/nyhedsrapport -STR_NEWS_MENU_MESSAGE_SETTINGS :Beskedindstillinger STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere beskeder ############ range ends here diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index 02d4f13..6e99cb8 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Geluid/muziek ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Laatste (nieuws)bericht -STR_NEWS_MENU_MESSAGE_SETTINGS :Berichtinstellingen STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berichtengeschiedenis ############ range ends here diff --git a/src/lang/english.txt b/src/lang/english.txt index 874c2dc..d75f961 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sound/music ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report -STR_NEWS_MENU_MESSAGE_SETTINGS :Message settings STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history ############ range ends here diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 664d231..e807ea6 100644 --- a/src/lang/english_AU.txt +++ b/src/lang/english_AU.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sound/music ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report -STR_NEWS_MENU_MESSAGE_SETTINGS :Message settings STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message history ############ range ends here diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index dc3359a..8d90f12 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sound/music ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Last message/news report -STR_NEWS_MENU_MESSAGE_SETTINGS :Message settings STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Message History ############ range ends here diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index ac980e8..3cf23a1 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -434,7 +434,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sono/muziko ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lasta mesaĝo/novaĵo -STR_NEWS_MENU_MESSAGE_SETTINGS :Mesaĝaj agordoj STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaĝa Historio ############ range ends here diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index dc5ecef..efc3237 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -493,7 +493,6 @@ STR_TOOLBAR_SOUND_MUSIC :Heli/muusika ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Viimane teade -STR_NEWS_MENU_MESSAGE_SETTINGS :Teadete seadistused STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Teadete ajalugu ############ range ends here diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 381ea06..d2d86c2 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :Ääni/musiikki ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Viimeisin viesti/uutisraportti -STR_NEWS_MENU_MESSAGE_SETTINGS :Viestiasetukset STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Viestihistoria ############ range ends here diff --git a/src/lang/french.txt b/src/lang/french.txt index 822efca..dcdcf8e 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -440,7 +440,6 @@ STR_TOOLBAR_SOUND_MUSIC :Son/Musique ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Message/Bulletin précédent -STR_NEWS_MENU_MESSAGE_SETTINGS :Options de messagerie STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historique des messages ############ range ends here diff --git a/src/lang/galician.txt b/src/lang/galician.txt index a5776d7..f8814e7 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -426,7 +426,6 @@ STR_TOOLBAR_SOUND_MUSIC :Son/música ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensaxe/noticia -STR_NEWS_MENU_MESSAGE_SETTINGS :Configuración das Mensaxes STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de Mensaxes ############ range ends here diff --git a/src/lang/german.txt b/src/lang/german.txt index ec5a93a..468c50f 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -440,7 +440,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sound/Musik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Letzte Mitteilung/Nachricht -STR_NEWS_MENU_MESSAGE_SETTINGS :Nachrichtenoptionen STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Vergangene Nachrichten ############ range ends here diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 49acb96..6848ac5 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -499,7 +499,6 @@ STR_TOOLBAR_SOUND_MUSIC :Ήχος/Μου ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Τελευταίο μήνυμα/αναφορά νέων -STR_NEWS_MENU_MESSAGE_SETTINGS :Ρυθμίσεις μηνυμάτων STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ιστορικό μηνυμάτων ############ range ends here diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 13a5c80..be0cc7e 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -445,7 +445,6 @@ STR_TOOLBAR_SOUND_MUSIC :צלילים/מ ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :הודעה אחרונה/מבזק חדשות אחרון -STR_NEWS_MENU_MESSAGE_SETTINGS :הגדרות הודעה STR_NEWS_MENU_MESSAGE_HISTORY_MENU :היסטורית הודעות ############ range ends here diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 040c2b3..a913045 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -499,7 +499,6 @@ STR_TOOLBAR_SOUND_MUSIC :Hang/zene ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Legutóbbi üzenet/újsághír -STR_NEWS_MENU_MESSAGE_SETTINGS :Üzenetek beállításai STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Előző üzenetek ############ range ends here diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 0821d72..75bb945 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -431,7 +431,6 @@ STR_TOOLBAR_SOUND_MUSIC :Hljóð/tónlis ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Síðustu skilaboð/frétt -STR_NEWS_MENU_MESSAGE_SETTINGS :Skilaboðastillingar STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Saga skilaboða ############ range ends here diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 5bef2c3..3698d1d 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Suara/musik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pesan/Berita terakhir -STR_NEWS_MENU_MESSAGE_SETTINGS :Pengaturan berita STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berita Lampau ############ range ends here diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 55f881a..b744273 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Fuaim/ceol ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Teachtaireacht/tuairisc nuachta deiridh -STR_NEWS_MENU_MESSAGE_SETTINGS :Socruithe teachtaireachtaí STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Stair na dteachtaireachtaí ############ range ends here diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 2915115..129808b 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -441,7 +441,6 @@ STR_TOOLBAR_SOUND_MUSIC :Suoni/musica ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimo messaggio/notizia -STR_NEWS_MENU_MESSAGE_SETTINGS :Impostazioni messaggi STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Cronologia messaggi ############ range ends here diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index e0420d9..7d577ba 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :効果音／音 ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :最後のメッセージとニュース -STR_NEWS_MENU_MESSAGE_SETTINGS :メッセージの設定 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :メッセージの履歴 ############ range ends here diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 2b031a2..7d7f03d 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :사운드/음 ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :최근 메시지/뉴스 기록 -STR_NEWS_MENU_MESSAGE_SETTINGS :메시지 설정 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :과거 메시지 목록 ############ range ends here diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index b272a21..1f9f075 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -440,7 +440,6 @@ STR_TOOLBAR_SOUND_MUSIC :Skaņa/mūzika ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pēdējais ziņojums/avīzes raksts -STR_NEWS_MENU_MESSAGE_SETTINGS :Ziņojumu iestatījumi STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Ziņojumu vēsture ############ range ends here diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 8c6aaa4..6199bbd 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -633,7 +633,6 @@ STR_TOOLBAR_SOUND_MUSIC :Garsas/muzika ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Paskutinė žinutė/naujiena -STR_NEWS_MENU_MESSAGE_SETTINGS :Žinučių nustatymai STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Žinučių istorija ############ range ends here diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 1bd18fb..afc8d1c 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sound/Musék ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Läscht Meldung/Neiegkeet -STR_NEWS_MENU_MESSAGE_SETTINGS :Meldungsanstellungen STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meldungshistorie ############ range ends here diff --git a/src/lang/malay.txt b/src/lang/malay.txt index b721ed6..424e38d 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Bunyi/muzik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Pesanan/laporan berita terkini -STR_NEWS_MENU_MESSAGE_SETTINGS :Tetapan Pesanan STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Pesanan sebelumnya ############ range ends here diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 72f71ce..0cc7b1c 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Lyd/musikk ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Siste melding/nyhet -STR_NEWS_MENU_MESSAGE_SETTINGS :Meldingsinnstillinger STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidligere meldinger ############ range ends here diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index ef9476a..f797971 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Lyd/musikk ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Siste melding/nyheit -STR_NEWS_MENU_MESSAGE_SETTINGS :Meldingsinstillingar STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Tidlegare meldingar ############ range ends here diff --git a/src/lang/polish.txt b/src/lang/polish.txt index d3e75b5..83eb3ae 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -817,7 +817,6 @@ STR_TOOLBAR_SOUND_MUSIC :Dźwięk/muzyka ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ostatnia wiadomość/ogłoszenie -STR_NEWS_MENU_MESSAGE_SETTINGS :Ustawienia wiadomości STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Poprzednie wiadomości ############ range ends here diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 134c943..f5a3cd0 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -438,7 +438,6 @@ STR_TOOLBAR_SOUND_MUSIC :Som/música ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Última mensagem/notícia -STR_NEWS_MENU_MESSAGE_SETTINGS :Opções de mensagens STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Histórico de mensagens ############ range ends here diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index cb7f18d..be15b13 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sunet/muzică ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima ştire -STR_NEWS_MENU_MESSAGE_SETTINGS :Setări mesaje STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Lista ultimelor mesaje ############ range ends here diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 36152d4..fa84acb 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -565,7 +565,6 @@ STR_TOOLBAR_SOUND_MUSIC :Звук/муз ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последняя новость -STR_NEWS_MENU_MESSAGE_SETTINGS :Настройки сообщений STR_NEWS_MENU_MESSAGE_HISTORY_MENU :История сообщений ############ range ends here diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index b266278..23afe50 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -624,7 +624,6 @@ STR_TOOLBAR_SOUND_MUSIC :Zvuk/muzika ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Poslednja poruka/izveštaj -STR_NEWS_MENU_MESSAGE_SETTINGS :Podešavanja poruka STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Istorija Obaveštenja ############ range ends here diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 7f6e836..88140f5 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :声音/音乐 ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :最新消息/新闻 -STR_NEWS_MENU_MESSAGE_SETTINGS :消息选项 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :消息历史 ############ range ends here diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index d3b8e4a..d423927 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -500,7 +500,6 @@ STR_TOOLBAR_SOUND_MUSIC :Zvuk/Hudba ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Zobraziť poslednú správu/novinku -STR_NEWS_MENU_MESSAGE_SETTINGS :Nastavenia správ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Archív správ ############ range ends here diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 62b2f34..ef12906 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -589,7 +589,6 @@ STR_TOOLBAR_SOUND_MUSIC :Zvok/glasba ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Zadnje sporočilo/novica -STR_NEWS_MENU_MESSAGE_SETTINGS :Nastavitve sporočil STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Zgodovina sporočil ############ range ends here diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index f50beb5..59a27b2 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -439,7 +439,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sonido/música ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Último mensaje/noticia -STR_NEWS_MENU_MESSAGE_SETTINGS :Opciones de mensajes STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Historial de mensajes ############ range ends here diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 9d4a928..ff29991 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Ljud/musik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Senaste meddelandet/nyheten -STR_NEWS_MENU_MESSAGE_SETTINGS :Meddelandeinställningar STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Meddelandehistorik ############ range ends here diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 270410e..98662b5 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -433,7 +433,6 @@ STR_TOOLBAR_SOUND_MUSIC :音效／背景 ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :上次訊息／新聞報告 -STR_NEWS_MENU_MESSAGE_SETTINGS :訊息設定 STR_NEWS_MENU_MESSAGE_HISTORY_MENU :訊息記錄 ############ range ends here diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 8264249..a2fc721 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -437,7 +437,6 @@ STR_TOOLBAR_SOUND_MUSIC :Ses/müzik ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Son mesaj/haber -STR_NEWS_MENU_MESSAGE_SETTINGS :Mesaj ayarları STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Mesaj Geçmişi ############ range ends here diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index dcabb99..1058264 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -564,7 +564,6 @@ STR_TOOLBAR_SOUND_MUSIC :Звук/Муз ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Останнє повідомлення -STR_NEWS_MENU_MESSAGE_SETTINGS :Налаштування повідомлень STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Історія повідомлень ############ range ends here diff --git a/src/lang/unfinished/faroese.txt b/src/lang/unfinished/faroese.txt index 774d11b..56440f2 100644 --- a/src/lang/unfinished/faroese.txt +++ b/src/lang/unfinished/faroese.txt @@ -420,7 +420,6 @@ STR_TOOLBAR_SOUND_MUSIC :Ljóð/ tónlei ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Seinastu boð/tíðinda frásøgn -STR_NEWS_MENU_MESSAGE_SETTINGS :Boð innstilling ############ range ends here ############ range for about menu starts diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 2aafbb6..e4f9c61 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -433,7 +433,6 @@ STR_TOOLBAR_SOUND_MUSIC :Lûd/musyk ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Lêste (neis)berjocht -STR_NEWS_MENU_MESSAGE_SETTINGS :Berjocht ynstellings STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Berjochtenskiednis ############ range ends here diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt index fb2135d..7a3c12c 100644 --- a/src/lang/unfinished/macedonian.txt +++ b/src/lang/unfinished/macedonian.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Звук/муз ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Последната порака/вест -STR_NEWS_MENU_MESSAGE_SETTINGS :Поставки за пораки STR_NEWS_MENU_MESSAGE_HISTORY_MENU :порака историјата ############ range ends here diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt index 344a603..37384c4 100644 --- a/src/lang/unfinished/marathi.txt +++ b/src/lang/unfinished/marathi.txt @@ -358,7 +358,6 @@ STR_TOOLBAR_SOUND_MUSIC :ध्वनी ############ range ends here ############ range for message menu starts -STR_NEWS_MENU_MESSAGE_SETTINGS :निरोपांचे पर्याय STR_NEWS_MENU_MESSAGE_HISTORY_MENU :निरोपांचा इतिहास ############ range ends here diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt index c0e2392..cc44d9d 100644 --- a/src/lang/unfinished/persian.txt +++ b/src/lang/unfinished/persian.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :صدا/موسی ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :گزارش آخرین پیام/خبر -STR_NEWS_MENU_MESSAGE_SETTINGS :تنظیمات پیغام ها STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخچه پیام ها ############ range ends here diff --git a/src/lang/unfinished/tamil.txt b/src/lang/unfinished/tamil.txt index c1d1a46..d62cdb2 100644 --- a/src/lang/unfinished/tamil.txt +++ b/src/lang/unfinished/tamil.txt @@ -431,7 +431,6 @@ STR_TOOLBAR_SOUND_MUSIC :ஒலி/இ ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :கடைசி செய்தி/செய்தி அறிவிக்கை -STR_NEWS_MENU_MESSAGE_SETTINGS :செய்தி அமைப்புகள் STR_NEWS_MENU_MESSAGE_HISTORY_MENU :செய்தி வரலாறு ############ range ends here diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt index 6f2442c..3cbd9e9 100644 --- a/src/lang/unfinished/thai.txt +++ b/src/lang/unfinished/thai.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :เสียง ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :ข้อความล่าสุด/รายงานข่าว -STR_NEWS_MENU_MESSAGE_SETTINGS :กำหนดค่าการแสดงข้อความ STR_NEWS_MENU_MESSAGE_HISTORY_MENU :ดูข้อความย้อนหลัง ############ range ends here diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt index 16abfc6..651dbe3 100644 --- a/src/lang/unfinished/urdu.txt +++ b/src/lang/unfinished/urdu.txt @@ -437,7 +437,6 @@ STR_TOOLBAR_SOUND_MUSIC :آواز و م ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :پچھلا پیعام/ خبر -STR_NEWS_MENU_MESSAGE_SETTINGS :اختیاراتِ پعغام STR_NEWS_MENU_MESSAGE_HISTORY_MENU :تاریخِ پیغامات ############ range ends here diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index ef222ee..15a321a 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Âm thanh/nhạ ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Thư/bản tin cuối cùng -STR_NEWS_MENU_MESSAGE_SETTINGS :Cài đặt thông báo STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Thông báo cũ ############ range ends here diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 5d45234..22222a6 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -436,7 +436,6 @@ STR_TOOLBAR_SOUND_MUSIC :Sain/cerddoriae ############ range for message menu starts STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Neges/Adroddiad newyddion ddiwethaf -STR_NEWS_MENU_MESSAGE_SETTINGS :Gosodiadau negeseuon STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Hanes negeseuon ############ range ends here diff --git a/src/news_func.h b/src/news_func.h index 4e15e7f..cd0862f 100644 --- a/src/news_func.h +++ b/src/news_func.h @@ -58,9 +58,6 @@ void NewsLoop(); void InitNewsItemStructs(); extern const NewsItem *_statusbar_news_item; -//TODO ER cleanup required: extern bool _news_ticker_sound; - -//TODO ER cleanup required: extern NewsTypeData _news_type_data[]; void DeleteInvalidEngineNews(); void DeleteVehicleNews(VehicleID vid, StringID news); diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 60a7efa..e553e3a 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -39,7 +39,6 @@ #include "table/strings.h" const NewsItem *_statusbar_news_item = NULL; -// TODO ER cleanup required: bool _news_ticker_sound; ///< Make a ticker sound when a news item is published. static uint MIN_NEWS_AMOUNT = 30; ///< prefered minimum amount of news messages static uint _total_news = 0; ///< current number of news items @@ -1134,273 +1133,3 @@ void ShowMessageHistory() new MessageHistoryWindow(&_message_history_desc); } -// TODO ER Cleanup required -struct MessageOptionsWindow : Window { - static const StringID message_opt[]; ///< Message report options, 'off', 'summary', or 'full'. - int state; ///< Option value for setting all categories at once. - Dimension dim_message_opt; ///< Amount of space needed for a label such that all labels will fit. - - MessageOptionsWindow(const WindowDesc *desc) : Window() - { - this->InitNested(desc, WN_GAME_OPTIONS_MESSAGE_OPTION); - /* Set up the initial disabled buttons in the case of 'off' or 'full' */ - NewsDisplay all_val = _news_type_data[0].GetNewsDisplay(); - for (int i = 0; i < NT_END; i++) { - this->SetMessageButtonStates(_news_type_data[i].GetNewsDisplay(), i); - /* If the value doesn't match the ALL-button value, set the ALL-button value to 'off' */ - if (_news_type_data[i].GetNewsDisplay() != all_val) all_val = ND_OFF; - } - /* If all values are the same value, the ALL-button will take over this value */ - this->state = all_val; - this->OnInvalidateData(0); - } - - /** - * Setup the disabled/enabled buttons in the message window - * If the value is 'off' disable the [<] widget, and enable the [>] one - * Same-wise for all the others. Starting value of 4 is the first widget - * group. These are grouped as [<][>] .. [<][>], etc. - * @param value to set in the widget - * @param element index of the group of widget to set - */ - void SetMessageButtonStates(byte value, int element) - { - element *= MOS_WIDG_PER_SETTING; - - this->SetWidgetDisabledState(element + WID_MO_START_OPTION, value == 0); - this->SetWidgetDisabledState(element + WID_MO_START_OPTION + 2, value == 2); - } - - virtual void DrawWidget(const Rect &r, int widget) const - { - if (widget >= WID_MO_START_OPTION && widget < WID_MO_END_OPTION && (widget - WID_MO_START_OPTION) % MOS_WIDG_PER_SETTING == 1) { - /* Draw the string of each setting on each button. */ - int i = (widget - WID_MO_START_OPTION) / MOS_WIDG_PER_SETTING; - DrawString(r.left, r.right, r.top + 2, this->message_opt[_news_type_data[i].GetNewsDisplay()], TC_BLACK, SA_HOR_CENTER); - } - } - - virtual void OnInit() - { - this->dim_message_opt.width = 0; - this->dim_message_opt.height = 0; - for (const StringID *str = message_opt; *str != INVALID_STRING_ID; str++) this->dim_message_opt = maxdim(this->dim_message_opt, GetStringBoundingBox(*str)); - } - - virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) - { - if (widget >= WID_MO_START_OPTION && widget < WID_MO_END_OPTION) { - /* Height is the biggest widget height in a row. */ - size->height = FONT_HEIGHT_NORMAL + max(WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM, WD_IMGBTN_TOP + WD_IMGBTN_BOTTOM); - - /* Compute width for the label widget only. */ - if ((widget - WID_MO_START_OPTION) % MOS_WIDG_PER_SETTING == 1) { - size->width = this->dim_message_opt.width + padding.width + MOS_BUTTON_SPACE; // A bit extra for better looks. - } - return; - } - - /* Size computations for global message options. */ - if (widget == WID_MO_DROP_SUMMARY || widget == WID_MO_LABEL_SUMMARY || widget == WID_MO_SOUNDTICKER || widget == WID_MO_SOUNDTICKER_LABEL) { - /* Height is the biggest widget height in a row. */ - size->height = FONT_HEIGHT_NORMAL + max(WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM, WD_DROPDOWNTEXT_TOP + WD_DROPDOWNTEXT_BOTTOM); - - if (widget == WID_MO_DROP_SUMMARY) { - size->width = this->dim_message_opt.width + padding.width + MOS_BUTTON_SPACE; // A bit extra for better looks. - } else if (widget == WID_MO_SOUNDTICKER) { - size->width += MOS_BUTTON_SPACE; // A bit extra for better looks. - } - return; - } - } - - /** - * Some data on this window has become invalid. - * @param data Information about the changed data. - * @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details. - */ - virtual void OnInvalidateData(int data = 0, bool gui_scope = true) - { - if (!gui_scope) return; - /* Update the dropdown value for 'set all categories'. */ - this->GetWidget(WID_MO_DROP_SUMMARY)->widget_data = this->message_opt[this->state]; - - /* Update widget to reflect the value of the #_news_ticker_sound variable. */ - // TODO ER Cleanup required: - this->SetWidgetLoweredState(WID_MO_SOUNDTICKER, _settings_client.news.sound_for_summarized_messages); - } - - virtual void OnClick(Point pt, int widget, int click_count) - { - switch (widget) { - case WID_MO_DROP_SUMMARY: // Dropdown menu for all settings - ShowDropDownMenu(this, this->message_opt, this->state, WID_MO_DROP_SUMMARY, 0, 0); - break; - - case WID_MO_SOUNDTICKER: // Change ticker sound on/off - // TODO ER Cleanup required - _settings_client.news.sound_for_summarized_messages ^= 1; - this->InvalidateData(); - break; - - default: { // Clicked on the [<] .. [>] widgets - if (widget >= WID_MO_START_OPTION && widget < WID_MO_END_OPTION) { - int wid = widget - WID_MO_START_OPTION; - int element = wid / MOS_WIDG_PER_SETTING; - byte val = (_news_type_data[element].GetNewsDisplay() + ((wid % MOS_WIDG_PER_SETTING) ? 1 : -1)) % 3; - - this->SetMessageButtonStates(val, element); - // TODO ER cleanup required *_news_type_data[element].GetNewsDisplay() = (NewsDisplay)val; - this->SetDirty(); - } - break; - } - } - } - - virtual void OnDropdownSelect(int widget, int index) - { - this->state = index; - - for (int i = 0; i < NT_END; i++) { - this->SetMessageButtonStates(index, i); - // TODO ER cleanup required: *_news_type_data[i].display = (NewsDisplay)index; - } - this->InvalidateData(); - } -}; - -const StringID MessageOptionsWindow::message_opt[] = {STR_NEWS_MESSAGES_OFF, STR_NEWS_MESSAGES_SUMMARY, STR_NEWS_MESSAGES_FULL, INVALID_STRING_ID}; - -/** Make a column with the buttons for changing each news category setting, and the global settings. */ -static NWidgetBase *MakeButtonsColumn(int *biggest_index) -{ - NWidgetVertical *vert_buttons = new NWidgetVertical; - - /* Top-part of the column, one row for each new category. */ - int widnum = WID_MO_START_OPTION; - for (int i = 0; i < NT_END; i++) { - NWidgetHorizontal *hor = new NWidgetHorizontal; - /* [<] button. */ - NWidgetLeaf *leaf = new NWidgetLeaf(WWT_PUSHARROWBTN, COLOUR_YELLOW, widnum, AWV_DECREASE, STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST); - leaf->SetFill(1, 1); - hor->Add(leaf); - /* Label. */ - leaf = new NWidgetLeaf(WWT_PUSHTXTBTN, COLOUR_YELLOW, widnum + 1, STR_EMPTY, STR_NULL); - leaf->SetFill(1, 1); - hor->Add(leaf); - /* [>] button. */ - leaf = new NWidgetLeaf(WWT_PUSHARROWBTN, COLOUR_YELLOW, widnum + 2, AWV_INCREASE, STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST); - leaf->SetFill(1, 1); - hor->Add(leaf); - vert_buttons->Add(hor); - - widnum += MOS_WIDG_PER_SETTING; - } - *biggest_index = widnum - MOS_WIDG_PER_SETTING + 2; - - /* Space between the category buttons and the global settings buttons. */ - NWidgetSpacer *spacer = new NWidgetSpacer(0, MOS_ABOVE_GLOBAL_SETTINGS); - vert_buttons->Add(spacer); - - /* Bottom part of the column with buttons for global changes. */ - NWidgetLeaf *leaf = new NWidgetLeaf(WWT_DROPDOWN, COLOUR_YELLOW, WID_MO_DROP_SUMMARY, STR_EMPTY, STR_NULL); - leaf->SetFill(1, 1); - vert_buttons->Add(leaf); - - leaf = new NWidgetLeaf(WWT_TEXTBTN_2, COLOUR_YELLOW, WID_MO_SOUNDTICKER, STR_STATION_BUILD_COVERAGE_OFF, STR_NULL); - leaf->SetFill(1, 1); - vert_buttons->Add(leaf); - - *biggest_index = max(*biggest_index, max(WID_MO_DROP_SUMMARY, WID_MO_SOUNDTICKER)); - return vert_buttons; -} - -/** Make a column with descriptions for each news category and the global settings. */ -static NWidgetBase *MakeDescriptionColumn(int *biggest_index) -{ - NWidgetVertical *vert_desc = new NWidgetVertical; - - /* Top-part of the column, one row for each new category. */ - int widnum = WID_MO_START_OPTION; - for (int i = 0; i < NT_END; i++) { - NWidgetHorizontal *hor = new NWidgetHorizontal; - - /* Descriptive text. */ - // TODO ER cleanup: - NWidgetLeaf *leaf = new NWidgetLeaf(WWT_TEXT, COLOUR_YELLOW, widnum + 3, STR_NULL, STR_NULL); - hor->Add(leaf); - /* Filling empty space to push text to the left. */ - NWidgetSpacer *spacer = new NWidgetSpacer(0, 0); - spacer->SetFill(1, 0); - hor->Add(spacer); - vert_desc->Add(hor); - - widnum += MOS_WIDG_PER_SETTING; - } - *biggest_index = widnum - MOS_WIDG_PER_SETTING + 3; - - /* Space between the category descriptions and the global settings descriptions. */ - NWidgetSpacer *spacer = new NWidgetSpacer(0, MOS_ABOVE_GLOBAL_SETTINGS); - vert_desc->Add(spacer); - - /* Bottom part of the column with descriptions of global changes. */ - NWidgetHorizontal *hor = new NWidgetHorizontal; - NWidgetLeaf *leaf = new NWidgetLeaf(WWT_TEXT, COLOUR_YELLOW, WID_MO_LABEL_SUMMARY, STR_NEWS_MESSAGES_ALL, STR_NULL); - hor->Add(leaf); - /* Filling empty space to push text to the left. */ - spacer = new NWidgetSpacer(0, 0); - spacer->SetFill(1, 0); - hor->Add(spacer); - vert_desc->Add(hor); - - hor = new NWidgetHorizontal; - leaf = new NWidgetLeaf(WWT_TEXT, COLOUR_YELLOW, WID_MO_SOUNDTICKER_LABEL, STR_NEWS_MESSAGES_SOUND, STR_NULL); - hor->Add(leaf); - /* Filling empty space to push text to the left. */ - spacer = new NWidgetSpacer(0, 0); - leaf->SetFill(1, 0); - hor->Add(spacer); - vert_desc->Add(hor); - - *biggest_index = max(*biggest_index, max(WID_MO_LABEL_SUMMARY, WID_MO_SOUNDTICKER_LABEL)); - return vert_desc; -} - -static const NWidgetPart _nested_message_options_widgets[] = { - NWidget(NWID_HORIZONTAL), - NWidget(WWT_CLOSEBOX, COLOUR_BROWN), - NWidget(WWT_CAPTION, COLOUR_BROWN), SetDataTip(STR_NEWS_MESSAGE_OPTIONS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), - EndContainer(), - NWidget(WWT_PANEL, COLOUR_BROWN, WID_MO_BACKGROUND), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetFill(1, 0), - NWidget(WWT_LABEL, COLOUR_BROWN, WID_MO_LABEL), SetMinimalSize(0, 14), SetDataTip(STR_NEWS_MESSAGE_TYPES, STR_NULL), - NWidget(NWID_SPACER), SetFill(1, 0), - EndContainer(), - NWidget(NWID_HORIZONTAL), - NWidget(NWID_SPACER), SetMinimalSize(MOS_LEFT_EDGE, 0), - NWidgetFunction(MakeButtonsColumn), - NWidget(NWID_SPACER), SetMinimalSize(MOS_COLUMN_SPACING, 0), - NWidgetFunction(MakeDescriptionColumn), - NWidget(NWID_SPACER), SetMinimalSize(MOS_RIGHT_EDGE, 0), - EndContainer(), - NWidget(NWID_SPACER), SetMinimalSize(0, MOS_BOTTOM_EDGE), - EndContainer(), -}; - -static const WindowDesc _message_options_desc( - WDP_AUTO, 0, 0, - WC_GAME_OPTIONS, WC_NONE, - 0, - _nested_message_options_widgets, lengthof(_nested_message_options_widgets) -); - -/** - * Show the settings window for news messages. - */ -void ShowMessageOptions() -{ - DeleteWindowByClass(WC_GAME_OPTIONS); - new MessageOptionsWindow(&_message_options_desc); -} diff --git a/src/news_gui.h b/src/news_gui.h index 3029d43..f0b28a7 100644 --- a/src/news_gui.h +++ b/src/news_gui.h @@ -13,7 +13,6 @@ #define NEWS_GUI_H void ShowLastNewsMessage(); -void ShowMessageOptions(); void ShowMessageHistory(); #endif /* NEWS_GUI_H */ diff --git a/src/script/api/game/game_window.hpp.sq b/src/script/api/game/game_window.hpp.sq index 0eae42a..aec5564 100644 --- a/src/script/api/game/game_window.hpp.sq +++ b/src/script/api/game/game_window.hpp.sq @@ -809,14 +809,6 @@ void SQGSWindow_Register(Squirrel *engine) SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_STICKYBOX, "WID_MH_STICKYBOX"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_BACKGROUND, "WID_MH_BACKGROUND"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MH_SCROLLBAR, "WID_MH_SCROLLBAR"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_BACKGROUND, "WID_MO_BACKGROUND"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_LABEL, "WID_MO_LABEL"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_DROP_SUMMARY, "WID_MO_DROP_SUMMARY"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_LABEL_SUMMARY, "WID_MO_LABEL_SUMMARY"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_SOUNDTICKER, "WID_MO_SOUNDTICKER"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_SOUNDTICKER_LABEL, "WID_MO_SOUNDTICKER_LABEL"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_START_OPTION, "WID_MO_START_OPTION"); - SQGSWindow.DefSQConst(engine, ScriptWindow::WID_MO_END_OPTION, "WID_MO_END_OPTION"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_CLASS_LIST, "WID_BO_CLASS_LIST"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_SCROLLBAR, "WID_BO_SCROLLBAR"); SQGSWindow.DefSQConst(engine, ScriptWindow::WID_BO_OBJECT_MATRIX, "WID_BO_OBJECT_MATRIX"); diff --git a/src/script/api/script_window.hpp b/src/script/api/script_window.hpp index 3bdc0c1..d3cd46a 100644 --- a/src/script/api/script_window.hpp +++ b/src/script/api/script_window.hpp @@ -1837,19 +1837,6 @@ public: WID_MH_SCROLLBAR = ::WID_MH_SCROLLBAR, ///< Scrollbar for the list. }; - /** Widgets of the #MessageOptionsWindow class. */ - enum MessageOptionWidgets { - WID_MO_BACKGROUND = ::WID_MO_BACKGROUND, ///< Background of the window. - WID_MO_LABEL = ::WID_MO_LABEL, ///< Top label. - WID_MO_DROP_SUMMARY = ::WID_MO_DROP_SUMMARY, ///< Dropdown that adjusts at once the level for all settings. - WID_MO_LABEL_SUMMARY = ::WID_MO_LABEL_SUMMARY, ///< Label of the summary drop down. - WID_MO_SOUNDTICKER = ::WID_MO_SOUNDTICKER, ///< Button for (de)activating sound on events. - WID_MO_SOUNDTICKER_LABEL = ::WID_MO_SOUNDTICKER_LABEL, ///< Label of the soundticker button. - - WID_MO_START_OPTION = ::WID_MO_START_OPTION, ///< First widget that is part of a group [<][label][>] [description]. - WID_MO_END_OPTION = ::WID_MO_END_OPTION, ///< First widget after the groups. - }; - /* automatically generated from ../../widgets/object_widget.h */ /** Widgets of the #BuildObjectWindow class. */ enum BuildObjectWidgets { diff --git a/src/script/api/template/template_window.hpp.sq b/src/script/api/template/template_window.hpp.sq index ac521c4..846bcf8 100644 --- a/src/script/api/template/template_window.hpp.sq +++ b/src/script/api/template/template_window.hpp.sq @@ -165,8 +165,6 @@ namespace SQConvert { template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::NewsWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::MessageHistoryWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::MessageHistoryWidgets)tmp; } template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::MessageHistoryWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } - template <> inline ScriptWindow::MessageOptionWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::MessageOptionWidgets)tmp; } - template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::MessageOptionWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::BuildObjectWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::BuildObjectWidgets)tmp; } template <> inline int Return(HSQUIRRELVM vm, ScriptWindow::BuildObjectWidgets res) { sq_pushinteger(vm, (int32)res); return 1; } template <> inline ScriptWindow::OrderWidgets GetParam(ForceType, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (ScriptWindow::OrderWidgets)tmp; } diff --git a/src/settings.cpp b/src/settings.cpp index dd261bb..6d2bf18 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1242,35 +1242,6 @@ static void HandleOldDiffCustom(bool savegame) } } -// TODO ER cleanup required - -///** -// * tries to convert newly introduced news settings based on old ones -// * @param name pointer to the string defining name of the old news config -// * @param value pointer to the string defining value of the old news config -// * @returns true if conversion could have been made -// */ -//static bool ConvertOldNewsSetting(const char *name, const char *value) -//{ -// if (strcasecmp(name, "openclose") == 0) { -// /* openclose has been split in "open" and "close". -// * So the job is now to decrypt the value of the old news config -// * and give it to the two newly introduced ones*/ -// -// NewsDisplay display = ND_OFF; // default -// if (strcasecmp(value, "full") == 0) { -// display = ND_FULL; -// } else if (strcasecmp(value, "summarized") == 0) { -// display = ND_SUMMARY; -// } -// /* transfer values */ -// _settings_client.news.open = (uint8) display; -// _settings_client.news.close = (uint8) display; -// return true; -// } -// return false; -//} - /** * Tried to read the really old news settings variant having 'openclose' option in * group 'news_display' and converts them into the new advanced configuration format. @@ -1303,57 +1274,6 @@ static void ReadOldNewsSettingOpenClose(IniFile *ini, const char *grpname) } } -///** -// * Load newstype settings from a configuration file. -// * @param ini the configuration to read from. -// * @param grpname Name of the group containing the news type settings. -// */ -//static void NewsDisplayLoadConfig(IniFile *ini, const char *grpname) -//{ -// -// // TODO ER CLEANUP REQUIRED -// -// IniGroup *group = ini->GetGroup(grpname); -// IniItem *item; -// -// /* If no group exists, return */ -// if (group == NULL) return; -// -// for (item = group->item; item != NULL; item = item->next) { -// int news_item = -1; -// for (int i = 0; i < NT_END; i++) { -// if (strcasecmp(item->name, _news_type_data[i].name) == 0) { -// news_item = i; -// break; -// } -// } -// -// /* the config been read is not within current aceptable config */ -// if (news_item == -1) { -// /* if the conversion function cannot process it, advice by a debug warning*/ -// if (!ConvertOldNewsSetting(item->name, item->value)) { -// DEBUG(misc, 0, "Invalid display option: %s", item->name); -// } -// /* in all cases, there is nothing left to do */ -// continue; -// } -// -// if (StrEmpty(item->value)) { -// DEBUG(misc, 0, "Empty display value for newstype %s", item->name); -// continue; -// } else if (strcasecmp(item->value, "full") == 0) { -// _news_type_data[news_item].display = ND_FULL; -// } else if (strcasecmp(item->value, "off") == 0) { -// _news_type_data[news_item].display = ND_OFF; -// } else if (strcasecmp(item->value, "summarized") == 0) { -// _news_type_data[news_item].display = ND_SUMMARY; -// } else { -// DEBUG(misc, 0, "Invalid display value for newstype %s: %s", item->name, item->value); -// continue; -// } -// } -//} - static void AILoadConfig(IniFile *ini, const char *grpname) { IniGroup *group = ini->GetGroup(grpname); @@ -1483,26 +1403,6 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati return first; } -// TODO ER cleanup required - saving is done automatically with the rest of the advanced settings -///** -// * Write newstype settings to a configuration file. -// * @param ini The configuration to write to. -// * @param grpname Name of the group containing the news type settings. -// */ -//static void NewsDisplaySaveConfig(IniFile *ini, const char *grpname) -//{ -// IniGroup *group = ini->GetGroup(grpname); -// -// for (int i = 0; i < NT_END; i++) { -// const char *value; -// int v = _news_type_data[i].display; -// -// value = (v == ND_OFF ? "off" : (v == ND_SUMMARY ? "summarized" : "full")); -// -// group->GetItem(_news_type_data[i].name, true)->SetValue(value); -// } -//} - static void AISaveConfig(IniFile *ini, const char *grpname) { IniGroup *group = ini->GetGroup(grpname); @@ -1634,7 +1534,6 @@ void LoadFromConfig(bool minimal) if (!minimal) { _grfconfig_newgame = GRFLoadConfig(ini, "newgrf", false); _grfconfig_static = GRFLoadConfig(ini, "newgrf-static", true); - // TODO ER cleanup NewsDisplayLoadConfig(ini, "news_display"); AILoadConfig(ini, "ai_players"); GameLoadConfig(ini, "game_scripts"); @@ -1666,7 +1565,6 @@ void SaveToConfig() HandleSettingDescs(ini, IniSaveSettings, IniSaveSettingList); GRFSaveConfig(ini, "newgrf", _grfconfig_newgame); GRFSaveConfig(ini, "newgrf-static", _grfconfig_static); - // TODO ER CLEANUP: NewsDisplaySaveConfig(ini, "news_display"); AISaveConfig(ini, "ai_players"); GameSaveConfig(ini, "game_scripts"); SaveVersionInConfig(ini); diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini index 78ed34f..6d9e7bb 100644 --- a/src/table/misc_settings.ini +++ b/src/table/misc_settings.ini @@ -42,12 +42,6 @@ var = _display_opt def = (1 << DO_SHOW_TOWN_NAMES | 1 << DO_SHOW_STATION_NAMES | 1 << DO_SHOW_SIGNS | 1 << DO_FULL_ANIMATION | 1 << DO_FULL_DETAIL | 1 << DO_SHOW_WAYPOINT_NAMES | 1 << DO_SHOW_COMPETITOR_SIGNS) full = ""SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION||FULL_DETAIL|WAYPOINTS|SHOW_COMPETITOR_SIGNS"" -; TODO ER cleanup required -;[SDTG_BOOL] -;name = ""news_ticker_sound"" -;var = _news_ticker_sound -;def = true - [SDTG_BOOL] name = ""fullscreen"" var = _fullscreen diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 0f71ade..a76f157 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -914,7 +914,7 @@ static CallBackFunction MenuClickMusicWindow(int index) static CallBackFunction ToolbarNewspaperClick(Window *w) { - PopupMainToolbMenu(w, WID_TN_MESSAGES, STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT, 3); + PopupMainToolbMenu(w, WID_TN_MESSAGES, STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT, 2); return CBF_NONE; } @@ -928,8 +928,7 @@ static CallBackFunction MenuClickNewspaper(int index) { switch (index) { case 0: ShowLastNewsMessage(); break; - case 1: ShowMessageOptions(); break; - case 2: ShowMessageHistory(); break; + case 1: ShowMessageHistory(); break; } return CBF_NONE; } diff --git a/src/widgets/news_widget.h b/src/widgets/news_widget.h index b345246..f127866 100644 --- a/src/widgets/news_widget.h +++ b/src/widgets/news_widget.h @@ -42,18 +42,4 @@ enum MessageHistoryWidgets { WID_MH_SCROLLBAR, ///< Scrollbar for the list. }; -// TODO ER cleanup required -/** Widgets of the #MessageOptionsWindow class. */ -enum MessageOptionWidgets { - WID_MO_BACKGROUND, ///< Background of the window. - WID_MO_LABEL, ///< Top label. - WID_MO_DROP_SUMMARY, ///< Dropdown that adjusts at once the level for all settings. - WID_MO_LABEL_SUMMARY, ///< Label of the summary drop down. - WID_MO_SOUNDTICKER, ///< Button for (de)activating sound on events. - WID_MO_SOUNDTICKER_LABEL, ///< Label of the soundticker button. - - WID_MO_START_OPTION, ///< First widget that is part of a group [<][label][>] [description]. - WID_MO_END_OPTION = WID_MO_START_OPTION + NT_END * MOS_WIDG_PER_SETTING, ///< First widget after the groups. -}; - #endif /* WIDGETS_NEWS_WIDGET_H */