diff --git a/ChangeLog b/ChangeLog index 5b416e31..818a12b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17435,3 +17435,6 @@ 2018-08-15 Fred Gleason * Fixed a bug in rddbmgr(8) that caused unreliable calculation of the correct schema version from a package version string. +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdgpimon(1). + * Fixed style inconsistencies in dialogs within rdpopup(1). diff --git a/utils/rdgpimon/gpi_label.cpp b/utils/rdgpimon/gpi_label.cpp index 2aaa6523..faea128e 100644 --- a/utils/rdgpimon/gpi_label.cpp +++ b/utils/rdgpimon/gpi_label.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (C) Copyright 2002-2007,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,11 +18,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // - #include -//Added by qt3to4: -#include - GpiLabel::GpiLabel(QWidget *parent) : QWidget(parent) diff --git a/utils/rdgpimon/gpi_label.h b/utils/rdgpimon/gpi_label.h index 4e074f27..c8c71fc0 100644 --- a/utils/rdgpimon/gpi_label.h +++ b/utils/rdgpimon/gpi_label.h @@ -2,7 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (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/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index db2081c9..ad68f2c7 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -2,7 +2,7 @@ // // A Qt-based application for testing General Purpose Input (GPI) devices. // -// (C) Copyright 2002-2014,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,9 +32,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -103,7 +100,7 @@ MainWidget::MainWidget(QWidget *parent) // Create And Set Icon // gpi_rivendell_map=new QPixmap(rivendell_22x22_xpm); - setIcon(*gpi_rivendell_map); + setWindowIcon(*gpi_rivendell_map); // // RIPC Connection @@ -313,7 +310,7 @@ void MainWidget::userData() QString str; str=QString("RDGpiMon")+" v"+VERSION+" - "+tr("User")+":"; - setCaption(str+" "+rda->ripc()->user()); + setWindowTitle(str+" "+rda->ripc()->user()); } diff --git a/utils/rdgpimon/rdgpimon.h b/utils/rdgpimon/rdgpimon.h index 1abc0c0f..c5c02e36 100644 --- a/utils/rdgpimon/rdgpimon.h +++ b/utils/rdgpimon/rdgpimon.h @@ -2,7 +2,7 @@ // // A Qt-based application for testing general purpose input (GPI) devices. // -// (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 diff --git a/utils/rdpopup/rdpopup.cpp b/utils/rdpopup/rdpopup.cpp index b14de084..15f20054 100644 --- a/utils/rdpopup/rdpopup.cpp +++ b/utils/rdpopup/rdpopup.cpp @@ -2,7 +2,7 @@ // // A utility for displaying messages on the desktop // -// (C) Copyright 2009,2016-2018 Fred Gleason +// (C) Copyright 2009-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,6 +32,11 @@ #include +// +// Icons +// +#include "../icons/rivendell-22x22.xpm" + QString WordWrap(const QString &str) { QString ret; @@ -85,34 +90,36 @@ int main(int argc,char *argv[]) QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime()); QString msg=WordWrap(argv[argc-1]); QMessageBox *mb; + switch(prio) { - case 1: - mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, - QMessageBox::Information, - QMessageBox::Ok,QMessageBox:: - NoButton,QMessageBox::NoButton); - break; + case 1: + mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, + QMessageBox::Information, + QMessageBox::Ok,QMessageBox:: + NoButton,QMessageBox::NoButton); + break; - case 2: - mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, - QMessageBox::Warning,QMessageBox::Ok, - QMessageBox::NoButton,QMessageBox::NoButton); - break; + case 2: + mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, + QMessageBox::Warning,QMessageBox::Ok, + QMessageBox::NoButton,QMessageBox::NoButton); + break; - case 3: - mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, - QMessageBox::Critical,QMessageBox::Ok, - QMessageBox::NoButton,QMessageBox::NoButton); - break; + case 3: + mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, + QMessageBox::Critical,QMessageBox::Ok, + QMessageBox::NoButton,QMessageBox::NoButton); + break; - default: - mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, - QMessageBox::Information, - QMessageBox::Ok,QMessageBox::NoButton, - QMessageBox::NoButton); - break; + default: + mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, + QMessageBox::Information, + QMessageBox::Ok,QMessageBox::NoButton, + QMessageBox::NoButton); + break; } - QFont font("hevetica",16,QFont::Bold); + mb->setWindowIcon(QPixmap(rivendell_22x22_xpm)); + QFont font("helvetica",16,QFont::Bold); font.setPixelSize(16); mb->setFont(font); mb->exec(); diff --git a/utils/rdpopup/rdpopup.h b/utils/rdpopup/rdpopup.h index e1c9c38d..1c388569 100644 --- a/utils/rdpopup/rdpopup.h +++ b/utils/rdpopup/rdpopup.h @@ -2,7 +2,7 @@ // // A utility for displaying messages on the desktop // -// (C) Copyright 2009,2016 Fred Gleason +// (C) Copyright 2009-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