Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-03 17:39:27 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Fixed style inconsistencies in dialogs within rdpanel(1).
This commit is contained in:
Fred Gleason 2018-08-15 14:24:51 +00:00
parent 1fe517c589
commit b53dcdd288
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17406,3 +17406,5 @@
* Fixed style inconsistencies in dialogs within rdlogmanager(1). * Fixed style inconsistencies in dialogs within rdlogmanager(1).
2018-08-15 Fred Gleason <fredg@paravelsystems.com> 2018-08-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed style inconsistencies in dialogs within rdmonitor(1). * Fixed style inconsistencies in dialogs within rdmonitor(1).
2018-08-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed style inconsistencies in dialogs within rdpanel(1).

2
rdpanel/globals.h
View File

@ -2,7 +2,7 @@
// //
// Global Variable Declarations for RDPanel // Global Variable Declarations for RDPanel
// //
// (C) Copyright 2002-2004,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

36
rdpanel/rdpanel.cpp
View File

@ -2,7 +2,7 @@
// //
// A Dedicated Cart Wall Utility for Rivendell. // A Dedicated Cart Wall Utility for Rivendell.
// //
// (C) Copyright 2002-2004,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
@ -22,7 +22,6 @@
#include <math.h> #include <math.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <signal.h>
#include <qmessagebox.h> #include <qmessagebox.h>
#include <qapplication.h> #include <qapplication.h>
@ -30,9 +29,6 @@
#include <qtranslator.h> #include <qtranslator.h>
#include <qtextcodec.h> #include <qtextcodec.h>
#include <qpainter.h> #include <qpainter.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QPixmap>
#include <dbversion.h> #include <dbversion.h>
#include <rd.h> #include <rd.h>
@ -54,23 +50,8 @@ RDCartDialog *panel_cart_dialog;
// //
#include "../icons/rdpanel-22x22.xpm" #include "../icons/rdpanel-22x22.xpm"
void SigHandler(int signo)
{
pid_t pLocalPid;
switch(signo) {
case SIGCHLD:
pLocalPid=waitpid(-1,NULL,WNOHANG);
while(pLocalPid>0) {
pLocalPid=waitpid(-1,NULL,WNOHANG);
}
signal(SIGCHLD,SigHandler);
return;
}
}
MainWidget::MainWidget(QWidget *parent) MainWidget::MainWidget(QWidget *parent)
:QWidget(parent) : QWidget(parent)
{ {
QPixmap *pm; QPixmap *pm;
QPainter *pd; QPainter *pd;
@ -96,7 +77,7 @@ MainWidget::MainWidget(QWidget *parent)
// Create Icons // Create Icons
// //
lib_rivendell_map=new QPixmap(rdpanel_22x22_xpm); lib_rivendell_map=new QPixmap(rdpanel_22x22_xpm);
setIcon(*lib_rivendell_map); setWindowIcon(*lib_rivendell_map);
// //
// Open the Database // Open the Database
@ -315,11 +296,6 @@ MainWidget::MainWidget(QWidget *parent)
} }
rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password()); rda->ripc()->connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
//
// Signal Handlers
//
signal(SIGCHLD,SigHandler);
} }
@ -402,9 +378,9 @@ void MainWidget::RunLocalMacros(RDMacro *rml)
void MainWidget::SetCaption() void MainWidget::SetCaption()
{ {
setCaption(QString("RDPanel")+" v"+VERSION+" - "+tr("Station")+": "+ setWindowTitle(QString("RDPanel")+" v"+VERSION+" - "+tr("Station")+": "+
rda->config()->stationName()+", "+tr("User")+": "+ rda->config()->stationName()+", "+tr("User")+": "+
rda->ripc()->user()); rda->ripc()->user());
} }

4
rdpanel/rdpanel.h
View File

@ -2,7 +2,7 @@
// //
// A Dedicated Cart Wall Utility for Rivendell. // A Dedicated Cart Wall Utility for Rivendell.
// //
// (C) Copyright 2002-2004,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
@ -24,8 +24,6 @@
#include <qwidget.h> #include <qwidget.h>
#include <qtimer.h> #include <qtimer.h>
#include <qpixmap.h> #include <qpixmap.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <rdemptycart.h> #include <rdemptycart.h>
#include <rdevent_player.h> #include <rdevent_player.h>