2018-08-14 Fred Gleason <fredg@paravelsystems.com>

* Fixed style inconsistencies in dialogs within rdlogedit(1).

ChangeLog

@@ -17394,3 +17394,5 @@
 	* Fixed cosmedic layout errors in the 'Edit Audio' dialog.
 2018-08-14 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed rendering errors in the 'Edit Audio' dialog.
+2018-08-14 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed style inconsistencies in dialogs within rdlogedit(1).

rdlogedit/add_meta.cpp

@@ -2,7 +2,7 @@
 //
 // Add a Rivendell RDCatch Event
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,16 +21,11 @@
 #include <qdialog.h>
 #include <qstring.h>
 #include <qpushbutton.h>
-#include <q3listbox.h>
-#include <q3textedit.h>
 #include <qpainter.h>
 #include <qevent.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
 #include <qsqldatabase.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QLabel>
 
 #include <rd.h>
 #include <rdlog_line.h>
@@ -38,9 +33,10 @@
 #include <add_meta.h>
 
 AddMeta::AddMeta(QWidget *parent)
-  : QDialog(parent,"",true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
+  : QDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
 {
-  setCaption("");
+  setModal(true);
+  setWindowTitle("");
 
   //
   // Fix the Window Size

rdlogedit/add_meta.h

@@ -2,7 +2,7 @@
 //
 // Add a Rivendell RDCatch Event
 //
-//   (C) Copyright 2002-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <qcheckbox.h>
 #include <qspinbox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <QCloseEvent>
 
 class AddMeta : public QDialog
 {

rdlogedit/edit_chain.cpp

@@ -20,9 +20,6 @@
 
 #include <qpushbutton.h>
 #include <qmessagebox.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QLabel>
 
 #include <rdapplication.h>
 #include <rddb.h>
@@ -34,8 +31,10 @@
 #include "globals.h"
 
 EditChain::EditChain(RDLogLine *line,QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
+
   //
   // Fix the Window Size
   //
@@ -44,7 +43,7 @@ EditChain::EditChain(RDLogLine *line,QWidget *parent)
   setMinimumHeight(sizeHint().height());
   setMaximumHeight(sizeHint().height());
 
-  setCaption(tr("Edit Log Chain"));
+  setWindowTitle("RDLogEdit - "+tr("Edit Log Chain"));
 
   edit_logline=line;
 

rdlogedit/edit_chain.h

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Log Entry
 //
-//   (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include <rdlog_line.h>
 #include <rdtimeedit.h>

rdlogedit/edit_log.cpp

@@ -21,19 +21,12 @@
 #include <math.h>
 
 #include <qdialog.h>
-#include <qstring.h>
-#include <q3listbox.h>
-#include <q3textedit.h>
-#include <qlabel.h>
-#include <qpainter.h>
 #include <qevent.h>
+#include <qgroupbox.h>
+#include <qlabel.h>
 #include <qmessagebox.h>
-#include <q3buttongroup.h>
+#include <qpainter.h>
-//Added by qt3to4:
+#include <qstring.h>
-#include <QResizeEvent>
-#include <QPixmap>
-#include <QCloseEvent>
-#include <QPaintEvent>
 
 #include <rd.h>
 #include <rdadd_log.h>
@@ -70,8 +63,10 @@
 EditLog::EditLog(QString logname,QString *filter,QString *group,
 		 QString *schedcode,vector<RDLogLine> *clipboard,
 		 vector<QString> *new_logs,QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
+
   QString sql;
   RDSqlQuery *q;
   QStringList services_list;
@@ -90,7 +85,8 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   bool editing_allowed=rda->user()->arrangeLog();
   bool saveas_allowed=rda->user()->createLog();
 
-  setCaption(tr("Edit Log"));
+  setModal(true);
+  setWindowTitle("RDLogEdit - "+tr("Edit Log"));
 
   //
   // Config Data
@@ -313,9 +309,8 @@ EditLog::EditLog(QString logname,QString *filter,QString *group,
   //
   // Time Counter Section
   //
-  edit_time_label=new QLabel(tr("Run Length"),this);
+  edit_time_groupbox=new QGroupBox(tr("Run Length"),this);
-  edit_time_label->setFont(label_font);
+  edit_time_groupbox->setFont(label_font);
-  edit_time_label->setAlignment(Qt::AlignCenter);  
 
   //
   // Stop Time Counter
@@ -1320,7 +1315,7 @@ void EditLog::resizeEvent(QResizeEvent *e)
   edit_startdate_box_label->setGeometry(270,96,175,20);
   edit_enddate_box_label->setGeometry(450,96,140,20);
 
-  edit_time_label->setGeometry(655,62,75,20);
+  edit_time_groupbox->setGeometry(624,65,136,59);
   edit_stoptime_label->setGeometry(625,82,65,18);
   edit_stoptime_edit->setGeometry(695,82,60,18);
   edit_endtime_label->setGeometry(625,102,65,18);
@@ -1361,14 +1356,14 @@ void EditLog::paintEvent(QPaintEvent *e)
   p->fillRect(60,8,size().width()-120,24,QColor(system_mid_color));
   p->fillRect(9,size().height()-130,size().width()-20,60,
 	      QColor(system_mid_color));
-
+  /*
   p->setPen(Qt::black);
   p->setBrush(Qt::black);
   p->drawLine(624,70,760,70);
   p->drawLine(760,70,760,124);
   p->drawLine(760,124,624,124);
   p->drawLine(624,124,624,70);
-
+  */
   p->end();
   delete p;
 }

rdlogedit/edit_log.h

@@ -23,22 +23,18 @@
 
 #include <vector>
 
-#include <qdialog.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QPixmap>
-#include <rdlistview.h>
-#include <qsqldatabase.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <q3datetimeedit.h>
 #include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qdialog.h>
+#include <qgroupbox.h>
 #include <qlabel.h>
+#include <qlineedit.h>
+
+#include <q3datetimeedit.h>
 
 #include <rdcart_dialog.h>
 #include <rdgroup_list.h>
+#include <rdlistview.h>
 #include <rdlog.h>
 #include <rdlog_event.h>
 #include <rdloglock.h>
@@ -190,7 +186,8 @@ class EditLog : public QDialog
   unsigned edit_start_macro;
   unsigned edit_end_macro;
   RDSimplePlayer *edit_player;
-  QLabel *edit_time_label;
+  //  QLabel *edit_time_label;
+  QGroupBox *edit_time_groupbox;
   QLabel *edit_stoptime_label;
   QLineEdit *edit_stoptime_edit;
   QLabel *edit_endtime_label;

rdlogedit/edit_logline.cpp

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Log Entry
 //
-//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,6 @@
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qradiobutton.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QLabel>
 
 #include <rd.h>
 #include <rdapplication.h>
@@ -37,8 +34,9 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
 			 QString *schedcode,QString svcname,
 			 RDGroupList *grplist,RDLogEvent *log,int lineno,
 			 QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
   //
   // Fix the Window Size
   //
@@ -47,7 +45,7 @@ EditLogLine::EditLogLine(RDLogLine *line,QString *filter,QString *group,
   setMinimumHeight(sizeHint().height());
   setMaximumHeight(sizeHint().height());
 
-  setCaption(tr("Edit Log Entry"));
+  setWindowTitle("RDLogEdit - "+tr("Edit Log Entry"));
 
   edit_logline=line;
   edit_filter=filter;

rdlogedit/edit_logline.h

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Log Entry
 //
-//   (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <qcheckbox.h>
 #include <q3buttongroup.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include <rdcart_dialog.h>
 #include <rdlog_event.h>

rdlogedit/edit_marker.cpp

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Log Marker Entry
 //
-//   (C) Copyright 2002-2004,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,15 +20,14 @@
 
 #include <qpushbutton.h>
 #include <qmessagebox.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QCloseEvent>
 
 #include "edit_marker.h"
 
 EditMarker::EditMarker(RDLogLine *line,QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
+
   //
   // Fix the Window Size
   //
@@ -37,7 +36,7 @@ EditMarker::EditMarker(RDLogLine *line,QWidget *parent)
   setMinimumHeight(sizeHint().height());
   setMaximumHeight(sizeHint().height());
 
-  setCaption(tr("Edit Log Marker"));
+  setWindowTitle("RDLogEdit - "+tr("Edit Log Marker"));
 
   edit_logline=line;
 

rdlogedit/edit_marker.h

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Log Entry
 //
-//   (C) Copyright 2002-2003,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include <rdlog_line.h>
 #include <rdtimeedit.h>

rdlogedit/edit_track.cpp

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Voice Track Log Entry
 //
-//   (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,15 +20,14 @@
 
 #include <qpushbutton.h>
 #include <qmessagebox.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QCloseEvent>
 
 #include <edit_track.h>
 
 EditTrack::EditTrack(RDLogLine *line,QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
+
   //
   // Fix the Window Size
   //
@@ -37,7 +36,7 @@ EditTrack::EditTrack(RDLogLine *line,QWidget *parent)
   setMinimumHeight(sizeHint().height());
   setMaximumHeight(sizeHint().height());
 
-  setCaption(tr("Edit Voice Track Marker"));
+  setWindowTitle("RDLogEdit - "+tr("Edit Voice Track Marker"));
 
   edit_logline=line;
 

rdlogedit/edit_track.h

@@ -2,7 +2,7 @@
 //
 // Edit a Rivendell Voice Track Log Entry
 //
-//   (C) Copyright 2002-2005,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
-//Added by qt3to4:
-#include <QCloseEvent>
 
 #include <rdlog_line.h>
 #include <rdtimeedit.h>

rdlogedit/import_track.cpp

@@ -2,7 +2,7 @@
 //
 // Insert Audio for a Voice Track
 //
-//   (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,10 +29,6 @@
 #include <qevent.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QKeyEvent>
-#include <QCloseEvent>
 
 #include <rddb.h>
 #include <rd.h>
@@ -40,14 +36,15 @@
 #include <rdcut_dialog.h>
 #include <rdcut_path.h>
 
-#include <import_track.h>
+#include "import_track.h"
 
 extern RDStation *rdstation_conf;
 
 ImportTrack::ImportTrack(QString *filter,QString *group,QWidget *parent)
-  : QDialog(parent,"",true,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
+  : QDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
 {
-  setCaption("");
+  setModal(true);
+  setWindowTitle("");
 
   //
   // Fix the Window Size

rdlogedit/import_track.h

@@ -2,7 +2,7 @@
 //
 // Import Audio for a Voice Track
 //
-//   (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <qcheckbox.h>
 #include <qspinbox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QKeyEvent>
 
 #include <rdrecording.h>
 #include <rddeck.h>

rdlogedit/list_reports.cpp

@@ -2,7 +2,7 @@
 //
 // List and Generate Log Reports
 //
-//   (C) Copyright 2002-2006,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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 <qmessagebox.h>
-//Added by qt3to4:
-#include <QLabel>
 
 #include <rdconf.h>
 #include <rddatedialog.h>
@@ -34,8 +32,10 @@ ListReports::ListReports(const QString &logname,const QString &description,
 			 const QString service_name,const QDate &start_date,
 			 const QDate &end_date,bool auto_refresh,
 			 RDLogEvent *events,QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
+  setModal(true);
+
   list_log_name=logname;
   list_description=description;
   list_service_name=service_name;

rdlogedit/list_reports.h

@@ -2,7 +2,7 @@
 //
 // List and Generate Log Reports
 //
-//   (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,7 +24,6 @@
 #include <qdialog.h>
 #include <q3datetimeedit.h>
 #include <qcombobox.h>
-#include <qsqldatabase.h>
 
 #include <rdlog.h>
 #include <rdlog_event.h>

rdlogedit/rdlogedit.cpp

@@ -39,10 +39,7 @@
 #include <qsettings.h>
 #include <qpixmap.h>
 #include <qpainter.h>
-//Added by qt3to4:
-#include <QResizeEvent>
 
-#include <dbversion.h>
 #include <rd.h>
 #include <rdadd_log.h>
 #include <rdapplication.h>
@@ -78,25 +75,6 @@
 //
 RDCartDialog *log_cart_dialog;
 bool import_running=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);
-    }
-    import_running=false;
-    signal(SIGCHLD,SigHandler);
-    return;
-  }
-}
-#endif  // WIN32
-
 
 MainWidget::MainWidget(QWidget *parent)
   :Q3MainWindow(parent)
@@ -168,7 +146,7 @@ MainWidget::MainWidget(QWidget *parent)
   // Create Icons
   //
   log_rivendell_map=new QPixmap(rdlogedit_22x22_xpm);
-  setIcon(*log_rivendell_map);
+  setWindowIcon(*log_rivendell_map);
   log_greencheckmark_map=new QPixmap(greencheckmark_xpm);
   log_redx_map=new QPixmap(redx_xpm);
   log_whiteball_map=new QPixmap(whiteball_xpm);
@@ -289,13 +267,8 @@ MainWidget::MainWidget(QWidget *parent)
 
 #ifdef WIN32
   RefreshList();
-#else
-  // 
-  // Setup Signal Handling 
-  //
-  ::signal(SIGCHLD,SigHandler);
 #endif  // WIN32
-  setCaption(QString("RDLogEdit")+"v"+VERSION+" - "+tr("Host")+": "+
+  setWindowTitle(QString("RDLogEdit")+"v"+VERSION+" - "+tr("Host")+": "+
 	     rda->config()->stationName()+", "+
 	     tr("User")+": ["+tr("Unknown")+"]");
 

rdlogedit/rdlogedit.h

@@ -33,8 +33,6 @@
 #include <qpixmap.h>
 #include <qcombobox.h>
 #include <qlabel.h>
-//Added by qt3to4:
-#include <QResizeEvent>
 
 #include <rdlog_line.h>
 #include <rdlogfilter.h>

rdlogedit/rdlogedit_cs.ts

@@ -385,7 +385,7 @@ jež jsou pro vybranou službu zakázány!</translation>
     </message>
     <message>
         <source>Run Length</source>
-        <translation>Délka běhu</translation>
+        <translation type="unfinished">Délka běhu</translation>
     </message>
     <message>
         <source>Selected:</source>

rdlogedit/rdlogedit_de.ts

@@ -385,7 +385,7 @@ die für den gewählten Service ungültig sind!</translation>
     </message>
     <message>
         <source>Run Length</source>
-        <translation>Laufzeit</translation>
+        <translation type="unfinished">Laufzeit</translation>
     </message>
     <message>
         <source>Selected:</source>

rdlogedit/rdlogedit_es.ts

@@ -385,7 +385,7 @@ desactivados para el servicio actual!
     </message>
     <message>
         <source>Run Length</source>
-        <translation>Durac. total</translation>
+        <translation type="unfinished">Durac. total</translation>
     </message>
     <message>
         <source>Selected:</source>

rdlogedit/rdlogedit_fr.ts

@@ -309,10 +309,6 @@ for the selected service!</source>
         <source>Log End:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Run Length</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Selected:</source>
         <translation type="unfinished"></translation>
@@ -417,6 +413,10 @@ for the selected service!</source>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Run Length</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditLogLine</name>

rdlogedit/rdlogedit_nb.ts

@@ -390,10 +390,6 @@ skrudd av for denne tenesta!</translation>
         <source>Select</source>
         <translation type="unfinished">Vel</translation>
     </message>
-    <message>
-        <source>Run Length</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Next Stop:</source>
         <translation type="unfinished"></translation>
@@ -502,6 +498,10 @@ skrudd av for denne tenesta!</translation>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Run Length</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditLogLine</name>

rdlogedit/rdlogedit_nn.ts

@@ -390,10 +390,6 @@ skrudd av for denne tenesta!</translation>
         <source>Select</source>
         <translation type="unfinished">Vel</translation>
     </message>
-    <message>
-        <source>Run Length</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Next Stop:</source>
         <translation type="unfinished"></translation>
@@ -502,6 +498,10 @@ skrudd av for denne tenesta!</translation>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Run Length</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditLogLine</name>

rdlogedit/rdlogedit_pt_BR.ts

@@ -160,7 +160,7 @@ Ação se Evento anterior estiver sendo executado</translation>
     </message>
     <message>
         <source>Run Length</source>
-        <translation>Duração </translation>
+        <translation type="unfinished">Duração </translation>
     </message>
     <message>
         <source>Next Stop:</source>

rdlogedit/render_dialog.cpp

@@ -28,10 +28,6 @@
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
-#include <QCloseEvent>
-#include <QResizeEvent>
-#include <QLabel>
 
 #include <rd.h>
 #include <rdconf.h>
@@ -45,6 +41,8 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
 
   : QDialog(parent)
 {
+  setModal(true);
+
   render_station=station;
   render_system=system;
   render_config=config;
@@ -52,7 +50,7 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
   render_first_line=0;
   render_last_line=0;
 
-  setCaption("RDLogEdit - "+tr("Render Log"));
+  setWindowTitle("RDLogEdit - "+tr("Render Log"));
 
   QFont button_font("helvetica",12,QFont::Bold);
   button_font.setPixelSize(12);

rdlogedit/render_dialog.h

@@ -2,7 +2,7 @@
 //
 // Log Rendering Dialog for Rivendell.
 //
-//   (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2017-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,9 +28,6 @@
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <q3progressdialog.h>
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QCloseEvent>
 
 #include <rdbusybar.h>
 #include <rdconfig.h>
@@ -46,7 +43,6 @@
 #define IMPORT_BAR_INTERVAL 500
 #define IMPORT_TEMP_BASENAME "rdlib"
 
-
 class RenderDialog : public QDialog
 {
  Q_OBJECT

rdlogedit/voice_tracker.cpp

@@ -27,15 +27,6 @@
 #include <qmessagebox.h>
 #include <qdatetime.h>
 #include <qapplication.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QWheelEvent>
-#include <QPixmap>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <Q3PointArray>
-#include <QPaintEvent>
-#include <Q3PopupMenu>
 
 #include <rdapplication.h>
 #include <rdconf.h>
@@ -66,12 +57,12 @@
 #include "../icons/traffic.xpm"
 #include "../icons/mic16.xpm"
 
-
 VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
 			   QWidget *parent)
-  : QDialog(parent,"",true)
+  : QDialog(parent)
 {
   setAttribute(Qt::WA_PaintOutsidePaintEvent);
+  setModal(true);
 
   edit_log_name=logname;
   edit_import_path=import_path;
@@ -111,7 +102,7 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path,
   setMaximumWidth(sizeHint().width());
   setMaximumHeight(sizeHint().height());
 
-  setCaption(tr("Voice Tracker"));
+  setWindowTitle("RDLogEdit - "+tr("Voice Tracker"));
 
   //
   // Create Fonts

rdlogedit/voice_tracker.h

@@ -2,7 +2,7 @@
 //
 // A Rivendell Voice Tracker
 //
-//   (C) Copyright 2002-2006,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
 //
 //   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,11 +33,6 @@
 #include <qtimer.h>
 #include <qcursor.h>
 #include <q3popupmenu.h>
-//Added by qt3to4:
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QWheelEvent>
 
 #include <rdcart.h>
 #include <rdcut.h>