Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-26 14:32:04 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified rdmonitor(1) to use QProcess to spawn rdselect(1).
This commit is contained in:
Fred Gleason 2018-10-22 21:37:39 -04:00
parent 15c0449489
commit f0803c2080
9 changed files with 139 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17880,3 +17880,5 @@
2018-10-22 Fred Gleason <fredg@paravelsystems.com> 2018-10-22 Fred Gleason <fredg@paravelsystems.com>
* Fixed a ''qt_sql_default_connection' is still in use' runtime * Fixed a ''qt_sql_default_connection' is still in use' runtime
warning emitted by the 'RDDbValid()' function. warning emitted by the 'RDDbValid()' function.
2018-10-22 Fred Gleason <fredg@paravelsystems.com>
* Modified rdmonitor(1) to use QProcess to spawn rdselect(1).

49
rdmonitor/rdmonitor.cpp
View File

@ -23,29 +23,24 @@
#include <unistd.h> #include <unistd.h>
#include <qapplication.h> #include <qapplication.h>
#include <qpainter.h>
#include <qsqldatabase.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qtextcodec.h>
#include <qtranslator.h>
#include <qpainter.h>
#include <q3process.h>
#include <qdir.h> #include <qdir.h>
#include <qsignalmapper.h> #include <qlabel.h>
#include <qmessagebox.h>
#include <qpainter.h>
#include <qprocess.h>
#include <qsqldatabase.h> #include <qsqldatabase.h>
#include <qstringlist.h>
#include <qtranslator.h>
#include <dbversion.h> #include <dbversion.h>
#include <rd.h> #include <rd.h>
#include <rdcmd_switch.h>
#include <rdaudioinfo.h> #include <rdaudioinfo.h>
#include <rdstation.h> #include <rdcmd_switch.h>
#include <rdcut.h>
#include <rdstatus.h>
#include <rdmonitor_config.h> #include <rdmonitor_config.h>
#include <rdstation.h>
#include <rdstatus.h>
#include <rdmonitor.h> #include "rdmonitor.h"
// //
// Icons // Icons
@ -217,8 +212,28 @@ void MainWidget::mouseDoubleClickEvent(QMouseEvent *e)
dir.setFilter(QDir::Files|QDir::Readable); dir.setFilter(QDir::Files|QDir::Readable);
dir.setNameFilter("*.conf"); dir.setNameFilter("*.conf");
if(dir.entryList().size()>1) { if(dir.entryList().size()>1) {
system(QString().sprintf("rdselect -geometry +%d+%d", QProcess *proc=new QProcess(this);
mon_rdselect_x,mon_rdselect_y)); QStringList args;
args.push_back("-geometry");
args.push_back(QString().sprintf("+%d+%d",mon_rdselect_x,mon_rdselect_y));
proc->start("rdselect",args);
proc->waitForFinished(-1);
if(proc->exitStatus()!=QProcess::NormalExit) {
QMessageBox::critical(this,"RDMonitor - "+tr("Error"),
tr("RDSelect crashed!"));
delete proc;
return;
}
if(proc->exitCode()!=0) {
QMessageBox::critical(this,"RDMonitor - "+tr("Error"),
tr("RDSelect returned non-zero exit code")+
QString().sprintf(" %d.",proc->exitCode())+
"\n\nERROR MESSAGE:\n"+
proc->readAllStandardError());
delete proc;
return;
}
delete proc;
validate(); validate();
} }
} }

15
rdmonitor/rdmonitor_cs.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_de.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_es.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_fr.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_nb.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_nn.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>

15
rdmonitor/rdmonitor_pt_BR.ts
View File

@ -1,6 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS> <!DOCTYPE TS>
<TS version="2.0"> <TS version="2.0">
<context>
<name>MainWidget</name>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect crashed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>RDSelect returned non-zero exit code</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>