From 76c4c9626f62a8559fb267abf7e4cd18b2a5ee4b Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 19 Jun 2021 09:04:26 -0400 Subject: [PATCH] 2021-06-19 Fred Gleason * Added 'RDMainWindow' to rdcastmanager(1). Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ rdcastmanager/rdcastmanager.cpp | 12 ++++++++++-- rdcastmanager/rdcastmanager.h | 6 ++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 335c77d9..9450619f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21923,3 +21923,5 @@ * Added an 'RDMainWindow' class. * Added 'RDMainWindow' to rdairplay(1). * Added 'RDMainWindow' to rdpanel(1). +2021-06-19 Fred Gleason + * Added 'RDMainWindow' to rdcastmanager(1). diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index ee96d361..21fb7ea1 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -40,7 +40,7 @@ QString cast_group; QString cast_schedcode; MainWidget::MainWidget(RDConfig *c,QWidget *parent) - : RDWidget(c,parent) + : RDMainWindow("rdcastmanager",c) { QString str1; QString str2; @@ -134,6 +134,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) connect(cast_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); cast_resize=true; + + loadSettings(true); } @@ -231,6 +233,7 @@ void MainWidget::feedDoubleClickedData(const QModelIndex &index) void MainWidget::quitMainWidget() { + saveSettings(); exit(0); } @@ -246,6 +249,12 @@ void MainWidget::resizeEvent(QResizeEvent *e) } +void MainWidget::closeEvent(QCloseEvent *e) +{ + quitMainWidget(); +} + + int main(int argc,char *argv[]) { QApplication::setStyle(RD_GUI_STYLE); @@ -284,7 +293,6 @@ int main(int argc,char *argv[]) RDConfig *config=new RDConfig(); config->load(); MainWidget *w=new MainWidget(config); - w->setGeometry(w->geometry().x(),w->geometry().y(),w->sizeHint().width(),w->sizeHint().height()); w->show(); return a.exec(); } diff --git a/rdcastmanager/rdcastmanager.h b/rdcastmanager/rdcastmanager.h index 2ddab70f..e5665573 100644 --- a/rdcastmanager/rdcastmanager.h +++ b/rdcastmanager/rdcastmanager.h @@ -26,12 +26,13 @@ #include #include #include +#include #include #include #define RDCASTMANAGER_USAGE "\n" -class MainWidget : public RDWidget +class MainWidget : public RDMainWindow { Q_OBJECT public: @@ -51,7 +52,8 @@ class MainWidget : public RDWidget protected: void resizeEvent(QResizeEvent *e); - + void closeEvent(QCloseEvent *e); + private: RDTreeView *cast_feed_view; RDFeedListModel *cast_feed_model;