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

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

Browse Source 
* Removed the 'Q3ProgressBar' dependency from rddiscimport(1).
This commit is contained in:
Fred Gleason 2020-02-26 16:20:46 -05:00
parent 884d7522de
commit 093aaa9b26
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

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

10
utils/rddiscimport/rddiscimport.cpp
View File

@ -157,14 +157,14 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
dg_disc_label=new QLabel(tr("Disk Progress"),this); dg_disc_label=new QLabel(tr("Disk Progress"),this);
dg_disc_label->setFont(labelFont()); dg_disc_label->setFont(labelFont());
dg_disc_label->setDisabled(true); dg_disc_label->setDisabled(true);
dg_disc_bar=new Q3ProgressBar(this); dg_disc_bar=new QProgressBar(this);
dg_disc_bar->setDisabled(true); dg_disc_bar->setDisabled(true);
dg_track_label=new QLabel(tr("Track Progress"),this); dg_track_label=new QLabel(tr("Track Progress"),this);
dg_track_label->setFont(labelFont()); dg_track_label->setFont(labelFont());
dg_track_label->setDisabled(true); dg_track_label->setDisabled(true);
dg_track_bar=new Q3ProgressBar(this); dg_track_bar=new QProgressBar(this);
dg_track_bar->setTotalSteps(dg_ripper->totalSteps()+1); dg_track_bar->setMaximum(dg_ripper->totalSteps()+1);
dg_track_bar->setDisabled(true); dg_track_bar->setDisabled(true);
connect(dg_ripper,SIGNAL(progressChanged(int)), connect(dg_ripper,SIGNAL(progressChanged(int)),
dg_track_bar,SLOT(setProgress(int))); dg_track_bar,SLOT(setProgress(int)));
@ -446,12 +446,12 @@ void MainWidget::ripData()
// //
// Rip and Import // Rip and Import
// //
dg_disc_bar->setTotalSteps(dg_player->tracks()); dg_disc_bar->setMaximum(dg_player->tracks());
for(int i=0;i<dg_player->tracks();i++) { for(int i=0;i<dg_player->tracks();i++) {
if(dg_rip_enableds[i]) { if(dg_rip_enableds[i]) {
MetaRecord *r=dg_metalibrary->track(dg_discid_edit->text(),i); MetaRecord *r=dg_metalibrary->track(dg_discid_edit->text(),i);
if(r!=NULL) { if(r!=NULL) {
dg_disc_bar->setProgress(i); dg_disc_bar->setValue(i);
dg_track_label->setText(QString().sprintf("Track %d: ",i+1)+ dg_track_label->setText(QString().sprintf("Track %d: ",i+1)+
r->title()+" - "+r->artist()); r->title()+" - "+r->artist());
dg_ripper->rip(i); dg_ripper->rip(i);

10
utils/rddiscimport/rddiscimport.h
View File

@ -2,7 +2,7 @@
// //
// A Qt-based application for importing TM Century GoldDisc CDs // A Qt-based application for importing TM Century GoldDisc CDs
// //
// (C) Copyright 2013-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2013-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,12 +21,12 @@
#ifndef RDDISCIMPORT_H #ifndef RDDISCIMPORT_H
#define RDDISCIMPORT_H #define RDDISCIMPORT_H
#include <q3progressbar.h>
#include <qcheckbox.h> #include <qcheckbox.h>
#include <qlabel.h>
#include <qcombobox.h> #include <qcombobox.h>
#include <qlabel.h>
#include <qlineedit.h> #include <qlineedit.h>
#include <qprogressbar.h>
#include <qspinbox.h> #include <qspinbox.h>
#include <rdaudioimport.h> #include <rdaudioimport.h>
@ -78,9 +78,9 @@ class MainWidget : public RDWidget
QLineEdit *dg_userdef_edit; QLineEdit *dg_userdef_edit;
RDListView *dg_track_list; RDListView *dg_track_list;
QLabel *dg_disc_label; QLabel *dg_disc_label;
Q3ProgressBar *dg_disc_bar; QProgressBar *dg_disc_bar;
QLabel *dg_track_label; QLabel *dg_track_label;
Q3ProgressBar *dg_track_bar; QProgressBar *dg_track_bar;
QLabel *dg_discid_label; QLabel *dg_discid_label;
QLineEdit *dg_discid_edit; QLineEdit *dg_discid_edit;
QPushButton *dg_rip_button; QPushButton *dg_rip_button;