Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-13 15:38:58 +02:00
Code Issues Projects Releases Wiki Activity

2020-02-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'Q3ProgressBar' dependency from rdlogedit(1).
This commit is contained in:
Fred Gleason 2020-02-26 16:16:57 -05:00
parent fb9c23483f
commit 884d7522de
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -19721,3 +19721,5 @@
* Removed the 'Q3ProgressBar' dependency from rdcartslots(1). * Removed the 'Q3ProgressBar' dependency from rdcartslots(1).
2020-02-26 Fred Gleason <fredg@paravelsystems.com> 2020-02-26 Fred Gleason <fredg@paravelsystems.com>
* Added sanity check code to 'RDRender'. * Added sanity check code to 'RDRender'.
2020-02-26 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3ProgressBar' dependency from rdlogedit(1).

20
rdlogedit/render_dialog.cpp
View File

@ -2,7 +2,7 @@
// //
// Render Log Dialog for Rivendell. // Render Log Dialog for Rivendell.
// //
// (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -53,8 +53,8 @@ RenderDialog::RenderDialog(RDStation *station,RDSystem *system,RDConfig *config,
// Dialogs // Dialogs
// //
render_progress_dialog= render_progress_dialog=
new Q3ProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,this,"",true); new QProgressDialog(tr("Rendering Log..."),tr("Cancel"),0,0,this);
render_progress_dialog->setWindowTitle("RDLogEdit - "+tr("Render Progress")); render_progress_dialog->setWindowTitle(tr("Render Progress"));
// //
// Settings // Settings
@ -214,7 +214,7 @@ void RenderDialog::selectData()
{ {
if(render_to_box->currentItem()) { if(render_to_box->currentItem()) {
QString filename= QString filename=
QFileDialog::getSaveFileName(this,"RDLogEdit - "+tr("Render Log"), QFileDialog::getSaveFileName(this,tr("Render Log"),
render_save_path,RD_AUDIO_FILE_FILTER); render_save_path,RD_AUDIO_FILE_FILTER);
if(!filename.isEmpty()) { if(!filename.isEmpty()) {
render_filename_edit->setText(filename); render_filename_edit->setText(filename);
@ -253,6 +253,13 @@ void RenderDialog::audiosettingsData()
} }
void RenderDialog::lineStartedData(int linno,int totallines)
{
render_progress_dialog->setMaximum(totallines);
render_progress_dialog->setValue(linno);
}
void RenderDialog::renderData() void RenderDialog::renderData()
{ {
QString err_msg; QString err_msg;
@ -269,9 +276,8 @@ void RenderDialog::renderData()
start_time=render_starttime_edit->time(); start_time=render_starttime_edit->time();
} }
RDRenderer *r=new RDRenderer(this); RDRenderer *r=new RDRenderer(this);
connect(r,SIGNAL(lineStarted(int,int)), connect(r,SIGNAL(lineStarted(int,int)),this,SLOT(lineStartedData(int,int)));
render_progress_dialog,SLOT(setProgress(int,int))); connect(render_progress_dialog,SIGNAL(canceled()),r,SLOT(abort()));
connect(render_progress_dialog,SIGNAL(cancelled()),r,SLOT(abort()));
if(render_to_box->currentItem()) { if(render_to_box->currentItem()) {
result= result=
r->renderToFile(render_filename_edit->text(),render_log,render_settings, r->renderToFile(render_filename_edit->text(),render_log,render_settings,

8
rdlogedit/render_dialog.h
View File

@ -2,7 +2,7 @@
// //
// Log Rendering Dialog for Rivendell. // Log Rendering Dialog for Rivendell.
// //
// (C) Copyright 2017-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2017-2020 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -21,9 +21,8 @@
#ifndef RENDER_DIALOG_H #ifndef RENDER_DIALOG_H
#define RENDER_DIALOG_H #define RENDER_DIALOG_H
#include <q3progressdialog.h>
#include <qdatetimeedit.h> #include <qdatetimeedit.h>
#include <qprogressdialog.h>
#include <rdcut_dialog.h> #include <rdcut_dialog.h>
#include <rddialog.h> #include <rddialog.h>
@ -53,6 +52,7 @@ class RenderDialog : public RDDialog
void selectData(); void selectData();
void starttimeSourceData(int item); void starttimeSourceData(int item);
void audiosettingsData(); void audiosettingsData();
void lineStartedData(int linno,int totallines);
void renderData(); void renderData();
void cancelData(); void cancelData();
@ -69,7 +69,7 @@ class RenderDialog : public RDDialog
int render_first_line; int render_first_line;
int render_last_line; int render_last_line;
RDSettings *render_settings; RDSettings *render_settings;
Q3ProgressDialog *render_progress_dialog; QProgressDialog *render_progress_dialog;
QLabel *render_to_label; QLabel *render_to_label;
QComboBox *render_to_box; QComboBox *render_to_box;
QLabel *render_filename_label; QLabel *render_filename_label;