Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 23:30:20 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Removed the 'pam_rd' plug-in.
	* Removed rdchunk(1).
	* Upgraded Qt3 to Qt4.
This commit is contained in:
Fred Gleason
2018-08-07 10:09:49 -04:00
parent 6b1a06a910
commit 796e1bebc3
774 changed files with 10347 additions and 10823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/rdgpimon/Makefile.am
View File

@@ -1,8 +1,6 @@
## automake.am
## Makefile.am
##
## Automake.am for rivendell/utils/rdgpimon
##
## (C) Copyright 2002-2006,2016 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2006,2016-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
@@ -19,8 +17,8 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib
LIBS = @QT_LIBS@ -L$(top_srcdir)/lib
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
# The dependency for qt's Meta Object Compiler (moc)
@@ -36,8 +34,8 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/rivendell/rdgpimon_*.qm
all:
@QT_BIN@/lupdate rdgpimon.pro
@QT_BIN@/lrelease rdgpimon.pro
lupdate-qt4 rdgpimon.pro
lrelease-qt4 rdgpimon.pro
bin_PROGRAMS = rdgpimon
@@ -47,7 +45,7 @@ dist_rdgpimon_SOURCES = gpi_label.cpp gpi_label.h\
nodist_rdgpimon_SOURCES = moc_gpi_label.cpp\
moc_rdgpimon.cpp
rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@
rdgpimon_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
EXTRA_DIST = rdgpimon.pro\
rdgpimon_cs.ts\

26
utils/rdgpimon/gpi_label.cpp
View File

@@ -20,6 +20,8 @@
#include <gpi_label.h>
//Added by qt3to4:
#include <QLabel>
GpiLabel::GpiLabel(QWidget *parent)
@@ -41,32 +43,32 @@ GpiLabel::GpiLabel(QWidget *parent)
gpi_line_label=new QLabel(this);
gpi_line_label->setGeometry(0,0,59,33);
gpi_line_label->setFont(line_font);
gpi_line_label->setAlignment(AlignHCenter|AlignVCenter);
gpi_line_label->setPalette(gray);
gpi_line_label->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
gpi_line_label->setPalette(Qt::gray);
//
// On Cart Label
//
QPalette p=palette();
p.setColor(QPalette::Active,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkGreen);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkGreen);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkGreen);
gpi_oncart_label=new QLabel(this);
gpi_oncart_label->setGeometry(0,33,59,16);
gpi_oncart_label->setFont(cart_font);
gpi_oncart_label->setAlignment(AlignHCenter|AlignTop);
gpi_oncart_label->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
gpi_oncart_label->setPalette(p);
//
// Off Cart Label
//
p.setColor(QPalette::Active,QColorGroup::Foreground,darkRed);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkRed);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkRed);
p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkRed);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkRed);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkRed);
gpi_offcart_label=new QLabel(this);
gpi_offcart_label->setGeometry(0,49,59,16);
gpi_offcart_label->setFont(cart_font);
gpi_offcart_label->setAlignment(AlignHCenter|AlignTop);
gpi_offcart_label->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
gpi_offcart_label->setPalette(p);
}
@@ -99,10 +101,10 @@ void GpiLabel::setLine(int line)
void GpiLabel::setState(bool state)
{
if(state) {
gpi_line_label->setPalette(green);
gpi_line_label->setPalette(Qt::green);
}
else {
gpi_line_label->setPalette(gray);
gpi_line_label->setPalette(Qt::gray);
}
}

34
utils/rdgpimon/rdgpimon.cpp
View File

