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

2019-10-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored rdcatch(1) to use the 'RDDialog' and 'RDWidget'
	base classes.
This commit is contained in:
Fred Gleason 2019-10-03 16:20:35 -04:00
parent e63c1a64a9
commit 247a3cd857
27 changed files with 473 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19142,3 +19142,6 @@
* Added support for posting podcast content via SFTP.
* Refactored rdcastmanager(1) to use the 'RDDialog' and 'RDWidget'
base classes.
2019-10-02 Fred Gleason <fredg@paravelsystems.com>
* Refactored rdcatch(1) to use the 'RDDialog' and 'RDWidget'
base classes.

2
lib/Makefile.am
View File

@ -128,6 +128,7 @@ dist_librd_la_SOURCES = dbversion.h\
rdfontset.cpp rdfontset.h\
rdformpost.cpp rdformpost.h\
rdflacdecode.cpp rdflacdecode.h\
rdframe.cpp rdframe.h\
rdgain_envelope.cpp rdgain_envelope.h\
rdget_ath.cpp rdget_ath.h\
rdgetpasswd.cpp rdgetpasswd.h\
@ -282,6 +283,7 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
moc_rdexception_dialog.cpp\
moc_rdexport_settings_dialog.cpp\
moc_rdfeed.cpp\
moc_rdframe.cpp\
moc_rdget_ath.cpp\
moc_rdgetpasswd.cpp\
moc_rdgpio.cpp\

2
lib/lib.pro
View File

@ -89,6 +89,7 @@ SOURCES += rdevent_line.cpp
SOURCES += rdeventimportlist.cpp
SOURCES += rdexception_dialog.cpp
SOURCES += rdexport_settings_dialog.cpp
SOURCES += rdframe.cpp
SOURCES += rdfontset.cpp
SOURCES += rdget_ath.cpp
SOURCES += rdgetpasswd.cpp
@ -223,6 +224,7 @@ HEADERS += rdevent_line.h
HEADERS += rdeventimportlist.h
HEADERS += rdexception_dialog.h
HEADERS += rdexport_settings_dialog.h
HEADERS += rdframe.h
HEADERS += rdfontset.h
HEADERS += rdget_ath.h
HEADERS += rdgetpasswd.h

1
lib/rddialog.h
View File

@ -22,7 +22,6 @@
#define RDDIALOG_H
#include <qdialog.h>
#include <qfont.h>
#include <rdfontset.h>

34
lib/rdframe.cpp Normal file
View File

@ -0,0 +1,34 @@
// rdframe.cpp
//
// Base class for Rivendell modal widgets.
//
// (C) Copyright 2019 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include "rdframe.h"
RDFrame::RDFrame(QWidget *parent,Qt::WindowFlags f)
: QFrame(parent,f), RDFontSet(font())
{
setFont(defaultFont());
}
RDFrame::RDFrame(RDConfig *config,QWidget *parent,Qt::WindowFlags f)
: QFrame(parent,f), RDFontSet(font(),config)
{
setFont(defaultFont());
}

37
lib/rdframe.h Normal file
View File

@ -0,0 +1,37 @@
// rdframe.h
//
// Base class for Rivendell QFrame-based widgets.
//
// (C) Copyright 2019 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDFRAME_H
#define RDFRAME_H
#include <qwidget.h>
#include <rdfontset.h>
class RDFrame : public QFrame, public RDFontSet
{
Q_OBJECT;
public:
RDFrame(QWidget *parent=0,Qt::WindowFlags f=0);
RDFrame(RDConfig *config,QWidget *parent=0,Qt::WindowFlags f=0);
};
#endif // RDFRAME_H

1
lib/rdwidget.h
View File

@ -22,7 +22,6 @@
#define RDWIDGET_H
#include <qwidget.h>
#include <qfont.h>
#include <rdfontset.h>

57
rdcatch/add_recording.cpp
View File

