From e6ea8a59d07f453cb63bb824b6c182f30d6474b4 Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paraelsystems.com>
Date: Wed, 15 Aug 2018 20:26:59 +0000
Subject: [PATCH] 2018-08-15 Fred Gleason <fredg@paravelsystems.com> 	*
 Fixed style inconsistencies in dialogs within rddgimport(1).

---
 ChangeLog                       |  2 ++
 utils/rddgimport/event.cpp      |  4 ++--
 utils/rddgimport/event.h        |  2 +-
 utils/rddgimport/rddgimport.cpp | 19 +++++++++++++------
 utils/rddgimport/rddgimport.h   |  4 +---
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35d3f7d0..20a4f6d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17430,3 +17430,5 @@
 	* Fixed style inconsistencies in dialogs within rdalsaconfig(8).
 2018-08-15 Fred Gleason <fredg@paravelsystems.com>
 	* Remved 'rdcheckcuts.pro'.
+2018-08-15 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed style inconsistencies in dialogs within rddgimport(1).
diff --git a/utils/rddgimport/event.cpp b/utils/rddgimport/event.cpp
index eb1fe735..4085e974 100644
--- a/utils/rddgimport/event.cpp
+++ b/utils/rddgimport/event.cpp
@@ -2,7 +2,7 @@
 //
 // Abstract a Dial Global Spot Event
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-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
@@ -18,7 +18,7 @@
 //   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include <event.h>
+#include "event.h"
 
 Event::Event()
 {
diff --git a/utils/rddgimport/event.h b/utils/rddgimport/event.h
index 82032711..5ed6d5ae 100644
--- a/utils/rddgimport/event.h
+++ b/utils/rddgimport/event.h
@@ -2,7 +2,7 @@
 //
 // Abstract a Dial Global Spot Event
 //
-//   (C) Copyright 2012,2016 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-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
diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp
index edf6b735..4a3d23f2 100644
--- a/utils/rddgimport/rddgimport.cpp
+++ b/utils/rddgimport/rddgimport.cpp
@@ -2,7 +2,7 @@
 //
 // A Qt-based application for importing Dial Global CDN downloads
 //
-//   (C) Copyright 2012,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-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
@@ -27,12 +27,9 @@
 #include <qtextcodec.h>
 #include <q3filedialog.h>
 #include <qmessagebox.h>
+#include <qtranslator.h>
 #include <qstringlist.h>
 #include <qfile.h>
-//Added by qt3to4:
-#include <QTranslator>
-#include <QLabel>
-#include <QResizeEvent>
 
 #include <rdapplication.h>
 #include <rdaudioimport.h>
@@ -46,6 +43,11 @@
 
 #include "rddgimport.h"
 
+//
+// Icons
+//
+#include "../../icons/rivendell-22x22.xpm"
+
 MainWidget::MainWidget(QWidget *parent)
   : QWidget(parent)
 {
@@ -56,6 +58,11 @@ MainWidget::MainWidget(QWidget *parent)
   dg_group=NULL;
   dg_svc=NULL;
 
+  //
+  // Create And Set Icon
+  //
+  setWindowIcon(QPixmap(rivendell_22x22_xpm));
+
   //
   // Open the Database
   //
@@ -290,7 +297,7 @@ void MainWidget::SetCaption()
 {
   QString username=tr("[unknown]");
   username=rda->user()->name();
-  setCaption(tr("RDDgImport")+" v"+VERSION+" "+tr("User")+": "+username);
+  setWindowTitle(tr("RDDgImport")+" v"+VERSION+" "+tr("User")+": "+username);
 }
 
 
diff --git a/utils/rddgimport/rddgimport.h b/utils/rddgimport/rddgimport.h
index 8c087c92..8309e30c 100644
--- a/utils/rddgimport/rddgimport.h
+++ b/utils/rddgimport/rddgimport.h
@@ -2,7 +2,7 @@
 //
 // A Qt-based application for importing Dial Global CDN downloads
 //
-//   (C) Copyright 2012,2016-2018 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2012-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
@@ -34,8 +34,6 @@
 #include <qdatetime.h>
 #include <q3datetimeedit.h>
 #include <q3textedit.h>
-//Added by qt3to4:
-#include <QResizeEvent>
 
 #include <rdbusybar.h>
 #include <rddb.h>