From 776e3ca842c7a89c6b097f690353c932eae663eb Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 25 Feb 2021 09:22:24 -0500 Subject: [PATCH] 2021-02-25 Fred Gleason * Fixed various regressions in rdadmin(1). Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ lib/rdstationlistmodel.cpp | 2 +- rdadmin/edit_cartslots.cpp | 2 +- rdadmin/edit_decks.cpp | 7 +++---- rdadmin/edit_rdairplay.cpp | 2 +- rdadmin/edit_station.cpp | 16 ++++++++-------- rdadmin/edit_station.h | 3 ++- rdadmin/edit_system.cpp | 18 +++++------------- rdadmin/edit_system.h | 2 ++ rdadmin/rdadmin_cs.ts | 2 +- rdadmin/rdadmin_de.ts | 2 +- rdadmin/rdadmin_es.ts | 4 ---- rdadmin/rdadmin_fr.ts | 4 ---- rdadmin/rdadmin_nb.ts | 2 +- rdadmin/rdadmin_nn.ts | 2 +- rdadmin/rdadmin_pt_BR.ts | 2 +- 16 files changed, 30 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bfa5764..d9a5083a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21198,3 +21198,5 @@ services. * Fixed a regression in rdlibrary(1) that broke searching for 'ALL' groups. +2021-02-25 Fred Gleason + * Fixed various regressions in rdadmin(1). diff --git a/lib/rdstationlistmodel.cpp b/lib/rdstationlistmodel.cpp index 3b9cb219..a7c0284d 100644 --- a/lib/rdstationlistmodel.cpp +++ b/lib/rdstationlistmodel.cpp @@ -236,7 +236,7 @@ void RDStationListModel::refresh(const QModelIndex &row) { if(row.row()first()) { updateRow(row.row(),q); diff --git a/rdadmin/edit_cartslots.cpp b/rdadmin/edit_cartslots.cpp index f9bb0410..d11a0136 100644 --- a/rdadmin/edit_cartslots.cpp +++ b/rdadmin/edit_cartslots.cpp @@ -418,7 +418,7 @@ void EditCartSlots::ReadSlot(unsigned slotnum) cartActionData(edit_cartaction_box->currentIndex()); modeData(edit_mode_box->currentIndex()); for(int i=0;icount();i++) { - if(q->value(7).toString()==edit_service_box->itemData(i).toString()) { + if(q->value(7).toString()==edit_service_box->itemText(i)) { edit_service_box->setCurrentIndex(i); } } diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index 97d7d432..ad38e2bd 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -645,22 +645,21 @@ void EditDecks::ReadRecord(int chan) break; } for(int i=0;icount();i++) { - if(edit_record_deck->switchStation()== - edit_swstation_box->itemData(i).toString()) { + if(edit_record_deck->switchStation()==edit_swstation_box->itemText(i)) { edit_swstation_box->setCurrentIndex(i); stationActivatedData(edit_swstation_box->currentText()); } } QString matrix_name=edit_record_deck->switchMatrixName(); for(int i=0;icount();i++) { - if(edit_swmatrix_box->itemData(i).toString()==matrix_name) { + if(edit_swmatrix_box->itemText(i)==matrix_name) { edit_swmatrix_box->setCurrentIndex(i); matrixActivatedData(edit_swmatrix_box->currentText()); } } QString output_name=edit_record_deck->switchOutputName(); for(int i=0;icount();i++) { - if(edit_swoutput_box->itemData(i).toString()==output_name) { + if(edit_swoutput_box->itemText(i)==output_name) { edit_swoutput_box->setCurrentIndex(i); } } diff --git a/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index 095c7bec..d4a2394f 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -950,7 +950,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, air_countto_box->setCurrentIndex(air_conf->pieEndPoint()); air_default_transtype_box->setCurrentIndex(air_conf->defaultTransType()); for(int i=0;icount();i++) { - if(air_defaultsvc_box->itemData(i).toString()==air_conf->defaultSvc()) { + if(air_defaultsvc_box->itemText(i)==air_conf->defaultSvc()) { air_defaultsvc_box->setCurrentIndex(i); break; } diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index 17def7cc..7aef7fc5 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -76,7 +76,6 @@ EditStation::EditStation(QString sname,QWidget *parent) // Models // station_username_model=new RDUserListModel(this); - station_station_model=new RDStationListModel(false,sname,this); // // Station Name @@ -303,7 +302,8 @@ EditStation::EditStation(QString sname,QWidget *parent) // station_http_station_box=new RDComboBox(this); station_http_station_box->setEditable(false); - station_http_station_box->setModel(station_station_model); + station_http_station_model=new RDStationListModel(false,sname,this); + station_http_station_box->setModel(station_http_station_model); station_http_station_label=new QLabel(tr("HTTP Xport:"),this); station_http_station_label->setFont(labelFont()); station_http_station_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); @@ -313,7 +313,8 @@ EditStation::EditStation(QString sname,QWidget *parent) // station_cae_station_box=new RDComboBox(this); station_cae_station_box->setEditable(false); - station_cae_station_box->setModel(station_station_model); + station_cae_station_model=new RDStationListModel(false,sname,this); + station_cae_station_box->setModel(station_cae_station_model); connect(station_cae_station_box,SIGNAL(activated(const QString &)), this,SLOT(caeStationActivatedData(const QString &))); station_cae_station_label=new QLabel(tr("Core Audio Engine:"),this); @@ -537,12 +538,10 @@ EditStation::EditStation(QString sname,QWidget *parent) station_http_station_box->setCurrentText(station_station->httpStation()); station_cae_station_box->setCurrentText(station_station->caeStation()); for(int i=0;icount();i++) { - if(station_http_station_box->itemData(i).toString()== - station_station->httpStation()) { + if(station_http_station_box->itemText(i)==station_station->httpStation()) { station_http_station_box->setCurrentIndex(i); } - if(station_cae_station_box->itemData(i).toString()== - station_station->caeStation()) { + if(station_cae_station_box->itemText(i)==station_station->caeStation()) { station_cae_station_box->setCurrentIndex(i); } } @@ -554,7 +553,8 @@ EditStation::~EditStation() delete station_station; delete station_cae_station; delete station_username_model; - delete station_station_model; + delete station_http_station_model; + delete station_cae_station_model; } diff --git a/rdadmin/edit_station.h b/rdadmin/edit_station.h index cbb35ebd..d88ff3f1 100644 --- a/rdadmin/edit_station.h +++ b/rdadmin/edit_station.h @@ -134,9 +134,10 @@ class EditStation : public RDDialog QGroupBox *station_systemservices_groupbox; QLabel *station_http_station_label; RDComboBox *station_http_station_box; + RDStationListModel *station_http_station_model; QLabel *station_cae_station_label; RDComboBox *station_cae_station_box; - RDStationListModel *station_station_model; + RDStationListModel *station_cae_station_model; QPushButton *station_rdlibrary_button; QPushButton *station_rdcatch_button; QPushButton *station_rdairplay_button; diff --git a/rdadmin/edit_system.cpp b/rdadmin/edit_system.cpp index a7122311..692b3257 100644 --- a/rdadmin/edit_system.cpp +++ b/rdadmin/edit_system.cpp @@ -34,9 +34,6 @@ EditSystem::EditSystem(QWidget *parent) : RDDialog(parent) { - QString sql; - RDSqlQuery *q; - y_pos=0; // @@ -51,6 +48,7 @@ EditSystem::EditSystem(QWidget *parent) edit_system=new RDSystem(); edit_encoders_dialog=new ListEncoders(this); + edit_station_list_model=new RDStationListModel(true,"",this); // // System Sample Rate @@ -156,14 +154,7 @@ EditSystem::EditSystem(QWidget *parent) // RSS Processor Host // edit_rss_processor_box=new QComboBox(this); - sql=QString("select NAME from STATIONS order by NAME"); - q=new RDSqlQuery(sql); - edit_rss_processor_box->insertItem(0,tr("[none]")); - while(q->next()) { - edit_rss_processor_box->insertItem(edit_rss_processor_box->count(), - q->value(0).toString()); - } - delete q; + edit_rss_processor_box->setModel(edit_station_list_model); edit_rss_processor_label=new QLabel(tr("Process RSS Updates On")+":",this); edit_rss_processor_label->setFont(labelFont()); edit_rss_processor_label-> @@ -231,13 +222,13 @@ EditSystem::EditSystem(QWidget *parent) QString station=edit_system->rssProcessorStation(); for(int i=0;icount();i++) { - if(edit_rss_processor_box->itemData(i).toString()==station) { + if(edit_rss_processor_box->itemText(i)==station) { edit_rss_processor_box->setCurrentIndex(i); } } for(int i=0;icount();i++) { - if(edit_sample_rate_box->itemData(i).toString().toUInt()== + if(edit_sample_rate_box->itemText(i).toUInt()== edit_system->sampleRate()) { edit_sample_rate_box->setCurrentIndex(i); } @@ -248,6 +239,7 @@ EditSystem::EditSystem(QWidget *parent) EditSystem::~EditSystem() { + delete edit_station_list_model; delete edit_system; delete edit_encoders_dialog; delete edit_duplicate_carts_box; diff --git a/rdadmin/edit_system.h b/rdadmin/edit_system.h index e5b876ae..9103eb82 100644 --- a/rdadmin/edit_system.h +++ b/rdadmin/edit_system.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -92,6 +93,7 @@ class EditSystem : public RDDialog RDSystem *edit_system; ListEncoders *edit_encoders_dialog; int y_pos; + RDStationListModel *edit_station_list_model; }; diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 2a6f9abd..f084ce75 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -4469,7 +4469,7 @@ Custom [none] - [žádný] + [žádný] Process RSS Updates On diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 4460eeb1..d061585c 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -4145,7 +4145,7 @@ Custom [none] - [keine] + [keine] Process RSS Updates On diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 298f07e2..2fd4c916 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -4408,10 +4408,6 @@ Custom Show User List in RDLogin - - [none] - - Process RSS Updates On diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index 2fea7ca3..3c83af4c 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -3267,10 +3267,6 @@ Custom Show User List in RDLogin - - [none] - - Process RSS Updates On diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 51ec1362..f1d331e5 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -4050,7 +4050,7 @@ Custom [none] - [ingen] + [ingen] Process RSS Updates On diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 51ec1362..f1d331e5 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -4050,7 +4050,7 @@ Custom [none] - [ingen] + [ingen] Process RSS Updates On diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 8d3c1de1..48f0717e 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -4125,7 +4125,7 @@ Custom [none] - [Nenhum] + [Nenhum] Process RSS Updates On