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

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

Browse Source 
* Removed the 'Q3ProgressBar' dependency from rdcartslots(1).
This commit is contained in:
Fred Gleason
2020-02-26 14:01:12 -05:00
parent ce15a6e3c7
commit b0b69338ae
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -19717,3 +19717,5 @@
main window when Realtime Filtering is disabled. main window when Realtime Filtering is disabled.
2020-02-26 Fred Gleason <fredg@paravelsystems.com> 2020-02-26 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3ProgressBar' dependency from rdairplay(1). * Removed the 'Q3ProgressBar' dependency from rdairplay(1).
2020-02-26 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3ProgressBar' dependency from rdcartslots(1).

12
lib/rdslotbox.cpp
View File

@@ -111,9 +111,9 @@ RDSlotBox::RDSlotBox(RDPlayDeck *deck,RDAirPlayConf *conf,QWidget *parent)
// //
// Position Slider // Position Slider
// //
line_position_bar=new Q3ProgressBar(this); line_position_bar=new QProgressBar(this);
line_position_bar->setGeometry(115,69,sizeHint().width()-190,13); line_position_bar->setGeometry(115,69,sizeHint().width()-190,13);
line_position_bar->setPercentageVisible(false); line_position_bar->setTextVisible(false);
line_position_bar->hide(); line_position_bar->hide();
// //
@@ -347,8 +347,8 @@ void RDSlotBox::setCart(RDLogLine *logline)
line_down_label-> line_down_label->
setText(RDGetTimeLength(line_logline->effectiveLength()- setText(RDGetTimeLength(line_logline->effectiveLength()-
line_logline->playPosition(),true,true)); line_logline->playPosition(),true,true));
line_position_bar->setTotalSteps(line_logline->effectiveLength()); line_position_bar->setMaximum(line_logline->effectiveLength());
line_position_bar->setProgress(line_logline->playPosition()); line_position_bar->setValue(line_logline->playPosition());
if(logline->cutNumber()>=0) { if(logline->cutNumber()>=0) {
line_cut_label-> line_cut_label->
setText(QString().sprintf("%03u",logline->cutNumber())); setText(QString().sprintf("%03u",logline->cutNumber()));
@@ -435,13 +435,13 @@ void RDSlotBox::setTimer(int msecs)
if(line_logline==NULL) { if(line_logline==NULL) {
line_up_label->setText(RDGetTimeLength(0,true,true)); line_up_label->setText(RDGetTimeLength(0,true,true));
line_down_label->setText(RDGetTimeLength(0,true,true)); line_down_label->setText(RDGetTimeLength(0,true,true));
line_position_bar->setProgress(0); line_position_bar->setValue(0);
} }
else { else {
line_up_label->setText(RDGetTimeLength(msecs,true,true)); line_up_label->setText(RDGetTimeLength(msecs,true,true));
line_down_label-> line_down_label->
setText(RDGetTimeLength(line_logline->effectiveLength()-msecs,true,true)); setText(RDGetTimeLength(line_logline->effectiveLength()-msecs,true,true));
line_position_bar->setProgress(msecs); line_position_bar->setValue(msecs);
} }
} }

6
lib/rdslotbox.h
View File

@@ -21,13 +21,13 @@
#ifndef RDSLOTBOX_H #ifndef RDSLOTBOX_H
#define RDSLOTBOX_H #define RDSLOTBOX_H
#include <q3progressbar.h>
#include <qdatetime.h> #include <qdatetime.h>
#include <qlabel.h> #include <qlabel.h>
#include <qpushbutton.h>
#include <qpalette.h> #include <qpalette.h>
#include <qpixmap.h> #include <qpixmap.h>
#include <qprogressbar.h>
#include <qpushbutton.h>
#include <qtimer.h> #include <qtimer.h>
#include <rdairplay_conf.h> #include <rdairplay_conf.h>
@@ -89,7 +89,7 @@ class RDSlotBox : public RDWidget
QLabel *line_talktime_label; QLabel *line_talktime_label;
QLabel *line_up_label; QLabel *line_up_label;
QLabel *line_down_label; QLabel *line_down_label;
Q3ProgressBar *line_position_bar; QProgressBar *line_position_bar;
QTime line_end_time; QTime line_end_time;
int log_id; int log_id;
RDLogLine *line_logline; RDLogLine *line_logline;