diff --git a/ChangeLog b/ChangeLog index 38c8cf9e..6a43435a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17411,3 +17411,5 @@ 2018-08-15 Fred Gleason * Fixed a regression that caused Sound Panel buttons to lose their border. +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdselect(8). diff --git a/rdselect/rdselect.cpp b/rdselect/rdselect.cpp index 04b05a35..8b157e25 100644 --- a/rdselect/rdselect.cpp +++ b/rdselect/rdselect.cpp @@ -2,7 +2,7 @@ // // System Selector for Rivendell // -// (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 @@ -34,9 +34,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -122,8 +119,8 @@ MainWidget::MainWidget(QWidget *parent) // Create And Set Icons // login_rivendell_map=new QPixmap(rivendell_22x22_xpm); - setIcon(*login_rivendell_map); - setCaption(tr("RDSelect")+" v"+VERSION); + setWindowIcon(*login_rivendell_map); + setWindowTitle(QString("RDSelect - v")+VERSION); greencheckmark_map=new QPixmap(greencheckmark_xpm); redx_map=new QPixmap(redx_xpm); diff --git a/rdselect/rdselect.h b/rdselect/rdselect.h index 6076f426..cbab3c04 100644 --- a/rdselect/rdselect.h +++ b/rdselect/rdselect.h @@ -2,7 +2,7 @@ // // System Selector for Rivendell // -// (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 @@ -31,8 +31,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -74,4 +72,4 @@ class MainWidget : public QWidget }; -#endif // RDLOGIN_H +#endif // RDSELECT_H