Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-22 08:35:44 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed style inconsistencies in dialogs within rdgpimon(1).
	* Fixed style inconsistencies in dialogs within rdpopup(1).
This commit is contained in:
Fred Gleason
2018-08-16 14:55:56 +00:00
parent 075d07d9bb
commit bd45c2ef77
7 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -17435,3 +17435,6 @@
2018-08-15 Fred Gleason <fredg@paravelsystems.com> 2018-08-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rddbmgr(8) that caused unreliable calculation of * Fixed a bug in rddbmgr(8) that caused unreliable calculation of
the correct schema version from a package version string. the correct schema version from a package version string.
2018-08-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed style inconsistencies in dialogs within rdgpimon(1).
* Fixed style inconsistencies in dialogs within rdpopup(1).

6
utils/rdgpimon/gpi_label.cpp
View File

@@ -2,7 +2,7 @@
// //
// A Qt-based application for testing general purpose input (GPI) devices. // A Qt-based application for testing general purpose input (GPI) devices.
// //
// (C) Copyright 2002-2007,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 // 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 // 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. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <gpi_label.h> #include <gpi_label.h>
//Added by qt3to4:
#include <QLabel>
GpiLabel::GpiLabel(QWidget *parent) GpiLabel::GpiLabel(QWidget *parent)
: QWidget(parent) : QWidget(parent)

2
utils/rdgpimon/gpi_label.h
View File

@@ -2,7 +2,7 @@
// //
// A Qt-based application for testing general purpose input (GPI) devices. // A Qt-based application for testing general purpose input (GPI) devices.
// //
// (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 // 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 // it under the terms of the GNU General Public License version 2 as

9
utils/rdgpimon/rdgpimon.cpp
View File

@@ -2,7 +2,7 @@
// //
// A Qt-based application for testing General Purpose Input (GPI) devices. // A Qt-based application for testing General Purpose Input (GPI) devices.
// //
// (C) Copyright 2002-2014,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 // 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 // it under the terms of the GNU General Public License version 2 as
@@ -32,9 +32,6 @@
#include <qlineedit.h> #include <qlineedit.h>
#include <qtextcodec.h> #include <qtextcodec.h>
#include <qtranslator.h> #include <qtranslator.h>
//Added by qt3to4:
#include <QLabel>
#include <QPixmap>
#include <rdapplication.h> #include <rdapplication.h>
#include <rddb.h> #include <rddb.h>
@@ -103,7 +100,7 @@ MainWidget::MainWidget(QWidget *parent)
// Create And Set Icon // Create And Set Icon
// //
gpi_rivendell_map=new QPixmap(rivendell_22x22_xpm); gpi_rivendell_map=new QPixmap(rivendell_22x22_xpm);
setIcon(*gpi_rivendell_map); setWindowIcon(*gpi_rivendell_map);
// //
// RIPC Connection // RIPC Connection
@@ -313,7 +310,7 @@ void MainWidget::userData()
QString str; QString str;
str=QString("RDGpiMon")+" v"+VERSION+" - "+tr("User")+":"; str=QString("RDGpiMon")+" v"+VERSION+" - "+tr("User")+":";
setCaption(str+" "+rda->ripc()->user()); setWindowTitle(str+" "+rda->ripc()->user());
} }

2
utils/rdgpimon/rdgpimon.h
View File

@@ -2,7 +2,7 @@
// //
// A Qt-based application for testing general purpose input (GPI) devices. // A Qt-based application for testing general purpose input (GPI) devices.
// //
// (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 // 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 // it under the terms of the GNU General Public License version 2 as

11
utils/rdpopup/rdpopup.cpp
View File

@@ -2,7 +2,7 @@
// //
// A utility for displaying messages on the desktop // A utility for displaying messages on the desktop
// //
// (C) Copyright 2009,2016-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2009-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@@ -32,6 +32,11 @@
#include <rdpopup.h> #include <rdpopup.h>
//
// Icons
//
#include "../icons/rivendell-22x22.xpm"
QString WordWrap(const QString &str) QString WordWrap(const QString &str)
{ {
QString ret; QString ret;
@@ -85,6 +90,7 @@ int main(int argc,char *argv[])
QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime()); QDateTime dt=QDateTime(QDate::currentDate(),QTime::currentTime());
QString msg=WordWrap(argv[argc-1]); QString msg=WordWrap(argv[argc-1]);
QMessageBox *mb; QMessageBox *mb;
switch(prio) { switch(prio) {
case 1: case 1:
mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg, mb=new QMessageBox(dt.toString("MM/dd @ hh:mm"),msg,
@@ -112,7 +118,8 @@ int main(int argc,char *argv[])
QMessageBox::NoButton); QMessageBox::NoButton);
break; break;
} }
QFont font("hevetica",16,QFont::Bold); mb->setWindowIcon(QPixmap(rivendell_22x22_xpm));
QFont font("helvetica",16,QFont::Bold);
font.setPixelSize(16); font.setPixelSize(16);
mb->setFont(font); mb->setFont(font);
mb->exec(); mb->exec();

2
utils/rdpopup/rdpopup.h
View File

@@ -2,7 +2,7 @@
// //
// A utility for displaying messages on the desktop // A utility for displaying messages on the desktop
// //
// (C) Copyright 2009,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2009-2018 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as