@ -2,7 +2,7 @@
//
// Add a Rivendell RDCatch Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,23 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <vector>
#include <qdialog.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rddb.h>
#include <rd.h>
#include <rdstation.h>
#include <rdcut_dialog.h>
#include <rdcut_path.h>
#include "add_recording.h"
#include "edit_recording.h"
@ -47,39 +32,25 @@
extern RDStation *rdstation_conf;
AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
: QDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
: RDDialog(parent,Qt::WStyle_Customize|Qt::WStyle_DialogBorder)
{
setModal(true);
add_id=id;
add_filter=filter;
setWindowTitle("RDCatch");
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",12,QFont::Normal);
day_font.setPixelSize(12);
add_id=id;
add_filter=filter;
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Title Label
//
QLabel *label=new QLabel(tr("Schedule a:"),this,"title_label");
label->setGeometry(0,0,sizeHint().width(),30);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignCenter);
//
@ -87,7 +58,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
QPushButton *button=new QPushButton(this,"recording_button");
button->setGeometry(10,30,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Recording"));
button->setDisabled(true);
QString sql=QString("select CHANNEL from DECKS \
@ -104,7 +75,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"playout_button");
button->setGeometry(10,80,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Playout"));
button->setDisabled(true);
sql=QString("select CHANNEL from DECKS where (CARD_NUMBER>=0)&&")+
@ -121,7 +92,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"download_button");
button->setGeometry(10,130,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Download"));
connect(button,SIGNAL(clicked()),this,SLOT(downloadData()));
@ -130,7 +101,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"upload_button");
button->setGeometry(10,180,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Upload"));
connect(button,SIGNAL(clicked()),this,SLOT(uploadData()));
@ -139,7 +110,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"macro_button");
button->setGeometry(10,230,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Macro Cart"));
connect(button,SIGNAL(clicked()),this,SLOT(macroData()));
@ -148,7 +119,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"switch_button");
button->setGeometry(10,280,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Switch Event"));
connect(button,SIGNAL(clicked()),this,SLOT(switchData()));
@ -157,7 +128,7 @@ AddRecording::AddRecording(int id,QString *filter,QWidget *parent)
//
button=new QPushButton(this,"cancel_button");
button->setGeometry(10,350,sizeHint().width()-20,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
button->setDefault(true);
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));

16
rdcatch/add_recording.h
View File

@ -2,7 +2,7 @@
//
// Add a Rivendell RDCatch Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,19 +21,9 @@
#ifndef ADD_RECORDING_H
#define ADD_RECORDING_H
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <rddialog.h>
#include <rdrecording.h>
#include <rddeck.h>
class AddRecording : public QDialog
class AddRecording : public RDDialog
{
Q_OBJECT
public:

43
rdcatch/deckmon.cpp
View File

@ -2,7 +2,7 @@
//
// Monitor a Rivendell RDCatch Deck
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,10 +18,6 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <rd.h>
#include <rdcut.h>
#include <rdcart.h>
#include <rddb.h>
#include <rdescape_string.h>
#include "colors.h"
@ -29,7 +25,7 @@
#include "globals.h"
DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
: Q3Frame(parent)
: RDFrame(parent)
{
mon_station=station;
mon_channel=channel;
@ -38,16 +34,6 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
setLineWidth(1);
setMidLineWidth(2);
//
// Generate Fonts
//
QFont small_font=QFont("Helvetica",6,QFont::Bold);
small_font.setPixelSize(6);
QFont label_font("Helvetica",12,QFont::Normal);
label_font.setPixelSize(12);
QFont event_font("Helvetica",12,QFont::Bold);
event_font.setPixelSize(12);
//
// Generate Palettes
//
@ -63,7 +49,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Station/Channel
//
mon_station_label=new QLabel(this);
mon_station_label->setFont(label_font);
mon_station_label->setFont(defaultFont());
if((mon_channel>0)&&(mon_channel<(MAX_DECKS+1))) {
mon_station_label->
setText(mon_station+QString().sprintf(" : %uR",mon_channel));
@ -77,7 +63,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Monitor Button
//
mon_monitor_button=new QPushButton(this);
mon_monitor_button->setFont(small_font);
mon_monitor_button->setFont(subButtonFont());
mon_monitor_button->setText(tr("MON"));
mon_monitor_palette=new QPalette(QColor(BUTTON_MONITOR_FLASHING_COLOR),
backgroundColor());
@ -91,7 +77,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Abort Button
//
mon_abort_button=new QPushButton(this);
mon_abort_button->setFont(small_font);
mon_abort_button->setFont(subButtonFont());
mon_abort_button->setText(tr("ABORT"));
mon_abort_button->setDisabled(true);
connect(mon_abort_button,SIGNAL(clicked()),this,SLOT(abortButtonData()));
@ -100,13 +86,13 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Cut
//
mon_cut_label=new QLabel(this);
mon_cut_label->setFont(label_font);
mon_cut_label->setFont(defaultFont());
//
// Event Indicator
//
mon_event_label=new QLabel(this);
mon_event_label->setFont(event_font);
mon_event_label->setFont(labelFont());
mon_event_label->setAlignment(Qt::AlignCenter);
mon_event_label->setFrameStyle(Q3Frame::Panel|Q3Frame::Sunken);
mon_event_label->setPalette(mon_dark_palette);
@ -118,7 +104,7 @@ DeckMon::DeckMon(QString station,unsigned channel,QWidget *parent)
// Status
//
mon_status_label=new QLabel(tr("OFFLINE"),this);
mon_status_label->setFont(label_font);
mon_status_label->setFont(defaultFont());
//
// Audio Meter
@ -161,18 +147,6 @@ void DeckMon::enableMonitorButton(bool state)
}
void DeckMon::setGeometry(int x,int y,int w,int h)
{
Q3Frame::setGeometry(x,y,w,h);
}
void DeckMon::setGeometry(const QRect &r)
{
setGeometry(r.x(),r.y(),r.width(),r.height());
}
void DeckMon::setMonitor(bool state)
{
if(state) {
@ -290,7 +264,6 @@ void DeckMon::resizeEvent(QResizeEvent *e)
mon_status_label->setGeometry(e->size().width()-320,6,80,18);
mon_left_meter->setGeometry(e->size().width()-235,6,225,10);
mon_right_meter->setGeometry(e->size().width()-235,16,225,10);
Q3Frame::resizeEvent(e);
}

13
rdcatch/deckmon.h
View File

@ -2,7 +2,7 @@
//
// Monitor a Rivendell Netcatcher Deck
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,16 +21,15 @@
#ifndef DECKMON_H
#define DECKMON_H
#include <q3frame.h>
#include <qlabel.h>
#include <qpalette.h>
#include <qpushbutton.h>
#include <rddeck.h>
#include <rdframe.h>
#include <rdplaymeter.h>
#include <rdrecording.h>
#include <rddeck.h>
class DeckMon : public Q3Frame
class DeckMon : public RDFrame
{
Q_OBJECT
public:
@ -40,10 +39,6 @@ class DeckMon : public Q3Frame
QSizePolicy sizePolicy() const;
void enableMonitorButton(bool state);
public slots:
void setGeometry(int x,int y,int w,int h);
void setGeometry(const QRect &r);
public slots:
void setMonitor(bool state);
void setStatus(RDDeck::Status status,int id,const QString &cutname);

82
rdcatch/edit_cartevent.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Macro Cart Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,22 +18,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rdapplication.h>
#include <rd.h>
#include <rdcart_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdtextvalidator.h>
@ -41,38 +28,24 @@
#include "globals.h"
EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
RDSqlQuery *q;
QString temp;
int cartnum;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
setWindowTitle("RDCatch - "+tr("Edit Cart Event"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -96,7 +69,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -106,17 +79,18 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_station_box->setGeometry(200,10,140,23);
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -127,7 +101,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,43,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -138,11 +112,11 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_destination_edit->setReadOnly(false);
label=new QLabel(edit_destination_edit,tr("Cart Number:"),this);
label->setGeometry(10,73,100,19);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight);
QPushButton *button=new QPushButton(this);
button->setGeometry(185,68,60,24);
button->setFont(day_font);
button->setFont(subLabelFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCartData()));
@ -150,7 +124,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,104,sizeHint().width()-20,62);
//
@ -160,7 +134,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_mon_button->setGeometry(20,120,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -170,7 +144,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_tue_button->setGeometry(115,120,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -180,7 +154,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_wed_button->setGeometry(215,120,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -190,7 +164,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_thu_button->setGeometry(335,120,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -200,7 +174,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_fri_button->setGeometry(440,120,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,120,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -210,7 +184,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sat_button->setGeometry(130,145,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -220,7 +194,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sun_button->setGeometry(300,145,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -230,7 +204,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_oneshot_box->setGeometry(20,180,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,178,115,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -238,7 +212,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -251,7 +225,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -260,7 +234,7 @@ EditCartEvent::EditCartEvent(int id,std::vector<int> *adds,QWidget *parent)
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));

19
rdcatch/edit_cartevent.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Netcatch Cart Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,22 +21,17 @@
#ifndef EDIT_CARTEVENT_H
#define EDIT_CARTEVENT_H
#include <vector>
#include <qdatetimeedit.h>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <qcombobox.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rddialog.h>
#include <rdcart.h>
#include <rdrecording.h>
class EditCartEvent : public QDialog
class EditCartEvent : public RDDialog
{
Q_OBJECT
public:
@ -63,7 +58,7 @@ class EditCartEvent : public QDialog
RDRecording *edit_recording;
QCheckBox *edit_active_button;
QComboBox *edit_station_box;
Q3TimeEdit *edit_starttime_edit;
QTimeEdit *edit_starttime_edit;
QLineEdit *edit_description_edit;
QString edit_cutname;
QLineEdit *edit_destination_edit;

116
rdcatch/edit_download.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Download Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,65 +18,38 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <q3url.h>
#include <qurl.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcut_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rddeck.h>
#include <rdescape_string.h>
#include <rdtextvalidator.h>
#include <rdurl.h>
#include "edit_download.h"
#include "globals.h"
EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
RDSqlQuery *q;
QString temp;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
edit_filter=filter;
setWindowTitle("RDCatch - "+tr("Edit Download"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -94,7 +67,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -104,17 +77,18 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_station_box->setGeometry(200,10,140,23);
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -125,7 +99,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,43,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -139,7 +113,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
this,SLOT(urlChangedData(const QString &)));
label=new QLabel(edit_url_edit,tr("Url:"),this);
label->setGeometry(10,70,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -151,7 +125,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_username_edit->setValidator(validator);
edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this);
edit_username_label->setGeometry(10,97,100,20);
edit_username_label->setFont(label_font);
edit_username_label->setFont(labelFont());
edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -164,7 +138,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_username_edit->setValidator(validator);
edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this);
edit_password_label->setGeometry(275,97,80,20);
edit_password_label->setFont(label_font);
edit_password_label->setFont(labelFont());
edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -175,11 +149,11 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_destination_edit->setReadOnly(true);
label=new QLabel(edit_destination_edit,tr("Destination:"),this);
label->setGeometry(10,127,100,19);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight);
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()-70,122,60,24);
button->setFont(day_font);
button->setFont(subLabelFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCartData()));
@ -192,7 +166,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_channels_box->insertItem("2");
label=new QLabel(edit_channels_box,tr("Channels:"),this);
label->setGeometry(120,149,70,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -204,18 +178,18 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
this,SLOT(autotrimToggledData(bool)));
label=new QLabel(edit_autotrim_box,tr("Autotrim"),this);
label->setGeometry(140,173,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
edit_autotrim_spin=new QSpinBox(this);
edit_autotrim_spin->setGeometry(265,173,40,20);
edit_autotrim_spin->setRange(-99,-1);
edit_autotrim_label=new QLabel(edit_autotrim_spin,tr("Level:"),this);
edit_autotrim_label->setGeometry(220,173,40,20);
edit_autotrim_label->setFont(label_font);
edit_autotrim_label->setFont(labelFont());
edit_autotrim_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
edit_autotrim_unit=new QLabel(edit_autotrim_spin,tr("dBFS"),this);
edit_autotrim_unit->setGeometry(310,173,40,20);
edit_autotrim_unit->setFont(label_font);
edit_autotrim_unit->setFont(labelFont());
edit_autotrim_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -227,18 +201,18 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
this,SLOT(normalizeToggledData(bool)));
label=new QLabel(edit_normalize_box,tr("Normalize"),this);
label->setGeometry(140,197,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
edit_normalize_spin=new QSpinBox(this);
edit_normalize_spin->setGeometry(265,197,40,20);
edit_normalize_spin->setRange(-99,-1);
edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this);
edit_normalize_label->setGeometry(220,197,40,20);
edit_normalize_label->setFont(label_font);
edit_normalize_label->setFont(labelFont());
edit_normalize_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
edit_normalize_unit=new QLabel(edit_normalize_spin,tr("dBFS"),this);
edit_normalize_unit->setGeometry(310,197,40,20);
edit_normalize_unit->setFont(label_font);
edit_normalize_unit->setFont(labelFont());
edit_normalize_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -248,14 +222,14 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_metadata_box->setGeometry(120,222,15,15);
label=new QLabel(edit_metadata_box,tr("Update Library Metadata"),this);
label->setGeometry(140,222,160,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,257,sizeHint().width()-20,62);
//
@ -265,7 +239,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_mon_button->setGeometry(20,273,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,273,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -275,7 +249,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_tue_button->setGeometry(115,273,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,273,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -285,7 +259,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_wed_button->setGeometry(215,273,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,273,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -295,7 +269,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_thu_button->setGeometry(335,273,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,273,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -305,7 +279,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_fri_button->setGeometry(440,273,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,273,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -315,7 +289,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_sat_button->setGeometry(130,298,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,298,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -325,7 +299,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_sun_button->setGeometry(300,298,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,298,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -335,7 +309,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_oneshot_box->setGeometry(20,335,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,333,115,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -346,11 +320,11 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
edit_eventoffset_spin->setRange(-30,30);
label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this);
label->setGeometry(140,333,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
label=new QLabel(edit_eventoffset_spin,tr("days"),this);
label->setGeometry(295,333,40,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -358,7 +332,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -371,7 +345,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -380,7 +354,7 @@ EditDownload::EditDownload(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
@ -457,7 +431,7 @@ QSizePolicy EditDownload::sizePolicy() const
void EditDownload::urlChangedData(const QString &str)
{
Q3Url url(str);
QUrl url(str);
QString protocol=url.protocol();
if((protocol=="ftp")||(protocol=="http")||(protocol=="file")||
(protocol=="scp")||(protocol=="sftp")) {
@ -521,12 +495,12 @@ void EditDownload::saveasData()
void EditDownload::okData()
{
if(Q3Url::isRelativeUrl(edit_url_edit->text())||
if(QUrl::isRelativeUrl(edit_url_edit->text())||
(edit_url_edit->text().right(1)=="/")) {
QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!"));
return;
}
RDUrl url(edit_url_edit->text());
QUrl url(edit_url_edit->text());
QString protocol=url.protocol();
if((protocol!="ftp")&&(protocol!="http")&&(protocol!="https")&&
(protocol!="file")&&(protocol!="scp")&&(protocol!="sftp")) {

16
rdcatch/edit_download.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Download Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,22 +21,18 @@
#ifndef EDIT_DOWNLOAD_H
#define EDIT_DOWNLOAD_H
#include <vector>
#include <qdatetimeedit.h>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rdcart.h>
#include <rddialog.h>
#include <rdrecording.h>
class EditDownload : public QDialog
class EditDownload : public RDDialog
{
Q_OBJECT
public:
@ -65,7 +61,7 @@ class EditDownload : public QDialog
RDRecording *edit_recording;
QCheckBox *edit_active_button;
QComboBox *edit_station_box;
Q3TimeEdit *edit_starttime_edit;
QTimeEdit *edit_starttime_edit;
QLineEdit *edit_description_edit;
QLineEdit *edit_url_edit;
QLabel *edit_username_label;

86
rdcatch/edit_playout.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell RDCatch Playout
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,60 +18,33 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcut.h>
#include <rdcut_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rdtextvalidator.h>
#include <edit_playout.h>
#include <globals.h>
#include "edit_playout.h"
#include "globals.h"
EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString temp;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
edit_filter=filter;
setWindowTitle("RDCatch - "+tr("Edit Playout"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -89,7 +62,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -99,7 +72,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_station_box->setGeometry(200,10,140,23);
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
connect(edit_station_box,SIGNAL(activated(int)),
this,SLOT(activateStationData(int)));
@ -107,11 +80,12 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -122,7 +96,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,43,90,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -133,11 +107,11 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_destination_edit->setReadOnly(true);
label=new QLabel(edit_destination_edit,tr("Destination:"),this);
label->setGeometry(10,70,90,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()-70,65,60,30);
button->setFont(day_font);
button->setFont(subButtonFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCutData()));
@ -145,7 +119,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,104,sizeHint().width()-20,62);
//
@ -155,7 +129,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_mon_button->setGeometry(20,120,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -165,7 +139,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_tue_button->setGeometry(115,120,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -175,7 +149,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_wed_button->setGeometry(215,120,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -185,7 +159,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_thu_button->setGeometry(335,120,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,120,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -195,7 +169,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_fri_button->setGeometry(440,120,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,120,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -205,7 +179,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_sat_button->setGeometry(130,145,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -215,7 +189,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_sun_button->setGeometry(300,145,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,145,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -225,7 +199,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
edit_oneshot_box->setGeometry(20,180,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,178,115,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -233,7 +207,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -246,7 +220,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -255,7 +229,7 @@ EditPlayout::EditPlayout(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));

20
rdcatch/edit_playout.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell RDCatch Playout
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>/
// (C) Copyright 2002-2019 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
@ -21,21 +21,15 @@
#ifndef EDIT_PLAYOUT_H
#define EDIT_PLAYOUT_H
#include <vector>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <qcombobox.h>
#include <qdatetimeedit.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rddialog.h>
#include <rdrecording.h>
class EditPlayout : public QDialog
class EditPlayout : public RDDialog
{
Q_OBJECT
public:
@ -63,7 +57,7 @@ class EditPlayout : public QDialog
RDRecording *edit_recording;
QCheckBox *edit_active_button;
QComboBox *edit_station_box;
Q3TimeEdit *edit_starttime_edit;
QTimeEdit *edit_starttime_edit;
QLineEdit *edit_description_edit;
QString edit_cutname;
QLineEdit *edit_destination_edit;

210
rdcatch/edit_recording.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell RDCatch Recording
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,22 +18,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <qradiobutton.h>
#include <qpainter.h>
#include <qevent.h>
#include <qgroupbox.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcut_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdmatrix.h>
#include <rdtextvalidator.h>
@ -43,36 +33,22 @@
EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString temp;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
edit_filter=filter;
setWindowTitle("RDCatch - "+tr("Edit Recording"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -88,7 +64,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
//
edit_active_button=new QCheckBox(tr("Event Active"),this);
edit_active_button->setGeometry(10,11,145,20);
edit_active_button->setFont(label_font);
edit_active_button->setFont(labelFont());
//
// Station
@ -97,7 +73,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_station_box->setGeometry(200,10,140,23);
QLabel * label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
connect(edit_station_box,SIGNAL(activated(int)),
this,SLOT(activateStationData(int)));
@ -110,41 +86,44 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
this,SLOT(startTypeClickedData(int)));
QGroupBox *groupbox=new QGroupBox(tr("Start Parameters"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,37,sizeHint().width()-20,105);
QRadioButton *rbutton=new QRadioButton(tr("Use Hard Time"),this);
rbutton->setGeometry(20,57,100,15);
rbutton->setGeometry(20,57,110,15);
edit_starttype_group->addButton(rbutton,RDRecording::HardStart);
rbutton->setFont(day_font);
rbutton->setFont(subLabelFont());
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit->setGeometry(235,53,80,20);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(255,53,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
edit_starttime_label=new QLabel(edit_starttime_edit,tr("Record Start Time:"),
this);
edit_starttime_label->setGeometry(125,57,105,15);
edit_starttime_label->setFont(day_font);
edit_starttime_label->setGeometry(135,57,115,15);
edit_starttime_label->setFont(subLabelFont());
edit_starttime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
rbutton=new QRadioButton(tr("Use GPI"),this);
rbutton->setGeometry(20,81,100,15);
rbutton->setFont(day_font);
rbutton->setFont(subLabelFont());
edit_start_startwindow_edit=new Q3TimeEdit(this);
edit_start_startwindow_edit->setGeometry(235,77,80,20);
edit_start_startwindow_edit=new QTimeEdit(this);
edit_start_startwindow_edit->setGeometry(255,77,80,20);
edit_start_startwindow_edit->setDisplayFormat("hh:mm:ss");
edit_start_startwindow_label=
new QLabel(edit_start_startwindow_edit,tr("Window Start Time:"),this);
edit_start_startwindow_label->setGeometry(125,81,105,15);
edit_start_startwindow_label->setFont(day_font);
edit_start_startwindow_label->setGeometry(135,81,115,15);
edit_start_startwindow_label->setFont(subLabelFont());
edit_start_startwindow_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_start_endwindow_edit=new Q3TimeEdit(this);
edit_start_endwindow_edit->setGeometry(435,77,80,20);
edit_start_endwindow_edit=new QTimeEdit(this);
edit_start_endwindow_edit->setGeometry(455,77,80,20);
edit_start_endwindow_edit->setDisplayFormat("hh:mm:ss");
edit_start_endwindow_label=
new QLabel(edit_start_endwindow_edit,"Window End Time:",this);
edit_start_endwindow_label->setGeometry(325,81,105,15);
edit_start_endwindow_label->setFont(day_font);
edit_start_endwindow_label->setGeometry(345,81,105,15);
edit_start_endwindow_label->setFont(subLabelFont());
edit_start_endwindow_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -154,30 +133,31 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_startmatrix_label=
new QLabel(edit_startmatrix_spin,tr("GPI Matrix:"),this);
edit_startmatrix_label->setGeometry(100,100,80,20);
edit_startmatrix_label->setFont(day_font);
edit_startmatrix_label->setFont(subLabelFont());
edit_startmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_startline_spin=new QSpinBox(this);
edit_startline_spin->setGeometry(295,99,30,20);
edit_startline_spin->setGeometry(305,99,30,20);
edit_startline_spin->setRange(1,MAX_GPIO_PINS);
edit_startline_label=new QLabel(edit_startline_spin,tr("GPI Line:"),this);
edit_startline_label->setGeometry(230,100,60,20);
edit_startline_label->setFont(day_font);
edit_startline_label->setGeometry(240,100,60,20);
edit_startline_label->setFont(subLabelFont());
edit_startline_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_startoffset_edit=new Q3TimeEdit(this);
edit_startoffset_edit->setGeometry(435,99,80,20);
edit_startoffset_edit=new QTimeEdit(this);
edit_startoffset_edit->setGeometry(455,99,80,20);
edit_startoffset_edit->setDisplayFormat("hh:mm:ss");
edit_startoffset_label=
new QLabel(edit_startoffset_edit,tr("Start Delay:"),this);
edit_startoffset_label->setGeometry(325,100,105,20);
edit_startoffset_label->setFont(day_font);
edit_startoffset_label->setGeometry(345,100,105,20);
edit_startoffset_label->setFont(subLabelFont());
edit_startoffset_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_multirec_box=
new QCheckBox(tr("Allow Multiple Recordings within this Window"),this);
edit_multirec_box->setGeometry(140,124,sizeHint().width()-170,15);
edit_multirec_box->setFont(day_font);
edit_multirec_box->setFont(subLabelFont());
edit_starttype_group->addButton(rbutton,RDRecording::GpiStart);
@ -189,48 +169,52 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
this,SLOT(endTypeClickedData(int)));
groupbox=new QGroupBox(tr("End Parameters"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,160,sizeHint().width()-20,112);
rbutton=new QRadioButton(tr("Use Length"),this);
rbutton->setGeometry(20,205,100,15);
edit_endtype_group->addButton(rbutton,RDRecording::LengthEnd);
rbutton->setFont(day_font);
edit_endlength_edit=new Q3TimeEdit(this);
edit_endlength_edit->setGeometry(235,201,80,20);
rbutton->setFont(subLabelFont());
edit_endlength_edit=new QTimeEdit(this);
edit_endlength_edit->setGeometry(245,201,80,20);
edit_endlength_edit->setDisplayFormat("hh:mm:ss");
edit_endlength_label=new QLabel(tr("Record Length:"),this);
edit_endlength_label->setGeometry(125,205,105,15);
edit_endlength_label->setFont(day_font);
edit_endlength_label->setGeometry(125,205,115,15);
edit_endlength_label->setFont(subLabelFont());
edit_endlength_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
rbutton=new QRadioButton(tr("Use Hard Time"),this);
rbutton->setGeometry(20,181,1100,15);
edit_endtype_group->addButton(rbutton,RDRecording::HardEnd);
rbutton->setFont(day_font);
edit_endtime_edit=new Q3TimeEdit(this);
edit_endtime_edit->setGeometry(235,177,80,20);
rbutton->setFont(subLabelFont());
edit_endtime_edit=new QTimeEdit(this);
edit_endtime_edit->setGeometry(245,177,80,20);
edit_endtime_edit->setDisplayFormat("hh:mm:ss");
edit_endtime_label=new QLabel(edit_endtime_edit,tr("Record End Time:"),this);
edit_endtime_label->setGeometry(125,177,105,15);
edit_endtime_label->setFont(day_font);
edit_endtime_label->setGeometry(125,181,115,15);
edit_endtime_label->setFont(subLabelFont());
edit_endtime_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
rbutton=new QRadioButton(tr("Use GPI"),this,"gpi_button");
rbutton=new QRadioButton(tr("Use GPI"),this);
rbutton->setGeometry(20,229,100,15);
rbutton->setFont(day_font);
edit_end_startwindow_edit=new Q3TimeEdit(this);
edit_end_startwindow_edit->setGeometry(235,225,80,20);
rbutton->setFont(subLabelFont());
edit_end_startwindow_edit=new QTimeEdit(this);
edit_end_startwindow_edit->setGeometry(245,225,80,20);
edit_end_startwindow_edit->setDisplayFormat("hh:mm:ss");
edit_end_startwindow_label=
new QLabel(edit_end_startwindow_edit,tr("Window Start Time:"),this);
edit_end_startwindow_label->setGeometry(125,229,105,15);
edit_end_startwindow_label->setFont(day_font);
edit_end_startwindow_label->setGeometry(125,229,115,15);
edit_end_startwindow_label->setFont(subLabelFont());
edit_end_startwindow_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_end_endwindow_edit=new Q3TimeEdit(this);
edit_end_endwindow_edit->setGeometry(435,225,80,20);
edit_end_endwindow_edit=new QTimeEdit(this);
edit_end_endwindow_edit->setGeometry(455,225,80,20);
edit_end_endwindow_edit->setDisplayFormat("hh:mm:ss");
edit_end_endwindow_label=
new QLabel(edit_end_endwindow_edit,tr("Window End Time:"),this);
edit_end_endwindow_label->setGeometry(325,229,105,15);
edit_end_endwindow_label->setFont(day_font);
edit_end_endwindow_label->setGeometry(345,229,105,15);
edit_end_endwindow_label->setFont(subLabelFont());
edit_end_endwindow_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -239,7 +223,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_endmatrix_spin->setRange(0,MAX_MATRICES-1);
edit_endmatrix_label=new QLabel(edit_endmatrix_spin,tr("GPI Matrix:"),this);
edit_endmatrix_label->setGeometry(100,248,80,20);
edit_endmatrix_label->setFont(day_font);
edit_endmatrix_label->setFont(subLabelFont());
edit_endmatrix_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_endline_spin=new QSpinBox(this);
@ -247,15 +231,16 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_endline_spin->setRange(1,MAX_GPIO_PINS);
edit_endline_label=new QLabel(edit_endline_spin,tr("GPI Line:"),this);
edit_endline_label->setGeometry(230,248,60,20);
edit_endline_label->setFont(day_font);
edit_endline_label->setFont(subLabelFont());
edit_endline_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_maxlength_edit=new Q3TimeEdit(this);
edit_maxlength_edit->setGeometry(435,247,80,20);
edit_maxlength_edit=new QTimeEdit(this);
edit_maxlength_edit->setGeometry(455,247,80,20);
edit_maxlength_edit->setDisplayFormat("hh:mm:ss");
edit_maxlength_label=
new QLabel(edit_maxlength_edit,tr("Max Record Length:"),this);
edit_maxlength_label->setGeometry(325,248,105,20);
edit_maxlength_label->setFont(day_font);
edit_maxlength_label->setGeometry(325,248,125,20);
edit_maxlength_label->setFont(subLabelFont());
edit_maxlength_label->
setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@ -269,7 +254,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,291,90,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -279,7 +264,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_source_box->setGeometry(105,317,sizeHint().width()-115,24);
label=new QLabel(edit_source_box,tr("Source:"),this);
label->setGeometry(10,317,90,24);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -290,11 +275,11 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_destination_edit->setReadOnly(true);
label=new QLabel(edit_destination_edit,tr("Destination:"),this);
label->setGeometry(10,345,90,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()-70,344,60,24);
button->setFont(day_font);
button->setFont(subButtonFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCutData()));
@ -307,7 +292,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_channels_box->insertItem("2");
label=new QLabel(edit_channels_box,tr("Channels:"),this);
label->setGeometry(120,370,70,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -315,7 +300,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
//
edit_autotrim_box=new QCheckBox(tr("Autotrim"),this);
edit_autotrim_box->setGeometry(120,395,100,15);
edit_autotrim_box->setFont(label_font);
edit_autotrim_box->setFont(labelFont());
connect(edit_autotrim_box,SIGNAL(toggled(bool)),
this,SLOT(autotrimToggledData(bool)));
edit_autotrim_spin=new QSpinBox(this);
@ -324,12 +309,12 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_autotrim_label=
new QLabel(edit_autotrim_spin,tr("Level:"),this);
edit_autotrim_label->setGeometry(220,393,40,20);
edit_autotrim_label->setFont(label_font);
edit_autotrim_label->setFont(labelFont());
edit_autotrim_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
edit_autotrim_unit=
new QLabel(edit_autotrim_spin,tr("dBFS"),this);
edit_autotrim_unit->setGeometry(310,393,40,20);
edit_autotrim_unit->setFont(label_font);
edit_autotrim_unit->setFont(labelFont());
edit_autotrim_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -339,26 +324,26 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_normalize_box->setGeometry(120,420,100,15);
connect(edit_normalize_box,SIGNAL(toggled(bool)),
this,SLOT(normalizeToggledData(bool)));
edit_normalize_box->setFont(label_font);
edit_normalize_box->setFont(labelFont());
edit_normalize_spin=new QSpinBox(this);
edit_normalize_spin->setGeometry(265,418,40,20);
edit_normalize_spin->setRange(-99,-1);
edit_normalize_label=
new QLabel(edit_normalize_spin,tr("Level:"),this);
edit_normalize_label->setGeometry(220,418,40,20);
edit_normalize_label->setFont(label_font);
edit_normalize_label->setFont(labelFont());
edit_normalize_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
edit_normalize_unit=
new QLabel(edit_normalize_spin,tr("dBFS"),this);
edit_normalize_unit->setGeometry(310,418,40,20);
edit_normalize_unit->setFont(label_font);
edit_normalize_unit->setFont(labelFont());
edit_normalize_unit->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
// Button Label
//
groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,442,sizeHint().width()-20,62);
//
@ -366,49 +351,49 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
//
edit_mon_button=new QCheckBox(tr("Monday"),this);
edit_mon_button->setGeometry(20,459,135,20);
edit_mon_button->setFont(day_font);
edit_mon_button->setFont(subLabelFont());
//
// Tuesday Button
//
edit_tue_button=new QCheckBox(tr("Tuesday"),this);
edit_tue_button->setGeometry(115,459,135,20);
edit_tue_button->setFont(day_font);
edit_tue_button->setFont(subLabelFont());
//
// Wednesday Button
//
edit_wed_button=new QCheckBox(tr("Wednesday"),this);
edit_wed_button->setGeometry(215,459,135,20);
edit_wed_button->setFont(day_font);
edit_wed_button->setFont(subLabelFont());
//
// Thursday Button
//
edit_thu_button=new QCheckBox(tr("Thursday"),this);
edit_thu_button->setGeometry(335,459,135,20);
edit_thu_button->setFont(day_font);
edit_thu_button->setFont(subLabelFont());
//
// Friday Button
//
edit_fri_button=new QCheckBox(tr("Friday"),this);
edit_fri_button->setGeometry(440,459,135,20);
edit_fri_button->setFont(day_font);
edit_fri_button->setFont(subLabelFont());
//
// Saturday Button
//
edit_sat_button=new QCheckBox(tr("Saturday"),this);
edit_sat_button->setGeometry(130,484,80,20);
edit_sat_button->setFont(day_font);
edit_sat_button->setFont(subLabelFont());
//
// Sunday Button
//
edit_sun_button=new QCheckBox(tr("Sunday"),this);
edit_sun_button->setGeometry(300,484,80,20);
edit_sun_button->setFont(day_font);
edit_sun_button->setFont(subLabelFont());
//
// Start Date Offset
@ -419,7 +404,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_startoffset_box->setSpecialValueText(tr("None"));
label=new QLabel(edit_startoffset_box,tr("Start Date Offset:"),this);
label->setGeometry(10,516,125,24);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -431,7 +416,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
edit_endoffset_box->setSpecialValueText(tr("None"));
label=new QLabel(edit_endoffset_box,tr("End Date Offset:"),this);
label->setGeometry(310,516,125,24);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -439,14 +424,14 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
//
edit_oneshot_box=new QCheckBox(tr("Make OneShot"),this);
edit_oneshot_box->setGeometry(20,553,125,15);
edit_oneshot_box->setFont(label_font);
edit_oneshot_box->setFont(labelFont());
//
// Save As Button
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -459,7 +444,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -468,7 +453,7 @@ EditRecording::EditRecording(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
@ -584,7 +569,8 @@ EditRecording::~EditRecording()
QSize EditRecording::sizeHint() const
{
return QSize(540,619);
return QSize(560,619);
// return QSize(540,619);
}

32
rdcatch/edit_recording.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Netcatch Recording
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,21 +21,19 @@
#ifndef EDIT_RECORDING_H
#define EDIT_RECORDING_H
#include <vector>
#include <qbuttongroup.h>
#include <qdialog.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qdatetimeedit.h>
#include <qspinbox.h>
#include <qlabel.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rddialog.h>
#include <rdrecording.h>
class EditRecording : public QDialog
class EditRecording : public RDDialog
{
Q_OBJECT
public:
@ -90,20 +88,20 @@ class EditRecording : public QDialog
QButtonGroup *edit_endtype_group;
QLabel *edit_endtime_label;
QLabel *edit_endlength_label;
Q3TimeEdit *edit_starttime_edit;
Q3TimeEdit *edit_endtime_edit;
Q3TimeEdit *edit_endlength_edit;
QTimeEdit *edit_starttime_edit;
QTimeEdit *edit_endtime_edit;
QTimeEdit *edit_endlength_edit;
QLabel *edit_start_startwindow_label;
Q3TimeEdit *edit_start_startwindow_edit;
QTimeEdit *edit_start_startwindow_edit;
QLabel *edit_start_endwindow_label;
Q3TimeEdit *edit_start_endwindow_edit;
QTimeEdit *edit_start_endwindow_edit;
QLabel *edit_end_startwindow_label;
QCheckBox *edit_multirec_box;
QLabel *edit_maxlength_label;
Q3TimeEdit *edit_maxlength_edit;
Q3TimeEdit *edit_end_startwindow_edit;
QTimeEdit *edit_maxlength_edit;
QTimeEdit *edit_end_startwindow_edit;
QLabel *edit_end_endwindow_label;
Q3TimeEdit *edit_end_endwindow_edit;
QTimeEdit *edit_end_endwindow_edit;
QLabel *edit_startmatrix_label;
QSpinBox *edit_startmatrix_spin;
QLabel *edit_startline_label;
@ -113,9 +111,9 @@ class EditRecording : public QDialog
QLabel *edit_endline_label;
QSpinBox *edit_endline_spin;
QLabel *edit_startlength_label;
Q3TimeEdit *edit_startlength_edit;
QTimeEdit *edit_startlength_edit;
QLabel *edit_startoffset_label;
Q3TimeEdit *edit_startoffset_edit;
QTimeEdit *edit_startoffset_edit;
std::vector<int> *edit_added_events;
QComboBox *edit_channels_box;
QCheckBox *edit_autotrim_box;

85
rdcatch/edit_switchevent.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Netcatch Cart Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,60 +18,34 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <rddb.h>
#include <rd.h>
#include <rdcart_dialog.h>
#include <rdcut_path.h>
#include <rdescape_string.h>
#include <rdtextvalidator.h>
#include <edit_switchevent.h>
#include "edit_switchevent.h"
EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
RDSqlQuery *q;
QString temp;
edit_matrix=NULL;
edit_added_events=adds;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
setWindowTitle("RDCatch - "+tr("Edit Switcher Event"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -89,7 +63,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -99,7 +73,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_station_box->setGeometry(200,10,140,23);
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
connect(edit_station_box,SIGNAL(activated(const QString &)),
this,SLOT(activateStationData(const QString &)));
@ -107,11 +81,12 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -122,7 +97,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,43,105,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -132,7 +107,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_matrix_box->setGeometry(120,70,sizeHint().width()-130,20);
label=new QLabel(edit_matrix_box,tr("Switch Matrix:"),this);
label->setGeometry(10,70,105,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
connect(edit_matrix_box,SIGNAL(activated(const QString &)),
this,SLOT(activateMatrixData(const QString &)));
@ -144,7 +119,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_input_box->setGeometry(120,100,sizeHint().width()-130,20);
label=new QLabel(edit_input_box,tr("Switch Input:"),this);
label->setGeometry(10,100,105,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
edit_input_spin=new QSpinBox(this);
edit_input_spin->setGeometry(140,125,50,20);
@ -158,7 +133,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_output_box->setGeometry(120,155,sizeHint().width()-130,20);
label=new QLabel(edit_output_box,tr("Switch Output:"),this);
label->setGeometry(10,155,105,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
edit_output_spin=new QSpinBox(this);
edit_output_spin->setGeometry(140,180,50,20);
@ -169,7 +144,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,213,sizeHint().width()-20,62);
//
@ -179,7 +154,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_mon_button->setGeometry(20,228,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,228,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -189,7 +164,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_tue_button->setGeometry(115,228,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,228,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -199,7 +174,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_wed_button->setGeometry(215,228,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,228,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -209,7 +184,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_thu_button->setGeometry(335,228,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,228,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -219,7 +194,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_fri_button->setGeometry(440,228,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,228,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -229,7 +204,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sat_button->setGeometry(130,253,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,253,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -239,7 +214,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_sun_button->setGeometry(300,253,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,253,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -249,7 +224,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
edit_oneshot_box->setGeometry(20,290,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,288,115,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -257,7 +232,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
//
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -270,7 +245,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -279,7 +254,7 @@ EditSwitchEvent::EditSwitchEvent(int id,std::vector<int> *adds,QWidget *parent)
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));

25
rdcatch/edit_switchevent.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Netcatch Cart Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,22 +21,17 @@
#ifndef EDIT_SWITCHEVENT_H
#define EDIT_SWITCHEVENT_H
#include <vector>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rdmatrix.h>
#include <qcombobox.h>
#include <qdatetimeedit.h>
#include <qspinbox.h>
class EditSwitchEvent : public QDialog
#include <rddeck.h>
#include <rddialog.h>
#include <rdmatrix.h>
#include <rdrecording.h>
class EditSwitchEvent : public RDDialog
{
Q_OBJECT
public:
@ -71,7 +66,7 @@ class EditSwitchEvent : public QDialog
RDRecording *edit_recording;
QCheckBox *edit_active_button;
QComboBox *edit_station_box;
Q3TimeEdit *edit_starttime_edit;
QTimeEdit *edit_starttime_edit;
QLineEdit *edit_description_edit;
QComboBox *edit_matrix_box;
QComboBox *edit_input_box;

118
rdcatch/edit_upload.cpp
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Upload Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,64 +18,39 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qgroupbox.h>
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <qurl.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcut_dialog.h>
#include <rdcut_path.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdexport_settings_dialog.h>
#include <rdtextvalidator.h>
#include <rdurl.h>
#include <edit_upload.h>
#include <globals.h>
#include "edit_upload.h"
#include "globals.h"
EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
QString sql;
RDSqlQuery *q;
QString temp;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",12,QFont::Bold);
label_font.setPixelSize(12);
QFont day_font=QFont("Helvetica",10,QFont::Normal);
day_font.setPixelSize(10);
edit_deck=NULL;
edit_added_events=adds;
edit_filter=filter;
setWindowTitle("RDCatch - "+tr("Edit Upload"));
//
// Fix the Window Size
//
setMinimumSize(sizeHint());
setMaximumSize(sizeHint());
//
// Text Validator
//
@ -93,7 +68,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_active_button->setGeometry(10,11,20,20);
QLabel *label=new QLabel(edit_active_button,tr("Event Active"),this);
label->setGeometry(30,11,125,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -105,17 +80,18 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
this,SLOT(stationChangedData(const QString &)));
label=new QLabel(edit_station_box,tr("Location:"),this);
label->setGeometry(125,10,70,23);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
// Start Time
//
edit_starttime_edit=new Q3TimeEdit(this);
edit_starttime_edit=new QTimeEdit(this);
edit_starttime_edit->setGeometry(sizeHint().width()-90,12,80,20);
edit_starttime_edit->setDisplayFormat("hh:mm:ss");
label=new QLabel(edit_starttime_edit,tr("Start Time:"),this);
label->setGeometry(sizeHint().width()-175,12,80,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -126,7 +102,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_feed_box->insertItem(tr("[none]"));
label=new QLabel(edit_feed_box,tr("RSS Feed:"),this);
label->setGeometry(10,43,100,19);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -137,11 +113,11 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_destination_edit->setReadOnly(true);
label=new QLabel(edit_destination_edit,tr("Source:"),this);
label->setGeometry(10,70,100,19);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
QPushButton *button=new QPushButton(this);
button->setGeometry(sizeHint().width()-70,68,60,24);
button->setFont(day_font);
button->setFont(subButtonFont());
button->setText(tr("&Select"));
connect(button,SIGNAL(clicked()),this,SLOT(selectCartData()));
@ -153,7 +129,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_description_edit->setValidator(validator);
label=new QLabel(edit_description_edit,tr("Description:"),this);
label->setGeometry(10,97,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -167,7 +143,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
this,SLOT(urlChangedData(const QString &)));
label=new QLabel(edit_url_edit,tr("Url:"),this);
label->setGeometry(10,124,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -179,7 +155,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_username_edit->setValidator(validator);
edit_username_label=new QLabel(edit_username_edit,tr("Username:"),this);
edit_username_label->setGeometry(10,151,100,20);
edit_username_label->setFont(label_font);
edit_username_label->setFont(labelFont());
edit_username_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -192,7 +168,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_username_edit->setValidator(validator);
edit_password_label=new QLabel(edit_password_edit,tr("Password:"),this);
edit_password_label->setGeometry(275,151,80,20);
edit_password_label->setFont(label_font);
edit_password_label->setFont(labelFont());
edit_password_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -203,11 +179,11 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_format_edit->setReadOnly(true);
label=new QLabel(edit_format_edit,tr("Export Format:"),this);
label->setGeometry(5,178,105,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter|Qt::TextShowMnemonic);
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-70,176,60,24);
button->setFont(day_font);
button->setFont(subButtonFont());
button->setText(tr("S&et"));
connect(button,SIGNAL(clicked()),this,SLOT(setFormatData()));
@ -219,7 +195,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_normalize_box->setChecked(true);
label=new QLabel(edit_normalize_box,tr("Normalize"),this);
label->setGeometry(135,206,83,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(edit_normalize_box,SIGNAL(toggled(bool)),
this,SLOT(normalizeCheckData(bool)));
@ -232,11 +208,11 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_normalize_spin->setRange(-30,0);
edit_normalize_label=new QLabel(edit_normalize_spin,tr("Level:"),this);
edit_normalize_label->setGeometry(215,206,45,20);
edit_normalize_label->setFont(label_font);
edit_normalize_label->setFont(labelFont());
edit_normalize_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit_normalize_unit=new QLabel(tr("dBFS"),this);
edit_normalize_unit->setGeometry(310,206,40,20);
edit_normalize_unit->setFont(label_font);
edit_normalize_unit->setFont(labelFont());
edit_normalize_unit->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
@ -246,14 +222,14 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_metadata_box->setGeometry(115,231,15,15);
label=new QLabel(edit_metadata_box,tr("Export Library Metadata"),this);
label->setGeometry(135,231,160,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
//
// Button Label
//
QGroupBox *groupbox=new QGroupBox(tr("Active Days"),this);
groupbox->setFont(label_font);
groupbox->setFont(labelFont());
groupbox->setGeometry(10,266,sizeHint().width()-20,62);
//
@ -263,7 +239,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_mon_button->setGeometry(20,282,20,20);
label=new QLabel(edit_mon_button,tr("Monday"),this);
label->setGeometry(40,282,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -273,7 +249,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_tue_button->setGeometry(115,282,20,20);
label=new QLabel(edit_tue_button,tr("Tuesday"),this);
label->setGeometry(135,282,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -283,7 +259,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_wed_button->setGeometry(215,282,20,20);
label=new QLabel(edit_wed_button,tr("Wednesday"),this);
label->setGeometry(235,282,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -293,7 +269,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_thu_button->setGeometry(335,282,20,20);
label=new QLabel(edit_thu_button,tr("Thursday"),this);
label->setGeometry(355,282,115,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -303,7 +279,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_fri_button->setGeometry(440,282,20,20);
label=new QLabel(edit_fri_button,tr("Friday"),this);
label->setGeometry(460,282,40,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -313,7 +289,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_sat_button->setGeometry(130,307,20,20);
label=new QLabel(edit_sat_button,tr("Saturday"),this);
label->setGeometry(150,307,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -323,7 +299,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_sun_button->setGeometry(300,307,20,20);
label=new QLabel(edit_sun_button,tr("Sunday"),this);
label->setGeometry(320,307,60,20);
label->setFont(day_font);
label->setFont(subLabelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -332,8 +308,8 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_oneshot_box=new QCheckBox(this);
edit_oneshot_box->setGeometry(20,342,15,15);
label=new QLabel(edit_oneshot_box,tr("Make OneShot"),this);
label->setGeometry(40,343,115,20);
label->setFont(label_font);
label->setGeometry(40,340,115,20);
label->setFont(labelFont());
label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter|Qt::TextShowMnemonic);
//
@ -344,11 +320,11 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
edit_eventoffset_spin->setRange(-30,30);
label=new QLabel(edit_eventoffset_spin,tr("Event Offset:"),this);
label->setGeometry(140,340,100,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
label=new QLabel(edit_eventoffset_spin,tr("days"),this);
label->setGeometry(295,335,40,20);
label->setFont(label_font);
label->setFont(labelFont());
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
//
@ -356,7 +332,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-300,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Save As\nNew"));
connect(button,SIGNAL(clicked()),this,SLOT(saveasData()));
if(adds==NULL) {
@ -369,7 +345,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
@ -378,7 +354,7 @@ EditUpload::EditUpload(int id,std::vector<int> *adds,QString *filter,
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(button_font);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
@ -471,7 +447,7 @@ void EditUpload::stationChangedData(const QString &str)
void EditUpload::urlChangedData(const QString &str)
{
Q3Url url(str);
QUrl url(str);
QString protocol=url.protocol().lower();
if((protocol=="ftp")||(protocol=="file")||
(protocol=="scp")||(protocol=="sftp")) {
@ -544,12 +520,12 @@ void EditUpload::okData()
tr("The currently selected export format is unsupported on host ")+edit_station_box->currentText()+"!");
return;
}
if(Q3Url::isRelativeUrl(edit_url_edit->text())||
if(QUrl::isRelativeUrl(edit_url_edit->text())||
(edit_url_edit->text().right(1)=="/")) {
QMessageBox::warning(this,tr("Invalid URL"),tr("The URL is invalid!"));
return;
}
RDUrl url(edit_url_edit->text());
QUrl url(edit_url_edit->text());
QString protocol=url.protocol();
if((protocol!="ftp")&&(protocol!="file")&&
(protocol!="scp")&&(protocol!="sftp")) {

20
rdcatch/edit_upload.h
View File

@ -2,7 +2,7 @@
//
// Edit a Rivendell Upload Event
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,23 +21,17 @@
#ifndef EDIT_UPLOAD_H
#define EDIT_UPLOAD_H
#include <vector>
#include <qdialog.h>
#include <qsqldatabase.h>
#include <qlineedit.h>
#include <q3datetimeedit.h>
#include <qcombobox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qdatetimeedit.h>
#include <qlabel.h>
#include <qspinbox.h>
#include <rdrecording.h>
#include <rddeck.h>
#include <rdcart.h>
#include <rdsettings.h>
#include <rddialog.h>
#include <rdrecording.h>
class EditUpload : public QDialog
class EditUpload : public RDDialog
{
Q_OBJECT
public:
@ -69,7 +63,7 @@ class EditUpload : public QDialog
RDSettings edit_settings;
QCheckBox *edit_active_button;
QComboBox *edit_station_box;
Q3TimeEdit *edit_starttime_edit;
QTimeEdit *edit_starttime_edit;
QComboBox *edit_feed_box;
QLineEdit *edit_description_edit;
QLineEdit *edit_url_edit;

25
rdcatch/list_reports.cpp
View File

@ -2,7 +2,7 @@
//
// List and Generate RDCatch Reports
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -18,14 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qdialog.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <rdcart_search_text.h>
#include <rdcart.h>
#include <rdconf.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdrecording.h>
#include <rdreport.h>
@ -36,10 +29,8 @@
ListReports::ListReports(bool today_only,bool active_only,int dow,
QWidget *parent)
: QDialog(parent)
: RDDialog(parent)
{
setModal(true);
list_today_only=today_only;
list_active_only=active_only;
list_dow=dow;
@ -54,12 +45,6 @@ ListReports::ListReports(bool today_only,bool active_only,int dow,
setWindowTitle("RDCatch - "+tr("RDLibrary Reports"));
//
// Create Fonts
//
QFont font=QFont("Helvetica",12,QFont::Bold);
font.setPixelSize(12);
//
// Reports List
//
@ -70,7 +55,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow,
QLabel *list_reports_label=
new QLabel(list_reports_box,tr("Type:"),this);
list_reports_label->setGeometry(10,10,35,19);
list_reports_label->setFont(font);
list_reports_label->setFont(labelFont());
list_reports_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
//
@ -80,7 +65,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow,
generate_button->
setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
generate_button->setDefault(true);
generate_button->setFont(font);
generate_button->setFont(buttonFont());
generate_button->setText(tr("&Generate"));
connect(generate_button,SIGNAL(clicked()),this,SLOT(generateData()));
@ -90,7 +75,7 @@ ListReports::ListReports(bool today_only,bool active_only,int dow,
QPushButton *close_button=new QPushButton(this);
close_button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,
80,50);
close_button->setFont(font);
close_button->setFont(buttonFont());
close_button->setText(tr("&Close"));
connect(close_button,SIGNAL(clicked()),this,SLOT(closeData()));
}

8
rdcatch/list_reports.h
View File

@ -2,7 +2,7 @@
//
// List and Generate RDCatch Reports
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,13 +21,11 @@
#ifndef LIST_REPORTS_H
#define LIST_REPORTS_H
#include <qdialog.h>
#include <qcombobox.h>
#include <qsqldatabase.h>
#include <rdsvc.h>
#include <rddialog.h>
class ListReports : public QDialog
class ListReports : public RDDialog
{
Q_OBJECT
public:

86
rdcatch/rdcatch.cpp
View File

@ -19,40 +19,15 @@
//
#include <assert.h>
#include <unistd.h>
#include <qapplication.h>
#include <qwindowsstyle.h>
#include <qwidget.h>
#include <qpainter.h>
#include <q3sqlpropertymap.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qlabel.h>
#include <q3listview.h>
#include <qsignalmapper.h>
#include <qtextcodec.h>
#include <qtranslator.h>
#include <qlayout.h>
#include <rdprofile.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdaudio_port.h>
#include <rdcatch.h>
#include <rdconf.h>
#include <rdcut.h>
#include <rdcut_path.h>
#include <rddeck.h>
#include <rdedit_audio.h>
#include <rdescape_string.h>
#include <rdmixer.h>
#include <rdripc.h>
#include <rdsettings.h>
#include <rdstation.h>
#include <rduser.h>
#include <dbversion.h>
#include "add_recording.h"
#include "colors.h"
@ -65,6 +40,7 @@
#include "list_reports.h"
#include "edit_switchevent.h"
#include "edit_upload.h"
#include "rdcatch.h"
//
// Global Resources
@ -106,8 +82,8 @@ QString CatchConnector::stationName()
MainWidget::MainWidget(QWidget *parent)
: QWidget(parent)
MainWidget::MainWidget(RDConfig *c,QWidget *parent)
: RDWidget(c,parent)
{
QString str;
QString err_msg;
@ -149,21 +125,6 @@ MainWidget::MainWidget(QWidget *parent)
setMinimumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
//
// Generate Fonts
//
QFont default_font("Helvetica",12,QFont::Normal);
default_font.setPixelSize(12);
qApp->setFont(default_font);
QFont list_font=QFont("Helvetica",12,QFont::Normal);
list_font.setPixelSize(12);
QFont label_font=QFont("Helvetica",10,QFont::Bold);
label_font.setPixelSize(10);
QFont button_font=QFont("Helvetica",12,QFont::Bold);
button_font.setPixelSize(12);
QFont clock_font=QFont("Helvetica",18,QFont::Bold);
clock_font.setPixelSize(18);
//
// Create Icons
//
@ -326,21 +287,21 @@ MainWidget::MainWidget(QWidget *parent)
catch_show_active_label=new QLabel(catch_show_active_box,
tr("Show Only Active Events"),
this,"catch_show_active_label");
catch_show_active_label->setFont(label_font);
catch_show_active_label->setFont(labelFont());
catch_show_active_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(catch_show_active_box,SIGNAL(toggled(bool)),
this,SLOT(filterChangedData(bool)));
catch_show_today_box=new QCheckBox(this);
catch_show_today_label=
new QLabel(catch_show_active_box,tr("Show Only Today's Events"),this);
catch_show_today_label->setFont(label_font);
catch_show_today_label->setFont(labelFont());
catch_show_today_label->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
connect(catch_show_today_box,SIGNAL(toggled(bool)),
this,SLOT(filterChangedData(bool)));
catch_dow_box=new QComboBox(this);
catch_dow_label=new QLabel(catch_dow_box,tr("Show DayOfWeek:"),this);
catch_dow_label->setFont(label_font);
catch_dow_label->setFont(labelFont());
catch_dow_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
catch_dow_box->insertItem(tr("All"));
catch_dow_box->insertItem(tr("Weekdays"));
@ -356,7 +317,7 @@ MainWidget::MainWidget(QWidget *parent)
catch_type_box=new QComboBox(this);
connect(catch_type_box,SIGNAL(activated(int)),this,SLOT(filterActivatedData(int)));
catch_type_label=new QLabel(catch_type_box,tr("Show Event Type")+":",this);
catch_type_label->setFont(label_font);
catch_type_label->setFont(labelFont());
catch_type_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
for(int i=0;i<RDRecording::LastType;i++) {
catch_type_box->insertItem(*(catch_type_maps[i]),
@ -377,7 +338,6 @@ MainWidget::MainWidget(QWidget *parent)
catch_recordings_list=new CatchListView(this);
catch_recordings_list->setAllColumnsShowFocus(true);
catch_recordings_list->setItemMargin(5);
catch_recordings_list->setFont(list_font);
connect(catch_recordings_list,SIGNAL(selectionChanged(Q3ListViewItem *)),
this,SLOT(selectionChangedData(Q3ListViewItem *)));
connect(catch_recordings_list,
@ -457,7 +417,7 @@ MainWidget::MainWidget(QWidget *parent)
// Add Button
//
catch_add_button=new QPushButton(this);
catch_add_button->setFont(button_font);
catch_add_button->setFont(buttonFont());
catch_add_button->setText(tr("&Add"));
connect(catch_add_button,SIGNAL(clicked()),this,SLOT(addData()));
@ -465,7 +425,7 @@ MainWidget::MainWidget(QWidget *parent)
// Edit Button
//
catch_edit_button=new QPushButton(this);
catch_edit_button->setFont(button_font);
catch_edit_button->setFont(buttonFont());
catch_edit_button->setText(tr("&Edit"));
connect(catch_edit_button,SIGNAL(clicked()),this,SLOT(editData()));
@ -473,7 +433,7 @@ MainWidget::MainWidget(QWidget *parent)
// Delete Button
//
catch_delete_button=new QPushButton(this);
catch_delete_button->setFont(button_font);
catch_delete_button->setFont(buttonFont());
catch_delete_button->setText(tr("&Delete"));
connect(catch_delete_button,SIGNAL(clicked()),this,SLOT(deleteData()));
@ -481,7 +441,7 @@ MainWidget::MainWidget(QWidget *parent)
// Scroll Button
//
catch_scroll_button=new QPushButton(this);
catch_scroll_button->setFont(button_font);
catch_scroll_button->setFont(buttonFont());
catch_scroll_button->setText(tr("Scroll"));
connect(catch_scroll_button,SIGNAL(clicked()),this,SLOT(scrollButtonData()));
@ -489,7 +449,7 @@ MainWidget::MainWidget(QWidget *parent)
// Reports Button
//
catch_reports_button=new QPushButton(this);
catch_reports_button->setFont(button_font);
catch_reports_button->setFont(buttonFont());
catch_reports_button->setText(tr("Reports"));
connect(catch_reports_button,SIGNAL(clicked()),this,SLOT(reportsButtonData()));
@ -497,7 +457,7 @@ MainWidget::MainWidget(QWidget *parent)
// Wall Clock
//
catch_clock_label=new QLabel("00:00:00",this);
catch_clock_label->setFont(clock_font);
catch_clock_label->setFont(progressFont());
catch_clock_label->setAlignment(Qt::AlignCenter);
catch_clock_timer=new QTimer(this);
connect(catch_clock_timer,SIGNAL(timeout()),this,SLOT(clockData()));
@ -530,7 +490,7 @@ MainWidget::MainWidget(QWidget *parent)
// Close Button
//
catch_close_button=new QPushButton(this);
catch_close_button->setFont(button_font);
catch_close_button->setFont(buttonFont());
catch_close_button->setText(tr("&Close"));
catch_close_button->setFocus();
catch_close_button->setDefault(true);
@ -1335,14 +1295,14 @@ void MainWidget::resizeEvent(QResizeEvent *e)
deck_height=catch_monitor_view->geometry().y()+
catch_monitor_view->geometry().height();
}
catch_show_active_label->setGeometry(35,deck_height+5,140,20);
catch_show_active_label->setGeometry(35,deck_height+4,155,20);
catch_show_active_box->setGeometry(15,deck_height+7,15,15);
catch_show_today_label->setGeometry(205,deck_height+5,145,20);
catch_show_today_box->setGeometry(185,deck_height+7,15,15);
catch_dow_label->setGeometry(370,deck_height+5,125,20);
catch_dow_box->setGeometry(500,deck_height+4,120,20);
catch_type_label->setGeometry(630,deck_height+5,125,20);
catch_type_box->setGeometry(760,deck_height+4,140,20);
catch_show_today_label->setGeometry(225,deck_height+4,170,20);
catch_show_today_box->setGeometry(205,deck_height+7,15,15);
catch_dow_label->setGeometry(400,deck_height+4,125,20);
catch_dow_box->setGeometry(530,deck_height+4,120,20);
catch_type_label->setGeometry(660,deck_height+4,125,20);
catch_type_box->setGeometry(790,deck_height+4,140,20);
catch_recordings_list->
setGeometry(10,deck_height+25,e->size().width()-20,
e->size().height()-90-deck_height);
@ -2156,7 +2116,9 @@ int main(int argc,char *argv[])
//
// Start Event Loop
//
MainWidget *w=new MainWidget();
RDConfig *config=new RDConfig();
config->load();
MainWidget *w=new MainWidget(config);
a.setMainWidget(w);
w->show();
return a.exec();

25
rdcatch/rdcatch.h
View File

@ -2,7 +2,7 @@
//
// The Event Schedule Manager for Rivendell.
//
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2019 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
@ -21,29 +21,12 @@
#ifndef RDCATCH_H
#define RDCATCH_H
#include <vector>
#include <qwidget.h>
#include <qsize.h>
#include <qsizepolicy.h>
#include <qsqldatabase.h>
#include <qpixmap.h>
#include <qtimer.h>
#include <qcheckbox.h>
#include <qcombobox.h>
#include <qpixmap.h>
#include <q3scrollview.h>
#include <QCloseEvent>
#include <QResizeEvent>
#include <QLabel>
#include <rd.h>
#include <rdcatch_connect.h>
#include <rdconfig.h>
#include <rddb.h>
#include <rddeck.h>
#include <rdlistviewitem.h>
#include <rdtransportbutton.h>
#include <rdwidget.h>
#include "catch_listview.h"
#include "catch_monitor.h"
@ -73,11 +56,11 @@ class CatchConnector
};
class MainWidget : public QWidget
class MainWidget : public RDWidget
{
Q_OBJECT
public:
MainWidget(QWidget *parent=0);
MainWidget(RDConfig *c,QWidget *parent=0);
QSize sizeHint() const;
QSizePolicy sizePolicy() const;