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

2021-02-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Qt3Support library from the build system.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-23 18:07:21 -05:00
parent b2f8532e25
commit 89a0d72439
508 changed files with 5763 additions and 6078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdmonitor/Makefile.am
View File

@@ -18,7 +18,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -DQT3_SUPPORT -I/usr/include/Qt3Support
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -46,7 +46,7 @@ dist_rdmonitor_SOURCES = positiondialog.cpp positiondialog.h\
nodist_rdmonitor_SOURCES = moc_positiondialog.cpp\
moc_rdmonitor.cpp
rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@ -lQt3Support
rdmonitor_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
EXTRA_DIST = rdmonitor.pro\
rdmonitor_cs.ts\

24
rdmonitor/positiondialog.cpp
View File

@@ -2,7 +2,7 @@
//
// Dialog to set RDMonitor screen position.
//
// (C) Copyright 2013-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2013-2021 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
@@ -33,8 +33,7 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
// Screen Number
//
pos_screen_number_box=new QComboBox(this);
pos_screen_number_label=
new QLabel(pos_screen_number_box,tr("Screen")+":",this);
pos_screen_number_label=new QLabel(tr("Screen")+":",this);
pos_screen_number_label->setFont(labelFont());
pos_screen_number_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -42,13 +41,12 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
// Position
//
pos_position_box=new QComboBox(this);
pos_position_label=
new QLabel(pos_position_box,tr("Position")+":",this);
pos_position_label=new QLabel(tr("Position")+":",this);
pos_position_label->setFont(labelFont());
pos_position_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
for(int i=0;i<RDMonitorConfig::LastPosition;i++) {
pos_position_box->
insertItem(RDMonitorConfig::positionText((RDMonitorConfig::Position)i));
insertItem(i,RDMonitorConfig::positionText((RDMonitorConfig::Position)i));
}
//
@@ -56,7 +54,7 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
//
pos_x_offset_spin=new QSpinBox(this);
pos_x_offset_spin->setRange(0,99);
pos_x_offset_label=new QLabel(pos_x_offset_spin,tr("X Offset")+":",this);
pos_x_offset_label=new QLabel(tr("X Offset")+":",this);
pos_x_offset_label->setFont(labelFont());
pos_x_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -65,7 +63,7 @@ PositionDialog::PositionDialog(QDesktopWidget *dw,RDMonitorConfig *mconfig,
//
pos_y_offset_spin=new QSpinBox(this);
pos_y_offset_spin->setRange(0,99);
pos_y_offset_label=new QLabel(pos_y_offset_spin,tr("Y Offset")+":",this);
pos_y_offset_label=new QLabel(tr("Y Offset")+":",this);
pos_y_offset_label->setFont(labelFont());
pos_y_offset_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -104,12 +102,12 @@ int PositionDialog::exec()
{
pos_screen_number_box->clear();
for(int i=0;i<pos_desktop_widget->numScreens();i++) {
pos_screen_number_box->insertItem(QString().sprintf("%d",i));
pos_screen_number_box->insertItem(i,QString().sprintf("%d",i));
if(i==pos_config->screenNumber()) {
pos_screen_number_box->setCurrentItem(i);
pos_screen_number_box->setCurrentIndex(i);
}
}
pos_position_box->setCurrentItem((int)pos_config->position());
pos_position_box->setCurrentIndex((int)pos_config->position());
pos_x_offset_spin->setValue(pos_config->xOffset());
pos_y_offset_spin->setValue(pos_config->yOffset());
@@ -119,9 +117,9 @@ int PositionDialog::exec()
void PositionDialog::okData()
{
pos_config->setScreenNumber(pos_screen_number_box->currentItem());
pos_config->setScreenNumber(pos_screen_number_box->currentIndex());
pos_config->
setPosition((RDMonitorConfig::Position)pos_position_box->currentItem());
setPosition((RDMonitorConfig::Position)pos_position_box->currentIndex());
pos_config->setXOffset(pos_x_offset_spin->value());
pos_config->setYOffset(pos_y_offset_spin->value());

60
rdmonitor/rdmonitor.cpp
View File

@@ -2,7 +2,7 @@
//
// System Monitor for Rivendell
//
// (C) Copyright 2012-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2012-2021 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
@@ -20,12 +20,12 @@
#include <signal.h>
#include <qapplication.h>
#include <qdir.h>
#include <qmessagebox.h>
#include <qpainter.h>
#include <qprocess.h>
#include <qtranslator.h>
#include <QApplication>
#include <QDir>
#include <QMessageBox>
#include <QPainter>
#include <QProcess>
#include <QTranslator>
#include <dbversion.h>
#include <rdstatus.h>
@@ -50,7 +50,7 @@ void SigHandler(int signo)
}
MainWidget::MainWidget(RDConfig *c,QWidget *parent)
: RDWidget(c,parent,(Qt::WindowFlags)(Qt::WStyle_Customize|Qt::WStyle_NoBorder|Qt::WStyle_StaysOnTop))
: RDWidget(c,parent,Qt::CustomizeWindowHint|Qt::WindowStaysOnTopHint)
{
QString str;
mon_dialog_x=0;
@@ -77,7 +77,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
// Create And Set Icon
//
setIcon(QPixmap(rivendell_22x22_xpm));
setWindowIcon(QPixmap(rivendell_22x22_xpm));
//
// Dialogs
@@ -115,9 +115,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Status Label
//
mon_status_label=new QLabel(tr("Status: unknown"),NULL,
(Qt::WindowFlags)(Qt::WStyle_Customize|
Qt::WStyle_NoBorder|
Qt::WStyle_StaysOnTop));
Qt::CustomizeWindowHint|Qt::WindowStaysOnTopHint);
mon_status_label->setAlignment(Qt::AlignCenter|Qt::AlignVCenter);
mon_status_label->
setStyleSheet(QString("background-color:")+RD_STATUS_BACKGROUND_COLOR);
@@ -130,8 +128,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
connect(mon_validate_timer,SIGNAL(timeout()),this,SLOT(validate()));
mon_validate_timer->start(5000);
// mon_tooltip=new StatusTip(this);
mon_name_label->setText(mon_rdconfig->label());
SetPosition();
@@ -226,7 +222,9 @@ void MainWidget::mouseDoubleClickEvent(QMouseEvent *e)
e->accept();
QDir dir(RD_DEFAULT_RDSELECT_DIR);
dir.setFilter(QDir::Files|QDir::Readable);
dir.setNameFilter("*.conf");
QStringList filters;
filters.push_back("*.conf");
dir.setNameFilters(filters);
if(dir.entryList().size()>1) {
QProcess *proc=new QProcess(this);
QStringList args;
@@ -480,25 +478,24 @@ int main(int argc,char *argv[])
//
// Load Translations
//
QTranslator qt(0);
qt.load(QString("/usr/share/qt4/translations/qt_")+QTextCodec::locale(),
".");
a.installTranslator(&qt);
QString loc=RDApplication::locale();
if(!loc.isEmpty()) {
QTranslator qt(0);
qt.load(QString("/usr/share/qt4/translations/qt_")+loc,".");
a.installTranslator(&qt);
QTranslator rd(0);
rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+
QTextCodec::locale(),".");
a.installTranslator(&rd);
QTranslator rd(0);
rd.load(QString(PREFIX)+QString("/share/rivendell/librd_")+loc,".");
a.installTranslator(&rd);
QTranslator rdhpi(0);
rdhpi.load(QString(PREFIX)+QString("/share/rivendell/librdhpi_")+
QTextCodec::locale(),".");
a.installTranslator(&rdhpi);
QTranslator rdhpi(0);
rdhpi.load(QString(PREFIX)+QString("/share/rivendell/librdhpi_")+loc,".");
a.installTranslator(&rdhpi);
QTranslator tr(0);
tr.load(QString(PREFIX)+QString("/share/rivendell/rdmonitor_")+
QTextCodec::locale(),".");
a.installTranslator(&tr);
QTranslator tr(0);
tr.load(QString(PREFIX)+QString("/share/rivendell/rdmonitor_")+loc,".");
a.installTranslator(&tr);
}
//
// Start Event Loop
@@ -506,7 +503,6 @@ int main(int argc,char *argv[])
RDConfig *config=new RDConfig();
config->load();
MainWidget *w=new MainWidget(config);
a.setMainWidget(w);
w->show();
return a.exec();
}