Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-30 07:32:32 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Commented out support for editing hotkeys in the 'Configure
	RDAirPlay' dialog in rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-02 18:17:38 -05:00
parent 4629cbd089
commit 6512148633
13 changed files with 45 additions and 432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20983,3 +20983,6 @@
model-based API.
2021-02-02 Fred Gleason <fredg@paravelsystems.com>
* Removed dead code from 'rdadmin/list_groups.h'.
2021-02-02 Fred Gleason <fredg@paravelsystems.com>
* Commented out support for editing hotkeys in the 'Configure
RDAirPlay' dialog in rdadmin(1).

2
rdadmin/Makefile.am
View File

@ -70,7 +70,6 @@ dist_rdadmin_SOURCES = add_feed.cpp add_feed.h\
edit_gpi.cpp edit_gpi.h\
edit_group.cpp edit_group.h\
edit_hostvar.cpp edit_hostvar.h\
edit_hotkeys.cpp edit_hotkeys.h\
edit_image.cpp edit_image.h\
edit_jack.cpp edit_jack.h\
edit_jack_client.cpp edit_jack_client.h\
@ -153,7 +152,6 @@ nodist_rdadmin_SOURCES = global_credits.c\
moc_edit_gpi.cpp\
moc_edit_group.cpp\
moc_edit_hostvar.cpp\
moc_edit_hotkeys.cpp\
moc_edit_image.cpp\
moc_edit_jack.cpp\
moc_edit_jack_client.cpp\

10
rdadmin/edit_rdairplay.cpp
View File

@ -30,7 +30,7 @@
#include <rdtextvalidator.h>
#include "edit_rdairplay.h"
#include "edit_hotkeys.h"
//#include "edit_hotkeys.h"
#include "edit_channelgpios.h"
#include "globals.h"
@ -280,11 +280,13 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
//
// HotKeys Configuration Button
//
/*
QPushButton *button=new QPushButton(this);
button->setGeometry(10,385,180,50);
button->setFont(buttonFont());
button->setText(tr("Configure Hot Keys"));
connect(button,SIGNAL(clicked()),this,SLOT(editHotKeys()));
*/
//
// Sound Panel First Play Output
@ -798,7 +800,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
label->setFont(subLabelFont());
label->setGeometry(435,403,115,20);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
button=new QPushButton(tr("Select"),this);
QPushButton *button=new QPushButton(tr("Select"),this);
button->setFont(subButtonFont());
button->setGeometry(745,400,50,25);
connect(button,SIGNAL(clicked()),this,SLOT(selectSkinData()));
@ -1157,7 +1159,7 @@ void EditRDAirPlay::selectData()
delete ll;
}
/*
void EditRDAirPlay::editHotKeys()
{
QString module_name = QString("airplay");
@ -1166,7 +1168,7 @@ void EditRDAirPlay::editHotKeys()
edit_hotkeys->exec();
delete edit_hotkeys;
}
*/
void EditRDAirPlay::selectSkinData()
{

2
rdadmin/edit_rdairplay.h
View File

@ -58,7 +58,7 @@ class EditRDAirPlay : public RDDialog
void virtualModeActivatedData(int vlognum);
void startModeChangedData(int mode);
void selectData();
void editHotKeys();
// void editHotKeys();
void selectSkinData();
void modeControlActivatedData(int n);
void logStartupModeActivatedData(int n);

3
rdadmin/edit_vguest_resource.cpp
View File

@ -148,6 +148,9 @@ int EditVguestResource::exec(RDMatrix::VguestType type,unsigned id)
setWindowTitle("RDADmin - "+tr("Edit vGuest Display"));
edit_relaynum_edit->setDisabled(true);
break;
case RDMatrix::VguestTypeNone:
break;
}
}
delete q;

2
rdadmin/rdadmin.pro
View File

