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

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

ChangeLog

@@ -17400,3 +17400,5 @@
 	* Rebased rdlogedit(1)'s main window to QWidget.
 2018-08-14 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed style inconsistencies in dialogs within rdlibrary(1).
+2018-08-14 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed style inconsistencies in dialogs within rdlogin(1).

rdlogin/rdlogin.cpp

@@ -2,7 +2,7 @@
 //
 // The User Login/Logout Utility for Rivendell.
 //
-//   (C) Copyright 2002-2008,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,24 +21,11 @@
 #include <stdlib.h>
 
 #include <qapplication.h>
-#include <qwindowsstyle.h>
-#include <qpainter.h>
-#include <qsqldatabase.h>
 #include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
-#include <qtextcodec.h>
 #include <qtranslator.h>
-//Added by qt3to4:
-#include <QResizeEvent>
-#include <QPixmap>
 
-#include <dbversion.h>
-#include <rd.h>
 #include <rdapplication.h>
-#include <rdcmd_switch.h>
 #include <rddb.h>
-#include <rddbheartbeat.h>
 
 #include "rdlogin.h"
 
@@ -84,7 +71,7 @@ MainWidget::MainWidget(QWidget *parent)
   // Create And Set Icon
   //
   login_rivendell_map=new QPixmap(rivendell_22x22_xpm);
-  setIcon(*login_rivendell_map);
+  setWindowIcon(*login_rivendell_map);
 
   rda=new RDApplication("RDLogin","rdlogin",RDLOGIN_USAGE,this);
   if(!rda->open(&err_msg)) {
@@ -104,8 +91,7 @@ MainWidget::MainWidget(QWidget *parent)
     }
   }
 
-  str=QString(tr("RDLogin - Station:"));
+  setWindowTitle("RDLogin");
-  setCaption(str+" "+rda->config()->stationName());
 
   //
   // RIPC Connection

rdlogin/rdlogin.h

@@ -2,7 +2,7 @@
 //
 // The User Login/Logout Utility for Rivendell.
 //
-//   (C) Copyright 2002-2005,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,17 +21,11 @@
 #ifndef RDLOGIN_H
 #define RDLOGIN_H
 
-#include <qwidget.h>
-#include <qsize.h>
-#include <qsizepolicy.h>
-#include <qsqldatabase.h>
 #include <qcombobox.h>
-#include <qlineedit.h>
 #include <qlabel.h>
+#include <qlineedit.h>
 #include <qpushbutton.h>
-//Added by qt3to4:
+#include <qwidget.h>
-#include <QResizeEvent>
-#include <QPixmap>
 
 #define RDLOGIN_USAGE "\n"
 

rdlogin/rdlogin_cs.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - Stanice:</translation>
+        <translation type="obsolete">RDLogin - Stanice:</translation>
     </message>
     <message>
         <source>rdlogin : </source>

rdlogin/rdlogin_de.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - Station:</translation>
+        <translation type="obsolete">RDLogin - Station:</translation>
     </message>
     <message>
         <source>rdlogin : </source>

rdlogin/rdlogin_es.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - Estación:</translation>
+        <translation type="obsolete">RDLogin - Estación:</translation>
     </message>
     <message>
         <source>Can&apos;t Connect</source>

rdlogin/rdlogin_fr.ts

@@ -3,10 +3,6 @@
 <TS version="2.0">
 <context>
     <name>MainWidget</name>
-    <message>
-        <source>RDLogin - Station:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Current User: unknown</source>
         <translation type="unfinished"></translation>

rdlogin/rdlogin_nb.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - stasjon:</translation>
+        <translation type="obsolete">RDLogin - stasjon:</translation>
     </message>
     <message>
         <source>rdlogin : </source>

rdlogin/rdlogin_nn.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - stasjon:</translation>
+        <translation type="obsolete">RDLogin - stasjon:</translation>
     </message>
     <message>
         <source>rdlogin : </source>

rdlogin/rdlogin_pt_BR.ts

@@ -5,7 +5,7 @@
     <name>MainWidget</name>
     <message>
         <source>RDLogin - Station:</source>
-        <translation>RDLogin - Estação:</translation>
+        <translation type="obsolete">RDLogin - Estação:</translation>
     </message>
     <message>
         <source>rdlogin : </source>