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

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

Browse Source 
* Removed the 'Q3ProgressDialog' dependency from the 'Select Cut'
	dialog.
This commit is contained in:
Fred Gleason
2020-02-25 17:20:35 -05:00
parent 2e6081c854
commit 42691d70aa
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -19707,3 +19707,6 @@
* Removed the 'Q3FileDialog' dependency from rddbconfig(8). * Removed the 'Q3FileDialog' dependency from rddbconfig(8).
2020-02-25 Fred Gleason <fredg@paravelsystems.com> 2020-02-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3FileDialog' dependency from rddiscimport(1). * Removed the 'Q3FileDialog' dependency from rddiscimport(1).
2020-02-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3ProgressDialog' dependency from the 'Select Cut'
dialog.

11
lib/rdcut_dialog.cpp
View File

@@ -2,7 +2,7 @@
// //
// A widget to select a Rivendell Cut. // A widget to select a Rivendell Cut.
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-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
@@ -83,8 +83,7 @@ RDCutDialog::RDCutDialog(QString *cutname,const QString &caption,
// Progress Dialog // Progress Dialog
// //
cut_progress_dialog= cut_progress_dialog=
new Q3ProgressDialog(tr("Please Wait..."),"Cancel",10,this, new QProgressDialog(tr("Please Wait..."),"Cancel",0,10,this,
"cut_progress_dialog",false,
Qt::WStyle_Customize|Qt::WStyle_NormalBorder); Qt::WStyle_Customize|Qt::WStyle_NormalBorder);
cut_progress_dialog->setCaption(" "); cut_progress_dialog->setCaption(" ");
QLabel *label=new QLabel(tr("Please Wait..."),cut_progress_dialog); QLabel *label=new QLabel(tr("Please Wait..."),cut_progress_dialog);
@@ -492,8 +491,8 @@ void RDCutDialog::RefreshCarts()
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
int step=0; int step=0;
int count=0; int count=0;
cut_progress_dialog->setTotalSteps(q->size()/RDCUT_DIALOG_STEP_SIZE); cut_progress_dialog->setMaximum(q->size()/RDCUT_DIALOG_STEP_SIZE);
cut_progress_dialog->setProgress(0); cut_progress_dialog->setValue(0);
while(q->next()) { while(q->next()) {
l=new RDListViewItem(cut_cart_list); l=new RDListViewItem(cut_cart_list);
switch((RDCart::Type)q->value(4).toUInt()) { switch((RDCart::Type)q->value(4).toUInt()) {
@@ -511,7 +510,7 @@ void RDCutDialog::RefreshCarts()
l->setText(3,q->value(2).toString()); // Group l->setText(3,q->value(2).toString()); // Group
l->setTextColor(3,q->value(3).toString(),QFont::Bold); l->setTextColor(3,q->value(3).toString(),QFont::Bold);
if(count++>RDCUT_DIALOG_STEP_SIZE) { if(count++>RDCUT_DIALOG_STEP_SIZE) {
cut_progress_dialog->setProgress(++step); cut_progress_dialog->setValue(++step);
count=0; count=0;
qApp->processEvents(QEventLoop::ExcludeUserInputEvents); qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
} }

6
lib/rdcut_dialog.h
View File

@@ -2,7 +2,7 @@
// //
// A widget to select a Rivendell Cut. // A widget to select a Rivendell Cut.
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-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
@@ -22,10 +22,10 @@
#define RDCUT_DIALOG_H #define RDCUT_DIALOG_H
#include <q3listview.h> #include <q3listview.h>
#include <q3progressdialog.h>
#include <qcombobox.h> #include <qcombobox.h>
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qprogressdialog.h>
#include <rddialog.h> #include <rddialog.h>
#include <rdlistviewitem.h> #include <rdlistviewitem.h>
@@ -90,7 +90,7 @@ class RDCutDialog : public RDDialog
QPixmap *cut_macro_map; QPixmap *cut_macro_map;
bool cut_allow_clear; bool cut_allow_clear;
bool cut_exclude_tracks; bool cut_exclude_tracks;
Q3ProgressDialog *cut_progress_dialog; QProgressDialog *cut_progress_dialog;
QString cut_caption; QString cut_caption;
}; };

2
rdlogedit/render_dialog.h
View File

@@ -21,6 +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 <rdcut_dialog.h> #include <rdcut_dialog.h>