@ -39,7 +39,6 @@ x11 {
SOURCES += edit_gpi.cpp
SOURCES += edit_group.cpp
SOURCES += edit_hostvar.cpp
SOURCES += edit_hotkeys.cpp
SOURCES += edit_image.cpp
SOURCES += edit_jack.cpp
SOURCES += edit_jack_client.cpp
@ -109,7 +108,6 @@ x11 {
HEADERS += edit_gpi.h
HEADERS += edit_group.h
HEADERS += edit_hostvar.h
HEADERS += edit_hotkeys.h
HEADERS += edit_image.h
HEADERS += edit_jack.h
HEADERS += edit_jack_client.h

40
rdadmin/rdadmin_cs.ts
View File

@ -1961,71 +1961,63 @@ Stále ještě chcete uložit?</translation>
<name>EditHotkeys</name>
<message>
<source>Hot Key Configuration for</source>
<translation>Nastavení klávesové zkratky pro</translation>
<translation type="obsolete">Nastavení klávesové zkratky pro</translation>
</message>
<message>
<source>Host Hot Key Configurations</source>
<translation>Nastavení klávesových zkratek pro server</translation>
<translation type="obsolete">Nastavení klávesových zkratek pro server</translation>
</message>
<message>
<source>Button / Function </source>
<translation>Tlačítko/Funkce</translation>
<translation type="obsolete">Tlačítko/Funkce</translation>
</message>
<message>
<source>KeyStroke</source>
<translation>Klávesová zkratka</translation>
<translation type="obsolete">Klávesová zkratka</translation>
</message>
<message>
<source>Set</source>
<translation>Nastavit</translation>
<translation type="obsolete">Nastavit</translation>
</message>
<message>
<source>Clear</source>
<translation>Smazat</translation>
<translation type="obsolete">Smazat</translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation>Smazat všechny klávesové zkratky</translation>
<translation type="obsolete">Smazat všechny klávesové zkratky</translation>
</message>
<message>
<source>Set From Host:</source>
<translation>Nastavit ze serveru:</translation>
<translation type="obsolete">Nastavit ze serveru:</translation>
</message>
<message>
<source>Save</source>
<translation>Uložit</translation>
<translation type="obsolete">Uložit</translation>
</message>
<message>
<source>Cancel</source>
<translation>Zrušit</translation>
<translation type="obsolete">Zrušit</translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation>Zdvojené záznamy</translation>
<translation type="obsolete">Zdvojené záznamy</translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation>Smazání klávesových zkratek</translation>
<translation type="obsolete">Smazání klávesových zkratek</translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation>Klávesové zkratky obnoveny</translation>
<translation type="obsolete">Klávesové zkratky obnoveny</translation>
</message>
<message>
<source>No Items Selected</source>
<translation>Nevybrány žádné položky</translation>
<translation type="obsolete">Nevybrány žádné položky</translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation>Vyberte, prosím, položku ze seznamu</translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Vyberte, prosím, položku ze seznamu</translation>
</message>
</context>
<context>
@ -2893,7 +2885,7 @@ nastaveném pro běh služby CAE pro naplnění databáze se zdroji zvuku.</tran
</message>
<message>
<source>Configure Hot Keys</source>
<translation>Nastavit zkratkové klávesy</translation>
<translation type="obsolete">Nastavit zkratkové klávesy</translation>
</message>
<message>
<source>Show Hour Selector</source>

75
rdadmin/rdadmin_de.ts
View File

@ -1787,77 +1787,6 @@ Do you still want to save?</source>
<translation>Abbre&amp;chen</translation>
</message>
</context>
<context>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Button / Function </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyStroke</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set From Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Items Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditImage</name>
<message>
@ -2731,10 +2660,6 @@ has not yet been generated. Please start the Rivendell daemons on the host
configured to run the CAE service in order to populate the audio resources database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure Hot Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hour Selector</source>
<translation type="unfinished"></translation>

40
rdadmin/rdadmin_es.ts
View File

@ -1959,71 +1959,63 @@ Do you still want to save?</source>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation>Configuración de atajos de teclado</translation>
<translation type="obsolete">Configuración de atajos de teclado</translation>
</message>
<message>
<source>Button / Function </source>
<translation>Botón / Función </translation>
<translation type="obsolete">Botón / Función </translation>
</message>
<message>
<source>KeyStroke</source>
<translation>Teclas</translation>
<translation type="obsolete">Teclas</translation>
</message>
<message>
<source>Set</source>
<translation>Asignar</translation>
<translation type="obsolete">Asignar</translation>
</message>
<message>
<source>Clear</source>
<translation>Limpiar</translation>
<translation type="obsolete">Limpiar</translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation>Borrar todo</translation>
<translation type="obsolete">Borrar todo</translation>
</message>
<message>
<source>Set From Host:</source>
<translation>Copiar desde:</translation>
<translation type="obsolete">Copiar desde:</translation>
</message>
<message>
<source>Save</source>
<translation>Guardar</translation>
<translation type="obsolete">Guardar</translation>
</message>
<message>
<source>Cancel</source>
<translation>Cancelar</translation>
<translation type="obsolete">Cancelar</translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation>Entradas duplicadas</translation>
<translation type="obsolete">Entradas duplicadas</translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation>Borrar atajos de teclado</translation>
<translation type="obsolete">Borrar atajos de teclado</translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation>Atajos de teclado actualizados</translation>
<translation type="obsolete">Atajos de teclado actualizados</translation>
</message>
<message>
<source>No Items Selected</source>
<translation>No se han seleccionado ítems</translation>
<translation type="obsolete">No se han seleccionado ítems</translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation>Por favor, seleccione un ítem de la lista</translation>
<translation type="obsolete">Por favor, seleccione un ítem de la lista</translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation>Atajos de teclado para</translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
<translation type="obsolete">Atajos de teclado para</translation>
</message>
</context>
<context>
@ -2891,7 +2883,7 @@ servicios de Rivendell en el equipo configurado para ejecutar el servicio CAE. <
</message>
<message>
<source>Configure Hot Keys</source>
<translation>Configurar atajos de teclado</translation>
<translation type="obsolete">Configurar atajos de teclado</translation>
</message>
<message>
<source>Show Hour Selector</source>

75
rdadmin/rdadmin_fr.ts
View File

@ -1326,77 +1326,6 @@ Do you still want to save?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Button / Function </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyStroke</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set From Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Items Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditImage</name>
<message>
@ -2068,10 +1997,6 @@ has not yet been generated. Please start the Rivendell daemons on the host
configured to run the CAE service in order to populate the audio resources database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure Hot Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hour Selector</source>
<translation type="unfinished"></translation>

75
rdadmin/rdadmin_nb.ts
View File

@ -1758,77 +1758,6 @@ Vil du framleis lagra?</translation>
<translation>&amp;Avbryt</translation>
</message>
</context>
<context>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Button / Function </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyStroke</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set From Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Items Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditImage</name>
<message>
@ -2663,10 +2592,6 @@ has not yet been generated. Please start the Rivendell daemons on the host
configured to run the CAE service in order to populate the audio resources database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure Hot Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hour Selector</source>
<translation type="unfinished"></translation>

75
rdadmin/rdadmin_nn.ts
View File

@ -1758,77 +1758,6 @@ Vil du framleis lagra?</translation>
<translation>&amp;Avbryt</translation>
</message>
</context>
<context>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Button / Function </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyStroke</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set From Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Items Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditImage</name>
<message>
@ -2663,10 +2592,6 @@ has not yet been generated. Please start the Rivendell daemons on the host
configured to run the CAE service in order to populate the audio resources database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure Hot Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hour Selector</source>
<translation type="unfinished"></translation>

75
rdadmin/rdadmin_pt_BR.ts
View File

@ -1764,77 +1764,6 @@ Você ainda quer salvar?</translation>
<translation>&amp;Cancelar</translation>
</message>
</context>
<context>
<name>EditHotkeys</name>
<message>
<source>Host Hot Key Configurations</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Button / Function </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeyStroke</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear All Hotkeys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Set From Host:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Entries</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hotkeys Updated</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Items Selected</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Please Select an Item From the List</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hot Key Configuration for</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Duplicate Hotkey defined</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No Duplicates allowed.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EditImage</name>
<message>
@ -2711,10 +2640,6 @@ has not yet been generated. Please start the Rivendell daemons on the host
configured to run the CAE service in order to populate the audio resources database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Configure Hot Keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show Hour Selector</source>
<translation type="unfinished"></translation>