diff --git a/ChangeLog b/ChangeLog index 8eceb81f..2192c1f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21887,3 +21887,6 @@ 2021-06-14 Fred Gleason * Reworked the 'ListLog' widget in rdairplay(1) to support dynamic resizing. +2021-06-14 Fred Gleason + * Removed commented-out code from the 'ListLog' widget in + rdairplay(1). diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index 89f014a3..b5a81ea7 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -158,10 +158,10 @@ ListLog::ListLog(RDLogPlay *log,int id,bool allow_pause, // // Time Counter Section // - log_groupbox=new QGroupBox(tr("Run Length"),this); - log_groupbox->setFont(labelFont()); + list_groupbox=new QGroupBox(tr("Run Length"),this); + list_groupbox->setFont(labelFont()); if(!rda->airplayConf()->showCounters()) { - log_groupbox->hide(); + list_groupbox->hide(); } // @@ -310,16 +310,8 @@ ListLog::ListLog(RDLogPlay *log,int id,bool allow_pause, // // Map Slots // - // connect(list_log,SIGNAL(reloaded()),this,SLOT(logReloadedData())); - // connect(list_log,SIGNAL(played(int)),this,SLOT(logPlayedData(int))); - // connect(list_log,SIGNAL(paused(int)),this,SLOT(logPausedData(int))); - // connect(list_log,SIGNAL(stopped(int)),this,SLOT(logStoppedData(int))); - // connect(list_log,SIGNAL(inserted(int)),this,SLOT(logInsertedData(int))); - // connect(list_log,SIGNAL(removed(int,int,bool)), - // this,SLOT(logRemovedData(int,int,bool))); connect(list_log,SIGNAL(transportChanged()), this,SLOT(transportChangedData())); - // connect(list_log,SIGNAL(modified(int)),this,SLOT(modifiedData(int))); connect(list_log,SIGNAL(refreshabilityChanged(bool)), this,SLOT(refreshabilityChangedData(bool))); connect(list_log,SIGNAL(auditionHeadPlayed(int)), @@ -923,7 +915,7 @@ void ListLog::resizeEvent(QResizeEvent *e) // // Counters // - log_groupbox->setGeometry(695,size().height()-61,153,58); + list_groupbox->setGeometry(695,size().height()-61,153,58); list_stoptime_edit->setGeometry(773,size().height()-45,70,18); list_stoptime_label->setGeometry(703,size().height()-45,65,18); list_endtime_edit->setGeometry(773,size().height()-25,70,18); @@ -952,7 +944,7 @@ void ListLog::resizeEvent(QResizeEvent *e) // // Counters // - log_groupbox->setGeometry(333,size().height()-116,158,58); + list_groupbox->setGeometry(333,size().height()-116,158,58); list_stoptime_edit->setGeometry(412,size().height()-100,70,18); list_stoptime_label->setGeometry(342,size().height()-100,65,18); list_endtime_edit->setGeometry(412,size().height()-80,70,18); diff --git a/rdairplay/list_log.h b/rdairplay/list_log.h index 5b36bc7e..85a7b21f 100644 --- a/rdairplay/list_log.h +++ b/rdairplay/list_log.h @@ -2,7 +2,7 @@ // // The full log widget for RDAirPlay. // -// (C) Copyright 2002-2020 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // 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 @@ -89,6 +89,7 @@ class ListLog : public RDWidget RDAirPlayConf::ActionMode list_action_mode; ListLog::PlayButtonMode list_playbutton_mode; EditEvent *list_event_edit; + QGroupBox *list_groupbox; QLabel *list_endtime_label; QLineEdit *list_endtime_edit; QLabel *list_stoptime_label; @@ -116,8 +117,6 @@ class ListLog : public RDWidget bool list_pause_allowed; bool list_audition_head_playing; bool list_audition_tail_playing; - - QGroupBox *log_groupbox; };