diff --git a/ChangeLog b/ChangeLog index 6c501a54..0a8d11a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14709,3 +14709,6 @@ * Fixed a bug in 'rdlogmanager/edit_eventline.cpp' that caused an invalid event line to be created when the dialog was closed by means of the 'X' button [GitHub issue #000053]. +2015-01-09 Fred Gleason + * Applied patch by Daniel Bair to add support for dark themes + [GitHub pull request #000046]. diff --git a/lib/rdedit_audio.cpp b/lib/rdedit_audio.cpp index 394fd30a..4759f118 100644 --- a/lib/rdedit_audio.cpp +++ b/lib/rdedit_audio.cpp @@ -169,8 +169,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_play_cursor_button=new RDTransportButton(RDTransportButton::PlayBetween, this,"edit_play_cursor_button"); edit_play_cursor_button->setGeometry(20,425,65,45); -// edit_play_cursor_button-> -// setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); edit_play_cursor_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_play_cursor_button,SIGNAL(clicked()), this,SLOT(playCursorData())); @@ -178,8 +176,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_play_start_button=new RDTransportButton(RDTransportButton::Play, this,"edit_play_start_button"); edit_play_start_button->setGeometry(90,425,65,45); -// edit_play_start_button-> -// setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); edit_play_start_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_play_start_button,SIGNAL(clicked()), this,SLOT(playStartData())); @@ -188,8 +184,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, this,"edit_pause_button"); edit_pause_button->setGeometry(160,425,65,45); edit_pause_button->setOnColor(QColor(red)); -// edit_pause_button-> -// setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); edit_pause_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_pause_button,SIGNAL(clicked()),this,SLOT(pauseData())); @@ -198,8 +192,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, edit_stop_button->setGeometry(230,425,65,45); edit_stop_button->on(); edit_stop_button->setOnColor(QColor(red)); -// edit_stop_button-> -// setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); edit_stop_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); @@ -207,8 +199,6 @@ RDEditAudio::RDEditAudio(RDCart *cart,QString cut_name,RDCae *cae,RDUser *user, this,"edit_loop_button"); edit_loop_button->setGeometry(300,425,65,45); edit_loop_button->off(); -// edit_loop_button-> -// setPalette(QPalette(backgroundColor(),QColor(EDITAUDIO_HIGHLIGHT_COLOR))); edit_loop_button->setEnabled((edit_card>=0)&&(edit_port>=0)); connect(edit_loop_button,SIGNAL(clicked()),this,SLOT(loopData())); @@ -2230,7 +2220,6 @@ bool RDEditAudio::SaveMarkers() // // Save Settings // - // edit_cut->setPlayGain(10*edit_gain_control->value()); edit_cut->setStartPoint((int)((double)(edit_cursors[RDEditAudio::Start])* 1152000.0/ (double)edit_sample_rate)); diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index 2e9a2bd2..ecab37fd 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -94,13 +94,11 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, QColor system_mid_color = colorGroup().mid(); list_from_color= QPalette(QColor(BUTTON_FROM_BACKGROUND_COLOR),QColor(system_mid_color)); - // QPalette(QColor(BUTTON_FROM_BACKGROUND_COLOR),QColor(lightGray)); list_from_color. setColor(QColorGroup::ButtonText,QColor(BUTTON_FROM_TEXT_COLOR)); list_to_color= QPalette(QColor(BUTTON_TO_BACKGROUND_COLOR),QColor(system_mid_color)); - // QPalette(QColor(BUTTON_TO_BACKGROUND_COLOR),QColor(lightGray)); list_to_color. setColor(QColorGroup::ButtonText,QColor(BUTTON_TO_TEXT_COLOR)); list_list_to_color=palette(); @@ -129,32 +127,25 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, BUTTON_LOG_ACTIVE_BACKGROUND_COLOR); list_scroll_color[0].setColor(QPalette::Active,QColorGroup::Background, system_mid_color); -// lightGray); list_scroll_color[0].setColor(QPalette::Inactive,QColorGroup::ButtonText, BUTTON_LOG_ACTIVE_TEXT_COLOR); list_scroll_color[0].setColor(QPalette::Inactive,QColorGroup::Button, BUTTON_LOG_ACTIVE_BACKGROUND_COLOR); list_scroll_color[0].setColor(QPalette::Inactive,QColorGroup::Background, system_mid_color); -// lightGray); -// list_scroll_color[1]=QPalette(backgroundColor(),QColor(system_button_text_color)); list_scroll_color[1]=palette(); list_scroll_color[1].setColor(QPalette::Active,QColorGroup::ButtonText, system_button_text_color); list_scroll_color[1].setColor(QPalette::Active,QColorGroup::Button, -// backgroundColor()); system_button_color); list_scroll_color[1].setColor(QPalette::Active,QColorGroup::Background, system_mid_color); -// lightGray); list_scroll_color[1].setColor(QPalette::Inactive,QColorGroup::ButtonText, system_button_text_color); list_scroll_color[1].setColor(QPalette::Inactive,QColorGroup::Button, -// backgroundColor()); system_button_color); list_scroll_color[1].setColor(QPalette::Inactive,QColorGroup::Background, system_mid_color); -// lightGray); // // Hour Selector @@ -243,7 +234,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, label->setFont(label_font); label->setAlignment(AlignCenter); label->setBackgroundColor(QColor(system_mid_color)); -// label->setBackgroundColor(QColor(lightGray)); if(!rdairplay_conf->showCounters()) { label->hide(); } @@ -258,7 +248,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_stoptime_label->setFont(label_font); list_stoptime_label->setAlignment(AlignRight|AlignVCenter); list_stoptime_label->setBackgroundColor(QColor(system_mid_color)); -// list_stoptime_label->setBackgroundColor(QColor(lightGray)); if(!rdairplay_conf->showCounters()) { list_stoptime_edit->hide(); list_stoptime_label->hide(); @@ -274,7 +263,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_endtime_label->setFont(label_font); list_endtime_label->setAlignment(AlignRight|AlignVCenter); list_endtime_label->setBackgroundColor(QColor(system_mid_color)); -// list_endtime_label->setBackgroundColor(QColor(lightGray)); if(!rdairplay_conf->showCounters()) { list_endtime_edit->hide(); list_endtime_label->hide(); @@ -287,7 +275,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_take_button->setGeometry(10,sizeHint().height()-55,80,50); list_take_button->setFont(font); list_take_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_take_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_take_button->setText(tr("Select")); list_take_button->setFocusPolicy(QWidget::NoFocus); connect(list_take_button,SIGNAL(clicked()),this,SLOT(takeButtonData())); @@ -300,7 +287,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_head_button->setGeometry(10,sizeHint().height()-113,80,50); list_head_button->setFont(font); list_head_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_head_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_head_button->setText(tr("Audition\nHead")); list_head_button->setFocusPolicy(QWidget::NoFocus); connect(list_head_button,SIGNAL(clicked()),this,SLOT(headButtonData())); @@ -315,7 +301,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_tail_button->setGeometry(90,sizeHint().height()-113,80,50); list_tail_button->setFont(font); list_tail_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_tail_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_tail_button->setText(tr("Audition\nTail")); list_tail_button->setFocusPolicy(QWidget::NoFocus); connect(list_tail_button,SIGNAL(clicked()),this,SLOT(tailButtonData())); @@ -330,7 +315,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_play_button->setGeometry(10,sizeHint().height()-55,80,50); list_play_button->setFont(font); list_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_play_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_play_button->setText(tr("Start")); list_play_button->setDisabled(true); list_play_button->setFocusPolicy(QWidget::NoFocus); @@ -343,8 +327,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_next_button->setGeometry(90,sizeHint().height()-55,80,50); list_next_button->setFont(font); list_next_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_next_button->setPalette(QPalette(backgroundColor(), -// QColor(lightGray))); list_next_button->setText(tr("Make\nNext")); list_next_button->setDisabled(true); list_next_button->setFocusPolicy(QWidget::NoFocus); @@ -357,8 +339,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_modify_button->setGeometry(170,sizeHint().height()-55,80,50); list_modify_button->setFont(font); list_modify_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_modify_button->setPalette(QPalette(backgroundColor(), -// QColor(lightGray))); list_modify_button->setText(tr("Modify")); list_modify_button->setDisabled(true); list_modify_button->setFocusPolicy(QWidget::NoFocus); @@ -371,8 +351,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_scroll_button->setGeometry(250,sizeHint().height()-55,80,50); list_scroll_button->setFont(font); list_scroll_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_scroll_button->setPalette(QPalette(backgroundColor(), -// QColor(lightGray))); list_scroll_button->setText(tr("Scroll")); list_scroll_button->setFocusPolicy(QWidget::NoFocus); connect(list_scroll_button,SIGNAL(clicked()),this,SLOT(scrollButtonData())); @@ -385,8 +363,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, list_refresh_button->setGeometry(330,sizeHint().height()-55,80,50); list_refresh_button->setFont(font); list_refresh_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_refresh_button-> -// setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_refresh_button->setText(tr("Refresh\nLog")); list_refresh_button->setDisabled(true); list_refresh_button->setFocusPolicy(QWidget::NoFocus); @@ -401,7 +377,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, 80,50); list_load_button->setFont(font); list_load_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// list_load_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); list_load_button->setText(tr("Select\nLog")); list_load_button->setFocusPolicy(QWidget::NoFocus); connect(list_load_button,SIGNAL(clicked()),this,SLOT(loadButtonData())); @@ -434,7 +409,6 @@ ListLog::ListLog(LogPlay *log,int id,bool allow_pause, this,SLOT(auditionStoppedData(int))); setBackgroundColor(QColor(system_mid_color)); -// setBackgroundColor(QColor(lightGray)); RefreshList(); UpdateTimes(); diff --git a/rdairplay/post_counter.cpp b/rdairplay/post_counter.cpp index dfc923cf..6c56fc69 100644 --- a/rdairplay/post_counter.cpp +++ b/rdairplay/post_counter.cpp @@ -176,8 +176,6 @@ void PostCounter::UpdateDisplay() QPixmap pix(sizeHint().width(),sizeHint().height()); QPainter *p=new QPainter(&pix); p->fillRect(0,0,sizeHint().width(),sizeHint().height(),color); - // p->eraseRect(0,0,sizeHint().width(),sizeHint().height()); - //p->setPen(color1); p->setPen(QColor(system_button_text_color)); p->setFont(post_small_font); p->drawText((sizeHint().width()-p-> diff --git a/rdairplay/stop_counter.cpp b/rdairplay/stop_counter.cpp index e415c923..b88dcf6a 100644 --- a/rdairplay/stop_counter.cpp +++ b/rdairplay/stop_counter.cpp @@ -143,8 +143,6 @@ void StopCounter::UpdateTime() p->fillRect(0,0,sizeHint().width(),sizeHint().height(), backgroundColor()); - //p->eraseRect(0,0,sizeHint().width(),sizeHint().height()); - //p->setPen(QColor(color1)); p->setPen(QColor(system_button_text_color)); p->setFont(stop_text_font); p->drawText((sizeHint().width()-p->fontMetrics().width(stop_text))/2,22, diff --git a/rdairplay/wall_clock.cpp b/rdairplay/wall_clock.cpp index 938205a9..8901ed9d 100644 --- a/rdairplay/wall_clock.cpp +++ b/rdairplay/wall_clock.cpp @@ -44,7 +44,6 @@ WallClock::WallClock(QWidget *parent,const char *name) time_mode=RDAirPlayConf::TwentyFourHour; previous_time_mode = RDAirPlayConf::TwentyFourHour; show_date=true; - // setFlashColor(QColor(BUTTON_TIME_SYNC_LOST_COLOR)); check_sync=true; flash_state=false; @@ -117,7 +116,6 @@ void WallClock::tickClock() if(check_sync) { if(RDTimeSynced()!=synced) { synced=RDTimeSynced(); - //setFlashingEnabled(!synced); } } current_time=QTime::currentTime().addMSecs(time_offset); @@ -160,9 +158,6 @@ void WallClock::tickClock() p.fillRect(0,0,width(),height(),backgroundColor()); p.setPen(QColor(system_button_text_color)); } - //p.eraseRect(0,0,width(),height()); -// p.setPen(color1); -// p.setBrush(color1); p.setFont(label_font); p.drawText((sizeHint().width()-p.fontMetrics().width(date))/2,22,date); p.setFont(time_font); @@ -177,7 +172,6 @@ void WallClock::flashButton(bool state) printf("flashButton()\n"); flash_state=state; tickClock(); - // RDPushButton::flashButton(state); } diff --git a/rdlibrary/audio_cart.cpp b/rdlibrary/audio_cart.cpp index f6106605..383c6156 100644 --- a/rdlibrary/audio_cart.cpp +++ b/rdlibrary/audio_cart.cpp @@ -186,7 +186,6 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, QPainter *p=new QPainter(pix); QFontMetrics *m=new QFontMetrics(button_font); p->fillRect(0,0,80,50,palette().color(QPalette::Active,QColorGroup::Button)); - //p->setPen(QColor(color1)); p->setPen(QColor(system_button_text_color)); p->setFont(button_font); p->drawText((80-m->width(tr("Cut Info")))/2,20,tr("Cut Info")); @@ -231,7 +230,6 @@ AudioCart::AudioCart(AudioControls *controls,RDCart *cart,QString *path, p=new QPainter(pix); m=new QFontMetrics(button_font); p->fillRect(0,0,80,50,palette().color(QPalette::Active,QColorGroup::Button)); - //p->setPen(QColor(color1)); p->setPen(QColor(system_button_text_color)); p->setFont(button_font); p->drawText((80-m->width(tr("Import")))/2,20,tr("Import")); @@ -293,7 +291,6 @@ void AudioCart::addCutData() rdcart_cut_list->clearSelection(); RDListViewItem *item=new RDListViewItem(rdcart_cut_list); item->setText(11,next_name); - // UpdateCutCount(); RefreshLine(item); rdcart_cut_list->setSelected(item,true); rdcart_cut_list->ensureItemVisible(item); diff --git a/rdlogedit/edit_log.cpp b/rdlogedit/edit_log.cpp index 29192349..fcf08759 100644 --- a/rdlogedit/edit_log.cpp +++ b/rdlogedit/edit_log.cpp @@ -147,13 +147,11 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_logname_label=new QLabel(logname,this,"edit_logname_label"); edit_logname_label->setBackgroundColor(QColor(system_mid_color)); -// edit_logname_label->setBackgroundColor(QColor(lightGray)); edit_logname_label->setAlignment(AlignLeft|AlignVCenter); edit_logname_label->setFont(title_font); edit_logname_label_label=new QLabel(tr("Log Name:"), this,"edit_logname_label_label"); edit_logname_label_label->setBackgroundColor(QColor(system_mid_color)); -// edit_logname_label_label->setBackgroundColor(QColor(lightGray)); edit_logname_label_label->setFont(label_font); edit_logname_label_label->setAlignment(AlignRight|AlignVCenter); @@ -162,13 +160,11 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_track_label=new QLabel(this,"edit_track_label"); edit_track_label->setBackgroundColor(QColor(system_mid_color)); -// edit_track_label->setBackgroundColor(QColor(lightGray)); edit_track_label->setAlignment(AlignLeft|AlignVCenter); edit_track_label->setFont(title_font); edit_track_label_label=new QLabel(tr("Tracks:"), this,"edit_track_label_label"); edit_track_label_label->setBackgroundColor(QColor(system_mid_color)); -// edit_track_label_label->setBackgroundColor(QColor(lightGray)); edit_track_label_label->setFont(label_font); edit_track_label_label->setAlignment(AlignRight|AlignVCenter); @@ -179,13 +175,11 @@ EditLog::EditLog(QString logname,vector *clipboard, edit_log->originDatetime().toString("MM/dd/yyyy - hh:mm:ss"), this,"edit_origin_label"); edit_origin_label->setBackgroundColor(QColor(system_mid_color)); -// edit_origin_label->setBackgroundColor(QColor(lightGray)); edit_origin_label->setAlignment(AlignLeft|AlignVCenter); edit_origin_label->setFont(title_font); edit_origin_label_label=new QLabel(tr("Origin:"), this,"edit_origin_label_label"); edit_origin_label_label->setBackgroundColor(QColor(system_mid_color)); -// edit_origin_label_label->setBackgroundColor(QColor(lightGray)); edit_origin_label_label->setFont(label_font); edit_origin_label_label->setAlignment(AlignRight|AlignVCenter); @@ -322,7 +316,6 @@ EditLog::EditLog(QString logname,vector *clipboard, edit_log_list->setAllColumnsShowFocus(true); edit_log_list->setSelectionMode(QListView::Extended); edit_log_list->setItemMargin(5); - //edit_log_list->setSorting(-1); edit_log_list->addColumn(""); edit_log_list->setColumnAlignment(0,Qt::AlignHCenter); edit_log_list->addColumn(tr("TIME")); @@ -371,7 +364,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_cart_button=new QPushButton(this,"edit_cart_button"); edit_cart_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_cart_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_cart_button->setFont(button_font); edit_cart_button->setText(tr("Insert\nCart")); connect(edit_cart_button,SIGNAL(clicked()), @@ -382,8 +374,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_marker_button=new QPushButton(this,"edit_marker_button"); edit_marker_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_marker_button-> -// setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_marker_button->setFont(button_font); edit_marker_button->setText(tr("Insert\nMeta")); connect(edit_marker_button,SIGNAL(clicked()), @@ -394,7 +384,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_edit_button=new QPushButton(this,"edit_edit_button"); edit_edit_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_edit_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_edit_button->setFont(button_font); edit_edit_button->setText(tr("Edit")); connect(edit_edit_button,SIGNAL(clicked()),this,SLOT(editButtonData())); @@ -404,8 +393,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_delete_button=new QPushButton(this,"edit_delete_button"); edit_delete_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_delete_button-> -// setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_delete_button->setFont(button_font); edit_delete_button->setText(tr("Delete")); connect(edit_delete_button,SIGNAL(clicked()),this,SLOT(deleteButtonData())); @@ -416,7 +403,6 @@ EditLog::EditLog(QString logname,vector *clipboard, edit_up_button=new RDTransportButton(RDTransportButton::Up, this,"delete_button"); edit_up_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_up_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); connect(edit_up_button,SIGNAL(clicked()),this,SLOT(upButtonData())); // @@ -425,7 +411,6 @@ EditLog::EditLog(QString logname,vector *clipboard, edit_down_button=new RDTransportButton(RDTransportButton::Down, this,"delete_button"); edit_down_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_down_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); connect(edit_down_button,SIGNAL(clicked()),this,SLOT(downButtonData())); // @@ -433,7 +418,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_cut_button=new QPushButton(this,"edit_cut_button"); edit_cut_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_cut_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_cut_button->setFont(button_font); edit_cut_button->setText(tr("Cut")); connect(edit_cut_button,SIGNAL(clicked()),this,SLOT(cutButtonData())); @@ -443,7 +427,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_copy_button=new QPushButton(this,"edit_copy_button"); edit_copy_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_copy_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_copy_button->setFont(button_font); edit_copy_button->setText(tr("Copy")); connect(edit_copy_button,SIGNAL(clicked()),this,SLOT(copyButtonData())); @@ -453,7 +436,6 @@ EditLog::EditLog(QString logname,vector *clipboard, // edit_paste_button=new QPushButton(this,"edit_paste_button"); edit_paste_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// edit_paste_button->setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_paste_button->setFont(button_font); edit_paste_button->setText(tr("Paste")); connect(edit_paste_button,SIGNAL(clicked()),this,SLOT(pasteButtonData())); @@ -491,10 +473,6 @@ EditLog::EditLog(QString logname,vector *clipboard, edit_player= new RDSimplePlayer(rdcae,rdripc,edit_output_card,edit_output_port, edit_start_macro,edit_end_macro,this,"edit_player"); -// edit_player->playButton()-> -// setPalette(QPalette(backgroundColor(),QColor(lightGray))); -// edit_player->stopButton()-> -// setPalette(QPalette(backgroundColor(),QColor(lightGray))); edit_player->stopButton()->setOnColor(red); #endif // WIN32 @@ -998,7 +976,6 @@ void EditLog::pasteButtonData() for(unsigned i=0;isize();i++) { edit_clipboard->at(i).setId(edit_log_event->logLine(line+i)->id()); *edit_log_event->logLine(line+i)=edit_clipboard->at(i); - // edit_log_event->logLine(line+i)->clearExternalData(); edit_log_event->logLine(line+i)->setSource(RDLogLine::Manual); edit_clipboard->at(i).clearExternalData(); } @@ -1283,10 +1260,8 @@ void EditLog::paintEvent(QPaintEvent *e) QColor system_mid_color = colorGroup().mid(); QPainter *p=new QPainter(this); p->fillRect(60,8,size().width()-120,24,QColor(system_mid_color)); -// p->fillRect(60,8,size().width()-120,24,QColor(lightGray)); p->fillRect(9,size().height()-130,size().width()-20,60, QColor(system_mid_color)); -// QColor(lightGray)); p->setPen(black); p->setBrush(black); diff --git a/rdlogedit/voice_tracker.cpp b/rdlogedit/voice_tracker.cpp index 865ebde8..c36ec213 100644 --- a/rdlogedit/voice_tracker.cpp +++ b/rdlogedit/voice_tracker.cpp @@ -4,8 +4,6 @@ // // (C) Copyright 2002-2006 Fred Gleason // -// $Id: voice_tracker.cpp,v 1.84.2.4.2.2 2014/05/21 18:19:43 cvs Exp $ -// // 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 // published by the Free Software Foundation. @@ -345,8 +343,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, "track_play_button"); track_play_button->setGeometry(20,265,80,50); track_play_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// track_play_button-> -// setPalette(QPalette(backgroundColor(),colorGroup().mid())); connect(track_play_button,SIGNAL(clicked()), this,SLOT(playData())); @@ -357,8 +353,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, "track_stop_button"); track_stop_button->setGeometry(110,265,80,50); track_stop_button->setPalette(QPalette(QColor(system_button_color),QColor(system_mid_color))); -// track_stop_button-> -// setPalette(QPalette(backgroundColor(),colorGroup().mid())); track_stop_button->setOnColor(red); track_stop_button->on(); connect(track_stop_button,SIGNAL(clicked()),this,SLOT(stopData())); @@ -379,7 +373,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_length_label=new QLabel(this,"edit_length_label"); edit_length_label->setText("-:--:--.-"); edit_length_label->setGeometry(565,255,110,25); -// edit_length_label->setBackgroundColor(white); edit_length_label->setAlignment(AlignCenter); edit_length_label->setFont(timer_font); @@ -394,7 +387,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_tracks_remaining_label=new QLabel(this,"edit_tracks_remaining_label"); edit_tracks_remaining_label->setText("0"); edit_tracks_remaining_label->setGeometry(565,313,40,18); -// edit_tracks_remaining_label->setBackgroundColor(white); edit_tracks_remaining_label->setAlignment(AlignCenter); edit_tracks_remaining_label->setFont(label_font); label=new QLabel(tr("Tracks"),this,"label"); @@ -406,7 +398,6 @@ VoiceTracker::VoiceTracker(const QString &logname,QString *import_path, edit_time_remaining_label=new QLabel(this,"edit_time_remaining_label"); edit_time_remaining_label->setText("0:00:00.0"); edit_time_remaining_label->setGeometry(615,313,60,18); -// edit_time_remaining_label->setBackgroundColor(white); edit_time_remaining_label->setAlignment(AlignCenter); edit_time_remaining_label->setFont(label_font); edit_time_remaining_palette[0]=edit_time_remaining_label->palette(); @@ -660,13 +651,6 @@ void VoiceTracker::updateMenuData() else { track_menu->setItemEnabled(4,false); } -// if(edit_wave_name[edit_rightclick_track].isEmpty() -// || edit_logline[edit_rightclick_track]->segueGain()==0) { -// track_menu->setItemEnabled(5,false); -// } -// else { -// track_menu->setItemEnabled(5,true); -// } menu_clicked_point=edit_rightclick_pos; DrawTrackMap(edit_rightclick_track); WriteTrackMap(edit_rightclick_track); @@ -1730,7 +1714,6 @@ void VoiceTracker::positionData(int id,int msecs) p->end(); delete p; edit_cursor_pos=x; -// edit_wave_pos[id]=msecs; } @@ -1862,13 +1845,8 @@ void VoiceTracker::recordingData(int card,int stream) edit_logline[0]->endPoint(); } } -// edit_segue_gain[0]=0; edit_wave_origin[1]=edit_wave_origin[0]+ edit_deck[0]->currentPosition(); - // rdcae->fadeOutputVolume(edit_deck[0]->card(),edit_deck[0]->stream(), -// edit_deck[0]->port(),edit_segue_gain[0], -// edit_logline[0]->endPoint(RDLogLine::CartPointer)- -// edit_segue_start_point[0]); if(!track_meter_timer->isActive()) { track_meter_timer->start(RD_METER_UPDATE_INTERVAL); } @@ -2213,9 +2191,6 @@ void VoiceTracker::LoadTrack(int line) } else { if(segue_loaded) { -// edit_track_line[0]=line-1; -// edit_track_line[1]=-1; -// edit_track_line[2]=line; edit_track_line[0]=line-1; edit_track_line[1]=line; edit_track_line[2]=line+1; @@ -2669,11 +2644,6 @@ QString VoiceTracker::GetCutName(int line,RDCut **cut) if(!logline->cutName().isEmpty()) { *cut=new RDCut(logline->cutName()); pathname=RDCut::pathName(logline->cutName()); - /* - if(!QFile::exists(pathname)) { - return QString(); - } - */ } return pathname; } @@ -2706,7 +2676,6 @@ void VoiceTracker::DragTrack(int trackno,int xdiff) if(edit_wave_name[trackno].isEmpty()) { return; } -// if((!track_changed)&&(trackno>0)&&(track_line!=0)) { if((!track_changed)&&(trackno>0)) { PushSegues(); } @@ -2733,7 +2702,6 @@ void VoiceTracker::DragTrack(int trackno,int xdiff) edit_logline[0]-> setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, RDLogLine::LogPointer); -// edit_logline[0]->setSegueGain(0); edit_logline[0]-> setAverageSegueLength(edit_logline[0]-> segueStartPoint()- @@ -2759,7 +2727,6 @@ void VoiceTracker::DragTrack(int trackno,int xdiff) edit_logline[0]-> setSegueStartPoint(edit_logline[0]->segueStartPoint()+tdiff, RDLogLine::LogPointer); -// edit_logline[0]->setSegueGain(0); edit_logline[0]-> setAverageSegueLength(edit_logline[0]-> segueStartPoint()- @@ -2782,7 +2749,6 @@ void VoiceTracker::DragTrack(int trackno,int xdiff) edit_logline[1]-> setSegueStartPoint(edit_logline[1]->segueStartPoint()+tdiff, RDLogLine::LogPointer); - // edit_logline[1]->setSegueGain(0); edit_logline[1]-> setAverageSegueLength(edit_logline[1]-> segueStartPoint()- @@ -3986,7 +3952,6 @@ bool VoiceTracker::InitTrack() edit_sliding=false; for(unsigned i=0;i<3;i++) { edit_segue_start_point[i]=-1; -// edit_segue_gain[i]=-1; } edit_logline[1]-> setFadeupPoint(edit_logline[1]->startPoint(),RDLogLine::LogPointer); @@ -4040,11 +4005,6 @@ bool VoiceTracker::IsTrack(int line,bool *offset) if(track_log_event->logLine(line-1)==NULL) { return false; } -/* if((track_log_event->logLine(line-1)->type()==RDLogLine::Track)|| - (track_log_event->logLine(line-1)->source()==RDLogLine::Tracker)) { - *offset=true; - return true; - }*/ return false; }