diff --git a/ChangeLog b/ChangeLog index eed87785..a03a2fd9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17419,3 +17419,5 @@ * Fixed style inconsistencies in dialogs within rdadmin(1). 2018-08-15 Fred Gleason * Fixed style inconsistencies in dialogs within rdcartslots(1). +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdcastmanager(1). diff --git a/rdcastmanager/edit_cast.cpp b/rdcastmanager/edit_cast.cpp index 8d71b5a7..e69be7b2 100644 --- a/rdcastmanager/edit_cast.cpp +++ b/rdcastmanager/edit_cast.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Cast // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -41,14 +41,16 @@ #include "pick_report_dates.h" EditCast::EditCast(unsigned cast_id,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + int ypos=0; cast_cast=new RDPodcast(rda->config(),cast_id); cast_feed=new RDFeed(cast_cast->feedId(),rda->config()); cast_status=cast_cast->status(); - setCaption(tr("Editing PodCast")); + setWindowTitle("RDCastManager - "+tr("Editing PodCast")); // // Create Fonts diff --git a/rdcastmanager/edit_cast.h b/rdcastmanager/edit_cast.h index 42bc7391..7e2b35e9 100644 --- a/rdcastmanager/edit_cast.h +++ b/rdcastmanager/edit_cast.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Cast // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdcastmanager/globals.h b/rdcastmanager/globals.h index 3a8e7a8d..6ebe776c 100644 --- a/rdcastmanager/globals.h +++ b/rdcastmanager/globals.h @@ -2,7 +2,7 @@ // // Global Variable Declarations for RDCastManager // -// (C) Copyright 2007,2016-2018 Fred Gleason +// (C) Copyright 2007-2018 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 diff --git a/rdcastmanager/list_casts.cpp b/rdcastmanager/list_casts.cpp index cdfe2e87..20e7519c 100644 --- a/rdcastmanager/list_casts.cpp +++ b/rdcastmanager/list_casts.cpp @@ -2,7 +2,7 @@ // // List Rivendell Casts // -// (C) Copyright 2002-2007,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -36,9 +36,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -67,8 +64,10 @@ #include "../icons/whiteball.xpm" ListCasts::ListCasts(unsigned feed_id,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + list_feed_id=feed_id; // @@ -77,7 +76,7 @@ ListCasts::ListCasts(unsigned feed_id,QWidget *parent) setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Podcast List")); + setWindowTitle("RDCastManager - "+tr("Podcast List")); // // Create Fonts diff --git a/rdcastmanager/list_casts.h b/rdcastmanager/list_casts.h index c16b4601..ccd04a6b 100644 --- a/rdcastmanager/list_casts.h +++ b/rdcastmanager/list_casts.h @@ -2,7 +2,7 @@ // // List Rivendell Casts // -// (C) Copyright 2002-2007,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -24,14 +24,11 @@ #include #include #include -#include #include #include #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdcastmanager/pick_report_dates.cpp b/rdcastmanager/pick_report_dates.cpp index 625fd573..b183e642 100644 --- a/rdcastmanager/pick_report_dates.cpp +++ b/rdcastmanager/pick_report_dates.cpp @@ -2,7 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -38,15 +38,17 @@ PickReportDates::PickReportDates(unsigned feed_id,unsigned cast_id, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; QDate yesterday_date=QDate::currentDate().addDays(-1); edit_cast_id=feed_id; edit_cast_id=cast_id; - setCaption(tr("Select Report Dates")); + setWindowTitle("RDCastManager - "+tr("Select Report Dates")); sql=QString().sprintf("select KEY_NAME from FEEDS where ID=%d",feed_id); q=new RDSqlQuery(sql); diff --git a/rdcastmanager/pick_report_dates.h b/rdcastmanager/pick_report_dates.h index a6bc34bd..8f43b23c 100644 --- a/rdcastmanager/pick_report_dates.h +++ b/rdcastmanager/pick_report_dates.h @@ -2,7 +2,7 @@ // // Select a Set of Dates for a Rivendell Podcast Report // -// (C) Copyright 2002-2007,2016 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index 71e48a85..d0131846 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -2,7 +2,7 @@ // // A PodCast Management Utility for Rivendell. // -// (C) Copyright 2002-2005,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -34,9 +34,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -65,7 +62,7 @@ QString cast_group; QString cast_schedcode; MainWidget::MainWidget(QWidget *parent) - :Q3MainWindow(parent) + : QWidget(parent) { QString str1; QString str2; @@ -103,7 +100,7 @@ MainWidget::MainWidget(QWidget *parent) str1=QString("RDCastManager")+" v"+VERSION+" - "+tr("Host"); str2=QString(tr("User: [Unknown]")); - setCaption(str1+": "+rda->config()->stationName()+" "+str2); + setWindowTitle(str1+": "+rda->config()->stationName()+" "+str2); // // RIPC Connection @@ -133,7 +130,7 @@ MainWidget::MainWidget(QWidget *parent) // Create Icons // cast_rivendell_map=new QPixmap(rdcastmanager_22x22_xpm); - setIcon(*cast_rivendell_map); + setWindowIcon(*cast_rivendell_map); cast_greencheckmark_map=new QPixmap(greencheckmark_xpm); cast_redx_map=new QPixmap(redx_xpm); diff --git a/rdcastmanager/rdcastmanager.h b/rdcastmanager/rdcastmanager.h index acdbda67..d20292e6 100644 --- a/rdcastmanager/rdcastmanager.h +++ b/rdcastmanager/rdcastmanager.h @@ -2,7 +2,7 @@ // // A RSS Feed Management Utility for Rivendell. // -// (C) Copyright 2002-2007,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -23,14 +23,12 @@ #include -#include #include #include #include #include #include -//Added by qt3to4: -#include +#include #include #include @@ -41,7 +39,7 @@ #define RDCASTMANAGER_USAGE "\n" -class MainWidget : public Q3MainWindow +class MainWidget : public QWidget { Q_OBJECT public: