diff --git a/ChangeLog b/ChangeLog index c4fecd3f..c4274c92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17406,3 +17406,5 @@ * Fixed style inconsistencies in dialogs within rdlogmanager(1). 2018-08-15 Fred Gleason * Fixed style inconsistencies in dialogs within rdmonitor(1). +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdpanel(1). diff --git a/rdpanel/globals.h b/rdpanel/globals.h index 89eb37e8..74df0072 100644 --- a/rdpanel/globals.h +++ b/rdpanel/globals.h @@ -2,7 +2,7 @@ // // Global Variable Declarations for RDPanel // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // 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 diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index ca854fc8..b9fc51bb 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -2,7 +2,7 @@ // // A Dedicated Cart Wall Utility for Rivendell. // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // 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 @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -30,9 +29,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -54,23 +50,8 @@ RDCartDialog *panel_cart_dialog; // #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) - :QWidget(parent) + : QWidget(parent) { QPixmap *pm; QPainter *pd; @@ -96,7 +77,7 @@ MainWidget::MainWidget(QWidget *parent) // Create Icons // lib_rivendell_map=new QPixmap(rdpanel_22x22_xpm); - setIcon(*lib_rivendell_map); + setWindowIcon(*lib_rivendell_map); // // Open the Database @@ -315,11 +296,6 @@ MainWidget::MainWidget(QWidget *parent) } 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() { - setCaption(QString("RDPanel")+" v"+VERSION+" - "+tr("Station")+": "+ - rda->config()->stationName()+", "+tr("User")+": "+ - rda->ripc()->user()); + setWindowTitle(QString("RDPanel")+" v"+VERSION+" - "+tr("Station")+": "+ + rda->config()->stationName()+", "+tr("User")+": "+ + rda->ripc()->user()); } diff --git a/rdpanel/rdpanel.h b/rdpanel/rdpanel.h index 81abf5e4..6198ad80 100644 --- a/rdpanel/rdpanel.h +++ b/rdpanel/rdpanel.h @@ -2,7 +2,7 @@ // // A Dedicated Cart Wall Utility for Rivendell. // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 Fred Gleason // // 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 @@ -24,8 +24,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include