diff --git a/ChangeLog b/ChangeLog index 2516339e..02e72cec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21115,3 +21115,6 @@ based API. 2021-02-14 Fred Gleason * Removed the 'CatchListView' widget from rdcatch(1). +2021-02-14 Fred Gleason + * Removed 'Q3Frame' dependencies from rdcatch(1). + * Removed 'Q3ScrollView' dependencies from rdcatch(1). diff --git a/rdcatch/deckmon.cpp b/rdcatch/deckmon.cpp index f79d99ed..fa294017 100644 --- a/rdcatch/deckmon.cpp +++ b/rdcatch/deckmon.cpp @@ -94,7 +94,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent) mon_event_label=new QLabel(this); mon_event_label->setFont(labelFont()); mon_event_label->setAlignment(Qt::AlignCenter); - mon_event_label->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken); + mon_event_label->setFrameStyle(QFrame::Panel|QFrame::Sunken); mon_event_label->setPalette(mon_dark_palette); mon_event_label->setText("--"); mon_event_timer=new QTimer(this); diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index 6ccea5e0..6a9d4c65 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -20,9 +20,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -172,10 +172,10 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Deck Monitors // - catch_monitor_view=new Q3ScrollView(this,"",Qt::WNoAutoErase); - catch_monitor_vbox=new VBox(catch_monitor_view); + catch_monitor_area=new QScrollArea(this); + catch_monitor_vbox=new VBox(catch_monitor_area); catch_monitor_vbox->setSpacing(2); - catch_monitor_view->addChild(catch_monitor_vbox); + catch_monitor_area->setWidget(catch_monitor_vbox); QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(abortData(int))); @@ -255,7 +255,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) } delete q; if(catch_monitor.size()==0) { - catch_monitor_view->hide(); + catch_monitor_area->hide(); } // @@ -1130,25 +1130,25 @@ void MainWidget::resizeEvent(QResizeEvent *e) return; } assert (e); - assert (catch_monitor_view); + assert (catch_monitor_area); if(catch_monitor.size()<=RDCATCH_MAX_VISIBLE_MONITORS) { - catch_monitor_view-> + catch_monitor_area-> setGeometry(10,10,e->size().width()-20,32*catch_monitor.size()+4); catch_monitor_vbox-> setGeometry(0,0,e->size().width()-25,32*catch_monitor.size()); } else { - catch_monitor_view-> + catch_monitor_area-> setGeometry(10,10,e->size().width()-20,32*RDCATCH_MAX_VISIBLE_MONITORS); catch_monitor_vbox-> setGeometry(0,0,e->size().width()- - catch_monitor_view->verticalScrollBar()->geometry().width()- + catch_monitor_area->verticalScrollBar()->geometry().width()- 25,32*catch_monitor.size()); } int deck_height=0; if (catch_monitor.size()>0){ - deck_height=catch_monitor_view->geometry().y()+ - catch_monitor_view->geometry().height(); + deck_height=catch_monitor_area->geometry().y()+ + catch_monitor_area->geometry().height(); } catch_show_active_label->setGeometry(35,deck_height+4,155,20); catch_show_active_box->setGeometry(15,deck_height+7,15,15); diff --git a/rdcatch/rdcatch.h b/rdcatch/rdcatch.h index ddd1bae9..9458e42c 100644 --- a/rdcatch/rdcatch.h +++ b/rdcatch/rdcatch.h @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -118,7 +119,7 @@ class MainWidget : public RDWidget void LoadGeometry(); void SaveGeometry(); std::vector catch_monitor; - Q3ScrollView *catch_monitor_view; + QScrollArea *catch_monitor_area; VBox *catch_monitor_vbox; std::vector catch_connect; QSqlDatabase *catch_db;