diff --git a/ChangeLog b/ChangeLog index 3411f6e3..e5422c22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20877,3 +20877,8 @@ 2021-01-22 Fred Gleason * Modified the 'Edit Deck' dialog in rdadmin(1) to use 'RDStationListModel'. +2021-01-22 Fred Gleason + * Modified the 'Configure RDAirPlay' dialog in rdadmin(1) to use + 'RDServiceListModel'. + * Modified the 'Configure RDPanel' dialog in rdadmin(1) to use + 'RDServiceListModel'. diff --git a/lib/librd_cs.ts b/lib/librd_cs.ts index 2a05e75b..b729ff99 100644 --- a/lib/librd_cs.ts +++ b/lib/librd_cs.ts @@ -3479,6 +3479,10 @@ Zkuste to, prosím, znovu! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_de.ts b/lib/librd_de.ts index dc052b1e..5e97280b 100644 --- a/lib/librd_de.ts +++ b/lib/librd_de.ts @@ -3460,6 +3460,10 @@ bitte erneut versuchen! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_es.ts b/lib/librd_es.ts index 081f0965..a6e5f2d8 100644 --- a/lib/librd_es.ts +++ b/lib/librd_es.ts @@ -3439,6 +3439,10 @@ please try again! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_fr.ts b/lib/librd_fr.ts index 1e727b73..bac791e6 100644 --- a/lib/librd_fr.ts +++ b/lib/librd_fr.ts @@ -2740,6 +2740,10 @@ please try again! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_nb.ts b/lib/librd_nb.ts index e6fcbd5a..d347e4d0 100644 --- a/lib/librd_nb.ts +++ b/lib/librd_nb.ts @@ -3342,6 +3342,10 @@ prøv ein gong til! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_nn.ts b/lib/librd_nn.ts index e6fcbd5a..d347e4d0 100644 --- a/lib/librd_nn.ts +++ b/lib/librd_nn.ts @@ -3342,6 +3342,10 @@ prøv ein gong til! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/librd_pt_BR.ts b/lib/librd_pt_BR.ts index cccb1e0b..5533f4f1 100644 --- a/lib/librd_pt_BR.ts +++ b/lib/librd_pt_BR.ts @@ -3393,6 +3393,10 @@ por favor, tente novamente! Import Markers + + [none] + + RDSoundPanel diff --git a/lib/rdservicelistmodel.cpp b/lib/rdservicelistmodel.cpp index 66379068..1eb1258f 100644 --- a/lib/rdservicelistmodel.cpp +++ b/lib/rdservicelistmodel.cpp @@ -22,9 +22,11 @@ #include "rdescape_string.h" #include "rdservicelistmodel.h" -RDServiceListModel::RDServiceListModel(QObject *parent) +RDServiceListModel::RDServiceListModel(bool incl_none,QObject *parent) : QAbstractTableModel(parent) { + d_include_none=incl_none; + // // Column Attributes // @@ -236,13 +238,19 @@ void RDServiceListModel::refresh(const QString &grpname) void RDServiceListModel::updateModel() { QList texts; - QList icons; RDSqlQuery *q=NULL; QString sql=sqlFields(); sql+="order by NAME "; beginResetModel(); d_texts.clear(); + if(d_include_none) { + d_texts.push_back(texts); + d_texts.back().push_back(tr("[none]")); + for(int i=1;inext()) { d_texts.push_back(texts); diff --git a/lib/rdservicelistmodel.h b/lib/rdservicelistmodel.h index f23c4f08..8a6501f6 100644 --- a/lib/rdservicelistmodel.h +++ b/lib/rdservicelistmodel.h @@ -41,7 +41,7 @@ class RDServiceListModel : public QAbstractTableModel { Q_OBJECT public: - RDServiceListModel(QObject *parent=0); + RDServiceListModel(bool incl_none,QObject *parent=0); ~RDServiceListModel(); QPalette palette(); void setPalette(const QPalette &pal); @@ -68,7 +68,7 @@ class RDServiceListModel : public QAbstractTableModel QPalette d_palette; QFont d_font; QFont d_bold_font; - QStringList d_service_names; + bool d_include_none; QList d_headers; QList d_alignments; QList > d_texts; diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index 9bcd9c52..fda9bb04 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -2,7 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,19 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -47,11 +38,6 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, QWidget *parent) : RDDialog(parent) { - setModal(true); - - QString sql; - RDSqlQuery *q; - air_exitpasswd_changed=false; air_logmachine=0; air_virtual_logmachine=0; @@ -60,10 +46,8 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // // Fix the Window Size // - setMinimumWidth(sizeHint().width()); - setMaximumWidth(sizeHint().width()); - setMinimumHeight(sizeHint().height()); - setMaximumHeight(sizeHint().height()); + setMinimumSize(sizeHint()); + setMaximumSize(sizeHint()); air_conf=new RDAirPlayConf(station->name(),"RDAIRPLAY"); @@ -77,6 +61,11 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // setWindowTitle("RDAdmin - "+tr("Configure RDAirPlay")); + // + // Models + // + air_service_model=new RDServiceListModel(true,this); + // // Channel Assignments Section // @@ -541,6 +530,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // air_defaultsvc_box=new QComboBox(this); air_defaultsvc_box->setGeometry(895,142,100,20); + air_defaultsvc_box->setModel(air_service_model); label=new QLabel(air_defaultsvc_box,tr("Default Service:"),this); label->setFont(subLabelFont()); label->setGeometry(760,142,130,20); @@ -961,18 +951,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_piecount_box->setValue(air_conf->pieCountLength()/1000); air_countto_box->setCurrentItem(air_conf->pieEndPoint()); air_default_transtype_box->setCurrentItem(air_conf->defaultTransType()); - air_defaultsvc_box->insertItem(tr("[none]")); - QString defaultsvc=air_conf->defaultSvc(); - sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+ - "STATION_NAME=\""+RDEscapeString(air_conf->station())+"\""; - q=new RDSqlQuery(sql); - while(q->next()) { - air_defaultsvc_box->insertItem(q->value(0).toString()); - if(defaultsvc==q->value(0).toString()) { - air_defaultsvc_box->setCurrentItem(air_defaultsvc_box->count()-1); - } - } - delete q; + air_defaultsvc_box->setCurrentText(air_conf->defaultSvc()); air_station_box->setValue(air_conf->panels(RDAirPlayConf::StationPanel)); air_user_box->setValue(air_conf->panels(RDAirPlayConf::UserPanel)); air_timesync_box->setChecked(air_conf->checkTimesync()); @@ -1040,6 +1019,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, EditRDAirPlay::~EditRDAirPlay() { + delete air_service_model; } diff --git a/rdadmin/edit_rdairplay.h b/rdadmin/edit_rdairplay.h index b5f93068..f4807a9f 100644 --- a/rdadmin/edit_rdairplay.h +++ b/rdadmin/edit_rdairplay.h @@ -2,7 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,18 +21,19 @@ #ifndef EDIT_RDAIRPLAY_H #define EDIT_RDAIRPLAY_H -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include + #include #include #include #include +#include #include /* @@ -148,6 +149,7 @@ class EditRDAirPlay : public RDDialog QComboBox *air_virtual_logstartmode_box; int air_virtual_logstartmachine; RDAirPlayConf::OpMode air_virtual_opmodes[RD_RDVAIRPLAY_LOG_QUAN]; + RDServiceListModel *air_service_model; }; diff --git a/rdadmin/edit_rdlibrary.h b/rdadmin/edit_rdlibrary.h index 46bba065..d3ec68f6 100644 --- a/rdadmin/edit_rdlibrary.h +++ b/rdadmin/edit_rdlibrary.h @@ -2,7 +2,7 @@ // // Edit an RDLibrry Configuration // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,11 +21,12 @@ #ifndef EDIT_RDLIBRARY_H #define EDIT_RDLIBRARY_H -#include -#include -#include #include +#include +#include +#include + #include #include #include diff --git a/rdadmin/edit_rdpanel.cpp b/rdadmin/edit_rdpanel.cpp index ba202617..ab774cf0 100644 --- a/rdadmin/edit_rdpanel.cpp +++ b/rdadmin/edit_rdpanel.cpp @@ -2,7 +2,7 @@ // // Edit an RDPanel Configuration // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,9 +18,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -#include -#include +#include +#include #include #include @@ -34,11 +33,6 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, QWidget *parent) : RDDialog(parent) { - setModal(true); - - QString sql; - RDSqlQuery *q; - // // Fix the Window Size // @@ -57,6 +51,11 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // setWindowTitle("RDAdmin - "+tr("Configure RDPanel")); + // + // Models + // + air_service_model=new RDServiceListModel(true,this); + // // Channel Assignments Section // @@ -288,6 +287,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // air_defaultsvc_box=new QComboBox(this); air_defaultsvc_box->setGeometry(520,151,100,20); + air_defaultsvc_box->setModel(air_service_model); label=new QLabel(air_defaultsvc_box,tr("Default Service:"),this); label->setFont(subLabelFont()); label->setGeometry(385,151,130,20); @@ -358,18 +358,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, air_card_sel[5]->setCard(air_conf->card(RDAirPlayConf::CueChannel)); air_card_sel[5]->setPort(air_conf->port(RDAirPlayConf::CueChannel)); - air_defaultsvc_box->insertItem(tr("[none]")); - QString defaultsvc=air_conf->defaultSvc(); - sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+ - "STATION_NAME=\""+RDEscapeString(air_conf->station())+"\""; - q=new RDSqlQuery(sql); - while(q->next()) { - air_defaultsvc_box->insertItem(q->value(0).toString()); - if(defaultsvc==q->value(0).toString()) { - air_defaultsvc_box->setCurrentItem(air_defaultsvc_box->count()-1); - } - } - delete q; + air_defaultsvc_box->setCurrentText(air_conf->defaultSvc()); air_skin_edit->setText(air_conf->skinPath()); air_station_box->setValue(air_conf->panels(RDAirPlayConf::StationPanel)); air_user_box->setValue(air_conf->panels(RDAirPlayConf::UserPanel)); diff --git a/rdadmin/edit_rdpanel.h b/rdadmin/edit_rdpanel.h index 11f136a4..989106e6 100644 --- a/rdadmin/edit_rdpanel.h +++ b/rdadmin/edit_rdpanel.h @@ -2,7 +2,7 @@ // // Edit an RDPanel Configuration // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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,16 +21,17 @@ #ifndef EDIT_RDPANEL_H #define EDIT_RDPANEL_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include /* @@ -68,6 +69,7 @@ class EditRDPanel : public RDDialog QLineEdit *air_label_template_edit; QComboBox *air_defaultsvc_box; QLineEdit *air_skin_edit; + RDServiceListModel *air_service_model; }; diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index d1124aa5..2044ad31 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -89,7 +89,7 @@ ListSvcs::ListSvcs(QWidget *parent) list_services_view->setShowGrid(false); list_services_view->setSortingEnabled(false); list_services_view->setWordWrap(false); - list_services_model=new RDServiceListModel(this); + list_services_model=new RDServiceListModel(false,this); list_services_model->setFont(defaultFont()); list_services_model->setPalette(palette()); list_services_view->setModel(list_services_model); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 7f3ec9b1..e33da21c 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -2777,7 +2777,7 @@ Daemons auf diesem Host neu, indem sie als 'root'-Benutzer den Befehl [none] - [žádný] + [žádný] Data Error @@ -3479,7 +3479,7 @@ pro naplnění databáze zdroji zvuku. [none] - [žádný] + [žádný] Select Image File diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 1c898d15..2fdb067b 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -2623,7 +2623,7 @@ Daemons auf diesem Host neu, indem sie als 'root'-Benutzer den Befehl [none] - [keine] + [keine] Data Error @@ -3301,7 +3301,7 @@ configured to run the CAE service in order to populate the audio resources datab [none] - [keine] + [keine] Select Image File diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index dda79a31..163dce16 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -2767,7 +2767,7 @@ Parameters [none] - [ninguno] + [ninguno] No Audio Configuration Data @@ -3463,7 +3463,7 @@ para generar la base de datos con los recursos de audio disponibles. [none] - [ninguno] + [ninguno] Select Image File diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 1c23698c..563c4d89 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -2085,10 +2085,6 @@ GPIOs No Audio Configuration Data - - [none] - - Data Error @@ -2713,10 +2709,6 @@ configured to run the CAE service in order to populate the audio resources datab No Audio Configuration Data - - [none] - - Select Image File diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 964e0976..2b15071f 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -2555,7 +2555,7 @@ for lydressursar. [none] - [ingen] + [ingen] Data Error @@ -3243,7 +3243,7 @@ for lydressursar. [none] - [ingen] + [ingen] Select Image File diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 964e0976..2b15071f 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -2555,7 +2555,7 @@ for lydressursar. [none] - [ingen] + [ingen] Data Error @@ -3243,7 +3243,7 @@ for lydressursar. [none] - [ingen] + [ingen] Select Image File diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 2159cde3..5423b9c4 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -2615,7 +2615,7 @@ Isto para popular os recursos de áudio na Base de Dados. [none] - [Nenhum] + [Nenhum] Select Image File @@ -3291,7 +3291,7 @@ Isto para popular os recursos de áudio na Base de Dados. [none] - [Nenhum] + [Nenhum] Select Image File