Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2021-07-27 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a layout glitch in the 'Add Event' dialog in rdcatch(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-07-27 12:38:18 -04:00
parent dae369075e
commit c189ff0b77
3 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
rdcatch/add_recording.cpp
View File

@@ -31,7 +31,7 @@
extern RDStation *rdstation_conf;
AddRecording::AddRecording(QString *filter,QWidget *parent)
: RDDialog(parent,Qt::CustomizeWindowHint|Qt::WindowTitleHint)
: RDDialog(parent)
{
add_id=-1;
add_filter=filter;
@@ -47,90 +47,82 @@ AddRecording::AddRecording(QString *filter,QWidget *parent)
//
// Title Label
//
QLabel *label=new QLabel(tr("Schedule a:"),this);
label->setGeometry(0,0,sizeHint().width(),30);
label->setFont(labelFont());
label->setAlignment(Qt::AlignCenter);
add_title_label=new QLabel(tr("Schedule a:"),this);
add_title_label->setFont(labelFont());
add_title_label->setAlignment(Qt::AlignCenter);
//
// Recording Button
//
QPushButton *button=new QPushButton(this);
button->setGeometry(10,30,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Recording"));
button->setDisabled(true);
add_recording_button=new QPushButton(this);
add_recording_button->setFont(buttonFont());
add_recording_button->setText(tr("Recording"));
add_recording_button->setDisabled(true);
QString sql=QString("select `CHANNEL` from `DECKS` where ")+
"(`CARD_NUMBER`>=0)&&(`CHANNEL`>0)&&(`CHANNEL`<=9)";
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
button->setEnabled(true);
add_recording_button->setEnabled(true);
}
delete q;
connect(button,SIGNAL(clicked()),this,SLOT(recordingData()));
connect(add_recording_button,SIGNAL(clicked()),this,SLOT(recordingData()));
//
// Playout Button
//
button=new QPushButton(this);
button->setGeometry(10,80,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Playout"));
button->setDisabled(true);
add_playout_button=new QPushButton(this);
add_playout_button->setFont(buttonFont());
add_playout_button->setText(tr("Playout"));
add_playout_button->setDisabled(true);
sql=QString("select `CHANNEL` from `DECKS` where (`CARD_NUMBER`>=0)&&")+
"(`PORT_NUMBER`>=0)&&(`CHANNEL`>128)&&(`CHANNEL`<=137)";
q=new RDSqlQuery(sql);
if(q->first()) {
button->setEnabled(true);
add_playout_button->setEnabled(true);
}
delete q;
connect(button,SIGNAL(clicked()),this,SLOT(playoutData()));
connect(add_playout_button,SIGNAL(clicked()),this,SLOT(playoutData()));
//
// Download Event Button
//
button=new QPushButton(this);
button->setGeometry(10,130,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Download"));
connect(button,SIGNAL(clicked()),this,SLOT(downloadData()));
add_download_button=new QPushButton(this);
add_download_button->setFont(buttonFont());
add_download_button->setText(tr("Download"));
connect(add_download_button,SIGNAL(clicked()),this,SLOT(downloadData()));
//
// Upload Event Button
//
button=new QPushButton(this);
button->setGeometry(10,180,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Upload"));
connect(button,SIGNAL(clicked()),this,SLOT(uploadData()));
add_upload_button=new QPushButton(this);
add_upload_button->setFont(buttonFont());
add_upload_button->setText(tr("Upload"));
connect(add_upload_button,SIGNAL(clicked()),this,SLOT(uploadData()));
//
// Macro Event Cart Button
//
button=new QPushButton(this);
button->setGeometry(10,230,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Macro Cart"));
connect(button,SIGNAL(clicked()),this,SLOT(macroData()));
add_macrocart_button=new QPushButton(this);
add_macrocart_button->setFont(buttonFont());
add_macrocart_button->setText(tr("Macro Cart"));
connect(add_macrocart_button,SIGNAL(clicked()),this,SLOT(macroData()));
//
// Switch Event Cart Button
//
button=new QPushButton(this);
button->setGeometry(10,280,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Switch Event"));
connect(button,SIGNAL(clicked()),this,SLOT(switchData()));
add_switchevent_button=new QPushButton(this);
add_switchevent_button->setFont(buttonFont());
add_switchevent_button->setText(tr("Switch Event"));
connect(add_switchevent_button,SIGNAL(clicked()),this,SLOT(switchData()));
//
// Cancel Button
//
button=new QPushButton(this);
button->setGeometry(10,350,sizeHint().width()-20,50);
button->setFont(buttonFont());
button->setText(tr("Cancel"));
button->setDefault(true);
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
add_cancel_button=new QPushButton(this);
add_cancel_button->setFont(buttonFont());
add_cancel_button->setText(tr("Cancel"));
add_cancel_button->setDefault(true);
connect(add_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
}
@@ -160,12 +152,6 @@ int AddRecording::exec(RDRecording::Type *type,int rec_id)
}
void AddRecording::closeEvent(QCloseEvent *e)
{
cancelData();
}
void AddRecording::recordingData()
{
EditRecording *recording=new EditRecording(add_id,NULL,add_filter,this);
@@ -257,6 +243,21 @@ void AddRecording::cancelData()
}
void AddRecording::resizeEvent(QResizeEvent *e)
{
add_title_label->setGeometry(0,0,sizeHint().width(),30);
add_recording_button->setGeometry(10,30,sizeHint().width()-20,50);
add_playout_button->setGeometry(10,80,sizeHint().width()-20,50);
add_download_button->setGeometry(10,130,sizeHint().width()-20,50);
add_upload_button->setGeometry(10,180,sizeHint().width()-20,50);
add_macrocart_button->setGeometry(10,230,sizeHint().width()-20,50);
add_switchevent_button->setGeometry(10,280,sizeHint().width()-20,50);
add_cancel_button->setGeometry(10,340,sizeHint().width()-20,50);
}
void AddRecording::keyPressEvent(QKeyEvent *e)
{
switch(e->key()) {
@@ -269,3 +270,9 @@ void AddRecording::keyPressEvent(QKeyEvent *e)
break;
}
}
void AddRecording::closeEvent(QCloseEvent *e)
{
cancelData();
}

18
rdcatch/add_recording.h
View File

@@ -35,9 +35,6 @@ class AddRecording : public RDDialog
public slots:
int exec(RDRecording::Type *type,int rec_id);
protected:
void closeEvent(QCloseEvent *e);
private slots:
void recordingData();
void playoutData();
@@ -48,14 +45,23 @@ class AddRecording : public RDDialog
void cancelData();
protected:
void resizeEvent(QResizeEvent *e);
void keyPressEvent(QKeyEvent *e);
void closeEvent(QCloseEvent *e);
private:
int add_id;
RDRecording::Type *add_type;
QString *add_filter;
QLabel *add_title_label;
QPushButton *add_recording_button;
QPushButton *add_playout_button;
QPushButton *add_download_button;
QPushButton *add_upload_button;
QPushButton *add_macrocart_button;
QPushButton *add_switchevent_button;
QPushButton *add_cancel_button;
};
#endif
#endif // ADD_RECORDING_H