@@ -32,6 +32,9 @@
#include <qlineedit.h>
#include <qtextcodec.h>
#include <qtranslator.h>
//Added by qt3to4:
#include <QLabel>
#include <QPixmap>
#include <rdapplication.h>
#include <rddb.h>
@@ -136,7 +139,7 @@ MainWidget::MainWidget(QWidget *parent)
QLabel *label=new QLabel(gpi_type_box,tr("Show:"),this);
label->setGeometry(20,10,55,21);
label->setFont(main_font);
label->setAlignment(AlignRight|AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(gpi_type_box,SIGNAL(activated(int)),
this,SLOT(matrixActivatedData(int)));
@@ -151,7 +154,7 @@ MainWidget::MainWidget(QWidget *parent)
label=new QLabel(gpi_matrix_box,tr("Matrix:"),this);
label->setGeometry(220,10,55,21);
label->setFont(main_font);
label->setAlignment(AlignRight|AlignVCenter);
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(gpi_matrix_box,SIGNAL(activated(int)),
this,SLOT(matrixActivatedData(int)));
@@ -191,20 +194,20 @@ MainWidget::MainWidget(QWidget *parent)
label=new QLabel(tr("Green = ON Cart"),this);
label->setGeometry(200,370,300,12);
label->setFont(main_font);
label->setAlignment(AlignLeft|AlignVCenter);
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
QPalette p=palette();
p.setColor(QPalette::Active,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkGreen);
p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkGreen);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkGreen);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkGreen);
label->setPalette(p);
label=new QLabel(tr("Red = OFF Cart"),this);
label->setGeometry(200,392,300,12);
label->setFont(main_font);
label->setAlignment(AlignLeft|AlignVCenter);
p.setColor(QPalette::Active,QColorGroup::Foreground,darkRed);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,darkRed);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,darkRed);
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
p.setColor(QPalette::Active,QColorGroup::Foreground,Qt::darkRed);
p.setColor(QPalette::Inactive,QColorGroup::Foreground,Qt::darkRed);
p.setColor(QPalette::Disabled,QColorGroup::Foreground,Qt::darkRed);
label->setPalette(p);
//
@@ -215,7 +218,7 @@ MainWidget::MainWidget(QWidget *parent)
label->setAlignment(Qt::AlignCenter);
label->setGeometry(110,423,sizeHint().width()-220,30);
gpi_events_date_edit=new QDateEdit(this);
gpi_events_date_edit=new Q3DateEdit(this);
gpi_events_date_edit->setGeometry(155,453,90,20);
gpi_events_date_edit->setDate(QDate::currentDate());
connect(gpi_events_date_edit,SIGNAL(valueChanged(const QDate &)),
@@ -241,7 +244,7 @@ MainWidget::MainWidget(QWidget *parent)
gpi_events_list->setFont(main_font);
gpi_events_list->setGeometry(110,480,sizeHint().width()-220,230);
gpi_events_list->setItemMargin(5);
gpi_events_list->setSelectionMode(QListView::NoSelection);
gpi_events_list->setSelectionMode(Q3ListView::NoSelection);
gpi_events_list->addColumn("Time");
gpi_events_list->setColumnAlignment(0,Qt::AlignHCenter);
@@ -265,13 +268,13 @@ MainWidget::MainWidget(QWidget *parent)
gpi_scroll_color.setColor(QPalette::Active,QColorGroup::Button,
Qt::blue);
gpi_scroll_color.setColor(QPalette::Active,QColorGroup::Background,
lightGray);
Qt::lightGray);
gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::ButtonText,
Qt::white);
gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::Button,
Qt::blue);
gpi_scroll_color.setColor(QPalette::Inactive,QColorGroup::Background,
lightGray);
Qt::lightGray);
gpi_events_report_button=new QPushButton(tr("Report"),this);
gpi_events_report_button->setGeometry(sizeHint().width()-100,570,80,50);
@@ -754,8 +757,7 @@ int main(int argc,char *argv[])
// Load Translations
//
QTranslator qt(0);
qt.load(QString(QTDIR)+QString("/translations/qt_")+QTextCodec::locale(),
".");
qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),".");
a.installTranslator(&qt);
QTranslator rd(0);

4
utils/rdgpimon/rdgpimon.h
View File

@@ -32,7 +32,7 @@
#include <qsqldatabase.h>
#include <qcombobox.h>
#include <qpixmap.h>
#include <qdatetimeedit.h>
#include <q3datetimeedit.h>
#include <qtimer.h>
#include <rdlistview.h>
@@ -89,7 +89,7 @@ class MainWidget : public QWidget
int gpi_first_line;
int gpi_last_line;
QLabel *gpi_events_date_label;
QDateEdit *gpi_events_date_edit;
Q3DateEdit *gpi_events_date_edit;
QLabel *gpi_events_state_label;
QComboBox *gpi_events_state_box;
QPushButton *gpi_events_scroll_button;

4
utils/rdgpimon/rdgpimon_cs.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_de.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_es.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_fr.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_nb.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_nn.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>

4
utils/rdgpimon/rdgpimon_pt_BR.ts
View File

@@ -1,4 +1,6 @@
<!DOCTYPE TS><TS>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<context>
<name>MainWidget</name>
<message>