Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-15 00:59:34 +02:00
Code Issues Projects Releases Wiki Activity

2019-10-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Replaced references to 'helvetica' fonts to use font engine
	values in 'lib/'.
This commit is contained in:
Fred Gleason 2019-10-07 16:23:38 -04:00
parent b11e07a605
commit 912f54bf2c
33 changed files with 209 additions and 1031 deletions

3
ChangeLog

@ -19181,3 +19181,6 @@
2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Refactored rmlsend(1) to use the 'RDDialog' and 'RDWidget'
base classes.
2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Replaced references to 'helvetica' fonts to use font engine
values in 'lib/'.

6
lib/Makefile.am

@ -121,7 +121,6 @@ dist_librd_la_SOURCES = dbversion.h\
rdevent_line.cpp rdevent_line.h\
rdevent_player.cpp rdevent_player.h\
rdeventimportlist.cpp rdeventimportlist.h\
rdexception_dialog.cpp rdexception_dialog.h\
rdexport_settings_dialog.cpp rdexport_settings_dialog.h\
rdfeed.cpp rdfeed.h\
rdfeedlog.cpp rdfeedlog.h\
@ -143,8 +142,6 @@ dist_librd_la_SOURCES = dbversion.h\
rdidvalidator.cpp rdidvalidator.h\
rdimport_audio.cpp rdimport_audio.h\
rdinstancelock.cpp rdinstancelock.h\
rdintegeredit.cpp rdintegeredit.h\
rdintegerdialog.cpp rdintegerdialog.h\
rd.h\
rdkernelgpio.cpp rdkernelgpio.h\
rdlabel.cpp rdlabel.h\
@ -280,7 +277,6 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
moc_rdedit_panel_name.cpp\
moc_rdemptycart.cpp\
moc_rdevent_player.cpp\
moc_rdexception_dialog.cpp\
moc_rdexport_settings_dialog.cpp\
moc_rdfeed.cpp\
moc_rdframe.cpp\
@ -291,8 +287,6 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
moc_rdhotkeys.cpp\
moc_rdhotkeylist.cpp\
moc_rdimport_audio.cpp\
moc_rdintegeredit.cpp\
moc_rdintegerdialog.cpp\
moc_rdkernelgpio.cpp\
moc_rdlabel.cpp\
moc_rdlineedit.cpp\

6
lib/lib.pro

@ -87,7 +87,6 @@ SOURCES += rdescape_string.cpp
SOURCES += rdevent.cpp
SOURCES += rdevent_line.cpp
SOURCES += rdeventimportlist.cpp
SOURCES += rdexception_dialog.cpp
SOURCES += rdexport_settings_dialog.cpp
SOURCES += rdframe.cpp
SOURCES += rdfontset.cpp
@ -100,8 +99,6 @@ SOURCES += rdgroup_list.cpp
SOURCES += rdhash.cpp
SOURCES += rdidvalidator.cpp
SOURCES += rdimport_audio.cpp
SOURCES += rdintegeredit.cpp
SOURCES += rdintegerdialog.cpp
SOURCES += rdkernelgpio.cpp
SOURCES += rdlabel.cpp
SOURCES += rdlibrary_conf.cpp
@ -222,7 +219,6 @@ HEADERS += rdescape_string.h
HEADERS += rdevent.h
HEADERS += rdevent_line.h
HEADERS += rdeventimportlist.h
HEADERS += rdexception_dialog.h
HEADERS += rdexport_settings_dialog.h
HEADERS += rdframe.h
HEADERS += rdfontset.h
@ -236,8 +232,6 @@ HEADERS += rdgroup.h
HEADERS += rdhash.h
HEADERS += rdidvalidator.h
HEADERS += rdimport_audio.h
HEADERS += rdintegeredit.h
HEADERS += rdintegerdialog.h
HEADERS += rdkernelgpio.h
HEADERS += rdlabel.h
HEADERS += rdlibrary_conf.h

42
lib/librd_cs.ts

