diff --git a/ChangeLog b/ChangeLog index 65ae8504..06eb9e1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21050,3 +21050,7 @@ * Removed the 'RDHPISoundSelector' widget. 2021-02-06 Fred Gleason * Removed 'Q3Frame' dependencies from rdairplay(1). +2021-02-06 Fred Gleason + * Removed 'Q3DateTimeEdit' dependencies from rdadmin(1). + * Removed 'Q3ListBox' dependencies from rdadmin(1). + * Removed 'Q3TextEdit' dependencies from rdadmin(1). diff --git a/rdadmin/edit_rdlibrary.cpp b/rdadmin/edit_rdlibrary.cpp index 11e3c8a7..fdef9ead 100644 --- a/rdadmin/edit_rdlibrary.cpp +++ b/rdadmin/edit_rdlibrary.cpp @@ -2,7 +2,7 @@ // // Edit an RDLibrary 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 @@ -20,18 +20,8 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include @@ -41,8 +31,6 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QWidget *parent) : RDDialog(parent) { - setModal(true); - // // Fix the Window Size // @@ -68,7 +56,6 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, lib_input_card->setGeometry(sizeHint().width()/5,29,120,117); QLabel *label=new QLabel(lib_input_card,tr("Input"),this); label->setGeometry(sizeHint().width()/5,10,120,19); - // label->setGeometry(10,10,110,19); label->setFont(sectionLabelFont()); label->setAlignment(Qt::AlignCenter|Qt::AlignVCenter); @@ -93,7 +80,8 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, // // Maximum Record Length // - lib_maxlength_time=new Q3TimeEdit(this); + lib_maxlength_time=new QTimeEdit(this); + lib_maxlength_time->setDisplayFormat("hh:mm:ss"); lib_maxlength_time->setGeometry(190,100,85,19); QLabel *lib_maxlength_label= new QLabel(lib_maxlength_time,tr("&Max Record Time:"),this); @@ -663,82 +651,5 @@ void EditRDLibrary::ShowBitRates(int layer,int rate) break; } break; - - /* - case 2: // MPEG-1 Layer 3 - lib_bitrate_box->setEnabled(true); - lib_bitrate_box->insertItem(tr("32 kbps/chan")); - lib_bitrate_box->insertItem(tr("40 kbps/chan")); - lib_bitrate_box->insertItem(tr("48 kbps/chan")); - lib_bitrate_box->insertItem(tr("56 kbps/chan")); - lib_bitrate_box->insertItem(tr("64 kbps/chan")); - lib_bitrate_box->insertItem(tr("80 kbps/chan")); - lib_bitrate_box->insertItem(tr("96 kbps/chan")); - lib_bitrate_box->insertItem(tr("112 kbps/chan")); - lib_bitrate_box->insertItem(tr("128 kbps/chan")); - lib_bitrate_box->insertItem(tr("160 kbps/chan")); - lib_bitrate_box->insertItem(tr("192 kbps/chan")); - lib_bitrate_box->insertItem(tr("224 kbps/chan")); - lib_bitrate_box->insertItem(tr("256 kbps/chan")); - lib_bitrate_box->insertItem(tr("320 kbps/chan")); - switch(lib_lib->defaultLayer()) { - case 32000: - lib_bitrate_box->setCurrentItem(0); - break; - - case 40000: - lib_bitrate_box->setCurrentItem(1); - break; - - case 48000: - lib_bitrate_box->setCurrentItem(2); - break; - - case 56000: - lib_bitrate_box->setCurrentItem(3); - break; - - case 64000: - lib_bitrate_box->setCurrentItem(4); - break; - - case 80000: - lib_bitrate_box->setCurrentItem(5); - break; - - case 96000: - lib_bitrate_box->setCurrentItem(6); - break; - - case 112000: - lib_bitrate_box->setCurrentItem(7); - break; - - case 128000: - lib_bitrate_box->setCurrentItem(8); - break; - - case 160000: - lib_bitrate_box->setCurrentItem(9); - break; - - case 192000: - lib_bitrate_box->setCurrentItem(10); - break; - - case 224000: - lib_bitrate_box->setCurrentItem(11); - break; - - case 256000: - lib_bitrate_box->setCurrentItem(12); - break; - - case 320000: - lib_bitrate_box->setCurrentItem(13); - break; - } - break; - */ } } diff --git a/rdadmin/edit_rdlibrary.h b/rdadmin/edit_rdlibrary.h index d3ec68f6..4db19cba 100644 --- a/rdadmin/edit_rdlibrary.h +++ b/rdadmin/edit_rdlibrary.h @@ -21,9 +21,8 @@ #ifndef EDIT_RDLIBRARY_H #define EDIT_RDLIBRARY_H -#include - #include +#include #include #include @@ -60,7 +59,7 @@ class EditRDLibrary : public RDDialog QSpinBox *lib_vox_spin; QSpinBox *lib_trim_spin; QSpinBox *lib_preroll_spin; - Q3TimeEdit *lib_maxlength_time; + QTimeEdit *lib_maxlength_time; QLineEdit *lib_ripdev_edit; QComboBox *lib_paranoia_box; QComboBox *lib_isrc_box; diff --git a/rdadmin/edit_rdlogedit.cpp b/rdadmin/edit_rdlogedit.cpp index 69305267..8957204e 100644 --- a/rdadmin/edit_rdlogedit.cpp +++ b/rdadmin/edit_rdlogedit.cpp @@ -81,7 +81,8 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, // // Maximum Record Length // - lib_maxlength_time=new Q3TimeEdit(this); + lib_maxlength_time=new QTimeEdit(this); + lib_maxlength_time->setDisplayFormat("hh:mm:ss"); lib_maxlength_time->setGeometry(180,100,85,19); QLabel *lib_maxlength_label= new QLabel(lib_maxlength_time,tr("&Max Record Time:"),this); diff --git a/rdadmin/edit_rdlogedit.h b/rdadmin/edit_rdlogedit.h index 294b9798..36cb1894 100644 --- a/rdadmin/edit_rdlogedit.h +++ b/rdadmin/edit_rdlogedit.h @@ -2,7 +2,7 @@ // // Edit an RDLogEdit 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,10 +21,8 @@ #ifndef EDIT_RDLOGEDIT_H #define EDIT_RDLOGEDIT_H -#include -#include -#include -#include +#include +#include #include #include @@ -61,7 +59,7 @@ class EditRDLogedit : public RDDialog QSpinBox *lib_preroll_spin; QSpinBox *lib_threshold_spin; QSpinBox *lib_normalization_spin; - Q3TimeEdit *lib_maxlength_time; + QTimeEdit *lib_maxlength_time; QLineEdit *lib_waveform_caption_edit; QLineEdit *lib_startcart_edit; QLineEdit *lib_endcart_edit; diff --git a/rdadmin/edit_report.cpp b/rdadmin/edit_report.cpp index 8604091e..521c29a9 100644 --- a/rdadmin/edit_report.cpp +++ b/rdadmin/edit_report.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Report // -// (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 @@ -258,18 +258,21 @@ EditReport::EditReport(QString rptname,QWidget *parent) edit_daypart_check->setGeometry(60,273,15,15); edit_daypart_label= new QLabel(edit_daypart_check,tr("Filter by Daypart"),this); - edit_daypart_label->setGeometry(edit_daypart_check->geometry().x()+20,273,155,19); + edit_daypart_label-> + setGeometry(edit_daypart_check->geometry().x()+20,273,155,19); edit_daypart_label->setFont(labelFont()); edit_daypart_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); - edit_starttime_edit=new Q3TimeEdit(this); + edit_starttime_edit=new QTimeEdit(this); + edit_starttime_edit->setDisplayFormat("hh:mm:ss"); edit_starttime_edit->setGeometry(150,294,80,20); edit_starttime_label=new QLabel(edit_starttime_edit,tr("Start Time:"),this); edit_starttime_label->setGeometry(65,294,80,20); edit_starttime_label->setFont(labelFont()); edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - edit_endtime_edit=new Q3TimeEdit(this); + edit_endtime_edit=new QTimeEdit(this); + edit_endtime_edit->setDisplayFormat("hh:mm:ss"); edit_endtime_edit->setGeometry(335,294,80,20); edit_endtime_label=new QLabel(edit_endtime_edit,tr("End Time:"),this); edit_endtime_label->setGeometry(250,294,80,20); diff --git a/rdadmin/edit_report.h b/rdadmin/edit_report.h index 94906d3f..084fcefe 100644 --- a/rdadmin/edit_report.h +++ b/rdadmin/edit_report.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Report // -// (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,12 +21,12 @@ #ifndef EDIT_REPORT_H #define EDIT_REPORT_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -77,11 +77,10 @@ class EditReport : public RDDialog QCheckBox *edit_daypart_check; QLabel *edit_daypart_label; QLabel *edit_starttime_label; - Q3TimeEdit *edit_starttime_edit; + QTimeEdit *edit_starttime_edit; QLabel *edit_endtime_label; - Q3TimeEdit *edit_endtime_edit; + QTimeEdit *edit_endtime_edit; }; -#endif - +#endif // EDIT_REPORT_H diff --git a/rdadmin/help_audios.cpp b/rdadmin/help_audios.cpp index 78e10059..f3417d55 100644 --- a/rdadmin/help_audios.cpp +++ b/rdadmin/help_audios.cpp @@ -2,7 +2,7 @@ // // Display help for audio ports (edit_audios.*) // -// (C) Copyright 2006-2019 Fred Gleason +// (C) Copyright 2006-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 @@ -25,8 +25,6 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent) : RDDialog(parent) { - setModal(true); - // // Fix the Window Size // @@ -36,7 +34,7 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent) setWindowTitle("RDAdmin - "+tr("Audio Ports Help")); // Help Text - help_edit=new Q3TextEdit(this,"help_edit"); + help_edit=new QTextEdit(this); help_edit-> setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-80); help_edit->setTextFormat(Qt::RichText); diff --git a/rdadmin/help_audios.h b/rdadmin/help_audios.h index 0d0a9c38..b013596d 100644 --- a/rdadmin/help_audios.h +++ b/rdadmin/help_audios.h @@ -2,7 +2,7 @@ // // Display help for audio ports (edit_audios.*) // -// (C) Copyright 2006-2019 Fred Gleason +// (C) Copyright 2006-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,7 +21,7 @@ #ifndef HELP_AUDIOS_H #define HELP_AUDIOS_H -#include +#include #include @@ -37,7 +37,7 @@ class HelpAudioPorts : public RDDialog void closeData(); private: - Q3TextEdit *help_edit; + QTextEdit *help_edit; }; diff --git a/rdadmin/list_reports.cpp b/rdadmin/list_reports.cpp index cbf1775b..7419ce2d 100644 --- a/rdadmin/list_reports.cpp +++ b/rdadmin/list_reports.cpp @@ -2,7 +2,7 @@ // // List Rivendell Reports // -// (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 @@ -18,7 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include #include #include @@ -30,8 +30,6 @@ ListReports::ListReports(QWidget *parent) : RDDialog(parent) { - setModal(true); - // // Fix the Window Size // @@ -75,12 +73,12 @@ ListReports::ListReports(QWidget *parent) // // Report List Box // - list_box=new Q3ListBox(this); + list_box=new QListWidget(this); QLabel *list_box_label=new QLabel(list_box,tr("R&eports:"),this); list_box_label->setFont(labelFont()); list_box_label->setGeometry(14,10,85,19); - connect(list_box,SIGNAL(doubleClicked(Q3ListBoxItem *)), - this,SLOT(doubleClickedData(Q3ListBoxItem *))); + connect(list_box,SIGNAL(doubleClicked(const QModelIndex &)), + this,SLOT(doubleClickedData(const QModelIndex &))); RefreshList(); } @@ -126,10 +124,13 @@ void ListReports::addData() void ListReports::editData() { - if(list_box->currentItem()<0) { + QModelIndexList rows=list_box->selectionModel()->selectedRows(); + + if(rows.size()!=1) { return; } - EditReport *edit_report=new EditReport(list_box->currentText(),this); + EditReport *edit_report + =new EditReport(list_box->item(rows.first().row())->text(),this); edit_report->exec(); delete edit_report; } @@ -137,20 +138,20 @@ void ListReports::editData() void ListReports::deleteData() { - if(list_box->currentText().isEmpty()) { + QModelIndexList rows=list_box->selectionModel()->selectedRows(); + + if(rows.size()!=1) { return; } + QString name=list_box->item(rows.first().row())->text(); if(QMessageBox::warning(this,"RDAdmin - "+tr("Delete Report"), tr("Are you sure you want to delete report")+ - " \""+list_box->currentText()+"\"?", + " \""+name+"\"?", QMessageBox::Yes,QMessageBox::No)== QMessageBox::Yes) { - DeleteReport(list_box->currentText()); + DeleteReport(name); - list_box->removeItem(list_box->currentItem()); - if(list_box->currentItem()>=0) { - list_box->setSelected(list_box->currentItem(),true); - } + list_box->model()->removeRow(rows.first().row()); } } @@ -161,7 +162,7 @@ void ListReports::closeData() } -void ListReports::doubleClickedData(Q3ListBoxItem *item) +void ListReports::doubleClickedData(const QModelIndex &index) { editData(); } @@ -201,14 +202,17 @@ void ListReports::RefreshList(QString rptname) { QString sql; RDSqlQuery *q; + int count=0; list_box->clear(); q=new RDSqlQuery("select NAME from REPORTS"); while (q->next()) { - list_box->insertItem(q->value(0).toString()); - if(rptname==list_box->text(list_box->count()-1)) { - list_box->setCurrentItem(list_box->count()-1); + list_box->insertItem(list_box->count(),q->value(0).toString()); + if(rptname==q->value(0).toString()) { + list_box->selectionModel()->select(list_box->model()->index(count,0), + QItemSelectionModel::ClearAndSelect); } + count++; } delete q; } diff --git a/rdadmin/list_reports.h b/rdadmin/list_reports.h index 977b6bbe..d1a709ac 100644 --- a/rdadmin/list_reports.h +++ b/rdadmin/list_reports.h @@ -2,7 +2,7 @@ // // List Rivendell Reports // -// (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,28 +21,26 @@ #ifndef LIST_REPORTS_H #define LIST_REPORTS_H -#include - -#include -#include +#include +#include #include class ListReports : public RDDialog { Q_OBJECT - public: - ListReports(QWidget *parent=0); - ~ListReports(); - QSize sizeHint() const; - QSizePolicy sizePolicy() const; + public: + ListReports(QWidget *parent=0); + ~ListReports(); + QSize sizeHint() const; + QSizePolicy sizePolicy() const; - private slots: - void addData(); - void editData(); - void deleteData(); - void doubleClickedData(Q3ListBoxItem *item); - void closeData(); + private slots: + void addData(); + void editData(); + void deleteData(); + void doubleClickedData(const QModelIndex &index); + void closeData(); protected: void resizeEvent(QResizeEvent *e); @@ -51,7 +49,7 @@ class ListReports : public RDDialog void DeleteReport(QString rptname); void RefreshList(QString rptname=""); QLabel *list_title_label; - Q3ListBox *list_box; + QListWidget *list_box; QPushButton *list_add_button; QPushButton *list_edit_button; QPushButton *list_delete_button; diff --git a/rdadmin/view_adapters.cpp b/rdadmin/view_adapters.cpp index 15f11e69..9433c472 100644 --- a/rdadmin/view_adapters.cpp +++ b/rdadmin/view_adapters.cpp @@ -2,7 +2,7 @@ // // Display Audio Adapter Information // -// (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 @@ -47,7 +47,7 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) // // Resource List // - view_text_edit=new Q3TextEdit(this,"adapter_edit"); + view_text_edit=new QTextEdit(this,"adapter_edit"); view_text_edit->setReadOnly(true); QString text; if(rdstation->scanned()) { diff --git a/rdadmin/view_adapters.h b/rdadmin/view_adapters.h index 31c1d7a1..7be46906 100644 --- a/rdadmin/view_adapters.h +++ b/rdadmin/view_adapters.h @@ -2,7 +2,7 @@ // // Display Audio Adapter Information // -// (C) Copyright 2002-2018 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,9 +21,10 @@ #ifndef VIEW_ADAPTER_H #define VIEW_ADAPTER_H -#include -#include -#include +//#include + +#include +#include #include #include @@ -45,7 +46,7 @@ class ViewAdapters : public RDDialog private: QLabel *view_title_label; - Q3TextEdit *view_text_edit; + QTextEdit *view_text_edit; QPushButton *view_close_button; };