diff --git a/ChangeLog b/ChangeLog index b086cb68..06c37fe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17415,3 +17415,5 @@ * Fixed style inconsistencies in dialogs within rdselect(8). 2018-08-15 Fred Gleason * Fixed style inconsistencies in dialogs within rdairplay(1). +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdadmin(1). diff --git a/rdadmin/add_feed.cpp b/rdadmin/add_feed.cpp index b9a15a14..ed8bdf53 100644 --- a/rdadmin/add_feed.cpp +++ b/rdadmin/add_feed.cpp @@ -1,8 +1,8 @@ // add_feed.cpp // -// Add a Rivendell Service +// Add a Rivendell RSS Feed // -// (C) Copyright 2002,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,8 +36,10 @@ #include "globals.h" AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + feed_keyname=keyname; feed_id=id; @@ -49,7 +51,7 @@ AddFeed::AddFeed(unsigned *id,QString *keyname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Feed")); + setWindowTitle("RDADmin - "+tr("Add RSS Feed")); // // Create Fonts diff --git a/rdadmin/add_feed.h b/rdadmin/add_feed.h index d99180d3..6d2d1681 100644 --- a/rdadmin/add_feed.h +++ b/rdadmin/add_feed.h @@ -2,7 +2,7 @@ // // Add a Rivendell Feed // -// (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 @@ -21,8 +21,8 @@ #ifndef ADD_FEED_H #define ADD_FEED_H -#include #include +#include #include // diff --git a/rdadmin/add_group.cpp b/rdadmin/add_group.cpp index e356eb1c..fbd2b021 100644 --- a/rdadmin/add_group.cpp +++ b/rdadmin/add_group.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Group // -// (C) Copyright 2002,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 @@ -29,17 +29,20 @@ #include #include #include + #include +#include #include #include #include #include -#include AddGroup::AddGroup(QString *group,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + group_group=group; // @@ -50,7 +53,7 @@ AddGroup::AddGroup(QString *group,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Group")); + setCaption("RDAdmin - "+tr("Add Group")); // // Create Fonts diff --git a/rdadmin/add_group.h b/rdadmin/add_group.h index f38f7402..b86c1f5f 100644 --- a/rdadmin/add_group.h +++ b/rdadmin/add_group.h @@ -2,7 +2,7 @@ // // Add a Rivendell Group // -// (C) Copyright 2002,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 @@ -21,8 +21,8 @@ #ifndef ADD_GROUP_H #define ADD_GROUP_H -#include #include +#include #include class AddGroup : public QDialog diff --git a/rdadmin/add_hostvar.cpp b/rdadmin/add_hostvar.cpp index 366a285b..a03543d0 100644 --- a/rdadmin/add_hostvar.cpp +++ b/rdadmin/add_hostvar.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Host Variable // -// (C) Copyright 2002-2004,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 @@ -29,23 +29,15 @@ #include #include #include -#include - -#include #include -#include -#include -#include -#include -#include -#include -#include AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, QString *remark,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + add_name=var; add_varvalue=varvalue; add_remark=remark; @@ -56,7 +48,7 @@ AddHostvar::AddHostvar(QString station,QString *var,QString *varvalue, QFont font=QFont("Helvetica",12,QFont::Bold); font.setPixelSize(12); - setCaption(tr("Add Host Variable")); + setWindowTitle("RDAdmin - "+tr("Add Host Variable")); // // Fix the Window Size diff --git a/rdadmin/add_hostvar.h b/rdadmin/add_hostvar.h index 743b61bb..4cd44b2d 100644 --- a/rdadmin/add_hostvar.h +++ b/rdadmin/add_hostvar.h @@ -2,7 +2,7 @@ // // Add a Rivendell Host Variable // -// (C) Copyright 2002-2004,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 @@ -32,7 +32,6 @@ #include #include -#include class AddHostvar : public QDialog { diff --git a/rdadmin/add_matrix.cpp b/rdadmin/add_matrix.cpp index 7ab3b89b..6cc8195e 100644 --- a/rdadmin/add_matrix.cpp +++ b/rdadmin/add_matrix.cpp @@ -1,7 +1,8 @@ +// add_matrix.cpp // // Add a Rivendell Matrix // -// (C) Copyright 2002-2012,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 @@ -18,12 +19,9 @@ // #include -#include #include #include #include -//Added by qt3to4: -#include #include #include @@ -35,8 +33,10 @@ #include "rdpasswd.h" AddMatrix::AddMatrix(QString station,QWidget *parent) - : QDialog(parent,"") + : QDialog(parent) { + setModal(true); + add_station=station; // @@ -47,7 +47,7 @@ AddMatrix::AddMatrix(QString station,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("RDAdmin - Add Switcher")); + setWindowTitle("RDAdmin - "+tr("Add Switcher")); // // Create Fonts diff --git a/rdadmin/add_matrix.h b/rdadmin/add_matrix.h index 661fa012..51e9bc37 100644 --- a/rdadmin/add_matrix.h +++ b/rdadmin/add_matrix.h @@ -2,7 +2,7 @@ // // Add a Rivendell Matrix // -// (C) Copyright 2002-2003,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 @@ -22,7 +22,6 @@ #define ADD_MATRIX_H #include -#include #include #include diff --git a/rdadmin/add_replicator.cpp b/rdadmin/add_replicator.cpp index ab2ab775..f34b6840 100644 --- a/rdadmin/add_replicator.cpp +++ b/rdadmin/add_replicator.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Replicator Configuration // -// (C) Copyright 2010,2016-2018 Fred Gleason +// (C) Copyright 2010-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 @@ -39,8 +39,10 @@ #include "add_replicator.h" AddReplicator::AddReplicator(QString *rname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + repl_name=rname; // @@ -51,7 +53,7 @@ AddReplicator::AddReplicator(QString *rname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Replicator")); + setWindowTitle("RDAdmin - "+tr("Add Replicator")); // // Create Fonts diff --git a/rdadmin/add_replicator.h b/rdadmin/add_replicator.h index 45dbc48a..a87c74c6 100644 --- a/rdadmin/add_replicator.h +++ b/rdadmin/add_replicator.h @@ -2,7 +2,7 @@ // // Add a Rivendell Replicator // -// (C) Copyright 2002,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 @@ -21,8 +21,8 @@ #ifndef ADD_REPLICATOR_H #define ADD_REPLICATOR_H -#include #include +#include #include class AddReplicator : public QDialog diff --git a/rdadmin/add_report.cpp b/rdadmin/add_report.cpp index 0b497d96..096fc212 100644 --- a/rdadmin/add_report.cpp +++ b/rdadmin/add_report.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Report // -// (C) Copyright 2002-2004,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 @@ -41,8 +41,10 @@ #include "edit_svc_perms.h" AddReport::AddReport(QString *rptname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -51,7 +53,7 @@ AddReport::AddReport(QString *rptname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Report")); + setWindowTitle("RDAdmin - "+tr("Add Report")); add_name=rptname; // diff --git a/rdadmin/add_report.h b/rdadmin/add_report.h index 10b74ca2..d6354bfe 100644 --- a/rdadmin/add_report.h +++ b/rdadmin/add_report.h @@ -2,7 +2,7 @@ // // Add a Rivendell Report // -// (C) Copyright 2002-2004,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 @@ -21,10 +21,9 @@ #ifndef ADD_REPORT_H #define ADD_REPORT_H -#include -#include -#include #include +#include +#include #include diff --git a/rdadmin/add_schedcodes.cpp b/rdadmin/add_schedcodes.cpp index 112e4f87..85b8003e 100644 --- a/rdadmin/add_schedcodes.cpp +++ b/rdadmin/add_schedcodes.cpp @@ -2,7 +2,8 @@ // // Add scheduler codes dialog // -// Copyright 2005-2018 Stefan Gabriel +// (C) Copyright 2005-2018 Stefan Gabriel +// (C) Copyright 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 @@ -39,8 +40,10 @@ #include "add_schedcodes.h" AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + schedCode_schedCode=schedCode; // @@ -51,7 +54,7 @@ AddSchedCode::AddSchedCode(QString *schedCode,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Scheduler Code")); + setWindowTitle("RDAdmin - "+tr("Add Scheduler Code")); // // Create Fonts diff --git a/rdadmin/add_schedcodes.h b/rdadmin/add_schedcodes.h index aca81027..ac4c0cdc 100644 --- a/rdadmin/add_schedcodes.h +++ b/rdadmin/add_schedcodes.h @@ -2,7 +2,8 @@ // // Add scheduler codes dialog // -// Stefan Gabriel +// (C) Copyright Stefan Gabriel +// (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 @@ -21,8 +22,8 @@ #ifndef ADD_SCHEDCODES_H #define ADD_SCHEDCODES_H -#include #include +#include #include class AddSchedCode : public QDialog diff --git a/rdadmin/add_station.cpp b/rdadmin/add_station.cpp index 82be6dc0..28015949 100644 --- a/rdadmin/add_station.cpp +++ b/rdadmin/add_station.cpp @@ -40,8 +40,10 @@ #include "edit_station.h" AddStation::AddStation(QString *stationname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + add_name=stationname; // @@ -52,7 +54,7 @@ AddStation::AddStation(QString *stationname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Host")); + setWindowTitle("RDAdmin - "+tr("Add Host")); // // Create Fonts diff --git a/rdadmin/add_station.h b/rdadmin/add_station.h index d250905e..0b0ba14d 100644 --- a/rdadmin/add_station.h +++ b/rdadmin/add_station.h @@ -2,7 +2,7 @@ // // Add a Rivendell Workstation // -// (C) Copyright 2002-2003,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/rdadmin/add_svc.cpp b/rdadmin/add_svc.cpp index b7582315..f1ecddfa 100644 --- a/rdadmin/add_svc.cpp +++ b/rdadmin/add_svc.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002,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 @@ -40,8 +40,10 @@ #include "globals.h" AddSvc::AddSvc(QString *svcname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + svc_name=svcname; // @@ -52,7 +54,7 @@ AddSvc::AddSvc(QString *svcname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Service")); + setWindowTitle("RDAdmin - "+tr("Add Service")); // // Create Fonts diff --git a/rdadmin/add_svc.h b/rdadmin/add_svc.h index 707e73ce..076d757f 100644 --- a/rdadmin/add_svc.h +++ b/rdadmin/add_svc.h @@ -2,7 +2,7 @@ // // Add a Rivendell Service // -// (C) Copyright 2002,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/rdadmin/add_user.cpp b/rdadmin/add_user.cpp index 58b53015..9c1e4887 100644 --- a/rdadmin/add_user.cpp +++ b/rdadmin/add_user.cpp @@ -2,7 +2,7 @@ // // Add a Rivendell User // -// (C) Copyright 2002-2008,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 @@ -39,8 +39,10 @@ #include AddUser::AddUser(QString *username,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + user_name=username; // @@ -51,7 +53,7 @@ AddUser::AddUser(QString *username,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add User")); + setWindowTitle("RDAdmin - "+tr("Add User")); // // Create Fonts diff --git a/rdadmin/add_user.h b/rdadmin/add_user.h index 1c48e80b..825e8533 100644 --- a/rdadmin/add_user.h +++ b/rdadmin/add_user.h @@ -2,7 +2,7 @@ // // Add a Rivendell User // -// (C) Copyright 2002,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/rdadmin/autofill_carts.cpp b/rdadmin/autofill_carts.cpp index 11cb7a7c..abf125a2 100644 --- a/rdadmin/autofill_carts.cpp +++ b/rdadmin/autofill_carts.cpp @@ -2,7 +2,7 @@ // // Edit a List of Autofill Carts // -// (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 @@ -42,8 +42,10 @@ #include "globals.h" AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString str; // @@ -56,7 +58,7 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent) svc_svc=svc; - setCaption(tr("Autofill Carts - Service:")+" "+svc_svc->name()); + setWindowTitle("RDAdmin - "+tr("Autofill Carts - Service:")+" "+svc_svc->name()); // // Create Fonts diff --git a/rdadmin/autofill_carts.h b/rdadmin/autofill_carts.h index 21dea46e..34308713 100644 --- a/rdadmin/autofill_carts.h +++ b/rdadmin/autofill_carts.h @@ -2,7 +2,7 @@ // // Edit a List of Autofill Carts // -// (C) Copyright 2002-2004,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/rdadmin/edit_audios.cpp b/rdadmin/edit_audios.cpp index 8bed8d36..ef6a888d 100644 --- a/rdadmin/edit_audios.cpp +++ b/rdadmin/edit_audios.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Audio Port Configuration // -// (C) Copyright 2002-2003,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 @@ -28,15 +28,14 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include +#include "edit_audios.h" EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString str; // @@ -51,7 +50,7 @@ EditAudioPorts::EditAudioPorts(QString station,QWidget *parent) edit_card=NULL; rdstation=NULL; - setCaption(tr("Edit AudioScience Audio Ports")); + setWindowTitle("RDAdmin - "+tr("Edit AudioScience Audio Ports")); // // Create Fonts diff --git a/rdadmin/edit_audios.h b/rdadmin/edit_audios.h index e5b13505..b6a495d1 100644 --- a/rdadmin/edit_audios.h +++ b/rdadmin/edit_audios.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Audio Port Configuration // -// (C) Copyright 2002-2003,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 @@ -28,15 +28,13 @@ #include #include #include -//Added by qt3to4: -#include #include #include - -#include #include +#include "help_audios.h" + class EditAudioPorts : public QDialog { Q_OBJECT diff --git a/rdadmin/edit_cartslots.cpp b/rdadmin/edit_cartslots.cpp index 5316e4ca..161e37aa 100644 --- a/rdadmin/edit_cartslots.cpp +++ b/rdadmin/edit_cartslots.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell CartSlot Configuration // -// (C) Copyright 2012,2016-2018 Fred Gleason +// (C) Copyright 2012-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,6 +36,8 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, QWidget *parent) : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -51,7 +53,7 @@ EditCartSlots::EditCartSlots(RDStation *station,RDStation *cae_station, setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("RDAdmin - Edit CartSlots")); + setWindowTitle("RDAdmin - "+tr("Edit CartSlots")); // // Fonts diff --git a/rdadmin/edit_cartslots.h b/rdadmin/edit_cartslots.h index 0829d44b..2e69df2f 100644 --- a/rdadmin/edit_cartslots.h +++ b/rdadmin/edit_cartslots.h @@ -2,7 +2,7 @@ // // Edit Rivendell CartSlot Configuration // -// (C) Copyright 2012,2016 Fred Gleason +// (C) Copyright 2012-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 @@ -27,8 +27,6 @@ #include #include #include -//Added by qt3to4: -#include #include diff --git a/rdadmin/edit_channelgpios.cpp b/rdadmin/edit_channelgpios.cpp index b479be7e..b63c7521 100644 --- a/rdadmin/edit_channelgpios.cpp +++ b/rdadmin/edit_channelgpios.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Channel GPIO Settings // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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 @@ -19,18 +19,17 @@ // #include -//Added by qt3to4: -#include -#include EditChannelGpios::EditChannelGpios(RDAirPlayConf *conf, RDAirPlayConf::Channel chan,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_airplay_conf=conf; edit_channel=chan; - setCaption(QString("RDAdmin - ")+tr("Edit Channel GPIOs")); + setWindowTitle("RDAdmin - "+tr("Edit Channel GPIOs")); // // Fonts diff --git a/rdadmin/edit_channelgpios.h b/rdadmin/edit_channelgpios.h index 8a3e7442..073f0e9d 100644 --- a/rdadmin/edit_channelgpios.h +++ b/rdadmin/edit_channelgpios.h @@ -2,7 +2,7 @@ // // Edit Rivendell Channel GPIO Settings // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include diff --git a/rdadmin/edit_decks.cpp b/rdadmin/edit_decks.cpp index 3ed30fe0..97c8e835 100644 --- a/rdadmin/edit_decks.cpp +++ b/rdadmin/edit_decks.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell RDCatch Deck Configuration // -// (C) Copyright 2002-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 @@ -29,9 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -43,19 +40,20 @@ #include "globals.h" EditDecks::EditDecks(RDStation *station,RDStation *cae_station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // setMinimumWidth(sizeHint().width()); - // setMaximumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); edit_station=station; - setCaption(tr("Configure RDCatch")); + setWindowTitle("RDAdmin - "+tr("Configure RDCatch")); // // Create Fonts diff --git a/rdadmin/edit_decks.h b/rdadmin/edit_decks.h index e593aa3a..ef4eae93 100644 --- a/rdadmin/edit_decks.h +++ b/rdadmin/edit_decks.h @@ -2,7 +2,7 @@ // // Edit Rivendell Netcatcher Configuration // -// (C) Copyright 2002-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 @@ -30,8 +30,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_dropbox.cpp b/rdadmin/edit_dropbox.cpp index bd890af1..726de550 100644 --- a/rdadmin/edit_dropbox.cpp +++ b/rdadmin/edit_dropbox.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Dropbox Configuration // -// (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 @@ -33,8 +33,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -45,8 +43,10 @@ #include "edit_dropbox.h" EditDropbox::EditDropbox(int id,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -60,8 +60,8 @@ EditDropbox::EditDropbox(int id,QWidget *parent) box_dropbox=new RDDropbox(id); - setCaption(tr("Dropbox Configuration")+" ["+ - tr("ID")+QString().sprintf(": %d]",id)); + setWindowTitle("RDAdmin - "+tr("Dropbox Configuration")+" ["+ + tr("ID")+QString().sprintf(": %d]",id)); // // Create Fonts diff --git a/rdadmin/edit_dropbox.h b/rdadmin/edit_dropbox.h index 7a640f73..1a45a13b 100644 --- a/rdadmin/edit_dropbox.h +++ b/rdadmin/edit_dropbox.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Dropbox Configuration // -// (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/rdadmin/edit_endpoint.cpp b/rdadmin/edit_endpoint.cpp index 36ab9e01..03946d70 100644 --- a/rdadmin/edit_endpoint.cpp +++ b/rdadmin/edit_endpoint.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Endpoint // -// (C) Copyright 2002-2003,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 @@ -19,8 +19,6 @@ // #include -//Added by qt3to4: -#include #include @@ -30,8 +28,10 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, int pointnum,QString *pointname,QString *feedname, RDMatrix::Mode *mode,int *enginenum,int *devicenum, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_type=type; edit_endpoint=endpoint; edit_pointnum=pointnum; @@ -42,15 +42,15 @@ EditEndpoint::EditEndpoint(RDMatrix::Type type,RDMatrix::Endpoint endpoint, edit_devicenum=devicenum; switch(edit_endpoint) { - case RDMatrix::Input: - edit_table="INPUTS"; - setCaption(tr("Edit Input")); - break; + case RDMatrix::Input: + edit_table="INPUTS"; + setWindowTitle("RDAdmin - "+tr("Edit Input")); + break; - case RDMatrix::Output: - edit_table="OUTPUTS"; - setCaption(tr("Edit Output")); - break; + case RDMatrix::Output: + edit_table="OUTPUTS"; + setWindowTitle("RDAdmin - "+tr("Edit Output")); + break; } // diff --git a/rdadmin/edit_endpoint.h b/rdadmin/edit_endpoint.h index d7849fe8..e7126f8d 100644 --- a/rdadmin/edit_endpoint.h +++ b/rdadmin/edit_endpoint.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Endpoint // -// (C) Copyright 2002-2003,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 @@ -22,7 +22,6 @@ #define EDIT_ENDPOINT_H #include -#include #include #include #include diff --git a/rdadmin/edit_feed.cpp b/rdadmin/edit_feed.cpp index ba78d41d..97b62ee2 100644 --- a/rdadmin/edit_feed.cpp +++ b/rdadmin/edit_feed.cpp @@ -27,9 +27,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -38,8 +35,10 @@ #include "globals.h" EditFeed::EditFeed(const QString &feed,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -50,7 +49,7 @@ EditFeed::EditFeed(const QString &feed,QWidget *parent) feed_feed=new RDFeed(feed,rda->config(),this); - setCaption(tr("Feed: ")+feed); + setWindowTitle("RDAdmin - "+tr("Feed: ")+feed); // // Create Fonts diff --git a/rdadmin/edit_feed.h b/rdadmin/edit_feed.h index 07f4c83e..5afa09ec 100644 --- a/rdadmin/edit_feed.h +++ b/rdadmin/edit_feed.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Feed // -// (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 @@ -30,8 +30,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_feed_perms.cpp b/rdadmin/edit_feed_perms.cpp index 59cd368f..8ef6eda3 100644 --- a/rdadmin/edit_feed_perms.cpp +++ b/rdadmin/edit_feed_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell RSS Feed Permissions // -// (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 @@ -38,8 +38,10 @@ #include "edit_feed_perms.h" EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -53,7 +55,7 @@ EditFeedPerms::EditFeedPerms(RDUser *user,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("User: ")+feed_user->name()); + setWindowTitle("RDAdmin - "+tr("User: ")+feed_user->name()); // // Create Fonts diff --git a/rdadmin/edit_feed_perms.h b/rdadmin/edit_feed_perms.h index e3581284..0dc93a42 100644 --- a/rdadmin/edit_feed_perms.h +++ b/rdadmin/edit_feed_perms.h @@ -2,7 +2,7 @@ // // Edit Rivendell RSS Feed Permissions // -// (C) Copyright 2002-2004,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 @@ -22,7 +22,7 @@ #define EDIT_FEED_PERMS_H #include -#include + #include #include diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index 385566ff..08601cf9 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Gpi // -// (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 @@ -20,9 +20,6 @@ #include #include -//Added by qt3to4: -#include -#include #include #include @@ -33,14 +30,16 @@ EditGpi::EditGpi(int gpi,int *oncart,QString *ondesc, int *offcart,QString *offdesc,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_gpi=gpi; edit_oncart=oncart; edit_offcart=offcart; edit_ondescription=ondesc; edit_offdescription=offdesc; - setCaption(tr("Edit GPI")+QString().sprintf(" %d",gpi)); + setWindowTitle("RDAdmin - "+tr("Edit GPI")+QString().sprintf(" %d",gpi)); // // Fix the Window Size diff --git a/rdadmin/edit_gpi.h b/rdadmin/edit_gpi.h index 76ac2700..894ede2b 100644 --- a/rdadmin/edit_gpi.h +++ b/rdadmin/edit_gpi.h @@ -2,7 +2,7 @@ // // Edit a Rivendell GPI // -// (C) Copyright 2002-2004,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 @@ -22,13 +22,10 @@ #define EDIT_GPI_H #include -#include #include #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_group.cpp b/rdadmin/edit_group.cpp index 4249b1ea..862e5831 100644 --- a/rdadmin/edit_group.cpp +++ b/rdadmin/edit_group.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Group // -// (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 @@ -31,9 +31,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -44,8 +41,10 @@ #include "edit_group.h" EditGroup::EditGroup(QString group,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -59,7 +58,7 @@ EditGroup::EditGroup(QString group,QWidget *parent) group_group=new RDGroup(group); - setCaption(tr("Group: ")+group); + setWindowTitle("RDAdmin - "+tr("Group: ")+group); // // Create Fonts diff --git a/rdadmin/edit_group.h b/rdadmin/edit_group.h index 547c9460..2d7598c3 100644 --- a/rdadmin/edit_group.h +++ b/rdadmin/edit_group.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Group // -// (C) Copyright 2002-2004,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 @@ -27,17 +27,13 @@ #include #include #include -#include #include #include #include #include -//Added by qt3to4: -#include - -#include #include +#include class EditGroup : public QDialog { diff --git a/rdadmin/edit_hostvar.cpp b/rdadmin/edit_hostvar.cpp index 8c536b19..d117ae4d 100644 --- a/rdadmin/edit_hostvar.cpp +++ b/rdadmin/edit_hostvar.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Host Variable // -// (C) Copyright 2002-2004,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 @@ -29,7 +29,6 @@ #include #include #include -#include #include @@ -44,8 +43,9 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, QString *remark,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); edit_varvalue=varvalue; edit_remark=remark; @@ -55,7 +55,7 @@ EditHostvar::EditHostvar(QString station,QString var,QString *varvalue, QFont font=QFont("Helvetica",12,QFont::Bold); font.setPixelSize(12); - setCaption(tr("Edit Host Variable")); + setWindowTitle("RDAdmin - "+tr("Edit Host Variable")); // // Fix the Window Size diff --git a/rdadmin/edit_hostvar.h b/rdadmin/edit_hostvar.h index c5869405..b0cee363 100644 --- a/rdadmin/edit_hostvar.h +++ b/rdadmin/edit_hostvar.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Host Variable // -// (C) Copyright 2002-2004,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/rdadmin/edit_hotkeys.cpp b/rdadmin/edit_hotkeys.cpp index 8462e178..c05ea8ca 100644 --- a/rdadmin/edit_hotkeys.cpp +++ b/rdadmin/edit_hotkeys.cpp @@ -2,7 +2,7 @@ // // Edit the Hot Key Configuration for a Rivendell Workstation. // -// (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 @@ -22,12 +22,8 @@ #include #include #include -#include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -38,8 +34,10 @@ EditHotkeys::EditHotkeys(const QString &station,const QString &module, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -69,8 +67,8 @@ EditHotkeys::EditHotkeys(const QString &station,const QString &module, // // Hot Key Configuration Label // - setCaption(hotkey_module.upper()+" "+tr("Hot Key Configuration for")+" "+ - hotkey_conf); + setWindowTitle("RDAdmin - "+hotkey_module.upper()+" "+ + tr("Hot Key Configuration for")+" "+hotkey_conf); list_view=new Q3ListView(this); list_view->setGeometry(10,24,320,220); diff --git a/rdadmin/edit_hotkeys.h b/rdadmin/edit_hotkeys.h index d0a67b3a..752b5079 100644 --- a/rdadmin/edit_hotkeys.h +++ b/rdadmin/edit_hotkeys.h @@ -2,7 +2,7 @@ // // Edit the Hot Keys Configuration for a Workstation // -// (C) Copyright 2002-2004,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 @@ -22,14 +22,11 @@ #define EDIT_HOTKEYS_H #include -#include #include #include #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_jack.cpp b/rdadmin/edit_jack.cpp index dd32374e..fdf9c2a9 100644 --- a/rdadmin/edit_jack.cpp +++ b/rdadmin/edit_jack.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Jack Configuration // -// (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 @@ -32,9 +32,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include @@ -45,8 +42,10 @@ #include EditJack::EditJack(RDStation *station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; edit_station=station; @@ -57,7 +56,8 @@ EditJack::EditJack(RDStation *station,QWidget *parent) setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("JACK Configuration for ")+edit_station->name()); + setWindowTitle("RDAdmin - "+tr("JACK Configuration for ")+ + edit_station->name()); // // Create Fonts diff --git a/rdadmin/edit_jack.h b/rdadmin/edit_jack.h index 75e48257..591c3176 100644 --- a/rdadmin/edit_jack.h +++ b/rdadmin/edit_jack.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Jack Configuration // -// (C) Copyright 2002-2011,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 @@ -30,8 +30,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_jack_client.cpp b/rdadmin/edit_jack_client.cpp index 60b73428..b78042c7 100644 --- a/rdadmin/edit_jack_client.cpp +++ b/rdadmin/edit_jack_client.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Jack Client Configuration // -// (C) Copyright 2012,2016 Fred Gleason +// (C) Copyright 2012-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,13 +23,12 @@ #include #include #include -//Added by qt3to4: -#include -#include EditJackClient::EditJackClient(RDStation *station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; edit_station=station; @@ -40,7 +39,8 @@ EditJackClient::EditJackClient(RDStation *station,QWidget *parent) setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("JACK Client Configuration for ")+edit_station->name()); + setWindowTitle("RDAdmin - "+tr("JACK Client Configuration for ")+ + edit_station->name()); // // Create Fonts diff --git a/rdadmin/edit_jack_client.h b/rdadmin/edit_jack_client.h index 3cce75a7..0ee1e43a 100644 --- a/rdadmin/edit_jack_client.h +++ b/rdadmin/edit_jack_client.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Jack Client Configuration // -// (C) Copyright 2012,2016 Fred Gleason +// (C) Copyright 2012-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 @@ -25,8 +25,6 @@ #include #include #include -//Added by qt3to4: -#include #include diff --git a/rdadmin/edit_livewiregpio.cpp b/rdadmin/edit_livewiregpio.cpp index 4d6eb671..3eec02d4 100644 --- a/rdadmin/edit_livewiregpio.cpp +++ b/rdadmin/edit_livewiregpio.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Livewire GPIO Slot Association // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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 @@ -28,8 +28,10 @@ EditLiveWireGpio::EditLiveWireGpio(int slot,int *source,QHostAddress *addr, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_slot=slot; edit_source=source; edit_address=addr; @@ -41,7 +43,7 @@ EditLiveWireGpio::EditLiveWireGpio(int slot,int *source,QHostAddress *addr, setMaximumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Edit GPIO Source")); + setWindowTitle("RDAdmin - "+tr("Edit GPIO Source")); // // Create Fonts diff --git a/rdadmin/edit_livewiregpio.h b/rdadmin/edit_livewiregpio.h index f96ded18..6d49a13b 100644 --- a/rdadmin/edit_livewiregpio.h +++ b/rdadmin/edit_livewiregpio.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Livewire GPIO Slot Association // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index f02aa88a..702ce94f 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Matrix // -// (C) Copyright 2002-2012,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 @@ -23,10 +23,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -//#include #include #include @@ -49,6 +45,8 @@ EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent) : QDialog(parent) { + setModal(true); + QString str; edit_matrix=matrix; @@ -63,7 +61,7 @@ EditMatrix::EditMatrix(RDMatrix *matrix,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("RDAdmin - Edit Switcher")); + setWindowTitle("RDAdmin - "+tr("Edit Switcher")); // // Create Fonts diff --git a/rdadmin/edit_matrix.h b/rdadmin/edit_matrix.h index 20f4bdaa..a7668ef6 100644 --- a/rdadmin/edit_matrix.h +++ b/rdadmin/edit_matrix.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Matrix // -// (C) Copyright 2002-2012,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 @@ -22,14 +22,11 @@ #define EDIT_MATRIX_H #include -#include #include #include #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_node.cpp b/rdadmin/edit_node.cpp index 0c054d44..c6e96265 100644 --- a/rdadmin/edit_node.cpp +++ b/rdadmin/edit_node.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (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 @@ -19,7 +19,6 @@ // #include -#include #include #include @@ -27,16 +26,18 @@ #include #include -#include -#include +#include "edit_node.h" +#include "view_node_info.h" EditNode::EditNode(int *id,RDMatrix *matrix,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_id=id; edit_matrix=matrix; edit_password_changed=false; - setCaption(tr("Edit LiveWire Node")); + setWindowTitle("RDAdmin - "+tr("Edit LiveWire Node")); // // Fix the Window Size diff --git a/rdadmin/edit_node.h b/rdadmin/edit_node.h index acb078a4..8b849571 100644 --- a/rdadmin/edit_node.h +++ b/rdadmin/edit_node.h @@ -2,7 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (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/rdadmin/edit_now_next.cpp b/rdadmin/edit_now_next.cpp index b6eae480..019f9797 100644 --- a/rdadmin/edit_now_next.cpp +++ b/rdadmin/edit_now_next.cpp @@ -2,7 +2,7 @@ // // Edit the Now & Next Configuration for a Rivendell Workstation. // -// (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 @@ -20,8 +20,6 @@ #include #include -//Added by qt3to4: -#include #include #include @@ -34,8 +32,10 @@ #include "globals.h" EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; RDListViewItem *item; @@ -60,7 +60,7 @@ EditNowNext::EditNowNext(RDAirPlayConf *conf,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Edit Now & Next Data")); + setWindowTitle("RDAdmin - "+tr("Edit Now & Next Data")); // // Text Validator diff --git a/rdadmin/edit_now_next.h b/rdadmin/edit_now_next.h index 5653bf08..3ba16fd3 100644 --- a/rdadmin/edit_now_next.h +++ b/rdadmin/edit_now_next.h @@ -2,7 +2,7 @@ // // Edit the Now & Next Configuration for a Rivendell Workstation // -// (C) Copyright 2002-2004,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/rdadmin/edit_nownextplugin.cpp b/rdadmin/edit_nownextplugin.cpp index f8efb4ca..9ca9d95c 100644 --- a/rdadmin/edit_nownextplugin.cpp +++ b/rdadmin/edit_nownextplugin.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Now & Next Plugin Configuration // -// (C) Copyright 2008,2016 Fred Gleason +// (C) Copyright 2008-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 @@ -26,13 +26,14 @@ #include #include -#include - +#include "edit_nownextplugin.h" EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + plugin_path=path; plugin_arg=arg; @@ -44,7 +45,7 @@ EditNowNextPlugin::EditNowNextPlugin(QString *path,QString *arg, setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Edit Plugin")); + setWindowTitle("RDAdmin - "+tr("Edit Plugin")); // // Create Fonts diff --git a/rdadmin/edit_nownextplugin.h b/rdadmin/edit_nownextplugin.h index f032b506..2a796389 100644 --- a/rdadmin/edit_nownextplugin.h +++ b/rdadmin/edit_nownextplugin.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Now & Next Plugin Configuration // -// (C) Copyright 2008,2016 Fred Gleason +// (C) Copyright 2008-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/rdadmin/edit_rdairplay.cpp b/rdadmin/edit_rdairplay.cpp index 6d03c68e..0d2165a9 100644 --- a/rdadmin/edit_rdairplay.cpp +++ b/rdadmin/edit_rdairplay.cpp @@ -2,7 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (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 @@ -31,9 +31,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -49,8 +46,10 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -87,7 +86,7 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station, // // Dialog Name // - setCaption(tr("Configure RDAirPlay")); + setWindowTitle("RDAdmin - "+tr("Configure RDAirPlay")); // // Channel Assignments Section diff --git a/rdadmin/edit_rdairplay.h b/rdadmin/edit_rdairplay.h index 7975a3bc..e1dcbcc2 100644 --- a/rdadmin/edit_rdairplay.h +++ b/rdadmin/edit_rdairplay.h @@ -2,7 +2,7 @@ // // Edit an RDAirPlay Configuration // -// (C) Copyright 2002-2010,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 @@ -22,7 +22,6 @@ #define EDIT_RDAIRPLAY_H #include -#include #include #include #include @@ -30,8 +29,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_rdlibrary.cpp b/rdadmin/edit_rdlibrary.cpp index c6a110f3..26351542 100644 --- a/rdadmin/edit_rdlibrary.cpp +++ b/rdadmin/edit_rdlibrary.cpp @@ -37,11 +37,12 @@ #include #include - EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -68,7 +69,7 @@ EditRDLibrary::EditRDLibrary(RDStation *station,RDStation *cae_station, // // Dialog Name // - setCaption(tr("Configure RDLibrary")); + setWindowTitle("RDAdmin - "+tr("Configure RDLibrary")); // // Input Configuration diff --git a/rdadmin/edit_rdlibrary.h b/rdadmin/edit_rdlibrary.h index 3bdbf18d..0058365e 100644 --- a/rdadmin/edit_rdlibrary.h +++ b/rdadmin/edit_rdlibrary.h @@ -2,7 +2,7 @@ // // Edit an RDLibrry Configuration // -// (C) Copyright 2002-2015 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 @@ -22,7 +22,6 @@ #define EDIT_RDLIBRARY_H #include -#include #include #include #include @@ -32,7 +31,6 @@ #include #include - class EditRDLibrary : public QDialog { Q_OBJECT diff --git a/rdadmin/edit_rdlogedit.cpp b/rdadmin/edit_rdlogedit.cpp index 58490088..02a7b73c 100644 --- a/rdadmin/edit_rdlogedit.cpp +++ b/rdadmin/edit_rdlogedit.cpp @@ -39,11 +39,12 @@ #include "edit_rdlogedit.h" #include "globals.h" - EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -65,7 +66,7 @@ EditRDLogedit::EditRDLogedit(RDStation *station,RDStation *cae_station, // // Dialog Name // - setCaption(tr("Configure RDLogedit")); + setWindowTitle("RDAdmin - "+tr("Configure RDLogedit")); // // Input Configuration diff --git a/rdadmin/edit_rdlogedit.h b/rdadmin/edit_rdlogedit.h index 84ed1739..b1d998f4 100644 --- a/rdadmin/edit_rdlogedit.h +++ b/rdadmin/edit_rdlogedit.h @@ -2,7 +2,7 @@ // // Edit an RDLogEdit Configuration // -// (C) Copyright 2002-2015 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 @@ -32,7 +32,6 @@ #include #include - class EditRDLogedit : public QDialog { Q_OBJECT diff --git a/rdadmin/edit_rdpanel.cpp b/rdadmin/edit_rdpanel.cpp index 0732fce5..85751216 100644 --- a/rdadmin/edit_rdpanel.cpp +++ b/rdadmin/edit_rdpanel.cpp @@ -2,7 +2,7 @@ // // Edit an RDPanel Configuration // -// (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 @@ -31,8 +31,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -45,8 +43,10 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -78,7 +78,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station, // // Dialog Name // - setCaption(tr("Configure RDPanel")); + setWindowTitle("RDAdmin - "+tr("Configure RDPanel")); // // Channel Assignments Section diff --git a/rdadmin/edit_rdpanel.h b/rdadmin/edit_rdpanel.h index b5b7d234..f9a3ad90 100644 --- a/rdadmin/edit_rdpanel.h +++ b/rdadmin/edit_rdpanel.h @@ -2,7 +2,7 @@ // // Edit an RDPanel Configuration // -// (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 @@ -22,7 +22,6 @@ #define EDIT_RDPANEL_H #include -#include #include #include #include diff --git a/rdadmin/edit_replicator.cpp b/rdadmin/edit_replicator.cpp index a700b288..313b1208 100644 --- a/rdadmin/edit_replicator.cpp +++ b/rdadmin/edit_replicator.cpp @@ -38,8 +38,10 @@ #include "globals.h" EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -54,7 +56,7 @@ EditReplicator::EditReplicator(const QString &repl_name,QWidget *parent) repl_replicator=new RDReplicator(repl_name); repl_settings=new RDSettings(); - setCaption(tr("Replicator: ")+repl_name); + setWindowTitle("RDAdmin - "+tr("Replicator: ")+repl_name); // // Create Fonts diff --git a/rdadmin/edit_replicator.h b/rdadmin/edit_replicator.h index 40ed11f9..9cc86dc0 100644 --- a/rdadmin/edit_replicator.h +++ b/rdadmin/edit_replicator.h @@ -1,9 +1,8 @@ - // edit_replicator.h // // Edit a Rivendell Replicator // -// (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/rdadmin/edit_report.cpp b/rdadmin/edit_report.cpp index f8c69e53..75d3049d 100644 --- a/rdadmin/edit_report.cpp +++ b/rdadmin/edit_report.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Report // -// (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 @@ -43,8 +43,10 @@ #include "test_import.h" EditReport::EditReport(QString rptname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; bool ok=false; @@ -58,7 +60,7 @@ EditReport::EditReport(QString rptname,QWidget *parent) setMaximumHeight(sizeHint().height()); edit_report=new RDReport(rptname,rda->station(),rda->config()); - setCaption(tr("Edit Report")+" "+rptname); + setWindowTitle("RDAdmin - "+tr("Edit Report")+" "+rptname); // // Create Fonts diff --git a/rdadmin/edit_report.h b/rdadmin/edit_report.h index 52f34ec9..94a76f2b 100644 --- a/rdadmin/edit_report.h +++ b/rdadmin/edit_report.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Report // -// (C) Copyright 2002-2004,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 @@ -22,7 +22,6 @@ #define EDIT_REPORT_H #include -#include #include #include #include diff --git a/rdadmin/edit_sas_resource.cpp b/rdadmin/edit_sas_resource.cpp index db3dc233..ec9ea7f2 100644 --- a/rdadmin/edit_sas_resource.cpp +++ b/rdadmin/edit_sas_resource.cpp @@ -2,7 +2,7 @@ // // Edit an SAS Resource Record. // -// (C) Copyright 2002-2005,2011,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 @@ -19,8 +19,6 @@ // #include -//Added by qt3to4: -#include #include @@ -28,12 +26,14 @@ EditSasResource::EditSasResource(int *enginenum,int *devicenum,int *relaynum, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_enginenum=enginenum; edit_devicenum=devicenum; edit_relaynum=relaynum; - setCaption(tr("Edit SAS Switch")); + setWindowTitle("RDAdmin - "+tr("Edit SAS Switch")); // // Fix the Window Size diff --git a/rdadmin/edit_sas_resource.h b/rdadmin/edit_sas_resource.h index c8b013bc..54d90a11 100644 --- a/rdadmin/edit_sas_resource.h +++ b/rdadmin/edit_sas_resource.h @@ -2,7 +2,7 @@ // // Edit an SAS Resource Record. // -// (C) Copyright 2002-2005,2011,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 @@ -22,7 +22,6 @@ #define EDIT_SAS_RESOURCE_H #include -#include #include #include #include diff --git a/rdadmin/edit_schedcodes.cpp b/rdadmin/edit_schedcodes.cpp index 9c359cd0..62bf6db0 100644 --- a/rdadmin/edit_schedcodes.cpp +++ b/rdadmin/edit_schedcodes.cpp @@ -4,6 +4,7 @@ // // Stefan Gabriel // (C) Copyright 2005-2018 +// (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 @@ -27,8 +28,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -41,8 +40,10 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -54,7 +55,7 @@ EditSchedCode::EditSchedCode(QString schedCode,QString description, schedCode_code=new QString(schedCode); schedCode_description=new QString(description); - setCaption(tr("Scheduler Code: ")+schedCode); + setWindowTitle("RDAdmin - "+tr("Scheduler Code: ")+schedCode); // // Create Fonts diff --git a/rdadmin/edit_schedcodes.h b/rdadmin/edit_schedcodes.h index 505731d0..2e119b89 100644 --- a/rdadmin/edit_schedcodes.h +++ b/rdadmin/edit_schedcodes.h @@ -3,6 +3,7 @@ // Edit scheduler codes dialog // // Stefan Gabriel +// (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/rdadmin/edit_settings.cpp b/rdadmin/edit_settings.cpp index 13c16e0b..4e4e822d 100644 --- a/rdadmin/edit_settings.cpp +++ b/rdadmin/edit_settings.cpp @@ -1,8 +1,8 @@ // edit_station.cpp // -// Edit Rivendell Systemwide Configuration +// Edit Rivendell System-Wide Configuration // -// (C) Copyright 2002-2004,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 @@ -28,8 +28,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -40,8 +38,10 @@ #include EditSettings::EditSettings(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -66,7 +66,7 @@ EditSettings::EditSettings(QWidget *parent) edit_system=new RDSystem(); - setCaption(tr("System-Wide Settings")); + setWindowTitle("RDAdmin - "+tr("System-Wide Settings")); edit_system=new RDSystem(); diff --git a/rdadmin/edit_settings.h b/rdadmin/edit_settings.h index 50c0da82..b843bb69 100644 --- a/rdadmin/edit_settings.h +++ b/rdadmin/edit_settings.h @@ -2,7 +2,7 @@ // // Edit Rivendell System-wide Settings. // -// (C) Copyright 2009,2016 Fred Gleason +// (C) Copyright 2009-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 @@ -30,8 +30,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/edit_station.cpp b/rdadmin/edit_station.cpp index 04a64bc6..276beece 100644 --- a/rdadmin/edit_station.cpp +++ b/rdadmin/edit_station.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Workstation Configuration // -// (C) Copyright 2002-2010,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 @@ -28,10 +28,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -58,8 +54,10 @@ #include "globals.h" EditStation::EditStation(QString sname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + RDSqlQuery *q; QString sql; int item=0; @@ -82,7 +80,7 @@ EditStation::EditStation(QString sname,QWidget *parent) station_station=new RDStation(sname); station_cae_station=NULL; - setCaption(tr("Host: ")+sname); + setWindowTitle("RDAdmin - "+tr("Host: ")+sname); GetPrivateProfileString(RD_CONF_FILE,"Identity","Password",temp,"",255); station_catch_connect=new RDCatchConnect(0,this); diff --git a/rdadmin/edit_station.h b/rdadmin/edit_station.h index c5b2345a..0c0bcd2e 100644 --- a/rdadmin/edit_station.h +++ b/rdadmin/edit_station.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Workstation // -// (C) Copyright 2002-2010,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 @@ -32,9 +32,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdadmin/edit_svc.cpp b/rdadmin/edit_svc.cpp index ebc5db2c..bb4d3966 100644 --- a/rdadmin/edit_svc.cpp +++ b/rdadmin/edit_svc.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Service // -// (C) Copyright 2002-2004,2008,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 @@ -33,7 +33,6 @@ #include #include #include -//#include #include #include #include @@ -45,8 +44,10 @@ #include "test_import.h" EditSvc::EditSvc(QString svc,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; QString group; @@ -62,7 +63,7 @@ EditSvc::EditSvc(QString svc,QWidget *parent) svc_svc=new RDSvc(svc,rda->station(),rda->config()); - setCaption(tr("Edit Service")); + setWindowTitle("RDAdmin - "+tr("Edit Service")); // // Create Fonts diff --git a/rdadmin/edit_svc.h b/rdadmin/edit_svc.h index 540bf760..5211658f 100644 --- a/rdadmin/edit_svc.h +++ b/rdadmin/edit_svc.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Service // -// (C) Copyright 2002-2010,2016-2017 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/rdadmin/edit_svc_perms.cpp b/rdadmin/edit_svc_perms.cpp index d9f66ee7..bd733b58 100644 --- a/rdadmin/edit_svc_perms.cpp +++ b/rdadmin/edit_svc_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2004,2016-2017 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,8 +24,10 @@ #include "edit_svc_perms.h" EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -39,7 +41,7 @@ EditSvcPerms::EditSvcPerms(RDSvc *svc,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Service: ")+svc_svc->name()); + setWindowTitle("RDAdmin - "+tr("Service: ")+svc_svc->name()); // // Create Fonts diff --git a/rdadmin/edit_svc_perms.h b/rdadmin/edit_svc_perms.h index ac458515..71bc113e 100644 --- a/rdadmin/edit_svc_perms.h +++ b/rdadmin/edit_svc_perms.h @@ -2,7 +2,7 @@ // // Edit Rivendell Service Permissions // -// (C) Copyright 2002-2004,2016-2017 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,9 +23,8 @@ #include -#include - #include +#include #include class EditSvcPerms : public QDialog diff --git a/rdadmin/edit_ttys.cpp b/rdadmin/edit_ttys.cpp index 8f2f3d74..0824897c 100644 --- a/rdadmin/edit_ttys.cpp +++ b/rdadmin/edit_ttys.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell TTY Configuration // -// (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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -39,8 +37,10 @@ #include "globals.h" EditTtys::EditTtys(QString station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -53,7 +53,7 @@ EditTtys::EditTtys(QString station,QWidget *parent) for(int i=0;i +// (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/rdadmin/edit_user.cpp b/rdadmin/edit_user.cpp index 7148530c..f97b42cb 100644 --- a/rdadmin/edit_user.cpp +++ b/rdadmin/edit_user.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell User // -// (C) Copyright 2002-2003,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 @@ -29,9 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -//#include #include #include @@ -45,8 +42,10 @@ #include "globals.h" EditUser::EditUser(const QString &user,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -55,7 +54,7 @@ EditUser::EditUser(const QString &user,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("User: ")+user); + setWindowTitle("RDAdmin - "+tr("User: ")+user); user_user=new RDUser(user); // diff --git a/rdadmin/edit_user.h b/rdadmin/edit_user.h index a022b8b9..2b34b3d6 100644 --- a/rdadmin/edit_user.h +++ b/rdadmin/edit_user.h @@ -2,7 +2,7 @@ // // Edit a Rivendell User // -// (C) Copyright 2002,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/rdadmin/edit_user_perms.cpp b/rdadmin/edit_user_perms.cpp index 927967d2..be8b5ab9 100644 --- a/rdadmin/edit_user_perms.cpp +++ b/rdadmin/edit_user_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2005,2016-2017 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 @@ -26,8 +26,10 @@ #include "edit_user_perms.h" EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -41,7 +43,7 @@ EditUserPerms::EditUserPerms(RDUser *user,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("User: ")+user_user->name()); + setWindowTitle("RDAdmin - "+tr("User: ")+user_user->name()); // // Create Fonts diff --git a/rdadmin/edit_user_perms.h b/rdadmin/edit_user_perms.h index d5a2480a..6a6a4c95 100644 --- a/rdadmin/edit_user_perms.h +++ b/rdadmin/edit_user_perms.h @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2004,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/rdadmin/edit_user_service_perms.cpp b/rdadmin/edit_user_service_perms.cpp index e35fe655..3522fa0e 100644 --- a/rdadmin/edit_user_service_perms.cpp +++ b/rdadmin/edit_user_service_perms.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2005,2016-2017 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 @@ -26,8 +26,10 @@ #include "edit_user_service_perms.h" EditUserServicePerms::EditUserServicePerms(RDUser *user,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; @@ -41,7 +43,7 @@ EditUserServicePerms::EditUserServicePerms(RDUser *user,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("User: ")+user_user->name()); + setWindowTitle("RDAdmin - "+tr("User: ")+user_user->name()); // // Create Fonts diff --git a/rdadmin/edit_user_service_perms.h b/rdadmin/edit_user_service_perms.h index 9458f959..40cfac48 100644 --- a/rdadmin/edit_user_service_perms.h +++ b/rdadmin/edit_user_service_perms.h @@ -2,7 +2,7 @@ // // Edit Rivendell User/Group Permissions // -// (C) Copyright 2002-2004,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/rdadmin/edit_vguest_resource.cpp b/rdadmin/edit_vguest_resource.cpp index 659fc121..9a570053 100644 --- a/rdadmin/edit_vguest_resource.cpp +++ b/rdadmin/edit_vguest_resource.cpp @@ -2,7 +2,7 @@ // // Edit a vGuest Resource Record. // -// (C) Copyright 2002-2005,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 @@ -19,20 +19,19 @@ // #include -//Added by qt3to4: -#include #include #include - EditVguestResource::EditVguestResource(RDMatrix::VguestType type, int *enginenum,int *devicenum, int *surfacenum,int *relaynum, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_type=type; edit_enginenum=enginenum; edit_devicenum=devicenum; @@ -129,17 +128,17 @@ EditVguestResource::EditVguestResource(RDMatrix::VguestType type, edit_surfacenum_edit->setText(QString().sprintf("%04X",*surfacenum)); } switch(edit_type) { - case RDMatrix::VguestTypeRelay: - setCaption(tr("Edit vGuest Switch")); - if(*relaynum>=0) { - edit_relaynum_edit->setText(QString().sprintf("%04X",*relaynum)); - } - break; + case RDMatrix::VguestTypeRelay: + setWindowTitle("RDAdmin - "+tr("Edit vGuest Switch")); + if(*relaynum>=0) { + edit_relaynum_edit->setText(QString().sprintf("%04X",*relaynum)); + } + break; - case RDMatrix::VguestTypeDisplay: - setCaption(tr("Edit vGuest Display")); - edit_relaynum_edit->setDisabled(true); - break; + case RDMatrix::VguestTypeDisplay: + setWindowTitle("RDADmin - "+tr("Edit vGuest Display")); + edit_relaynum_edit->setDisabled(true); + break; } } diff --git a/rdadmin/edit_vguest_resource.h b/rdadmin/edit_vguest_resource.h index 03b918f6..9b4e32b9 100644 --- a/rdadmin/edit_vguest_resource.h +++ b/rdadmin/edit_vguest_resource.h @@ -2,7 +2,7 @@ // // Edit a vGuest Resource Record. // -// (C) Copyright 2002-2005,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/rdadmin/globals.h b/rdadmin/globals.h index 23624bbf..4e0a02cd 100644 --- a/rdadmin/globals.h +++ b/rdadmin/globals.h @@ -2,7 +2,7 @@ // // Global Definitions for RDAdmin // -// (C) Copyright 2002-2003,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/rdadmin/help_audios.cpp b/rdadmin/help_audios.cpp index 00ce7e32..21914b22 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,2016 Fred Gleason +// (C) Copyright 2006-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,8 +23,10 @@ #include HelpAudioPorts::HelpAudioPorts(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -33,7 +35,7 @@ HelpAudioPorts::HelpAudioPorts(QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Audio Ports Help")); + setWindowTitle("RDAdmin - "+tr("Audio Ports Help")); // // Create Fonts diff --git a/rdadmin/help_audios.h b/rdadmin/help_audios.h index 79616ca7..a68137d3 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,2016 Fred Gleason +// (C) Copyright 2006-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/rdadmin/importfields.cpp b/rdadmin/importfields.cpp index a4bd2ad1..23d8a0a0 100644 --- a/rdadmin/importfields.cpp +++ b/rdadmin/importfields.cpp @@ -1,8 +1,8 @@ // importfields.cpp // -// Parser Parameters for RDAdmin. +// Import Parser Parameters for RDAdmin. // -// (C) Copyright 2010,2016 Fred Gleason +// (C) Copyright 2010-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 @@ -21,8 +21,6 @@ #include #include -//Added by qt3to4: -#include ImportFields::ImportFields(QWidget *parent) : QWidget(parent) diff --git a/rdadmin/importfields.h b/rdadmin/importfields.h index 0d93e2af..7fd45842 100644 --- a/rdadmin/importfields.h +++ b/rdadmin/importfields.h @@ -1,8 +1,8 @@ // importfields.h // -// Parser Parameters for RDAdmin. +// Import Parser Parameters for RDAdmin. // -// (C) Copyright 2010,2016 Fred Gleason +// (C) Copyright 2010-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/rdadmin/info_dialog.cpp b/rdadmin/info_dialog.cpp index 165be944..7c1f480f 100644 --- a/rdadmin/info_dialog.cpp +++ b/rdadmin/info_dialog.cpp @@ -2,7 +2,7 @@ // // Display System Information for Rivendell // -// (C) Copyright 2002-2014,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 @@ -49,8 +49,10 @@ #include InfoDialog::InfoDialog(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -59,7 +61,7 @@ InfoDialog::InfoDialog(QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("System Information")); + setWindowTitle("RDAdmin - "+tr("System Information")); // // Create Fonts diff --git a/rdadmin/info_dialog.h b/rdadmin/info_dialog.h index be6142f6..7ec1f4b6 100644 --- a/rdadmin/info_dialog.h +++ b/rdadmin/info_dialog.h @@ -2,7 +2,7 @@ // // Display System Information for Rivendell // -// (C) Copyright 2002-2003,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/rdadmin/list_dropboxes.cpp b/rdadmin/list_dropboxes.cpp index 99b1a972..2f263404 100644 --- a/rdadmin/list_dropboxes.cpp +++ b/rdadmin/list_dropboxes.cpp @@ -2,7 +2,7 @@ // // List Rivendell Dropboxes // -// (C) Copyright 2002,2016-2018 Gleason +// (C) Copyright 2002-2018 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 @@ -28,8 +28,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -38,8 +36,10 @@ #include "list_dropboxes.h" ListDropboxes::ListDropboxes(const QString &stationname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + list_stationname=stationname; // @@ -48,7 +48,8 @@ ListDropboxes::ListDropboxes(const QString &stationname,QWidget *parent) setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell Dropbox Configurations on")+" "+stationname); + setWindowTitle("RDAdmin - "+tr("Rivendell Dropbox Configurations on")+" "+ + stationname); // // Create Fonts diff --git a/rdadmin/list_dropboxes.h b/rdadmin/list_dropboxes.h index 1ae234a1..31ba4a06 100644 --- a/rdadmin/list_dropboxes.h +++ b/rdadmin/list_dropboxes.h @@ -2,7 +2,7 @@ // // List Rivendell Dropbox Configurations // -// (C) Copyright 2002,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,10 +24,7 @@ #include #include #include -#include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_endpoints.cpp b/rdadmin/list_endpoints.cpp index 0d681823..8bf9427a 100644 --- a/rdadmin/list_endpoints.cpp +++ b/rdadmin/list_endpoints.cpp @@ -2,7 +2,7 @@ // // List a Rivendell Endpoints // -// (C) Copyright 2002-2003,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 @@ -23,8 +23,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -37,8 +35,10 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; Q3ListViewItem *l; @@ -47,17 +47,17 @@ ListEndpoints::ListEndpoints(RDMatrix *matrix,RDMatrix::Endpoint endpoint, list_matrix=matrix; list_endpoint=endpoint; switch(list_endpoint) { - case RDMatrix::Input: - list_size=list_matrix->inputs(); - list_table="INPUTS"; - setCaption(tr("List Inputs")); - break; + case RDMatrix::Input: + list_size=list_matrix->inputs(); + list_table="INPUTS"; + setWindowTitle("RDAdmin - "+tr("List Inputs")); + break; - case RDMatrix::Output: - list_size=list_matrix->outputs(); - list_table="OUTPUTS"; - setCaption(tr("List Outputs")); - break; + case RDMatrix::Output: + list_size=list_matrix->outputs(); + list_table="OUTPUTS"; + setWindowTitle("RDAdmin - "+tr("List Outputs")); + break; } // diff --git a/rdadmin/list_endpoints.h b/rdadmin/list_endpoints.h index d9d1d76b..8d1f24c2 100644 --- a/rdadmin/list_endpoints.h +++ b/rdadmin/list_endpoints.h @@ -2,7 +2,7 @@ // // List Rivendell Endpoints // -// (C) Copyright 2002-2003,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 @@ -22,7 +22,6 @@ #define LIST_ENDPOINTS_H #include -#include #include #include #include diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index 0b088cb9..6c4dbfc9 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -2,7 +2,7 @@ // // List Rivendell Feeds // -// (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 @@ -34,8 +34,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -51,15 +49,17 @@ #include "list_feeds.h" ListFeeds::ListFeeds(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell Feed List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Feed List")); // // Create Fonts diff --git a/rdadmin/list_feeds.h b/rdadmin/list_feeds.h index 32786570..7f628d87 100644 --- a/rdadmin/list_feeds.h +++ b/rdadmin/list_feeds.h @@ -2,7 +2,7 @@ // // List Rivendell Feeds // -// (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,10 +24,7 @@ #include #include #include -#include #include -//Added by qt3to4: -#include #include diff --git a/rdadmin/list_gpis.cpp b/rdadmin/list_gpis.cpp index b87cf488..e37f193a 100644 --- a/rdadmin/list_gpis.cpp +++ b/rdadmin/list_gpis.cpp @@ -2,7 +2,7 @@ // // List Rivendell GPIOs // -// (C) Copyright 2002-2008,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 @@ -23,9 +23,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -40,8 +37,10 @@ #include "list_gpis.h" ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; Q3ListViewItem *l; @@ -50,19 +49,19 @@ ListGpis::ListGpis(RDMatrix *matrix,RDMatrix::GpioType type,QWidget *parent) list_matrix=matrix; list_type=type; switch(type) { - case RDMatrix::GpioInput: - list_tablename="GPIS"; - list_size=list_matrix->gpis(); - list_label=tr("GPI Lines"); - setCaption(tr("List GPIs")); - break; + case RDMatrix::GpioInput: + list_tablename="GPIS"; + list_size=list_matrix->gpis(); + list_label=tr("GPI Lines"); + setWindowTitle("RDAdmin - "+tr("List GPIs")); + break; - case RDMatrix::GpioOutput: - list_tablename="GPOS"; - list_size=list_matrix->gpos(); - list_label=tr("GPO Lines"); - setCaption(tr("List GPOs")); - break; + case RDMatrix::GpioOutput: + list_tablename="GPOS"; + list_size=list_matrix->gpos(); + list_label=tr("GPO Lines"); + setWindowTitle("RDAdmin - "+tr("List GPOs")); + break; } // diff --git a/rdadmin/list_gpis.h b/rdadmin/list_gpis.h index 259c9f30..22f89bbc 100644 --- a/rdadmin/list_gpis.h +++ b/rdadmin/list_gpis.h @@ -2,7 +2,7 @@ // // List Rivendell GPIs // -// (C) Copyright 2002-2004,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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_groups.cpp b/rdadmin/list_groups.cpp index 09758e7c..f154d047 100644 --- a/rdadmin/list_groups.cpp +++ b/rdadmin/list_groups.cpp @@ -2,7 +2,7 @@ // // List Rivendell Groups // -// (C) Copyright 2002,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 @@ -30,8 +30,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -47,15 +45,17 @@ #include "rename_group.h" ListGroups::ListGroups(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell Group List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Group List")); // // Create Fonts diff --git a/rdadmin/list_groups.h b/rdadmin/list_groups.h index 59e6edb4..dd3bbb10 100644 --- a/rdadmin/list_groups.h +++ b/rdadmin/list_groups.h @@ -2,7 +2,7 @@ // // List Rivendell Groups // -// (C) Copyright 2002,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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_hostvars.cpp b/rdadmin/list_hostvars.cpp index 36ed6e07..4865beb3 100644 --- a/rdadmin/list_hostvars.cpp +++ b/rdadmin/list_hostvars.cpp @@ -2,7 +2,7 @@ // // List Rivendell Host Variables // -// (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 @@ -39,8 +39,10 @@ #include "list_hostvars.h" ListHostvars::ListHostvars(QString station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString str; // @@ -53,7 +55,7 @@ ListHostvars::ListHostvars(QString station,QWidget *parent) list_station=station; str=QString(tr("Host Variables for")); - setCaption(tr("Host Variables for")+" "+station); + setWindowTitle("RDAdmin - "+tr("Host Variables for")+" "+station); // // Create Fonts diff --git a/rdadmin/list_hostvars.h b/rdadmin/list_hostvars.h index cc90d968..d43bbb30 100644 --- a/rdadmin/list_hostvars.h +++ b/rdadmin/list_hostvars.h @@ -2,7 +2,7 @@ // // List Rivendell Host Variables // -// (C) Copyright 2002-2004,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 @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/rdadmin/list_livewiregpios.cpp b/rdadmin/list_livewiregpios.cpp index 929e8be7..c423a45e 100644 --- a/rdadmin/list_livewiregpios.cpp +++ b/rdadmin/list_livewiregpios.cpp @@ -2,7 +2,7 @@ // // List Rivendell Livewire GPIO Slot Associations // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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,8 +38,10 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -50,7 +52,7 @@ ListLiveWireGpios::ListLiveWireGpios(RDMatrix *matrix,int slot_quan, list_matrix=matrix; list_slot_quan=slot_quan; - setCaption(tr("LiveWire GPIO Source Assignments")); + setWindowTitle("RDAdmin - "+tr("Livewire GPIO Source Assignments")); // // Create Fonts diff --git a/rdadmin/list_livewiregpios.h b/rdadmin/list_livewiregpios.h index f917bfd0..46829472 100644 --- a/rdadmin/list_livewiregpios.h +++ b/rdadmin/list_livewiregpios.h @@ -2,7 +2,7 @@ // // List Rivendell Livewire GPIO Slot Associations // -// (C) Copyright 2013,2016 Fred Gleason +// (C) Copyright 2013-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/rdadmin/list_matrices.cpp b/rdadmin/list_matrices.cpp index b8f3950c..727855c7 100644 --- a/rdadmin/list_matrices.cpp +++ b/rdadmin/list_matrices.cpp @@ -2,7 +2,7 @@ // // List Rivendell Matrices // -// (C) Copyright 2002-2003,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 @@ -39,8 +39,10 @@ #include "list_matrices.h" ListMatrices::ListMatrices(QString station,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -50,7 +52,7 @@ ListMatrices::ListMatrices(QString station,QWidget *parent) setMaximumHeight(sizeHint().height()); list_station=station; - setCaption(tr("Rivendell Switcher List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Switcher List")); // // Create Fonts diff --git a/rdadmin/list_matrices.h b/rdadmin/list_matrices.h index 22bf3e35..8853a3c9 100644 --- a/rdadmin/list_matrices.h +++ b/rdadmin/list_matrices.h @@ -2,7 +2,7 @@ // // List Rivendell Matrices // -// (C) Copyright 2002-2003,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/rdadmin/list_nodes.cpp b/rdadmin/list_nodes.cpp index 5d7deb35..a2a51921 100644 --- a/rdadmin/list_nodes.cpp +++ b/rdadmin/list_nodes.cpp @@ -1,8 +1,8 @@ // list_nodes.cpp // -// List Rivendell LiveWire Nodes +// List Rivendell Livewire Nodes // -// (C) Copyright 2002-2003,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,10 +34,12 @@ #include "edit_endpoint.h" ListNodes::ListNodes(RDMatrix *matrix,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + list_matrix=matrix; - setCaption(tr("LiveWire Node List")); + setWindowTitle("RDAdmin - "+tr("Livewire Node List")); // // Fix the Window Size diff --git a/rdadmin/list_nodes.h b/rdadmin/list_nodes.h index 1029fad0..e05105b5 100644 --- a/rdadmin/list_nodes.h +++ b/rdadmin/list_nodes.h @@ -2,7 +2,7 @@ // // List Rivendell LiveWire Nodes // -// (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 @@ -22,7 +22,6 @@ #define LIST_NODES_H #include -#include #include #include diff --git a/rdadmin/list_replicator_carts.cpp b/rdadmin/list_replicator_carts.cpp index 1478dfd5..79e5795f 100644 --- a/rdadmin/list_replicator_carts.cpp +++ b/rdadmin/list_replicator_carts.cpp @@ -2,7 +2,7 @@ // // List Rivendell Replicator Carts // -// (C) Copyright 2002-2008,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 @@ -30,26 +30,25 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include +#include #include #include #include -#include -#include -#include +#include "add_replicator.h" +#include "edit_replicator.h" +#include "list_replicator_carts.h" #include "../icons/play.xpm" #include "../icons/rml5.xpm" ListReplicatorCarts::ListReplicatorCarts(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -141,7 +140,7 @@ QSizePolicy ListReplicatorCarts::sizePolicy() const int ListReplicatorCarts::exec(const QString &replname) { list_replicator_name=replname; - setCaption(replname+tr(" Replicator Carts")); + setWindowTitle("RDAdmin - "+replname+tr(" Replicator Carts")); RefreshList(); list_refresh_timer->start(5000,true); return QDialog::exec(); diff --git a/rdadmin/list_replicator_carts.h b/rdadmin/list_replicator_carts.h index 6977b469..dab888e3 100644 --- a/rdadmin/list_replicator_carts.h +++ b/rdadmin/list_replicator_carts.h @@ -2,7 +2,7 @@ // // List Rivendell Replicator Carts // -// (C) Copyright 2012,2016 Fred Gleason +// (C) Copyright 2012-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 @@ -27,8 +27,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_replicators.cpp b/rdadmin/list_replicators.cpp index 819abe67..f19f4f9d 100644 --- a/rdadmin/list_replicators.cpp +++ b/rdadmin/list_replicators.cpp @@ -1,8 +1,8 @@ // list_replicators.cpp // -// List Rivendell Replication Configuratins +// List Rivendell Replication Configurations // -// (C) Copyright 2002-2008,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 @@ -30,30 +30,30 @@ #include #include #include -//Added by qt3to4: -#include -#include #include +#include #include #include #include -#include -#include -#include -#include +#include "add_replicator.h" +#include "edit_replicator.h" +#include "list_replicators.h" +#include "list_replicator_carts.h" ListReplicators::ListReplicators(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell Replicators")); + setWindowTitle("RDAdmin - "+tr("Rivendell Replicators")); // // Create Fonts diff --git a/rdadmin/list_replicators.h b/rdadmin/list_replicators.h index 53ad3f0d..9a545062 100644 --- a/rdadmin/list_replicators.h +++ b/rdadmin/list_replicators.h @@ -2,7 +2,7 @@ // // List Rivendell Replication Configurations // -// (C) Copyright 2010,2016 Fred Gleason +// (C) Copyright 2010-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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_reports.cpp b/rdadmin/list_reports.cpp index 43625603..3751cde0 100644 --- a/rdadmin/list_reports.cpp +++ b/rdadmin/list_reports.cpp @@ -2,7 +2,7 @@ // // List Rivendell Reports // -// (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 @@ -37,8 +37,10 @@ #include "list_reports.h" ListReports::ListReports(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -47,7 +49,7 @@ ListReports::ListReports(QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Rivendell Report List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Report List")); // // Create Fonts diff --git a/rdadmin/list_reports.h b/rdadmin/list_reports.h index 76ea1f11..ebe0c3b7 100644 --- a/rdadmin/list_reports.h +++ b/rdadmin/list_reports.h @@ -2,7 +2,7 @@ // // List Rivendell Reports // -// (C) Copyright 2002-2004,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/rdadmin/list_sas_resources.cpp b/rdadmin/list_sas_resources.cpp index ca4aed41..ef756374 100644 --- a/rdadmin/list_sas_resources.cpp +++ b/rdadmin/list_sas_resources.cpp @@ -2,7 +2,7 @@ // // List SAS Resources. // -// (C) Copyright 2002-2005,2011,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,8 +23,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -34,14 +32,16 @@ #include ListSasResources::ListSasResources(RDMatrix *matrix,int size,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; QString str; list_matrix=matrix; list_size=size; - setCaption(tr("SAS Switches")); + setWindowTitle("RDAdmin - "+tr("SAS Switches")); // // Fix the Window Size diff --git a/rdadmin/list_sas_resources.h b/rdadmin/list_sas_resources.h index 7ab508ed..b5c733c7 100644 --- a/rdadmin/list_sas_resources.h +++ b/rdadmin/list_sas_resources.h @@ -2,7 +2,7 @@ // // List SAS Resources // -// (C) Copyright 2002-2005,2011,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/rdadmin/list_schedcodes.cpp b/rdadmin/list_schedcodes.cpp index c5879279..cca77471 100644 --- a/rdadmin/list_schedcodes.cpp +++ b/rdadmin/list_schedcodes.cpp @@ -3,6 +3,7 @@ // The scheduler codes dialog for rdadmin // // Stefan Gabriel +// (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 @@ -27,8 +28,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -40,15 +39,17 @@ #include ListSchedCodes::ListSchedCodes(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell Scheduler Codes List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Scheduler Codes List")); // // Create Fonts diff --git a/rdadmin/list_schedcodes.h b/rdadmin/list_schedcodes.h index ca9a5493..aab6620f 100644 --- a/rdadmin/list_schedcodes.h +++ b/rdadmin/list_schedcodes.h @@ -1,8 +1,9 @@ -// List_schedcodes.h +// list_schedcodes.h // // The scheduler codes dialog for rdadmin // // Stefan Gabriel +// (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,10 +24,7 @@ #include #include -#include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_stations.cpp b/rdadmin/list_stations.cpp index d84e2470..1115f82e 100644 --- a/rdadmin/list_stations.cpp +++ b/rdadmin/list_stations.cpp @@ -38,8 +38,10 @@ #include "list_stations.h" ListStations::ListStations(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -48,7 +50,7 @@ ListStations::ListStations(QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Rivendell Host List")); + setWindowTitle("RDAdmin - "+tr("Rivendell Host List")); // // Create Fonts diff --git a/rdadmin/list_stations.h b/rdadmin/list_stations.h index d0664a8e..90febd07 100644 --- a/rdadmin/list_stations.h +++ b/rdadmin/list_stations.h @@ -2,7 +2,7 @@ // // List Rivendell Workstations // -// (C) Copyright 2002,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 @@ -26,7 +26,6 @@ #include #include #include -#include class ListStations : public QDialog { diff --git a/rdadmin/list_svcs.cpp b/rdadmin/list_svcs.cpp index a9167882..495c47cf 100644 --- a/rdadmin/list_svcs.cpp +++ b/rdadmin/list_svcs.cpp @@ -2,7 +2,7 @@ // // List Rivendell Services // -// (C) Copyright 2002-2003,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 @@ -39,8 +39,10 @@ #include "list_svcs.h" ListSvcs::ListSvcs(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -49,7 +51,7 @@ ListSvcs::ListSvcs(QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Services")); + setWindowTitle("RDAdmin - "+tr("Services")); // // Create Fonts diff --git a/rdadmin/list_svcs.h b/rdadmin/list_svcs.h index 2dd935cc..a8abe3f1 100644 --- a/rdadmin/list_svcs.h +++ b/rdadmin/list_svcs.h @@ -2,7 +2,7 @@ // // List Rivendell Services // -// (C) Copyright 2002,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 @@ -26,7 +26,6 @@ #include #include #include -#include class ListSvcs : public QDialog { diff --git a/rdadmin/list_users.cpp b/rdadmin/list_users.cpp index 9d653e14..8b86f45f 100644 --- a/rdadmin/list_users.cpp +++ b/rdadmin/list_users.cpp @@ -2,7 +2,7 @@ // // List Rivendell Users // -// (C) Copyright 2002-2008,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 @@ -30,18 +30,15 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include +#include #include #include -#include -#include -#include +#include "add_user.h" +#include "edit_user.h" +#include "list_users.h" // // Icons @@ -50,8 +47,9 @@ #include "../icons/user.xpm" ListUsers::ListUsers(const QString &admin_name,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); list_admin_name=admin_name; // @@ -60,7 +58,7 @@ ListUsers::ListUsers(const QString &admin_name,QWidget *parent) setMinimumWidth(sizeHint().width()); setMinimumHeight(sizeHint().height()); - setCaption(tr("Rivendell User List")); + setWindowTitle("RDAdmin - "+tr("Rivendell User List")); // // Create Fonts diff --git a/rdadmin/list_users.h b/rdadmin/list_users.h index b1c56371..3da0e5bd 100644 --- a/rdadmin/list_users.h +++ b/rdadmin/list_users.h @@ -2,7 +2,7 @@ // // List Rivendell Users // -// (C) Copyright 2002-2008,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,11 +24,8 @@ #include #include #include -#include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdadmin/list_vguest_resources.cpp b/rdadmin/list_vguest_resources.cpp index 2613a8d7..407aeb41 100644 --- a/rdadmin/list_vguest_resources.cpp +++ b/rdadmin/list_vguest_resources.cpp @@ -2,7 +2,7 @@ // // List vGuest Resources. // -// (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 @@ -23,8 +23,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -37,8 +35,10 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, RDMatrix::VguestType type,int size, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; QString str; @@ -74,16 +74,15 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, list_list_view->setAllColumnsShowFocus(true); list_list_view->setItemMargin(5); switch(list_type) { - case RDMatrix::VguestTypeRelay: + case RDMatrix::VguestTypeRelay: + setWindowTitle("RDAdmin - "+tr("vGuest Switches")); + list_list_view->addColumn(tr("GPIO LINE")); + break; - setCaption(tr("vGuest Switches")); - list_list_view->addColumn(tr("GPIO LINE")); - break; - - case RDMatrix::VguestTypeDisplay: - setCaption(tr("vGuest Displays")); - list_list_view->addColumn(tr("DISPLAY")); - break; + case RDMatrix::VguestTypeDisplay: + setWindowTitle("RDAdmin - "+tr("vGuest Displays")); + list_list_view->addColumn(tr("DISPLAY")); + break; } list_list_view->setColumnAlignment(0,Qt::AlignHCenter); list_list_view->addColumn(tr("ENGINE (Hex)")); @@ -91,17 +90,17 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix, list_list_view->addColumn(tr("DEVICE (Hex)")); list_list_view->setColumnAlignment(2,Qt::AlignHCenter); switch(list_type) { - case RDMatrix::VguestTypeRelay: - list_list_view->addColumn(tr("SURFACE (Hex)")); - list_list_view->setColumnAlignment(3,Qt::AlignHCenter); - list_list_view->addColumn(tr("BUS/RELAY (Hex)")); - list_list_view->setColumnAlignment(4,Qt::AlignHCenter); - break; + case RDMatrix::VguestTypeRelay: + list_list_view->addColumn(tr("SURFACE (Hex)")); + list_list_view->setColumnAlignment(3,Qt::AlignHCenter); + list_list_view->addColumn(tr("BUS/RELAY (Hex)")); + list_list_view->setColumnAlignment(4,Qt::AlignHCenter); + break; - case RDMatrix::VguestTypeDisplay: - list_list_view->addColumn(tr("SURFACE (Hex)")); - list_list_view->setColumnAlignment(3,Qt::AlignHCenter); - break; + case RDMatrix::VguestTypeDisplay: + list_list_view->addColumn(tr("SURFACE (Hex)")); + list_list_view->setColumnAlignment(3,Qt::AlignHCenter); + break; } connect(list_list_view, SIGNAL(doubleClicked(Q3ListViewItem *,const QPoint &,int)), diff --git a/rdadmin/list_vguest_resources.h b/rdadmin/list_vguest_resources.h index 95aafa6e..9b7b47cc 100644 --- a/rdadmin/list_vguest_resources.h +++ b/rdadmin/list_vguest_resources.h @@ -2,7 +2,7 @@ // // List vGuest Resources // -// (C) Copyright 2002-2005,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/rdadmin/login.cpp b/rdadmin/login.cpp index 95fead0e..4a9fc370 100644 --- a/rdadmin/login.cpp +++ b/rdadmin/login.cpp @@ -2,7 +2,7 @@ // // Login widget for RDAdmin. // -// (C) Copyright 2002-2004,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 @@ -31,16 +31,16 @@ #include #include #include -//Added by qt3to4: -#include #include #include Login::Login(QString *username,QString *password,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -49,7 +49,7 @@ Login::Login(QString *username,QString *password,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Login")); + setWindowTitle("RDAdmin"); login_name=username; login_password=password; diff --git a/rdadmin/login.h b/rdadmin/login.h index 3169ca63..8f9c0b7d 100644 --- a/rdadmin/login.h +++ b/rdadmin/login.h @@ -2,7 +2,7 @@ // // Login Widget for RDAdmin. // -// (C) Copyright 2002,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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include class Login : public QDialog { diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index ce413997..7484d016 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -2,7 +2,7 @@ // // The Administrator Utility for Rivendell. // -// (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 @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -34,10 +33,7 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include #include @@ -70,22 +66,6 @@ RDCartDialog *admin_cart_dialog; bool exiting=false; -void SigHandler(int signo) -{ - pid_t pLocalPid; - - switch(signo) { - case SIGCHLD: - pLocalPid=waitpid(-1,NULL,WNOHANG); - while(pLocalPid>0) { - pLocalPid=waitpid(-1,NULL,WNOHANG); - } - signal(SIGCHLD,SigHandler); - break; - } -} - - void PrintError(const QString &str,bool interactive) { if(interactive) { @@ -98,12 +78,11 @@ void PrintError(const QString &str,bool interactive) MainWidget::MainWidget(QWidget *parent) - :QWidget(parent) + : QWidget(parent) { QString str; QString err_msg; - // // Fix the Window Size // @@ -125,7 +104,7 @@ MainWidget::MainWidget(QWidget *parent) // Create And Set Icon // admin_rivendell_map=new QPixmap(rdadmin_22x22_xpm); - setIcon(*admin_rivendell_map); + setWindowIcon(*admin_rivendell_map); // // Open the Database @@ -135,7 +114,8 @@ MainWidget::MainWidget(QWidget *parent) QMessageBox::critical(this,"RDAdmin - "+tr("Error"),err_msg); exit(1); } - setCaption(QString("RDAdmin v")+VERSION+" - "+tr("Host")+": "+rda->config()->stationName()); + setWindowTitle(QString("RDAdmin v")+VERSION+" - "+ + tr("Host")+": "+rda->config()->stationName()); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); @@ -278,8 +258,6 @@ MainWidget::MainWidget(QWidget *parent) quit_button->setFont(font); quit_button->setText(tr("&Quit")); connect(quit_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); - - signal(SIGCHLD,SigHandler); } diff --git a/rdadmin/rdadmin.pro b/rdadmin/rdadmin.pro index 043909db..3a0c10d2 100644 --- a/rdadmin/rdadmin.pro +++ b/rdadmin/rdadmin.pro @@ -31,7 +31,6 @@ x11 { SOURCES += add_user.cpp SOURCES += autofill_carts.cpp SOURCES += edit_audios.cpp - SOURCES += edit_backup.cpp SOURCES += edit_cartslots.cpp SOURCES += edit_decks.cpp SOURCES += edit_dropbox.cpp @@ -98,7 +97,6 @@ x11 { HEADERS += add_user.h HEADERS += autofill_carts.h HEADERS += edit_audios.h - HEADERS += edit_backup.h HEADERS += edit_cartslots.h HEADERS += edit_decks.h HEADERS += edit_dropbox.h diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 25a70107..c532e66c 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -214,7 +214,7 @@ a záloha původní databáze uložena v AddFeed Add Feed - Přidat přívod + Přidat přívod Enable Feed for All Users @@ -240,6 +240,10 @@ a záloha původní databáze uložena v A feed with that key name already exists! Přívod s tímto názvem klíče již existuje! + + Add RSS Feed + + AddGroup @@ -323,7 +327,7 @@ a záloha původní databáze uložena v AddMatrix Add Switcher - Přidat přepínač + Přidat přepínač &New Matrix Number: @@ -405,10 +409,6 @@ a záloha původní databáze uložena v New Switcher Nový přepínač - - RDAdmin - Add Switcher - - AddReplicator @@ -815,10 +815,6 @@ a záloha původní databáze uložena v EditCartSlots - - RDAdmin - Edit CartSlots - - Global Settings @@ -931,6 +927,10 @@ a záloha původní databáze uložena v Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1985,7 +1985,7 @@ Stále ještě chcete uložit? EditMatrix Edit Switcher - Upravit přepínač + Upravit přepínač Matrix Number: @@ -2167,10 +2167,6 @@ Switches Přepínače SAS - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4999,10 +4995,6 @@ Stále ještě jej chcete smazat? ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Přepínače: @@ -5039,6 +5031,10 @@ Stále ještě jej chcete smazat? Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5447,7 +5443,7 @@ Stále ještě chcete pokračovat? Login Login - Přihlášení + Přihlášení &OK diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 38fdb460..936e9fc6 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -150,10 +150,6 @@ worden. Aktuelle Version AddFeed - - Add Feed - - Enable Feed for All Users @@ -178,6 +174,10 @@ worden. Aktuelle Version A feed with that key name already exists! + + Add RSS Feed + + AddGroup @@ -261,7 +261,7 @@ worden. Aktuelle Version AddMatrix Add Switcher - Switcher hinzufügen + Switcher hinzufügen &New Matrix Number: @@ -343,10 +343,6 @@ worden. Aktuelle Version New Switcher - - RDAdmin - Add Switcher - - AddReplicator @@ -741,10 +737,6 @@ worden. Aktuelle Version EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -865,6 +857,10 @@ worden. Aktuelle Version Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1907,7 +1903,7 @@ Do you still want to save? EditMatrix Edit Switcher - Switcher editieren + Switcher editieren Matrix Number: @@ -2089,10 +2085,6 @@ konfigurieren Switches - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4868,10 +4860,6 @@ Generieren ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Schalter: @@ -4908,6 +4896,10 @@ Generieren Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5314,7 +5306,7 @@ Wollen Sie immernoch fortfahren? Login Login - Login + Login &OK diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 74df3770..ca937fcc 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -223,7 +223,7 @@ y un respaldo de la base de datos se guardó en AddFeed Add Feed - Añadir Feed + Añadir Feed Enable Feed for All Users @@ -249,6 +249,10 @@ y un respaldo de la base de datos se guardó en A feed with that key name already exists! ¡Un feed con ese nombre ya existe! + + Add RSS Feed + + AddGroup @@ -332,7 +336,7 @@ y un respaldo de la base de datos se guardó en AddMatrix Add Switcher - Agregar Suichera + Agregar Suichera &New Matrix Number: @@ -378,10 +382,6 @@ y un respaldo de la base de datos se guardó en New Switcher Nueva Suichera - - RDAdmin - Add Switcher - - AddReplicator @@ -823,10 +823,6 @@ y un respaldo de la base de datos se guardó en EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -947,6 +943,10 @@ y un respaldo de la base de datos se guardó en Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1999,7 +1999,7 @@ Do you still want to save? EditMatrix Edit Switcher - Editar Suichera + Editar Suichera Matrix Number: @@ -2180,10 +2180,6 @@ Switches Switches SAS - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4962,10 +4958,6 @@ Do you still want to delete it? ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Suicheras: @@ -5002,6 +4994,10 @@ Do you still want to delete it? Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5413,7 +5409,7 @@ Do you still want to proceed? Login Login - Ingreso + Ingreso &OK diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index be020747..d6da7ca4 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -1,10 +1,6 @@ AddFeed - - Add Feed - - Enable Feed for All Users @@ -29,6 +25,10 @@ A feed with that key name already exists! + + Add RSS Feed + + AddGroup @@ -139,7 +139,7 @@ - RDAdmin - Add Switcher + Add Switcher @@ -466,10 +466,6 @@ EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -582,6 +578,10 @@ Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1722,10 +1722,6 @@ G&POs Switches - - RDAdmin - Edit Switcher - - Configure &Outputs @@ -1736,6 +1732,10 @@ Switches GPIOs + + Edit Switcher + + EditNowNext @@ -4194,10 +4194,6 @@ PARTICULAR PURPOSE. Touch the "View License" button for details. ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: @@ -4234,6 +4230,10 @@ PARTICULAR PURPOSE. Touch the "View License" button for details.Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -4570,10 +4570,6 @@ Carts Login - - Login - - &OK diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index d9f3e2c4..d65bd4c2 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -140,10 +140,6 @@ oppdatert til versjon AddFeed - - Add Feed - - Enable Feed for All Users @@ -168,6 +164,10 @@ oppdatert til versjon A feed with that key name already exists! + + Add RSS Feed + + AddGroup @@ -251,7 +251,7 @@ oppdatert til versjon AddMatrix Add Switcher - Legg til bytar + Legg til bytar &New Matrix Number: @@ -325,10 +325,6 @@ oppdatert til versjon New Switcher - - RDAdmin - Add Switcher - - AddReplicator @@ -723,10 +719,6 @@ oppdatert til versjon EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -847,6 +839,10 @@ oppdatert til versjon Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1874,7 +1870,7 @@ Vil du framleis lagra? EditMatrix Edit Switcher - Rediger svitsjar + Rediger svitsjar Matrix Number: @@ -2061,10 +2057,6 @@ G&POs Switches - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4782,10 +4774,6 @@ Klikk på "Lisens"-knappen for fleire opplysningar. ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Svitsjarar: @@ -4822,6 +4810,10 @@ Klikk på "Lisens"-knappen for fleire opplysningar. Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5222,7 +5214,7 @@ Er du sikker på at du vil halda fram? Login Login - Logg inn + Logg inn &OK diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index d9f3e2c4..d65bd4c2 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -140,10 +140,6 @@ oppdatert til versjon AddFeed - - Add Feed - - Enable Feed for All Users @@ -168,6 +164,10 @@ oppdatert til versjon A feed with that key name already exists! + + Add RSS Feed + + AddGroup @@ -251,7 +251,7 @@ oppdatert til versjon AddMatrix Add Switcher - Legg til bytar + Legg til bytar &New Matrix Number: @@ -325,10 +325,6 @@ oppdatert til versjon New Switcher - - RDAdmin - Add Switcher - - AddReplicator @@ -723,10 +719,6 @@ oppdatert til versjon EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -847,6 +839,10 @@ oppdatert til versjon Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1874,7 +1870,7 @@ Vil du framleis lagra? EditMatrix Edit Switcher - Rediger svitsjar + Rediger svitsjar Matrix Number: @@ -2061,10 +2057,6 @@ G&POs Switches - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4782,10 +4774,6 @@ Klikk på "Lisens"-knappen for fleire opplysningar. ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Svitsjarar: @@ -4822,6 +4810,10 @@ Klikk på "Lisens"-knappen for fleire opplysningar. Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5222,7 +5214,7 @@ Er du sikker på at du vil halda fram? Login Login - Logg inn + Logg inn &OK diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 0544a998..e3e30de1 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -133,10 +133,6 @@ atualizada para a Versão AddFeed - - Add Feed - - Enable Feed for All Users @@ -161,6 +157,10 @@ atualizada para a Versão A feed with that key name already exists! + + Add RSS Feed + + AddGroup @@ -244,7 +244,7 @@ atualizada para a Versão AddMatrix Add Switcher - Adicionar Switcher + Adicionar Switcher &New Matrix Number: @@ -318,10 +318,6 @@ atualizada para a Versão New Switcher - - RDAdmin - Add Switcher - - AddReplicator @@ -712,10 +708,6 @@ atualizada para a Versão EditCartSlots - - RDAdmin - Edit CartSlots - - Close @@ -836,6 +828,10 @@ atualizada para a Versão Slot selected has changed! + + Edit CartSlots + + EditDecks @@ -1880,7 +1876,7 @@ Você ainda quer salvar? EditMatrix Edit Switcher - Editar Switcher + Editar Switcher Matrix Number: @@ -2064,10 +2060,6 @@ Displays Switches - - RDAdmin - Edit Switcher - - LiveWire GPIOs @@ -4849,10 +4841,6 @@ Você ainda quer Deletar? ListLiveWireGpios - - LiveWire GPIO Source Assignments - - Switchers: Switchers: @@ -4889,6 +4877,10 @@ Você ainda quer Deletar? Source # + + Livewire GPIO Source Assignments + + ListMatrices @@ -5287,7 +5279,7 @@ Você quer proceder? Login Login - Administrar + Administrar &OK diff --git a/rdadmin/rename_group.cpp b/rdadmin/rename_group.cpp index 3de2405b..b9192197 100644 --- a/rdadmin/rename_group.cpp +++ b/rdadmin/rename_group.cpp @@ -2,7 +2,7 @@ // // Rename a Rivendell Group // -// (C) Copyright 2002-2004,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 @@ -31,18 +31,19 @@ #include #include #include -#include +#include #include #include #include #include #include - RenameGroup::RenameGroup(QString group,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + group_name=group; // @@ -53,7 +54,7 @@ RenameGroup::RenameGroup(QString group,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Rename Group")); + setWindowTitle("RDAdmin - "+tr("Rename Group")); // // Create Fonts diff --git a/rdadmin/rename_group.h b/rdadmin/rename_group.h index dab5829e..2ca012f1 100644 --- a/rdadmin/rename_group.h +++ b/rdadmin/rename_group.h @@ -2,7 +2,7 @@ // // Rename a Rivendell Group // -// (C) Copyright 2002-2004,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/rdadmin/test_import.cpp b/rdadmin/test_import.cpp index aa55c8af..4fac3223 100644 --- a/rdadmin/test_import.cpp +++ b/rdadmin/test_import.cpp @@ -2,7 +2,7 @@ // // Test a Rivendell Log Import // -// (C) Copyright 2002-2004,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 @@ -21,10 +21,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -40,8 +36,10 @@ #include "test_import.h" TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; QDate current_date=QDate::currentDate(); @@ -55,13 +53,13 @@ TestImport::TestImport(RDSvc *svc,RDSvc::ImportSource src,QWidget *parent) setMinimumHeight(sizeHint().height()); switch(test_src) { - case RDSvc::Traffic: - setCaption(tr("Test Traffic Import")); - break; + case RDSvc::Traffic: + setWindowTitle("RDAdmin - "+tr("Test Traffic Import")); + break; - case RDSvc::Music: - setCaption(tr("Test Music Import")); - break; + case RDSvc::Music: + setWindowTitle("RDAdmin - "+tr("Test Music Import")); + break; } // diff --git a/rdadmin/test_import.h b/rdadmin/test_import.h index 4eb9d47d..8a096643 100644 --- a/rdadmin/test_import.h +++ b/rdadmin/test_import.h @@ -2,7 +2,7 @@ // // Test a Rivendell Log Import // -// (C) Copyright 2002-2004,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 @@ -22,14 +22,10 @@ #define TEST_IMPORT_H #include -#include #include #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdadmin/view_adapters.cpp b/rdadmin/view_adapters.cpp index 51289a27..e3dba286 100644 --- a/rdadmin/view_adapters.cpp +++ b/rdadmin/view_adapters.cpp @@ -2,7 +2,7 @@ // // Display Audio Adapter Information // -// (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 @@ -27,8 +27,10 @@ #include "view_adapters.h" ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -37,7 +39,7 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption("RDADmin - "+tr("Audio Resource Information")); + setWindowTitle("RDADmin - "+tr("Audio Resource Information")); // // Create Fonts diff --git a/rdadmin/view_adapters.h b/rdadmin/view_adapters.h index 26cee540..0306090d 100644 --- a/rdadmin/view_adapters.h +++ b/rdadmin/view_adapters.h @@ -2,7 +2,7 @@ // // Display Audio Adapter Information // -// (C) Copyright 2002-2004,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 @@ -22,7 +22,6 @@ #define VIEW_ADAPTER_H #include -#include #include #include #include @@ -45,5 +44,4 @@ class ViewAdapters : public QDialog }; -#endif - +#endif // VIEW_ADAPTER_H diff --git a/rdadmin/view_node_info.cpp b/rdadmin/view_node_info.cpp index 4af35144..70f0009e 100644 --- a/rdadmin/view_node_info.cpp +++ b/rdadmin/view_node_info.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell LiveWire Node // -// (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 @@ -19,7 +19,6 @@ // #include -#include #include #include @@ -30,9 +29,11 @@ #include ViewNodeInfo::ViewNodeInfo(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Viewing LiveWire Node")); + setModal(true); + + setWindowTitle("RDAdmin - "+tr("Viewing Livewire Node")); // // Fix the Window Size diff --git a/rdadmin/view_node_info.h b/rdadmin/view_node_info.h index 7b604d5f..39f2a69b 100644 --- a/rdadmin/view_node_info.h +++ b/rdadmin/view_node_info.h @@ -1,8 +1,8 @@ // view_node_info.h // -// Edit a Rivendell LiveWire Node +// Edit a Rivendell Livewire Node // -// (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/rdadmin/xpm_info_banner1.cpp b/rdadmin/xpm_info_banner1.cpp index 6323b893..69f15e96 100644 --- a/rdadmin/xpm_info_banner1.cpp +++ b/rdadmin/xpm_info_banner1.cpp @@ -2,7 +2,7 @@ // // Elvish Script for the Copyright Screen // -// (C) Copyright 2002-2004,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/rdadmin/xpm_info_banner2.cpp b/rdadmin/xpm_info_banner2.cpp index 09642551..2080f550 100644 --- a/rdadmin/xpm_info_banner2.cpp +++ b/rdadmin/xpm_info_banner2.cpp @@ -2,7 +2,7 @@ // // Elvish Script for the Copyright Screen // -// (C) Copyright 2002-2004,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