@ -1677,59 +1677,51 @@ Opravdu chcete uložit?</translation>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Zpráva o chybě Rivendellu</translation>
<translation type="obsolete">Zpráva o chybě Rivendellu</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Uložit</translation>
<translation type="obsolete">&amp;Uložit</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>&amp;Zavřít</translation>
<translation type="obsolete">&amp;Zavřít</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Text (*.txt *.TXT)
<translation type="obsolete">Text (*.txt *.TXT)
Všechny soubory (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Vyvést soubor</translation>
<translation type="obsolete">Vyvést soubor</translation>
</message>
<message>
<source>The file</source>
<translation>Soubor</translation>
<translation type="obsolete">Soubor</translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>Již existuje!
<translation type="obsolete">Již existuje!
Přepsat?</translation>
</message>
<message>
<source>File Exists</source>
<translation>Soubor již existuje</translation>
<translation type="obsolete">Soubor již existuje</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>Nelze otevřít soubor</translation>
<translation type="obsolete">Nelze otevřít soubor</translation>
</message>
<message>
<source>for writing!</source>
<translation>pro zápis!</translation>
<translation type="obsolete">pro zápis!</translation>
</message>
<message>
<source>File Error</source>
<translation>Chyba souboru</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Chyba souboru</translation>
</message>
</context>
<context>
@ -2157,30 +2149,30 @@ Bitte Kofiguration prüfen und erneut versuchen.</translation>
<name>RDIntegerDialog</name>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Zrušit</translation>
<translation type="obsolete">&amp;Zrušit</translation>
</message>
<message>
<source>Set Value</source>
<translation>Nastavit hodnotu</translation>
<translation type="obsolete">Nastavit hodnotu</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Add</source>
<translation>Přidat</translation>
<translation type="obsolete">Přidat</translation>
</message>
<message>
<source>Delete</source>
<translation>Smazat</translation>
<translation type="obsolete">Smazat</translation>
</message>
<message>
<source>Set Value</source>
<translation>Nastavit hodnotu</translation>
<translation type="obsolete">Nastavit hodnotu</translation>
</message>
</context>
<context>

42
lib/librd_de.ts

@ -1664,59 +1664,51 @@ Are you sure you want to save?</source>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Rivendell Fehlerreport</translation>
<translation type="obsolete">Rivendell Fehlerreport</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Speichern</translation>
<translation type="obsolete">&amp;Speichern</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>&amp;Schliessen</translation>
<translation type="obsolete">&amp;Schliessen</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Text (*.txt *.TXT)
<translation type="obsolete">Text (*.txt *.TXT)
Alle Dateien (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Datei Exportieren</translation>
<translation type="obsolete">Datei Exportieren</translation>
</message>
<message>
<source>The file</source>
<translation>Die Datei</translation>
<translation type="obsolete">Die Datei</translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>existiert bereits!
<translation type="obsolete">existiert bereits!
Überschreiben?</translation>
</message>
<message>
<source>File Exists</source>
<translation>Datei existiert</translation>
<translation type="obsolete">Datei existiert</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>Kann die Datei nicht öffnen</translation>
<translation type="obsolete">Kann die Datei nicht öffnen</translation>
</message>
<message>
<source>for writing!</source>
<translation>zum schreiben!</translation>
<translation type="obsolete">zum schreiben!</translation>
</message>
<message>
<source>File Error</source>
<translation>Dateifehler</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Dateifehler</translation>
</message>
</context>
<context>
@ -2144,30 +2136,30 @@ Bitte Kofiguration prüfen und erneut versuchen.</translation>
<name>RDIntegerDialog</name>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Abbrechen</translation>
<translation type="obsolete">&amp;Abbrechen</translation>
</message>
<message>
<source>Set Value</source>
<translation>Wert setzen</translation>
<translation type="obsolete">Wert setzen</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Add</source>
<translation>Hinzufügen</translation>
<translation type="obsolete">Hinzufügen</translation>
</message>
<message>
<source>Delete</source>
<translation>Löschen</translation>
<translation type="obsolete">Löschen</translation>
</message>
<message>
<source>Set Value</source>
<translation>Wert setzen</translation>
<translation type="obsolete">Wert setzen</translation>
</message>
</context>
<context>

42
lib/librd_es.ts

@ -1670,59 +1670,51 @@ Are you sure you want to save?</source>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Reporte de excepciones</translation>
<translation type="obsolete">Reporte de excepciones</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Guardar</translation>
<translation type="obsolete">&amp;Guardar</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>&amp;Cerrar</translation>
<translation type="obsolete">&amp;Cerrar</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Texto (*.txt *.TXT)
<translation type="obsolete">Texto (*.txt *.TXT)
Todos los archivos (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Exportar archivo</translation>
<translation type="obsolete">Exportar archivo</translation>
</message>
<message>
<source>The file</source>
<translation>El archivo </translation>
<translation type="obsolete">El archivo </translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>ya existe.
<translation type="obsolete">ya existe.
¿Sobreescribir?</translation>
</message>
<message>
<source>File Exists</source>
<translation>El archivo ya existe</translation>
<translation type="obsolete">El archivo ya existe</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>¡No es posible abrir el archivo</translation>
<translation type="obsolete">¡No es posible abrir el archivo</translation>
</message>
<message>
<source>for writing!</source>
<translation>para escritura!</translation>
<translation type="obsolete">para escritura!</translation>
</message>
<message>
<source>File Error</source>
<translation>Error de archivo</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Error de archivo</translation>
</message>
</context>
<context>
@ -2150,30 +2142,30 @@ Do you still want to proceed?</source>
<name>RDIntegerDialog</name>
<message>
<source>&amp;OK</source>
<translation>&amp;Aceptar</translation>
<translation type="obsolete">&amp;Aceptar</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Cancelar</translation>
<translation type="obsolete">&amp;Cancelar</translation>
</message>
<message>
<source>Set Value</source>
<translation>Asignar valor</translation>
<translation type="obsolete">Asignar valor</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Add</source>
<translation>Añadir</translation>
<translation type="obsolete">Añadir</translation>
</message>
<message>
<source>Delete</source>
<translation>Borrar</translation>
<translation type="obsolete">Borrar</translation>
</message>
<message>
<source>Set Value</source>
<translation>Colocar valor</translation>
<translation type="obsolete">Colocar valor</translation>
</message>
</context>
<context>

80
lib/librd_fr.ts

@ -1480,63 +1480,6 @@ Are you sure you want to save?</source>
<translation>&amp;Annuler</translation>
</message>
</context>
<context>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File Exists</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to open file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>for writing!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDExportSettingsDialog</name>
<message>
@ -1871,30 +1814,11 @@ Do you want to overwrite it?</source>
<name>RDIntegerDialog</name>
<message>
<source>&amp;OK</source>
<translation type="unfinished">&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation type="unfinished">&amp;Annuler</translation>
</message>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
<translation type="obsolete">&amp;Annuler</translation>
</message>
</context>
<context>

53
lib/librd_nb.ts

@ -1666,59 +1666,51 @@ Are you sure you want to save?</source>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Unntaksrapport frå Rivendell</translation>
<translation type="obsolete">Unntaksrapport frå Rivendell</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Lagre</translation>
<translation type="obsolete">&amp;Lagre</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>Lu&amp;kk</translation>
<translation type="obsolete">Lu&amp;kk</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Tekst (*.txt *.TXT)
<translation type="obsolete">Tekst (*.txt *.TXT)
Alle filer (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Eksporter fil</translation>
<translation type="obsolete">Eksporter fil</translation>
</message>
<message>
<source>The file</source>
<translation>Fila</translation>
<translation type="obsolete">Fila</translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>finst frå før!
<translation type="obsolete">finst frå før!
Skriv over?</translation>
</message>
<message>
<source>File Exists</source>
<translation>Fila finst</translation>
<translation type="obsolete">Fila finst</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>Greier ikkje opna fila</translation>
<translation type="obsolete">Greier ikkje opna fila</translation>
</message>
<message>
<source>for writing!</source>
<translation>for skriving!</translation>
<translation type="obsolete">for skriving!</translation>
</message>
<message>
<source>File Error</source>
<translation>Filfeil</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Filfeil</translation>
</message>
</context>
<context>
@ -2144,32 +2136,13 @@ Sjekk eksportoppsettet ditt og prøv att.</translation>
</context>
<context>
<name>RDIntegerDialog</name>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;OK</source>
<translation type="unfinished">&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation type="unfinished">&amp;Avbryt</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete</source>
<translation type="unfinished"></translation>
<translation type="obsolete">&amp;Avbryt</translation>
</message>
</context>
<context>

53
lib/librd_nn.ts

@ -1666,59 +1666,51 @@ Are you sure you want to save?</source>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Unntaksrapport frå Rivendell</translation>
<translation type="obsolete">Unntaksrapport frå Rivendell</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Lagre</translation>
<translation type="obsolete">&amp;Lagre</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>Lu&amp;kk</translation>
<translation type="obsolete">Lu&amp;kk</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Tekst (*.txt *.TXT)
<translation type="obsolete">Tekst (*.txt *.TXT)
Alle filer (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Eksporter fil</translation>
<translation type="obsolete">Eksporter fil</translation>
</message>
<message>
<source>The file</source>
<translation>Fila</translation>
<translation type="obsolete">Fila</translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>finst frå før!
<translation type="obsolete">finst frå før!
Skriv over?</translation>
</message>
<message>
<source>File Exists</source>
<translation>Fila finst</translation>
<translation type="obsolete">Fila finst</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>Greier ikkje opna fila</translation>
<translation type="obsolete">Greier ikkje opna fila</translation>
</message>
<message>
<source>for writing!</source>
<translation>for skriving!</translation>
<translation type="obsolete">for skriving!</translation>
</message>
<message>
<source>File Error</source>
<translation>Filfeil</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Filfeil</translation>
</message>
</context>
<context>
@ -2144,32 +2136,13 @@ Sjekk eksportoppsettet ditt og prøv att.</translation>
</context>
<context>
<name>RDIntegerDialog</name>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;OK</source>
<translation type="unfinished">&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation type="unfinished">&amp;Avbryt</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Set Value</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Delete</source>
<translation type="unfinished"></translation>
<translation type="obsolete">&amp;Avbryt</translation>
</message>
</context>
<context>

42
lib/librd_pt_BR.ts

@ -1668,59 +1668,51 @@ Are you sure you want to save?</source>
<name>RDExceptionDialog</name>
<message>
<source>Rivendell Exception Report</source>
<translation>Relatório de Exceções do Rivendell</translation>
<translation type="obsolete">Relatório de Exceções do Rivendell</translation>
</message>
<message>
<source>&amp;Save</source>
<translation>&amp;Salvar</translation>
<translation type="obsolete">&amp;Salvar</translation>
</message>
<message>
<source>&amp;Close</source>
<translation>&amp;Fechar</translation>
<translation type="obsolete">&amp;Fechar</translation>
</message>
<message>
<source>Text (*.txt *.TXT)
All Files (*.*)</source>
<translation>Textos (*.txt *.TXT)
<translation type="obsolete">Textos (*.txt *.TXT)
Todos os Arquivos (*.*)</translation>
</message>
<message>
<source>Export File</source>
<translation>Exportar Arquivo</translation>
<translation type="obsolete">Exportar Arquivo</translation>
</message>
<message>
<source>The file</source>
<translation>O Arquivo</translation>
<translation type="obsolete">O Arquivo</translation>
</message>
<message>
<source>already exists!
Overwrite?</source>
<translation>já Existe!
<translation type="obsolete">já Existe!
Sobreescrever?</translation>
</message>
<message>
<source>File Exists</source>
<translation>Arquivo Existente</translation>
<translation type="obsolete">Arquivo Existente</translation>
</message>
<message>
<source>Unable to open file</source>
<translation>Não foi Possível abrir o arquivo</translation>
<translation type="obsolete">Não foi Possível abrir o arquivo</translation>
</message>
<message>
<source>for writing!</source>
<translation>para escrita!</translation>
<translation type="obsolete">para escrita!</translation>
</message>
<message>
<source>File Error</source>
<translation>Erro no Arquivo</translation>
</message>
<message>
<source>already exists!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Overwrite?</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Erro no Arquivo</translation>
</message>
</context>
<context>
@ -2148,30 +2140,30 @@ Por Favor, cheque suas configurações e tenbte outra vez.</translation>
<name>RDIntegerDialog</name>
<message>
<source>Set Value</source>
<translation>Selecionar Valor</translation>
<translation type="obsolete">Selecionar Valor</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Cancelar</translation>
<translation type="obsolete">&amp;Cancelar</translation>
</message>
</context>
<context>
<name>RDIntegerEdit</name>
<message>
<source>Set Value</source>
<translation>Selecionar Valor</translation>
<translation type="obsolete">Selecionar Valor</translation>
</message>
<message>
<source>Add</source>
<translation>Adicionar</translation>
<translation type="obsolete">Adicionar</translation>
</message>
<message>
<source>Delete</source>
<translation>Deletar</translation>
<translation type="obsolete">Deletar</translation>
</message>
</context>
<context>

14
lib/rdbusydialog.cpp

@ -2,7 +2,7 @@
//
// A 'progress dialog' widget that shows busy state.
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@ -19,19 +19,13 @@
//
//
#include <rdbusydialog.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <QLabel>
#include "rdbusydialog.h"
RDBusyDialog::RDBusyDialog(QWidget *parent,Qt::WFlags f)
: QDialog(parent,"",true,f)
: RDDialog(parent)
{
QFont font("helvetica",16,QFont::Bold);
font.setPixelSize(16);
bar_label=new QLabel(this);
bar_label->setFont(font);
bar_label->setFont(progressFont());
bar_label->setAlignment(Qt::AlignCenter);
bar_bar=new RDBusyBar(this);

10
lib/rdbusydialog.h

@ -2,7 +2,7 @@
//
// A 'progress dialog' widget that shows busy state.
//
// (C) Copyright 2010,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2010-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@ -21,14 +21,10 @@
#ifndef RDBUSYDIALOG_H
#define RDBUSYDIALOG_H
#include <qdialog.h>
#include <qlabel.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <rdbusybar.h>
#include <rddialog.h>
class RDBusyDialog : public QDialog
class RDBusyDialog : public RDDialog
{
Q_OBJECT;
public:

17
lib/rdcartslot.cpp

@ -35,7 +35,7 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
RDCueEditDialog *cue_dialog,
const QString &caption,RDAirPlayConf *conf,
QWidget *parent)
: QWidget(parent)
: RDWidget(parent)
{
slot_number=slotnum;
slot_ripc=ripc;
@ -48,7 +48,6 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
slot_cue_dialog=cue_dialog;
slot_caption=caption;
slot_airplay_conf=conf;
slot_svc_names=NULL;
slot_stop_requested=false;
slot_logline=new RDLogLine();
@ -60,14 +59,6 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
slot_timescaling_active=false;
slot_temp_cart=false;
//
// Fonts
//
QFont big_font("helvetica",36,QFont::Bold);
big_font.setPixelSize(36);
QFont mid_font("helvetica",14,QFont::Bold);
mid_font.setPixelSize(14);
//
// Palettes
//
@ -99,7 +90,7 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
//
slot_start_button=new QPushButton(QString().sprintf("%d",slotnum+1),this);
slot_start_button->setGeometry(0,0,sizeHint().height(),sizeHint().height());
slot_start_button->setFont(big_font);
slot_start_button->setFont(hugeButtonFont());
slot_start_button->setDisabled(true);
connect(slot_start_button,SIGNAL(clicked()),this,SLOT(startData()));
@ -124,7 +115,7 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
slot_load_button->
setGeometry(sizeHint().height()+5+slot_box->sizeHint().width()+5,0,
sizeHint().height(),sizeHint().height());
slot_load_button->setFont(mid_font);
slot_load_button->setFont(buttonFont());
connect(slot_load_button,SIGNAL(clicked()),this,SLOT(loadData()));
//
@ -134,7 +125,7 @@ RDCartSlot::RDCartSlot(int slotnum,RDRipc *ripc,RDCae *cae,RDStation *station,
slot_options_button->
setGeometry(2*sizeHint().height()+10+slot_box->sizeHint().width()+5,0,
sizeHint().height(),sizeHint().height());
slot_options_button->setFont(mid_font);
slot_options_button->setFont(buttonFont());
connect(slot_options_button,SIGNAL(clicked()),this,SLOT(optionsData()));
updateOptions();

29
lib/rdcartslot.h

@ -21,35 +21,14 @@
#ifndef RDCARTSLOT_H
#define RDCARTSLOT_H
#include <vector>
#include <qwidget.h>
#include <qdatetime.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qsignalmapper.h>
#include <rdpushbutton.h>
#include <rdcart_dialog.h>
#include <rdcart.h>
#include <rduser.h>
#include <rdlog_line.h>
#include <rdplay_deck.h>
#include <rdpanel_button.h>
#include <rdbutton_dialog.h>
#include <rdbutton_panel.h>
#include <rdripc.h>
#include <rdcombobox.h>
#include <rdsvc.h>
#include <rdslotbox.h>
#include <rdslotdialog.h>
#include <rdslotoptions.h>
#include <rdcueeditdialog.h>
#include <rdlistsvcs.h>
#include <rdairplay_conf.h>
#include <rdslotbox.h>
#include <rdslotdialog.h>
#include <rdwidget.h>
class RDCartSlot : public QWidget
class RDCartSlot : public RDWidget
{
Q_OBJECT
public:

6
lib/rdedit_audio.cpp

@ -2749,7 +2749,7 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label,
//
// Time Tick Marks
//
p->setFont(QFont("Helvetica",8,QFont::Normal));
p->setFont(subLabelFont());
for(unsigned i=0;i<2*edit_peaks->energySize();
i+=(int)(edit_factor_x*(double)edit_sample_rate/576.0)) {
offset=(int)((double)(i-origin_x)/edit_factor_x);
@ -2809,14 +2809,14 @@ void RDEditAudio::DrawWave(int xsize,int ysize,int chan,QString label,
p->setPen(QColor(Qt::red));
if(!label.isEmpty()) {
p->setFont(QFont("Helvetica",24,QFont::Normal));
p->setFont(bannerFont());
p->drawText(10,28-ysize/2,label);
}
p->setPen(QColor(Qt::black));
p->drawLine(0,0,xsize-3,0);
}
else {
p->setFont(QFont("Helvetica",24,QFont::Bold));
p->setFont(bannerFont());
p->drawText(270,0,"No Energy Data");
}
delete p;

128
lib/rdexception_dialog.cpp

@ -1,128 +0,0 @@
// rdexception_dialog.cpp
//
// A dialog for displaying exception reports.
//
// (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qpushbutton.h>
#include <q3filedialog.h>
#include <qmessagebox.h>
#include <rdconf.h>
#include <rdexception_dialog.h>
RDExceptionDialog::RDExceptionDialog(QString report,QWidget *parent)
: QDialog(parent,"",true)
{
setCaption(tr("Rivendell Exception Report"));
//
// Generate Fonts
//
QFont button_font("helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
//
// Report Viewer
//
report_view=new Q3TextView(this,"report_view");
report_view->setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80);
report_view->setText(report);
//
// Save Button
//
QPushButton *button=new QPushButton(this,"save_button");
button->setGeometry(10,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setText(tr("&Save"));
button->setFont(button_font);
connect(button,SIGNAL(clicked()),this,SLOT(saveData()));
//
// Close Button
//
button=new QPushButton(this,"close_button");
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setText(tr("&Close"));
button->setFont(button_font);
connect(button,SIGNAL(clicked()),this,SLOT(closeData()));
}
RDExceptionDialog::~RDExceptionDialog()
{
}
QSize RDExceptionDialog::sizeHint() const
{
return QSize(400,300);
}
QSizePolicy RDExceptionDialog::sizePolicy() const
{
return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
}
void RDExceptionDialog::saveData()
{
QString str1;
QString str2;
QString filename=Q3FileDialog::getSaveFileName(RDGetHomeDir(),
tr("Text (*.txt *.TXT)\nAll Files (*.*)"),
this,tr("Export File"));
if(filename.isEmpty()) {
return;
}
if(filename.find(".")<0) {
filename+=".txt";
}
QFile file(filename);
if(file.exists()) {
str1=QString(tr("The file"));
str2=QString(tr("already exists!\nOverwrite?"));
if(QMessageBox::question(this,tr("File Exists"),
tr("The file")+" \""+filename+"\" "+
tr("already exists!")+"\n"+tr("Overwrite?"),
QMessageBox::Yes,QMessageBox::No)==
QMessageBox::No) {
return;
}
}
FILE *fh=fopen((const char *)filename,"w");
if(fh==NULL) {
str1=QString(tr("Unable to open file"));
str2=QString(tr("for writing!"));
QMessageBox::
warning(this,tr("File Error"),tr("Unable to open file")+
" \""+filename+"\" "+tr("for writing!"));
return;
}
fprintf(fh,(const char *)report_view->text());
fclose(fh);
}
void RDExceptionDialog::closeData()
{
done(0);
}

45
lib/rdexception_dialog.h

@ -1,45 +0,0 @@
// rdexception_dialog.h
//
// A dialog for displaying exception reports.
//
// (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDEXCEPTION_DIALOG_H
#define RDEXCEPTION_DIALOG_H
#include <qdialog.h>
#include <q3textview.h>
class RDExceptionDialog : public QDialog
{
Q_OBJECT
public:
RDExceptionDialog(QString report,QWidget *parent=0);
~RDExceptionDialog();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
private slots:
void saveData();
void closeData();
private:
Q3TextView *report_view;
};
#endif

25
lib/rdexport_settings_dialog.cpp

@ -2,7 +2,7 @@
//
// Edit Audio Export Settings
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -18,35 +18,20 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <math.h>
#include <q3buttongroup.h>
#include <qcheckbox.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
//Added by qt3to4:
#include <QLabel>
#include "rdapplication.h"
#include "rdexport_settings_dialog.h"
RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
QWidget *parent)
: QDialog(parent,"",true)
: RDDialog(parent)
{
lib_settings=settings;
//
// Generate Fonts
//
QFont button_font("helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
//
// Dialog Name
//
setCaption(tr("Edit Export Settings"));
setWindowTitle(tr("Edit Export Settings"));
//
// Default Format
@ -108,7 +93,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
QPushButton *ok_button=new QPushButton(this);
ok_button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
ok_button->setDefault(true);
ok_button->setFont(button_font);
ok_button->setFont(buttonFont());
ok_button->setText(tr("&OK"));
connect(ok_button,SIGNAL(clicked()),this,SLOT(okData()));
@ -118,7 +103,7 @@ RDExportSettingsDialog::RDExportSettingsDialog(RDSettings *settings,
QPushButton *cancel_button=new QPushButton(this);
cancel_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,
80,50);
cancel_button->setFont(button_font);
cancel_button->setFont(buttonFont());
cancel_button->setText(tr("&Cancel"));
connect(cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));

9
lib/rdexport_settings_dialog.h

@ -2,7 +2,7 @@
//
// Edit Rivendell Audio Settings
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,15 +21,14 @@
#ifndef RDEXPORT_SETTINGS_DIALOG_H
#define RDEXPORT_SETTINGS_DIALOG_H
#include <qdialog.h>
#include <qlineedit.h>
#include <qcombobox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <qspinbox.h>
#include <rddialog.h>
#include <rdsettings.h>
class RDExportSettingsDialog : public QDialog
class RDExportSettingsDialog : public RDDialog
{
Q_OBJECT
public:

18
lib/rdfontset.cpp

@ -53,6 +53,12 @@ QFont RDFontSet::buttonFont() const
}
QFont RDFontSet::hugeButtonFont() const
{
return font_huge_button_font;
}
QFont RDFontSet::bigButtonFont() const
{
return font_big_button_font;
@ -101,6 +107,12 @@ QFont RDFontSet::timerFont() const
}
QFont RDFontSet::smallTimerFont() const
{
return font_small_timer_font;
}
QFont RDFontSet::defaultFont() const
{
return font_default_font;
@ -130,6 +142,9 @@ void RDFontSet::MakeFonts(const QFont &default_font)
font_button_font=QFont(family,button_size,QFont::Bold);
font_button_font.setPixelSize(button_size);
font_huge_button_font=QFont(family,button_size+24,QFont::DemiBold);
font_huge_button_font.setPixelSize(button_size+24);
font_big_button_font=QFont(family,button_size+4,QFont::DemiBold);
font_big_button_font.setPixelSize(button_size+4);
@ -154,6 +169,9 @@ void RDFontSet::MakeFonts(const QFont &default_font)
font_timer_font=QFont(family,20,QFont::Normal);
font_timer_font.setPixelSize(20);
font_small_timer_font=QFont(family,default_size+2,QFont::Normal);
font_small_timer_font.setPixelSize(default_size+2);
font_default_font=QFont(family,default_size,QFont::Normal);
font_default_font.setPixelSize(default_size);
}

4
lib/rdfontset.h

@ -31,6 +31,7 @@ class RDFontSet
RDFontSet(const QFont &default_font,RDConfig *c=NULL);
RDFontSet(RDConfig *c=NULL);
QFont buttonFont() const;
QFont hugeButtonFont() const;
QFont bigButtonFont() const;
QFont subButtonFont() const;
QFont sectionLabelFont() const;
@ -39,11 +40,13 @@ class RDFontSet
QFont progressFont() const;
QFont bannerFont() const;
QFont timerFont() const;
QFont smallTimerFont() const;
QFont defaultFont() const;
private:
void MakeFonts(const QFont &default_font);
QFont font_button_font;
QFont font_huge_button_font;
QFont font_big_button_font;
QFont font_sub_button_font;
QFont font_section_label_font;
@ -52,6 +55,7 @@ class RDFontSet
QFont font_progress_font;
QFont font_banner_font;
QFont font_timer_font;
QFont font_small_timer_font;
QFont font_default_font;
RDConfig *font_config;
};

112
lib/rdintegerdialog.cpp

@ -1,112 +0,0 @@
// rdintegerdialog.cpp
//
// A widget to set an integer value.
//
// (C) Copyright 2008,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qpushbutton.h>
#include <qlabel.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <rdintegerdialog.h>
RDIntegerDialog::RDIntegerDialog(int *value,const QString &lbl,int low,int high,
QWidget *parent)
: QDialog(parent,"",false)
{
int_value=value;
//
// Fix the Window Size
//
setCaption(tr("Set Value"));
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont font=QFont("helvetica",12,QFont::Bold);
font.setPixelSize(12);
//
// Value Control
//
int_value_box=new QSpinBox(this);
int_value_box->setGeometry(125,10,80,20);
int_value_box->setRange(low,high);
int_value_box->setValue(*value);
QLabel *label=new QLabel(int_value_box,lbl,this);
label->setGeometry(10,10,110,20);
label->setFont(font);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// OK Button
//
QPushButton *button=new QPushButton(tr("&OK"),this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setFont(font);
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
//
// Cancel Button
//
button=new QPushButton(tr("&Cancel"),this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(font);
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
}
RDIntegerDialog::~RDIntegerDialog()
{
}
QSize RDIntegerDialog::sizeHint() const
{
return QSize(240,100);
}
QSizePolicy RDIntegerDialog::sizePolicy() const
{
return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
}
void RDIntegerDialog::okData()
{
*int_value=int_value_box->value();
done(0);
}
void RDIntegerDialog::cancelData()
{
done(-1);
}
void RDIntegerDialog::closeEvent(QCloseEvent *e)
{
done(-1);
}

52
lib/rdintegerdialog.h

@ -1,52 +0,0 @@
// rdintegerdialog.h
//
// A widget to set an integer value.
//
// (C) Copyright 2008,2016 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDINTEGERDIALOG_H
#define RDINTEGERDIALOG_H
#include <qdialog.h>
#include <qspinbox.h>
//Added by qt3to4:
#include <QCloseEvent>
class RDIntegerDialog : public QDialog
{
Q_OBJECT
public:
RDIntegerDialog(int *value,const QString &lbl,int low,int high,
QWidget *parent=0);
~RDIntegerDialog();
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
private slots:
void okData();
void cancelData();
protected:
void closeEvent(QCloseEvent *e);
private:
QSpinBox *int_value_box;
int *int_value;
};
#endif

143
lib/rdintegeredit.cpp

@ -1,143 +0,0 @@
// rdintegeredit.cpp
//
// A widget for editing a list of integer values.
//
// (C) Copyright 2008-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
// version 2 as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include "rdintegerdialog.h"
#include "rdintegeredit.h"
RDIntegerEdit::RDIntegerEdit(const QString &lbl,int low,int high,
QWidget *parent)
: RDWidget(parent)
{
edit_low=low;
edit_high=high;
setWindowTitle(tr("Set Value"));
//
// Values List
//
edit_values_box=new Q3ListBox(this);
//
// Title Label
//
edit_label=new QLabel(edit_values_box,lbl,this);
edit_label->setAlignment(Qt::AlignCenter);
edit_label->setFont(labelFont());
//
// Add Button
//
edit_add_button=new QPushButton(tr("Add"),this);
edit_add_button->setFont(buttonFont());
connect(edit_add_button,SIGNAL(clicked()),this,SLOT(addData()));
//
// Delete Button
//
edit_delete_button=new QPushButton(tr("Delete"),this);
edit_delete_button->setFont(buttonFont());
connect(edit_delete_button,SIGNAL(clicked()),this,SLOT(deleteData()));
}
QSize RDIntegerEdit::sizeHint() const
{
return QSize(300,100);
}
QSizePolicy RDIntegerEdit::sizePolicy() const
{
return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
}
unsigned RDIntegerEdit::values(std::vector<int> *v) const
{
v->clear();
for(int i=0;i<edit_values_box->numRows();i++) {
v->push_back(edit_values_box->text(i).toInt());
}
return v->size();
}
void RDIntegerEdit::setValues(std::vector<int> *v)
{
for(unsigned i=0;i<v->size();i++) {
edit_values_box->insertItem(QString().sprintf("%d",v->at(i)));
}
}
void RDIntegerEdit::setGeometry(int x,int y,int w,int h)
{
QWidget::setGeometry(x,y,w,h);
edit_label->setGeometry(0,0,width(),20);
edit_values_box->setGeometry(0,20,width(),height()-60);
edit_add_button->setGeometry(0,height()-35,width()/2-5,30);
edit_delete_button->setGeometry(width()/2+5,height()-35,width()/2-5,30);
}
void RDIntegerEdit::addData()
{
int value=edit_low;
int index=-1;
RDIntegerDialog *ie=
new RDIntegerDialog(&value,edit_label->text(),edit_low,edit_high,this);
if(ie->exec()==0) {
for(unsigned i=0;i<edit_values_box->count();i++) {
if(edit_values_box->item(i)->text().toInt()<value) {
index=i;
}
if(edit_values_box->item(i)->text().toInt()==value) {
delete ie;
return;
}
}
edit_values_box->insertItem(QString().sprintf("%d",value),index+1);
}
delete ie;
}
void RDIntegerEdit::deleteData()
{
Q3ListBoxItem *item=edit_values_box->selectedItem();
if(item==NULL) {
return;
}
delete item;
}
Q3ListBoxItem *RDIntegerEdit::GetItem(int value)
{
for(unsigned i=0;i<edit_values_box->count();i++) {
if(edit_values_box->item(i)->text().toInt()==value) {
return edit_values_box->item(i);
}
}
return NULL;
}

59
lib/rdintegeredit.h

@ -1,59 +0,0 @@
// rdintegeredit.h
//
// A widget for editing a list of integer values.
//
// (C) Copyright 2008-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
// version 2 as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDINTEGEREDIT_H
#define RDINTEGEREDIT_H
#include <q3listbox.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <rdwidget.h>
class RDIntegerEdit : public RDWidget
{
Q_OBJECT
public:
RDIntegerEdit(const QString &lbl,int low,int high,QWidget *parent);
QSize sizeHint() const;
QSizePolicy sizePolicy() const;
unsigned values(std::vector<int> *v) const;
void setValues(std::vector<int> *v);
public slots:
void setGeometry(int x,int y,int w,int h);
private slots:
void addData();
void deleteData();
private:
Q3ListBoxItem *GetItem(int value);
QLabel *edit_label;
Q3ListBox *edit_values_box;
QPushButton *edit_add_button;
QPushButton *edit_delete_button;
int edit_low;
int edit_high;
};
#endif // RDINTEGEREDIT_H

29
lib/rdlistsvcs.cpp

@ -2,7 +2,7 @@
//
// Service Picker dialog
//
// (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -18,36 +18,19 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qcolordialog.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <rddb.h>
#include <rdcart.h>
#include <rdcart_dialog.h>
#include <rd.h>
#include <rdconf.h>
#include "rdlistsvcs.h"
RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
edit_caption=caption;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMinimumSize(sizeHint());
setCaption(caption+" - "+tr("Rivendell Services"));
//
// Fonts
//
QFont label_font("helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
setWindowTitle(caption+" - "+tr("Rivendell Services"));
//
// Services
@ -61,7 +44,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
//
edit_ok_button=new QPushButton(this);
edit_ok_button->setDefault(true);
edit_ok_button->setFont(label_font);
edit_ok_button->setFont(buttonFont());
edit_ok_button->setText(tr("&OK"));
connect(edit_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
@ -69,7 +52,7 @@ RDListSvcs::RDListSvcs(const QString &caption,QWidget *parent)
// Cancel Button
//
edit_cancel_button=new QPushButton(this);
edit_cancel_button->setFont(label_font);
edit_cancel_button->setFont(buttonFont());
edit_cancel_button->setText(tr("&Cancel"));
connect(edit_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
}

7
lib/rdlistsvcs.h

@ -21,13 +21,12 @@
#ifndef RDLISTSVCS_H
#define RDLISTSVCS_H
#include <qdialog.h>
#include <q3listbox.h>
#include <qpushbutton.h>
//Added by qt3to4:
#include <QResizeEvent>
class RDListSvcs : public QDialog
#include <rddialog.h>
class RDListSvcs : public RDDialog
{
Q_OBJECT
public:

38
lib/rdpanel_button.cpp

@ -2,7 +2,7 @@
//
// The SoundPanel Button for RDAirPlay.
//
// (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -18,21 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <rdconf.h>
#include <rdpanel_button.h>
#include <qpixmap.h>
#include <qpainter.h>
#include <QDropEvent>
#include <QMouseEvent>
#include <QKeyEvent>
#include <QDragEnterEvent>
#include <rdcartdrag.h>
#include <rdconf.h>
#include "rdpanel_button.h"
RDPanelButton::RDPanelButton(int row,int col,RDStation *station,bool flash,
QWidget *parent)
: QPushButton(parent)
: RDPushButton(parent)
{
button_row=row;
button_col=col;
@ -432,10 +428,8 @@ void RDPanelButton::WriteKeycap(int secs)
//
// Button Title
//
QFont font("helvetica",13,QFont::Normal);
font.setPixelSize(13);
QFontMetrics m(font);
p->setFont(font);
QFontMetrics m(buttonFont());
p->setFont(buttonFont());
p->drawText(RDPANEL_BUTTON_MARGIN,m.lineSpacing(),
GetNextLine(&text,m,size().width()-2-3*RDPANEL_BUTTON_MARGIN));
p->drawText(RDPANEL_BUTTON_MARGIN,2*m.lineSpacing(),
@ -448,9 +442,7 @@ void RDPanelButton::WriteKeycap(int secs)
//
if(!button_text.isEmpty()) {
if(secs<0) {
QFont out_font("helvetica",13,QFont::Normal);
out_font.setPixelSize(13);
p->setFont(out_font);
p->setFont(smallTimerFont());
if(button_pause_when_finished) {
p->drawText(RDPANEL_BUTTON_MARGIN,size().height()-2-RDPANEL_BUTTON_MARGIN,"Finished");
}
@ -469,19 +461,15 @@ void RDPanelButton::WriteKeycap(int secs)
else {
if(secs>8) {
p->drawText(RDPANEL_BUTTON_MARGIN,size().height()-2-RDPANEL_BUTTON_MARGIN,
RDGetTimeLength(1000*(secs+1),true,false));
}
RDGetTimeLength(1000*(secs+1),true,false));
}
else {
QFont out_font("helvetica",18,QFont::Bold);
out_font.setPixelSize(18);
p->setFont(out_font);
p->setFont(timerFont());
QString secstr=QString().sprintf(":%d",secs+1);
p->drawText(RDPANEL_BUTTON_MARGIN,size().height()-2-RDPANEL_BUTTON_MARGIN,secstr);
}
QFont out_font("helvetica",18,QFont::Bold);
out_font.setPixelSize(18);
p->setFont(out_font);
QFontMetrics om(out_font);
p->setFont(bannerFont());
QFontMetrics om(timerFont());
p->drawText(size().width()-2-om.width(button_output_text)-
RDPANEL_BUTTON_MARGIN,
size().height()-2-RDPANEL_BUTTON_MARGIN,button_output_text);

20
lib/rdpanel_button.h

@ -2,7 +2,7 @@
//
// The SoundPanel Button for RDAirPlay.
//
// (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,26 +21,12 @@
#ifndef RDPANEL_BUTTON_H
#define RDPANEL_BUTTON_H
#include <qdatetime.h>
#include <qpushbutton.h>
#include <qstring.h>
#include <qpalette.h>
#include <qtimer.h>
//Added by qt3to4:
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QMouseEvent>
#include <QKeyEvent>
#include <rdstation.h>
#include <rdairplay_conf.h>
#include <rdpushbutton.h>
#include <rdplay_deck.h>
#include <rdlog_line.h>
#include <rdcartdrag.h>
#define RDPANEL_BUTTON_MARGIN 5
class RDPanelButton : public QPushButton
class RDPanelButton : public RDPushButton
{
Q_OBJECT
public:

29
lib/rdplaymeter.cpp

@ -3,7 +3,7 @@
// This implements a widget that represents a stereo audio level meter,
// complete with labels and scale.
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@ -19,19 +19,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdio.h>
#include <qcolor.h>
#include <qfont.h>
#include <qfontmetrics.h>
#include <qpainter.h>
#include <qstring.h>
#include <qwidget.h>
#include "rdplaymeter.h"
RDPlayMeter::RDPlayMeter(RDSegMeter::Orientation orient,QWidget *parent)
: QWidget(parent)
: RDWidget(parent)
{
meter_label=QString("");
orientation=orient;
@ -132,22 +123,22 @@ void RDPlayMeter::setGeometry(int x,int y,int w,int h)
switch(orientation) {
case RDSegMeter::Left:
meter->setGeometry(2,2,w-4-h,h-4);
label_font=QFont("helvetica",height()-2,QFont::Bold);
label_font=QFont(font().family(),height()-2,QFont::Bold);
label_font.setPixelSize(height()-2);
break;
case RDSegMeter::Right:
meter->setGeometry(2+h,2,w-4-h,h-4);
label_font=QFont("helvetica",height()-2,QFont::Bold);
label_font=QFont(font().family(),height()-2,QFont::Bold);
label_font.setPixelSize(height()-2);
break;
case RDSegMeter::Up:
meter->setGeometry(2,2,w-4,h-4-w);
label_font=QFont("helvetica",width()-2,QFont::Bold);
label_font=QFont(font().family(),width()-2,QFont::Bold);
label_font.setPixelSize(width()-2);
break;
case RDSegMeter::Down:
meter->setGeometry(2,2+width(),w-4,h-4-w);
label_font=QFont("helvetica",width()-2,QFont::Bold);
label_font=QFont(font().family(),width()-2,QFont::Bold);
label_font.setPixelSize(width()-2);
break;
}
@ -241,25 +232,25 @@ void RDPlayMeter::makeFont()
{
switch(orientation) {
case RDSegMeter::Left:
label_font=QFont("helvetica",height()-2,QFont::Bold);
label_font=QFont(font().family(),height()-2,QFont::Bold);
label_font.setPixelSize(height()-2);
meter_label_x=(height()-QFontMetrics(label_font).width(meter_label))/2;
break;
case RDSegMeter::Right:
label_font=QFont("helvetica",height()-2,QFont::Bold);
label_font=QFont(font().family(),height()-2,QFont::Bold);
label_font.setPixelSize(height()-2);
meter_label_x=(height()-QFontMetrics(label_font).width(meter_label))/2;
break;
case RDSegMeter::Up:
label_font=QFont("helvetica",width()-2,QFont::Bold);
label_font=QFont(font().family(),width()-2,QFont::Bold);
label_font.setPixelSize(width()-2);
meter_label_x=(width()-QFontMetrics(label_font).width(meter_label))/2;
break;
case RDSegMeter::Down:
label_font=QFont("helvetica",width()-2,QFont::Bold);
label_font=QFont(font().family(),width()-2,QFont::Bold);
label_font.setPixelSize(width()-2);
meter_label_x=(width()-QFontMetrics(label_font).width(meter_label))/2;
break;

13
lib/rdplaymeter.h

@ -2,7 +2,7 @@
//
// A playback audio meter widget.
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@ -21,17 +21,10 @@
#ifndef RDPLAYMETER_H
#define RDPLAYMETER_H
#include <qcolor.h>
#include <qfont.h>
#include <qpainter.h>
#include <qrect.h>
#include <qsize.h>
#include <qstring.h>
#include <qwidget.h>
#include <rdsegmeter.h>
#include <rdwidget.h>
class RDPlayMeter : public QWidget
class RDPlayMeter : public RDWidget
{
Q_OBJECT
public:

51
lib/rdwavedata_dialog.cpp

@ -2,7 +2,7 @@
//
// A dialog to edit the contents of an RDWaveData.
//
// (C) Copyright 2014,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2014-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -18,25 +18,14 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qvalidator.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QResizeEvent>
#include <QLabel>
#include "rdwavedata_dialog.h"
RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
: QDialog(parent,"",true)
: RDDialog(parent)
{
wave_caption=caption;
setCaption(caption+" - "+tr("Edit Cart Label"));
//
// Fonts
//
QFont label_font("helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
setWindowTitle(caption+" - "+tr("Edit Cart Label"));
//
// Dialogs
@ -47,7 +36,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Title
//
wave_title_label=new QLabel(tr("Title")+":",this);
wave_title_label->setFont(label_font);
wave_title_label->setFont(labelFont());
wave_title_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_title_edit=new QLineEdit(this);
wave_title_edit->setMaxLength(255);
@ -56,7 +45,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Artist
//
wave_artist_label=new QLabel(tr("Artist")+":",this);
wave_artist_label->setFont(label_font);
wave_artist_label->setFont(labelFont());
wave_artist_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_artist_edit=new QLineEdit(this);
wave_artist_edit->setMaxLength(255);
@ -65,7 +54,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Year
//
wave_year_label=new QLabel(tr("Year")+":",this);
wave_year_label->setFont(label_font);
wave_year_label->setFont(labelFont());
wave_year_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_year_edit=new QLineEdit(this);
wave_year_edit->setMaxLength(4);
@ -75,7 +64,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Usage
//
wave_usage_label=new QLabel(tr("Usage")+":",this);
wave_usage_label->setFont(label_font);
wave_usage_label->setFont(labelFont());
wave_usage_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_usage_box=new QComboBox(this);
for(int i=0;i<(int)RDCart::UsageLast;i++) {
@ -86,14 +75,14 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Scheduler Codes
//
wave_sched_button=new QPushButton(tr("Scheduler Codes"),this);
wave_sched_button->setFont(label_font);
wave_sched_button->setFont(buttonFont());
connect(wave_sched_button,SIGNAL(clicked()),this,SLOT(schedClickedData()));
//
// Song ID
//
wave_songid_label=new QLabel(tr("Song ID")+":",this);
wave_songid_label->setFont(label_font);
wave_songid_label->setFont(labelFont());
wave_songid_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_songid_edit=new QLineEdit(this);
wave_songid_edit->setMaxLength(32);
@ -102,7 +91,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Beats Per Minute
//
wave_bpm_label=new QLabel(tr("Beats per Minute")+":",this);
wave_bpm_label->setFont(label_font);
wave_bpm_label->setFont(labelFont());
wave_bpm_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_bpm_spin=new QSpinBox(this);
wave_bpm_spin->setRange(0,300);
@ -112,7 +101,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Album
//
wave_album_label=new QLabel(tr("Album")+":",this);
wave_album_label->setFont(label_font);
wave_album_label->setFont(labelFont());
wave_album_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_album_edit=new QLineEdit(this);
wave_album_edit->setMaxLength(255);
@ -121,7 +110,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Label
//
wave_label_label=new QLabel(tr("Label")+":",this);
wave_label_label->setFont(label_font);
wave_label_label->setFont(labelFont());
wave_label_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_label_edit=new QLineEdit(this);
wave_label_edit->setMaxLength(64);
@ -130,7 +119,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Client
//
wave_client_label=new QLabel(tr("Client")+":",this);
wave_client_label->setFont(label_font);
wave_client_label->setFont(labelFont());
wave_client_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_client_edit=new QLineEdit(this);
wave_client_edit->setMaxLength(64);
@ -139,7 +128,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Agency
//
wave_agency_label=new QLabel(tr("Agency")+":",this);
wave_agency_label->setFont(label_font);
wave_agency_label->setFont(labelFont());
wave_agency_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_agency_edit=new QLineEdit(this);
wave_agency_edit->setMaxLength(64);
@ -148,7 +137,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Publisher
//
wave_publisher_label=new QLabel(tr("Publisher")+":",this);
wave_publisher_label->setFont(label_font);
wave_publisher_label->setFont(labelFont());
wave_publisher_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_publisher_edit=new QLineEdit(this);
wave_publisher_edit->setMaxLength(64);
@ -157,7 +146,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Composer
//
wave_composer_label=new QLabel(tr("Composer")+":",this);
wave_composer_label->setFont(label_font);
wave_composer_label->setFont(labelFont());
wave_composer_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_composer_edit=new QLineEdit(this);
wave_composer_edit->setMaxLength(64);
@ -166,7 +155,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// Conductor
//
wave_conductor_label=new QLabel(tr("Conductor")+":",this);
wave_conductor_label->setFont(label_font);
wave_conductor_label->setFont(labelFont());
wave_conductor_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_conductor_edit=new QLineEdit(this);
wave_conductor_edit->setMaxLength(64);
@ -175,7 +164,7 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// User Defined
//
wave_userdef_label=new QLabel(tr("User Defined")+":",this);
wave_userdef_label->setFont(label_font);
wave_userdef_label->setFont(labelFont());
wave_userdef_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
wave_userdef_edit=new QLineEdit(this);
wave_userdef_edit->setMaxLength(255);
@ -184,14 +173,14 @@ RDWaveDataDialog::RDWaveDataDialog(const QString &caption,QWidget *parent)
// OK Button
//
wave_ok_button=new QPushButton(tr("OK"),this);
wave_ok_button->setFont(label_font);
wave_ok_button->setFont(buttonFont());
connect(wave_ok_button,SIGNAL(clicked()),this,SLOT(okData()));
//
// Cancel Button
//
wave_cancel_button=new QPushButton(tr("Cancel"),this);
wave_cancel_button->setFont(label_font);
wave_cancel_button->setFont(buttonFont());
connect(wave_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
}

13
lib/rdwavedata_dialog.h

@ -2,7 +2,7 @@
//
// A dialog to edit the contents of an RDWaveData.
//
// (C) Copyright 2014,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2014-2019 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,21 +21,14 @@
#ifndef RDWAVEDATA_DIALOG_H
#define RDWAVEDATA_DIALOG_H
#include <qdialog.h>
#include <qlineedit.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qcombobox.h>
#include <qspinbox.h>
//Added by qt3to4:
#include <QResizeEvent>
#include <QCloseEvent>
#include <rdcombobox.h>
#include <rdcart.h>
#include <rddialog.h>
#include <rdschedcodes_dialog.h>
class RDWaveDataDialog : public QDialog
class RDWaveDataDialog : public RDDialog
{
Q_OBJECT
public: