diff --git a/ChangeLog b/ChangeLog index 353d3f59..1fbf7923 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14550,3 +14550,6 @@ 2014-10-10 Fred Gleason * Tweaked sensitivity for initiating drags on Sound Panel buttons in '/lib/rdpanel_button.cpp' [GitHub issue #000032]. +2014-10-10 Fred Gleason + * Adjusted display of Talk Time in button widget to allow for display + of lengths greater than :59 [GitHub issue #000018]. diff --git a/lib/rdlabel.h b/lib/rdlabel.h index fa5d86f2..6d09937d 100644 --- a/lib/rdlabel.h +++ b/lib/rdlabel.h @@ -38,7 +38,7 @@ class RDLabel : public QLabel Q_OBJECT public: - RDLabel(QWidget *parent,const char *name,WFlags f=0); + RDLabel(QWidget *parent=0,const char *name=0,WFlags f=0); RDLabel(const QString &text,QWidget *parent,const char *name,WFlags f=0); RDLabel(QWidget *buddy,const QString &text,QWidget *parent,const char *name, WFlags f=0); diff --git a/rdairplay/loglinebox.cpp b/rdairplay/loglinebox.cpp index a1b002b1..a75bc155 100644 --- a/rdairplay/loglinebox.cpp +++ b/rdairplay/loglinebox.cpp @@ -134,7 +134,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Count Up // - line_up_label=new QLabel(this,"line_up_label"); + line_up_label=new QLabel(this); line_up_label->setGeometry(5,65,65,16); line_up_label->setAlignment(AlignLeft|AlignVCenter); line_up_label->setFont(line_font); @@ -143,7 +143,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Position Slider // - line_position_bar=new QProgressBar(this,"line_position_bar"); + line_position_bar=new QProgressBar(this); line_position_bar->setGeometry(75,66,sizeHint().width()-150,13); line_position_bar->setPercentageVisible(false); line_position_bar->hide(); @@ -151,7 +151,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Count Down // - line_down_label=new QLabel(this,"line_down_label"); + line_down_label=new QLabel(this); line_down_label->setGeometry(sizeHint().width()-72,65,65,16); line_down_label->setAlignment(AlignLeft|AlignVCenter); line_down_label->setFont(line_font); @@ -160,7 +160,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Cut Description // - line_description_label=new QLabel(this,"line_description_label"); + line_description_label=new QLabel(this); line_description_label->setGeometry((sizeHint().width()/2),48,(sizeHint().width()/2 -10),16); line_description_label->setFont(line_font); line_description_label->hide(); @@ -168,7 +168,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Outcue // - line_outcue_label=new QLabel(this,"line_outcue_label"); + line_outcue_label=new QLabel(this); line_outcue_label->setGeometry(5,48, (sizeHint().width()/2 -10),16); line_outcue_label->setFont(outcue_font); line_outcue_label->hide(); @@ -176,21 +176,21 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Artist // - line_artist_label=new QLabel(this,"line_artist_label"); + line_artist_label=new QLabel(this); line_artist_label->setGeometry(5,33,sizeHint().width()-10,16); line_artist_label->setFont(line_font); // // Title // - line_title_label=new QLabel(this,"line_title_label"); + line_title_label=new QLabel(this); line_title_label->setGeometry(5,18,sizeHint().width()-10,18); line_title_label->setFont(line_bold_font); // // Marker Comment // - line_comment_label=new RDLabel(this,"line_comment_label"); + line_comment_label=new RDLabel(this); line_comment_label->setGeometry(5,18,sizeHint().width()-10,62); line_comment_label->setFont(line_font); line_comment_label->setAlignment(AlignTop|AlignLeft); @@ -200,35 +200,35 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Icon // - line_icon_label=new QLabel(this,"line_icon_label"); + line_icon_label=new QLabel(this); line_icon_label->setGeometry(5,3,45,16); // // Cart // - line_cart_label=new QLabel(this,"line_cart_label"); + line_cart_label=new QLabel(this); line_cart_label->setGeometry(25,3,53,16); line_cart_label->setFont(line_font); // // Cut // - line_cut_label=new QLabel(this,"line_cut_label"); + line_cut_label=new QLabel(this); line_cut_label->setGeometry(80,3,24,16); line_cut_label->setFont(line_font); // // Group // - line_group_label=new QLabel(this,"line_group_label"); + line_group_label=new QLabel(this); line_group_label->setGeometry(107,3,75,16); line_group_label->setFont(line_bold_font); // // Time // - line_time_label=new QLabel(this,"line_time_label"); - line_time_label->setGeometry(185,3,85,16); + line_time_label=new QLabel(this); + line_time_label->setGeometry(185,3,70,16); line_time_label->setFont(line_font); line_time_label->setAlignment(AlignRight); line_time_label->setPalette(line_time_palette); @@ -236,15 +236,15 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Talk Time // - line_talktime_label=new QLabel(this,"line_talktime_label"); - line_talktime_label->setGeometry(273,3,21,16); + line_talktime_label=new QLabel(this); + line_talktime_label->setGeometry(257,3,36,16); line_talktime_label->setFont(talk_font); line_talktime_label->setAlignment(AlignRight); // // Length // - line_length_label=new QLabel(this,"line_length_label"); + line_length_label=new QLabel(this); line_length_label->setGeometry(297,3,40,16); line_length_label->setFont(line_font); line_length_label->setAlignment(AlignRight); @@ -252,7 +252,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Transition Type // - line_trans_label=new QLabel(this,"line_trans_label"); + line_trans_label=new QLabel(this); line_trans_label->setGeometry(sizeHint().width()-53,3,48,16); line_trans_label->setAlignment(AlignRight); line_trans_label->setFont(line_bold_font); @@ -262,7 +262,7 @@ LogLineBox::LogLineBox(RDAirPlayConf *conf,QWidget *parent,const char *name) // // Countdown Timer // - line_countdown_timer=new QTimer(this,"line_countdown_timer"); + line_countdown_timer=new QTimer(this); connect(line_countdown_timer,SIGNAL(timeout()),this,SLOT(countdownData())); setAcceptDrops(true); @@ -844,6 +844,7 @@ void LogLineBox::dropEvent(QDropEvent *e) void LogLineBox::SetColor(QColor color) { setBackgroundColor(color); + // color=Qt::red; line_cart_label->setBackgroundColor(color); line_cut_label->setBackgroundColor(color); line_group_label->setBackgroundColor(color);