From c372e73010e62cd22f65f4ebbef1663b668c0093 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 14 Aug 2018 22:01:57 +0000 Subject: [PATCH] 2018-08-14 Fred Gleason * Fixed style inconsistencies in dialogs within rdlogmanager(1). --- ChangeLog | 2 ++ rdlogmanager/add_clock.cpp | 15 +++++++------ rdlogmanager/add_clock.h | 4 +--- rdlogmanager/add_event.cpp | 29 ++++++++++-------------- rdlogmanager/add_event.h | 12 +++++----- rdlogmanager/clock_listview.cpp | 8 +++---- rdlogmanager/clock_listview.h | 4 +--- rdlogmanager/commandline_ops.cpp | 2 +- rdlogmanager/edit_clock.cpp | 11 ++++------ rdlogmanager/edit_clock.h | 10 +++------ rdlogmanager/edit_event.cpp | 13 +++++------ rdlogmanager/edit_event.h | 6 +---- rdlogmanager/edit_eventline.cpp | 11 +++++----- rdlogmanager/edit_eventline.h | 4 +--- rdlogmanager/edit_grid.cpp | 11 ++++------ rdlogmanager/edit_grid.h | 10 +++------ rdlogmanager/edit_note.cpp | 10 ++++----- rdlogmanager/edit_note.h | 5 +---- rdlogmanager/edit_perms.cpp | 12 +++++----- rdlogmanager/edit_perms.h | 3 +-- rdlogmanager/edit_schedcoderules.cpp | 17 +++++++------- rdlogmanager/edit_schedcoderules.h | 9 ++++---- rdlogmanager/edit_schedrules.cpp | 13 +++++------ rdlogmanager/edit_schedrules.h | 7 ++---- rdlogmanager/edit_track.cpp | 9 +++----- rdlogmanager/edit_track.h | 4 +--- rdlogmanager/generate_log.cpp | 12 +++++----- rdlogmanager/generate_log.h | 4 +--- rdlogmanager/import_listview.cpp | 10 ++------- rdlogmanager/import_listview.h | 8 +------ rdlogmanager/lib_listview.cpp | 5 +---- rdlogmanager/lib_listview.h | 2 +- rdlogmanager/list_clocks.cpp | 10 ++++----- rdlogmanager/list_clocks.h | 5 +---- rdlogmanager/list_events.cpp | 13 +++++------ rdlogmanager/list_events.h | 5 +---- rdlogmanager/list_grids.cpp | 8 ++++--- rdlogmanager/list_grids.h | 2 +- rdlogmanager/list_svcs.cpp | 10 ++++----- rdlogmanager/list_svcs.h | 4 +--- rdlogmanager/pick_report_dates.cpp | 8 ++++--- rdlogmanager/pick_report_dates.h | 3 +-- rdlogmanager/rdlogmanager.cpp | 33 +++------------------------- rdlogmanager/rdlogmanager_cs.ts | 6 ++++- rdlogmanager/rdlogmanager_de.ts | 6 ++++- rdlogmanager/rdlogmanager_es.ts | 6 ++++- rdlogmanager/rdlogmanager_fr.ts | 8 +++---- rdlogmanager/rdlogmanager_nb.ts | 6 ++++- rdlogmanager/rdlogmanager_nn.ts | 6 ++++- rdlogmanager/rdlogmanager_pt_BR.ts | 6 ++++- rdlogmanager/rename_item.cpp | 8 ++++--- rdlogmanager/rename_item.h | 2 +- rdlogmanager/svc_rec.cpp | 5 ++--- rdlogmanager/svc_rec.h | 4 +--- rdlogmanager/svc_rec_dialog.cpp | 9 ++++---- rdlogmanager/svc_rec_dialog.h | 2 +- 56 files changed, 187 insertions(+), 270 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa229da3..9eed31f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17402,3 +17402,5 @@ * Fixed style inconsistencies in dialogs within rdlibrary(1). 2018-08-14 Fred Gleason * Fixed style inconsistencies in dialogs within rdlogin(1). +2018-08-14 Fred Gleason + * Fixed style inconsistencies in dialogs within rdlogmanager(1). diff --git a/rdlogmanager/add_clock.cpp b/rdlogmanager/add_clock.cpp index acb1a948..b5472798 100644 --- a/rdlogmanager/add_clock.cpp +++ b/rdlogmanager/add_clock.cpp @@ -1,8 +1,8 @@ // add_clock.cpp // -// Add a Rivendell Service +// Add a Rivendell Clock // -// (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,16 +30,17 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include +#include "add_clock.h" + AddClock::AddClock(QString *logname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + clock_name=logname; // @@ -50,7 +51,7 @@ AddClock::AddClock(QString *logname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Log Clock")); + setWindowTitle("RDLogManager - "+tr("Add Clock")); // // Create Fonts diff --git a/rdlogmanager/add_clock.h b/rdlogmanager/add_clock.h index acebf0d0..032ea666 100644 --- a/rdlogmanager/add_clock.h +++ b/rdlogmanager/add_clock.h @@ -2,7 +2,7 @@ // // Add a Rivendell Log Manager Clock // -// (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 diff --git a/rdlogmanager/add_event.cpp b/rdlogmanager/add_event.cpp index d3fb1e69..af07cd22 100644 --- a/rdlogmanager/add_event.cpp +++ b/rdlogmanager/add_event.cpp @@ -1,8 +1,8 @@ // add_event.cpp // -// Add a Rivendell Service +// Add a Rivendell LogManager Event // -// (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 @@ -19,29 +19,24 @@ // #include -#include -#include -#include -#include -#include -#include #include #include -#include +#include +#include + #include -#include -//Added by qt3to4: -#include -#include #include +#include -#include -#include +#include "add_event.h" +#include "edit_event.h" AddEvent::AddEvent(QString *logname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + event_name=logname; // @@ -52,7 +47,7 @@ AddEvent::AddEvent(QString *logname,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Add Log Event")); + setWindowTitle("RDLogManager - "+tr("Add Log Event")); // // Create Fonts diff --git a/rdlogmanager/add_event.h b/rdlogmanager/add_event.h index 258e6cf4..446bf5f0 100644 --- a/rdlogmanager/add_event.h +++ b/rdlogmanager/add_event.h @@ -2,7 +2,7 @@ // // Add a Rivendell Log Manager Event // -// (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,15 +21,13 @@ #ifndef ADD_EVENT_H #define ADD_EVENT_H +#include #include +#include +#include + #include #include -#include -#include -#include -#include -//Added by qt3to4: -#include #include diff --git a/rdlogmanager/clock_listview.cpp b/rdlogmanager/clock_listview.cpp index 2d407353..a24ac9b0 100644 --- a/rdlogmanager/clock_listview.cpp +++ b/rdlogmanager/clock_listview.cpp @@ -2,7 +2,7 @@ // // The Clock Carts ListView widget for RDLogManager. // -// (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,14 +21,12 @@ #include #include -//Added by qt3to4: -#include #include #include -#include -#include +#include "clock_listview.h" +#include "edit_note.h" ClockListView::ClockListView(QWidget *parent) : RDListView(parent) diff --git a/rdlogmanager/clock_listview.h b/rdlogmanager/clock_listview.h index ffd3aeec..548562fb 100644 --- a/rdlogmanager/clock_listview.h +++ b/rdlogmanager/clock_listview.h @@ -2,7 +2,7 @@ // // The Clock ListView widget for RDLogManager. // -// (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 @@ -25,8 +25,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdlogmanager/commandline_ops.cpp b/rdlogmanager/commandline_ops.cpp index 7190a5e3..81ae4c1c 100644 --- a/rdlogmanager/commandline_ops.cpp +++ b/rdlogmanager/commandline_ops.cpp @@ -2,7 +2,7 @@ // // Command Line Operations for RDLogManager // -// (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 diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index 55763776..eb4a15b5 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -30,11 +30,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include -#include #include #include @@ -54,11 +49,13 @@ EditClock::EditClock(QString clockname,bool new_clock, std::vector *new_clocks,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString str; - setCaption("RDLogManager - "+tr("Edit Clock")+": "+clockname); + setWindowTitle("RDLogManager - "+tr("Edit Clock")+": "+clockname); edit_name=clockname; edit_new_clock=new_clock; edit_new_clocks=new_clocks; diff --git a/rdlogmanager/edit_clock.h b/rdlogmanager/edit_clock.h index 0d4e1324..043b8b4d 100644 --- a/rdlogmanager/edit_clock.h +++ b/rdlogmanager/edit_clock.h @@ -2,7 +2,7 @@ // // Edit A Rivendell Log Clock // -// (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 @@ -24,21 +24,17 @@ #include #include -#include #include #include #include #include #include -//Added by qt3to4: -#include -#include #include - -#include #include +#include "clock_listview.h" + // // Layout // diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index e19ea678..303e40e1 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell Log Event // -// (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 @@ -24,11 +24,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include -#include #include #include @@ -52,14 +47,16 @@ EditEvent::EditEvent(QString eventname,bool new_event, std::vector *new_events,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + event_saved=false; event_name=eventname; event_new_event=new_event; event_new_events=new_events; event_event=new RDEvent(eventname); - setCaption("RDLogManager - "+tr("Editing Event")+" - "+event_event->name()); + setWindowTitle("RDLogManager - "+tr("Editing Event")+" - "+event_event->name()); // // Fix the Window Size diff --git a/rdlogmanager/edit_event.h b/rdlogmanager/edit_event.h index cd3a0e9d..dc613eb7 100644 --- a/rdlogmanager/edit_event.h +++ b/rdlogmanager/edit_event.h @@ -2,7 +2,7 @@ // // Edit a Rivendell Log Event // -// (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 @@ -35,10 +35,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include diff --git a/rdlogmanager/edit_eventline.cpp b/rdlogmanager/edit_eventline.cpp index fe40deb7..0cd79c08 100644 --- a/rdlogmanager/edit_eventline.cpp +++ b/rdlogmanager/edit_eventline.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Log Eventline // -// (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 @@ -24,9 +24,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -38,9 +35,11 @@ EditEventLine::EditEventLine(RDEventLine *eventline,RDClock *clock,int line, QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Edit Event Assignment")); + setModal(true); + + setWindowTitle("RDLogManager - "+tr("Edit Event Assignment")); edit_eventline=eventline; edit_clock=clock; edit_line=line; diff --git a/rdlogmanager/edit_eventline.h b/rdlogmanager/edit_eventline.h index 375b3213..4a163472 100644 --- a/rdlogmanager/edit_eventline.h +++ b/rdlogmanager/edit_eventline.h @@ -2,7 +2,7 @@ // // Edit A Rivendell Log Clock // -// (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 @@ -25,8 +25,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index 07b31694..bda6cf98 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -29,11 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include -#include #include #include @@ -45,11 +40,13 @@ #include "edit_clock.h" EditGrid::EditGrid(QString servicename,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; - setCaption("RDLogManager - "+tr("Edit Grid")+": "+servicename); + setWindowTitle("RDLogManager - "+tr("Edit Grid")+": "+servicename); edit_servicename=servicename; // diff --git a/rdlogmanager/edit_grid.h b/rdlogmanager/edit_grid.h index 92f3a015..7eb0978b 100644 --- a/rdlogmanager/edit_grid.h +++ b/rdlogmanager/edit_grid.h @@ -2,7 +2,7 @@ // // Edit A Rivendell Log Grid // -// (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 @@ -25,14 +25,10 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include - -#include #include +#include +#include class EditGrid : public QDialog { diff --git a/rdlogmanager/edit_note.cpp b/rdlogmanager/edit_note.cpp index 713ac83a..ceb1e480 100644 --- a/rdlogmanager/edit_note.cpp +++ b/rdlogmanager/edit_note.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (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 @@ -24,8 +24,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -33,9 +31,11 @@ #include "edit_note.h" EditNote::EditNote(QString *text,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Edit Log Note")); + setModal(true); + + setWindowTitle("RDLogManager - "+tr("Edit Log Note")); edit_text=text; // diff --git a/rdlogmanager/edit_note.h b/rdlogmanager/edit_note.h index 153070b2..50c304be 100644 --- a/rdlogmanager/edit_note.h +++ b/rdlogmanager/edit_note.h @@ -2,7 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (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 @@ -24,9 +24,6 @@ #include #include #include -//Added by qt3to4: -#include - class EditNote : public QDialog { diff --git a/rdlogmanager/edit_perms.cpp b/rdlogmanager/edit_perms.cpp index f6b80d59..1caec57f 100644 --- a/rdlogmanager/edit_perms.cpp +++ b/rdlogmanager/edit_perms.cpp @@ -2,7 +2,7 @@ // // Edit RDLogManager Service Associations // -// (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 @@ -29,8 +29,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -40,11 +38,12 @@ #include "edit_perms.h" EditPerms::EditPerms(QString object_name,ObjectType type,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; - QString str; sel_type=type; sel_name=object_name; @@ -57,8 +56,7 @@ EditPerms::EditPerms(QString object_name,ObjectType type,QWidget *parent) setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - str=QString(tr("Service Associations")); - setCaption("RDLogManager - "+sel_name+" - "+tr("Service Associations")); + setWindowTitle("RDLogManager - "+sel_name+" - "+tr("Service Associations")); // // Create Fonts diff --git a/rdlogmanager/edit_perms.h b/rdlogmanager/edit_perms.h index 11e27850..7e1e5543 100644 --- a/rdlogmanager/edit_perms.h +++ b/rdlogmanager/edit_perms.h @@ -2,7 +2,7 @@ // // Edit RDLogManager Service Associations // -// (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 @@ -27,7 +27,6 @@ #include #include - #include class EditPerms : public QDialog diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp index 6358088f..a9f939c4 100644 --- a/rdlogmanager/edit_schedcoderules.cpp +++ b/rdlogmanager/edit_schedcoderules.cpp @@ -2,7 +2,8 @@ // // Change rules for scheduler codes dialog // -// Stefan Gabriel +// (C) Stefan Gabriel +// (C) 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,20 +29,19 @@ #include #include #include -//Added by qt3to4: -#include -#include #include - -#include #include +#include "edit_schedcoderules.h" + editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item, SchedRulesList *sched_rules_list, QWidget* parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + item_edit = item; // @@ -52,8 +52,7 @@ editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item, setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Edit Rules for Code")); - + setWindowTitle("RDLogManager - "+tr("Edit Rules for Code")); // Create Font QFont font=QFont("Helvetica",12,QFont::Bold); diff --git a/rdlogmanager/edit_schedcoderules.h b/rdlogmanager/edit_schedcoderules.h index bddfd95b..2adaaeef 100644 --- a/rdlogmanager/edit_schedcoderules.h +++ b/rdlogmanager/edit_schedcoderules.h @@ -2,7 +2,8 @@ // // Change rules for 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 @@ -22,16 +23,14 @@ #define EDIT_SCHEDCODERULES_H #include -#include #include #include #include #include -//Added by qt3to4: -#include #include -#include + +#include "clock_listview.h" class QSpinBox; diff --git a/rdlogmanager/edit_schedrules.cpp b/rdlogmanager/edit_schedrules.cpp index 416e9698..6ba2a67e 100644 --- a/rdlogmanager/edit_schedrules.cpp +++ b/rdlogmanager/edit_schedrules.cpp @@ -2,7 +2,8 @@ // // Edit scheduler rules of a clock // -// 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 @@ -23,12 +24,8 @@ #include #include #include - #include #include -//Added by qt3to4: -#include -#include #include #include @@ -43,8 +40,10 @@ #include "schedruleslist.h" EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList *schedruleslist,bool *rules_modified,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_artistsep=artistsep; edit_rules_modified=rules_modified; sched_rules_list = schedruleslist; @@ -58,7 +57,7 @@ EditSchedRules::EditSchedRules(QString clock,unsigned *artistsep,SchedRulesList setMinimumHeight(sizeHint().height()); setMaximumHeight(sizeHint().height()); - setCaption(tr("Scheduler Rules")); + setWindowTitle("RDLogManager - "+tr("Scheduler Rules")); // // Create Fonts diff --git a/rdlogmanager/edit_schedrules.h b/rdlogmanager/edit_schedrules.h index bf85f135..69ac6555 100644 --- a/rdlogmanager/edit_schedrules.h +++ b/rdlogmanager/edit_schedrules.h @@ -2,7 +2,8 @@ // // Edit scheduler rules of a clock // -// 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 @@ -22,16 +23,12 @@ #define EDIT_SCHEDRULES_H #include -#include #include #include #include #include -//Added by qt3to4: -#include #include - #include class QSpinBox; diff --git a/rdlogmanager/edit_track.cpp b/rdlogmanager/edit_track.cpp index 261a4c9e..54baf8b4 100644 --- a/rdlogmanager/edit_track.cpp +++ b/rdlogmanager/edit_track.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell LogManager Track // -// (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 @@ -23,9 +23,6 @@ #include #include #include -#include -//Added by qt3to4: -#include #include #include @@ -33,9 +30,9 @@ #include "edit_track.h" EditTrack::EditTrack(QString *text,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Edit Voice Track Marker")); + setWindowTitle("RDLogManager - "+tr("Edit Voice Track Marker")); edit_text=text; // diff --git a/rdlogmanager/edit_track.h b/rdlogmanager/edit_track.h index b2ac89a0..ed5f7a55 100644 --- a/rdlogmanager/edit_track.h +++ b/rdlogmanager/edit_track.h @@ -2,7 +2,7 @@ // // Edit a Rivendell LogManager Track // -// (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 @@ -24,8 +24,6 @@ #include #include #include -//Added by qt3to4: -#include class EditTrack : public QDialog { diff --git a/rdlogmanager/generate_log.cpp b/rdlogmanager/generate_log.cpp index 93dc4b5d..4141ba63 100644 --- a/rdlogmanager/generate_log.cpp +++ b/rdlogmanager/generate_log.cpp @@ -2,7 +2,7 @@ // // Generate a Rivendell Log // -// (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,10 +26,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -54,15 +50,17 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service, QDate *cmd_date) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QStringList services_list; bool cmdservicefit=false; cmdswitch=cmd_switch; cmdservice = cmd_service; cmddate = cmd_date; - setCaption("RDLogManager - "+tr("Generate Log")); + setWindowTitle("RDLogManager - "+tr("Generate Log")); gen_music_enabled=false; gen_traffic_enabled=false; diff --git a/rdlogmanager/generate_log.h b/rdlogmanager/generate_log.h index a50937d4..c2637fb1 100644 --- a/rdlogmanager/generate_log.h +++ b/rdlogmanager/generate_log.h @@ -2,7 +2,7 @@ // // Generate a Rivendell Log // -// (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 diff --git a/rdlogmanager/import_listview.cpp b/rdlogmanager/import_listview.cpp index 77020f8e..b9745a9f 100644 --- a/rdlogmanager/import_listview.cpp +++ b/rdlogmanager/import_listview.cpp @@ -2,7 +2,7 @@ // // The Import Carts ListView widget for RDLogManager. // -// (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 @@ -18,15 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#include #include #include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include #include #include diff --git a/rdlogmanager/import_listview.h b/rdlogmanager/import_listview.h index a0da12a1..b6e9c85b 100644 --- a/rdlogmanager/import_listview.h +++ b/rdlogmanager/import_listview.h @@ -2,7 +2,7 @@ // // The Import Carts ListView widget for RDLogManager. // -// (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 @@ -24,14 +24,8 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include -#include #include -//#include class ImportListView : public Q3ListView { diff --git a/rdlogmanager/lib_listview.cpp b/rdlogmanager/lib_listview.cpp index 1f3db53e..5116843f 100644 --- a/rdlogmanager/lib_listview.cpp +++ b/rdlogmanager/lib_listview.cpp @@ -2,7 +2,7 @@ // // The Library ListView widget for RDLogManager. // -// (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,9 +22,6 @@ #include #include -//Added by qt3to4: -#include -#include LibListView::LibListView(QWidget *parent) : Q3ListView(parent) diff --git a/rdlogmanager/lib_listview.h b/rdlogmanager/lib_listview.h index 856a2c78..331b890c 100644 --- a/rdlogmanager/lib_listview.h +++ b/rdlogmanager/lib_listview.h @@ -2,7 +2,7 @@ // // The Library ListView widget for RDLogManager. // -// (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/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 5542b12e..bf46739b 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -25,10 +25,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -43,10 +39,12 @@ #include "rename_item.h" ListClocks::ListClocks(QString *clockname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QStringList services_list; - setCaption("RDLogManager - "+tr("Log Clocks")); + setWindowTitle("RDLogManager - "+tr("Log Clocks")); edit_clockname=clockname; // diff --git a/rdlogmanager/list_clocks.h b/rdlogmanager/list_clocks.h index 8b11ffc4..c2c0123b 100644 --- a/rdlogmanager/list_clocks.h +++ b/rdlogmanager/list_clocks.h @@ -2,7 +2,7 @@ // // List Rivendell Log Clocks // -// (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 @@ -29,9 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdlogmanager/list_events.cpp b/rdlogmanager/list_events.cpp index 9f729467..cdc028d2 100644 --- a/rdlogmanager/list_events.cpp +++ b/rdlogmanager/list_events.cpp @@ -2,7 +2,7 @@ // // List a Rivendell Log Event // -// (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 @@ -25,11 +25,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include -#include #include #include @@ -44,10 +39,12 @@ #include "rename_item.h" ListEvents::ListEvents(QString *eventname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QStringList services_list; - setCaption("RDLogManager - "+tr("Log Events")); + setWindowTitle("RDLogManager - "+tr("Log Events")); edit_eventname=eventname; // diff --git a/rdlogmanager/list_events.h b/rdlogmanager/list_events.h index e56e30c7..48a4ff9c 100644 --- a/rdlogmanager/list_events.h +++ b/rdlogmanager/list_events.h @@ -2,7 +2,7 @@ // // List Rivendell Log Events // -// (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,9 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdlogmanager/list_grids.cpp b/rdlogmanager/list_grids.cpp index d7a04f23..06cf170f 100644 --- a/rdlogmanager/list_grids.cpp +++ b/rdlogmanager/list_grids.cpp @@ -2,7 +2,7 @@ // // List Rivendell Log Grids // -// (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 @@ -33,9 +33,11 @@ #include "list_grids.h" ListGrids::ListGrids(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Log Grids")); + setModal(true); + + setWindowTitle("RDLogManager - "+tr("Log Grids")); // // Fix the Window Size diff --git a/rdlogmanager/list_grids.h b/rdlogmanager/list_grids.h index daeede54..b5f7698a 100644 --- a/rdlogmanager/list_grids.h +++ b/rdlogmanager/list_grids.h @@ -2,7 +2,7 @@ // // List Rivendell Log Grids // -// (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/rdlogmanager/list_svcs.cpp b/rdlogmanager/list_svcs.cpp index c353d7d5..8f3a7a68 100644 --- a/rdlogmanager/list_svcs.cpp +++ b/rdlogmanager/list_svcs.cpp @@ -2,7 +2,7 @@ // // List Rivendell Services and Report Ages // -// (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 @@ -20,8 +20,6 @@ #include #include -//Added by qt3to4: -#include #include #include @@ -33,9 +31,11 @@ #include "pick_report_dates.h" ListSvcs::ListSvcs(QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { - setCaption(tr("Rivendell Services")); + setModal(true); + + setWindowTitle("RDLogManager - "+tr("Rivendell Services")); // // Fix the Window Size diff --git a/rdlogmanager/list_svcs.h b/rdlogmanager/list_svcs.h index e9681f14..826dd84e 100644 --- a/rdlogmanager/list_svcs.h +++ b/rdlogmanager/list_svcs.h @@ -2,7 +2,7 @@ // // List Rivendell Services and Report Ages // -// (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 @@ -25,8 +25,6 @@ #include #include #include -//Added by qt3to4: -#include class ListSvcs : public QDialog { diff --git a/rdlogmanager/pick_report_dates.cpp b/rdlogmanager/pick_report_dates.cpp index d5a7931f..a2d076f5 100644 --- a/rdlogmanager/pick_report_dates.cpp +++ b/rdlogmanager/pick_report_dates.cpp @@ -2,7 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -34,14 +34,16 @@ #include "pick_report_dates.h" PickReportDates::PickReportDates(const QString &svcname,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + QString sql; RDSqlQuery *q; QDate yesterday_date=QDate::currentDate().addDays(-1); edit_svcname=svcname; - setCaption(tr("Select Report Dates")); + setWindowTitle("RDLogManager - "+tr("Select Report Dates")); // // Fix the Window Size diff --git a/rdlogmanager/pick_report_dates.h b/rdlogmanager/pick_report_dates.h index 064f0fe5..89d5c66d 100644 --- a/rdlogmanager/pick_report_dates.h +++ b/rdlogmanager/pick_report_dates.h @@ -2,7 +2,7 @@ // // Select a Set of Dates for a Rivendell Report // -// (C) Copyright 2002-2006,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 PICK_REPORT_DATE_H #include -#include #include #include diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index e6cd418e..8aa93363 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -1,8 +1,8 @@ // rdlogmanager.cpp // -// The Log Editor Utility for Rivendell. +// The Log Generator Utility for Rivendell. // -// (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 @@ -38,10 +38,7 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include #include @@ -72,24 +69,6 @@ QString *event_filter; QString *clock_filter; bool skip_db_check=false; -#ifndef WIN32 -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; - } -} -#endif // WIN32 - - MainWidget::MainWidget(QWidget *parent) :QWidget(parent) { @@ -112,7 +91,7 @@ MainWidget::MainWidget(QWidget *parent) exit(1); } - setCaption(tr("RDLogManager")); + setWindowTitle(tr("RDLogManager")); // // CAE Connection @@ -219,10 +198,6 @@ MainWidget::MainWidget(QWidget *parent) log_close_button->setText(tr("&Close")); log_close_button->setDefault(true); connect(log_close_button,SIGNAL(clicked()),this,SLOT(quitMainWidget())); - -#ifndef WIN32 - signal(SIGCHLD,SigHandler); -#endif // WIN32 } @@ -240,8 +215,6 @@ QSizePolicy MainWidget::sizePolicy() const void MainWidget::userData() { - setCaption("RDLogManager"); - // // Set Control Perms // diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index c98e7f5c..f20bec1b 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Přidat nové hodiny zápisu + Přidat nové hodiny zápisu &New Clock Name: @@ -19,6 +19,10 @@ &Cancel Z&rušit + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index 6721f821..7cc0916a 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Neue Loguhr hinzufügen + Neue Loguhr hinzufügen &New Clock Name: @@ -19,6 +19,10 @@ &Cancel Abbre&chen + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index d40a747b..ee1df274 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Añadir Torta + Añadir Torta &New Clock Name: @@ -19,6 +19,10 @@ &Cancel &Cancelar + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index 84d55641..8b26db71 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -3,10 +3,6 @@ AddClock - - Add Log Clock - - &New Clock Name: @@ -19,6 +15,10 @@ &Cancel + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index d47e8b77..69fc2c7b 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Legg til loggklokke + Legg til loggklokke &New Clock Name: @@ -19,6 +19,10 @@ &Cancel &Avbryt + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index d47e8b77..69fc2c7b 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Legg til loggklokke + Legg til loggklokke &New Clock Name: @@ -19,6 +19,10 @@ &Cancel &Avbryt + + Add Clock + + AddEvent diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index 5e285799..1be0ce45 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -5,7 +5,7 @@ AddClock Add Log Clock - Adicionar Relógio + Adicionar Relógio &New Clock Name: @@ -19,6 +19,10 @@ &Cancel &Cancelar + + Add Clock + + AddEvent diff --git a/rdlogmanager/rename_item.cpp b/rdlogmanager/rename_item.cpp index e7b66f29..5e6821da 100644 --- a/rdlogmanager/rename_item.cpp +++ b/rdlogmanager/rename_item.cpp @@ -2,7 +2,7 @@ // // Edit a Rivendell LogManager Note // -// (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 @@ -32,12 +32,14 @@ #include "rename_item.h" RenameItem::RenameItem(QString *text,QString table,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_text=text; edit_tablename=table; - setCaption(tr("Rename")); + setWindowTitle("RDLogManager - "+tr("Rename")); // // Fix the Window Size diff --git a/rdlogmanager/rename_item.h b/rdlogmanager/rename_item.h index 763eb749..2999ede4 100644 --- a/rdlogmanager/rename_item.h +++ b/rdlogmanager/rename_item.h @@ -2,7 +2,7 @@ // // Rename an RDLogManager Event or Clock // -// (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/rdlogmanager/svc_rec.cpp b/rdlogmanager/svc_rec.cpp index b259195e..3e1939ae 100644 --- a/rdlogmanager/svc_rec.cpp +++ b/rdlogmanager/svc_rec.cpp @@ -2,7 +2,7 @@ // // Calendar widget. // -// (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 @@ -21,9 +21,8 @@ #include #include #include -#include -//Added by qt3to4: #include +#include #include #include diff --git a/rdlogmanager/svc_rec.h b/rdlogmanager/svc_rec.h index 2a3c9a4c..0e99f1dd 100644 --- a/rdlogmanager/svc_rec.h +++ b/rdlogmanager/svc_rec.h @@ -2,7 +2,7 @@ // // A Calendar Widget. // -// (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,8 +31,6 @@ #include #include #include -//Added by qt3to4: -#include // // Display Settings diff --git a/rdlogmanager/svc_rec_dialog.cpp b/rdlogmanager/svc_rec_dialog.cpp index 54b14700..a11c4928 100644 --- a/rdlogmanager/svc_rec_dialog.cpp +++ b/rdlogmanager/svc_rec_dialog.cpp @@ -2,7 +2,7 @@ // // A Services/Reports Management Dialog. // -// (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 @@ -42,15 +42,16 @@ // Global Classes // SvcRecDialog::SvcRecDialog(const QString &svcname,QWidget *parent) - :QDialog(parent,"",true) + :QDialog(parent) { + setModal(true); + QFont font; font=QFont("Helvetica",12,QFont::Bold); font.setPixelSize(12); - setCaption(QString().sprintf("%s %s",(const char *)svcname, - (const char *)tr("Report Data"))); + setWindowTitle("RDLogManager - "+svcname+" "+tr("Report Data")); // // Datepicker diff --git a/rdlogmanager/svc_rec_dialog.h b/rdlogmanager/svc_rec_dialog.h index fa224808..67e5b348 100644 --- a/rdlogmanager/svc_rec_dialog.h +++ b/rdlogmanager/svc_rec_dialog.h @@ -2,7 +2,7 @@ // // A Services/Reports Management Dialog. // -// (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