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

2019-10-07 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored rdsoftkeys(1) to use the 'RDDialog' and 'RDWidget'
	base classes.
This commit is contained in:
Fred Gleason
2019-10-07 14:20:29 -04:00
parent 93e40d43df
commit d4bfe38f85
3 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -19175,3 +19175,6 @@
2019-10-07 Fred Gleason <fredg@paravelsystems.com> 2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Refactored rdpopup(1) to use the 'RDDialog' and 'RDWidget' * Refactored rdpopup(1) to use the 'RDDialog' and 'RDWidget'
base classes. base classes.
2019-10-07 Fred Gleason <fredg@paravelsystems.com>
* Refactored rdsoftkeys(1) to use the 'RDDialog' and 'RDWidget'
base classes.

32
utils/rdsoftkeys/rdsoftkeys.cpp
View File

@@ -2,7 +2,7 @@
// //
// A utility for sending RML Commands // A utility for sending RML Commands
// //
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2019 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,29 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <stdlib.h>
#include <netdb.h> #include <netdb.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <qtranslator.h>
#include <qapplication.h> #include <qapplication.h>
#include <qwindowsstyle.h>
#include <qtextcodec.h>
#include <qsignalmapper.h>
#include <qpushbutton.h>
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qsettings.h>
#include <QCloseEvent>
#include <QPixmap>
#include <rdprofile.h> #include <rdprofile.h>
#include <rd.h> #include <qpushbutton.h>
#include <rdcmd_switch.h> #include <qsignalmapper.h>
#include <rdconfig.h> #include <qtranslator.h>
#include <rdsoftkeys.h> #include "rdsoftkeys.h"
// //
// Icons // Icons
@@ -48,7 +36,7 @@
#include "../icons/rivendell-22x22.xpm" #include "../icons/rivendell-22x22.xpm"
MainWidget::MainWidget(QWidget *parent) MainWidget::MainWidget(QWidget *parent)
: QWidget(parent) : RDWidget(parent)
{ {
key_ysize=70; key_ysize=70;
@@ -67,14 +55,6 @@ MainWidget::MainWidget(QWidget *parent)
} }
delete cmd; delete cmd;
//
// Generate Font
//
QFont font("Helvetica",12,QFont::Bold);
font.setPixelSize(12);
QFont label_font("Helvetica",18,QFont::Bold);
label_font.setPixelSize(18);
setWindowTitle(QString("RDSoftKeys")+" v"+VERSION); setWindowTitle(QString("RDSoftKeys")+" v"+VERSION);
// //

12
utils/rdsoftkeys/rdsoftkeys.h
View File

@@ -2,7 +2,7 @@
// //
// A utility for sending RML Commands // A utility for sending RML Commands
// //
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2019 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
@@ -21,15 +21,9 @@
#ifndef RDSOFTKEYS_H #ifndef RDSOFTKEYS_H
#define RDSOFTKEYS_H #define RDSOFTKEYS_H
#include <vector>
#include <qsize.h>
#include <qsizepolicy.h>
#include <qpixmap.h>
#include <q3socketdevice.h> #include <q3socketdevice.h>
#include <qwidget.h>
#include <rdmacro.h> #include <rdwidget.h>
// //
// Settings // Settings
@@ -37,7 +31,7 @@
#define RDSOFTKEYS_USAGE "[--map-file=<filename>]\n\nWhere <filename> is the name of the file load soft key definitions from.\nThe default value is master Rivendell configuration file.\n" #define RDSOFTKEYS_USAGE "[--map-file=<filename>]\n\nWhere <filename> is the name of the file load soft key definitions from.\nThe default value is master Rivendell configuration file.\n"
#define RDSOFTKEYS_DEFAULT_COLUMNS 1 #define RDSOFTKEYS_DEFAULT_COLUMNS 1
class MainWidget : public QWidget class MainWidget : public RDWidget
{ {
Q_OBJECT Q_OBJECT
public: public: