From 0931e703f14fc1359885d53daece2d35ae63c0ae Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 15 Aug 2018 16:01:24 +0000 Subject: [PATCH] 2018-08-15 Fred Gleason * Fixed style inconsistencies in dialogs within rdairplay(1). --- ChangeLog | 2 + rdairplay/button_log.cpp | 436 ++++++++--------- rdairplay/button_log.h | 3 +- rdairplay/colors.h | 2 +- rdairplay/edit_event.cpp | 12 +- rdairplay/edit_event.h | 5 +- rdairplay/globals.h | 2 +- rdairplay/hourselector.cpp | 6 +- rdairplay/hourselector.h | 4 +- rdairplay/lib_listview.cpp | 7 +- rdairplay/lib_listview.h | 5 +- rdairplay/list_log.cpp | 69 +-- rdairplay/list_log.h | 7 +- rdairplay/list_logs.cpp | 11 +- rdairplay/list_logs.h | 5 +- rdairplay/local_macros.cpp | 2 +- rdairplay/loglinebox.cpp | 11 +- rdairplay/loglinebox.h | 2 +- rdairplay/mode_display.cpp | 50 +- rdairplay/mode_display.h | 2 +- rdairplay/pie_counter.cpp | 9 +- rdairplay/pie_counter.h | 6 +- rdairplay/post_counter.cpp | 24 +- rdairplay/post_counter.h | 6 +- rdairplay/rdairplay.cpp | 903 +++++++++++++++++------------------ rdairplay/rdairplay.h | 8 +- rdairplay/rdairplay_cs.ts | 92 +++- rdairplay/rdairplay_de.ts | 92 +++- rdairplay/rdairplay_es.ts | 92 +++- rdairplay/rdairplay_fr.ts | 94 +++- rdairplay/rdairplay_nb.ts | 92 +++- rdairplay/rdairplay_nn.ts | 92 +++- rdairplay/rdairplay_pt_BR.ts | 92 +++- rdairplay/start_button.cpp | 107 +++-- rdairplay/start_button.h | 4 +- rdairplay/stop_counter.cpp | 78 +-- rdairplay/stop_counter.h | 4 +- rdairplay/wall_clock.cpp | 20 +- rdairplay/wall_clock.h | 6 +- 39 files changed, 1401 insertions(+), 1063 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a43435a..b086cb68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17413,3 +17413,5 @@ border. 2018-08-15 Fred Gleason * Fixed style inconsistencies in dialogs within rdselect(8). +2018-08-15 Fred Gleason + * Fixed style inconsistencies in dialogs within rdairplay(1). diff --git a/rdairplay/button_log.cpp b/rdairplay/button_log.cpp index 6bc02a9c..9688fef1 100644 --- a/rdairplay/button_log.cpp +++ b/rdairplay/button_log.cpp @@ -2,7 +2,7 @@ // // The button log widget for RDAirPlay // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -163,120 +163,120 @@ void ButtonLog::setActionMode(RDAirPlayConf::ActionMode mode,int *cartnum) for(int i=0;ilogLine(lines[i]))!=NULL)) { switch(logline->status()) { - case RDLogLine::Playing: - case RDLogLine::Finishing: - if(mode==RDAirPlayConf::CopyFrom) { - log_start_button[i]-> - setMode(StartButton::CopyFrom,logline->cartType()); - } - else { - log_start_button[i]-> - setMode(StartButton::Play,logline->cartType()); - } + case RDLogLine::Playing: + case RDLogLine::Finishing: + if(mode==RDAirPlayConf::CopyFrom) { + log_start_button[i]-> + setMode(StartButton::CopyFrom,logline->cartType()); + } + else { + log_start_button[i]-> + setMode(StartButton::Play,logline->cartType()); + } + break; + + case RDLogLine::Paused: + switch(mode) { + case RDAirPlayConf::DeleteFrom: + log_start_button[i]-> + setMode(StartButton::DeleteFrom,logline->cartType()); + break; + + case RDAirPlayConf::CopyFrom: + log_start_button[i]-> + setMode(StartButton::CopyFrom,logline->cartType()); + break; + + default: + log_start_button[i]-> + setMode(StartButton::Pause,logline->cartType()); + } + break; + + default: + switch(mode) { + case RDAirPlayConf::Normal: + log_start_button[i]-> + setMode(StartButton::Stop,logline->cartType()); + break; + + case RDAirPlayConf::AddTo: + log_start_button[i]-> + setMode(StartButton::AddTo,logline->cartType()); + break; + + case RDAirPlayConf::DeleteFrom: + log_start_button[i]-> + setMode(StartButton::DeleteFrom,logline->cartType()); + break; + + case RDAirPlayConf::MoveFrom: + log_start_button[i]-> + setMode(StartButton::MoveFrom,logline->cartType()); + break; + + case RDAirPlayConf::MoveTo: + log_start_button[i]-> + setMode(StartButton::MoveTo,logline->cartType()); + break; + + case RDAirPlayConf::CopyFrom: + switch(logline->type()) { + case RDLogLine::Marker: + case RDLogLine::OpenBracket: + case RDLogLine::CloseBracket: + case RDLogLine::Chain: + case RDLogLine::Track: + case RDLogLine::MusicLink: + case RDLogLine::TrafficLink: + case RDLogLine::UnknownType: + log_start_button[i]-> + setMode(StartButton::Stop,logline->cartType()); break; - case RDLogLine::Paused: - switch(mode) { - case RDAirPlayConf::DeleteFrom: - log_start_button[i]-> - setMode(StartButton::DeleteFrom,logline->cartType()); - break; - - case RDAirPlayConf::CopyFrom: - log_start_button[i]-> - setMode(StartButton::CopyFrom,logline->cartType()); - break; - - default: - log_start_button[i]-> - setMode(StartButton::Pause,logline->cartType()); - } + case RDLogLine::Cart: + case RDLogLine::Macro: + log_start_button[i]-> + setMode(StartButton::CopyFrom,logline->cartType()); break; + } + break; + + case RDAirPlayConf::CopyTo: + log_start_button[i]-> + setMode(StartButton::CopyTo,logline->cartType()); + break; - default: - switch(mode) { - case RDAirPlayConf::Normal: - log_start_button[i]-> - setMode(StartButton::Stop,logline->cartType()); - break; - - case RDAirPlayConf::AddTo: - log_start_button[i]-> - setMode(StartButton::AddTo,logline->cartType()); - break; - - case RDAirPlayConf::DeleteFrom: - log_start_button[i]-> - setMode(StartButton::DeleteFrom,logline->cartType()); - break; - - case RDAirPlayConf::MoveFrom: - log_start_button[i]-> - setMode(StartButton::MoveFrom,logline->cartType()); - break; - - case RDAirPlayConf::MoveTo: - log_start_button[i]-> - setMode(StartButton::MoveTo,logline->cartType()); - break; - - case RDAirPlayConf::CopyFrom: - switch(logline->type()) { - case RDLogLine::Marker: - case RDLogLine::OpenBracket: - case RDLogLine::CloseBracket: - case RDLogLine::Chain: - case RDLogLine::Track: - case RDLogLine::MusicLink: - case RDLogLine::TrafficLink: - case RDLogLine::UnknownType: - log_start_button[i]-> - setMode(StartButton::Stop,logline->cartType()); - break; - - case RDLogLine::Cart: - case RDLogLine::Macro: - log_start_button[i]-> - setMode(StartButton::CopyFrom,logline->cartType()); - break; - } - break; - - case RDAirPlayConf::CopyTo: - log_start_button[i]-> - setMode(StartButton::CopyTo,logline->cartType()); - break; - - default: - break; - } + default: + break; + } } } else { if(!end_button) { switch(mode) { - case RDAirPlayConf::AddTo: - log_start_button[i]-> - setMode(StartButton::AddTo,RDCart::All); - end_button=true; - break; - - case RDAirPlayConf::MoveTo: - log_start_button[i]-> - setMode(StartButton::MoveTo,RDCart::All); - end_button=true; - break; - - case RDAirPlayConf::CopyTo: - log_start_button[i]-> - setMode(StartButton::CopyTo,RDCart::All); - end_button=true; - break; - - default: - log_start_button[i]-> - setMode(StartButton::Disabled,RDCart::All); - break; + case RDAirPlayConf::AddTo: + log_start_button[i]-> + setMode(StartButton::AddTo,RDCart::All); + end_button=true; + break; + + case RDAirPlayConf::MoveTo: + log_start_button[i]-> + setMode(StartButton::MoveTo,RDCart::All); + end_button=true; + break; + + case RDAirPlayConf::CopyTo: + log_start_button[i]-> + setMode(StartButton::CopyTo,RDCart::All); + end_button=true; + break; + + default: + log_start_button[i]-> + setMode(StartButton::Disabled,RDCart::All); + break; } end_button=true; } @@ -315,42 +315,42 @@ void ButtonLog::startButton(int id) line=log_log->size(); } switch(log_start_button[id]->mode()) { - case StartButton::Stop: - log_log->makeNext(line,false); - log_log->play(line,RDLogLine::StartManual); - break; + case StartButton::Stop: + log_log->makeNext(line,false); + log_log->play(line,RDLogLine::StartManual); + break; - case StartButton::Pause: - log_log->play(line,RDLogLine::StartManual); - break; + case StartButton::Pause: + log_log->play(line,RDLogLine::StartManual); + break; - case StartButton::Play: - if(log_pause_enabled&&(logline!=NULL)&& - (logline->cartType()==RDCart::Audio)) { - log_log->pause(line); - } - else { - log_log->stop(line); - } - break; + case StartButton::Play: + if(log_pause_enabled&&(logline!=NULL)&& + (logline->cartType()==RDCart::Audio)) { + log_log->pause(line); + } + else { + log_log->stop(line); + } + break; - case StartButton::AddTo: - case StartButton::DeleteFrom: - case StartButton::MoveFrom: - case StartButton::MoveTo: - case StartButton::CopyFrom: - case StartButton::CopyTo: - if((logline=log_log->logLine(line))==NULL) { - status=RDLogLine::Scheduled; - } - else { - status=logline->status(); - } - emit selectClicked(log_id,line,status); - break; + case StartButton::AddTo: + case StartButton::DeleteFrom: + case StartButton::MoveFrom: + case StartButton::MoveTo: + case StartButton::CopyFrom: + case StartButton::CopyTo: + if((logline=log_log->logLine(line))==NULL) { + status=RDLogLine::Scheduled; + } + else { + status=logline->status(); + } + emit selectClicked(log_id,line,status); + break; - default: - break; + default: + break; } } @@ -489,26 +489,26 @@ void ButtonLog::UpdateEvents() log_start_button[i]->setPort(logline->portName()); log_line_box[i]->setStatus(log_log->logLine(lines[i])->status()); switch(log_log->logLine(lines[i])->status()) { - case RDLogLine::Playing: - case RDLogLine::Finishing: - log_start_button[i]-> - setMode(StartButton::Play,logline->cartType()); - break; - - case RDLogLine::Paused: - log_start_button[i]-> - setMode(StartButton::Pause,logline->cartType()); - break; - - case RDLogLine::Scheduled: - log_start_button[i]-> - setMode(StartButton::Stop,logline->cartType()); - break; - - default: - log_start_button[i]-> - setMode(StartButton::Disabled,logline->cartType()); - break; + case RDLogLine::Playing: + case RDLogLine::Finishing: + log_start_button[i]-> + setMode(StartButton::Play,logline->cartType()); + break; + + case RDLogLine::Paused: + log_start_button[i]-> + setMode(StartButton::Pause,logline->cartType()); + break; + + case RDLogLine::Scheduled: + log_start_button[i]-> + setMode(StartButton::Stop,logline->cartType()); + break; + + default: + log_start_button[i]-> + setMode(StartButton::Disabled,logline->cartType()); + break; } } if((next_line=log_log->nextLine(lines[i]))>=0) { @@ -561,32 +561,32 @@ void ButtonLog::UpdateButtons() // Set Buttons // switch(logline->status()) { - case RDLogLine::Playing: - case RDLogLine::Finishing: - log_start_button[i]-> - setMode(StartButton::Play,logline->cartType()); - log_start_button[i]-> - setTime(logline->startTime(RDLogLine::Actual)); - break; + case RDLogLine::Playing: + case RDLogLine::Finishing: + log_start_button[i]-> + setMode(StartButton::Play,logline->cartType()); + log_start_button[i]-> + setTime(logline->startTime(RDLogLine::Actual)); + break; - case RDLogLine::Paused: - log_start_button[i]-> - setMode(StartButton::Pause,logline->cartType()); - log_start_button[i]-> - setTime(logline->startTime(RDLogLine::Predicted)); - break; + case RDLogLine::Paused: + log_start_button[i]-> + setMode(StartButton::Pause,logline->cartType()); + log_start_button[i]-> + setTime(logline->startTime(RDLogLine::Predicted)); + break; - case RDLogLine::Scheduled: - log_start_button[i]-> - setMode(StartButton::Stop,logline->cartType()); - log_start_button[i]-> - setTime(logline->startTime(RDLogLine::Predicted)); - break; + case RDLogLine::Scheduled: + log_start_button[i]-> + setMode(StartButton::Stop,logline->cartType()); + log_start_button[i]-> + setTime(logline->startTime(RDLogLine::Predicted)); + break; - default: - log_start_button[i]-> - setMode(StartButton::Disabled,logline->cartType()); - break; + default: + log_start_button[i]-> + setMode(StartButton::Disabled,logline->cartType()); + break; } // @@ -595,48 +595,48 @@ void ButtonLog::UpdateButtons() if((next_logline=log_log->logLine(log_log->nextLine(lines[i])))!= NULL) { switch(log_log->mode()) { - case RDAirPlayConf::Auto: - switch(next_logline->transType()) { - case RDLogLine::Play: - case RDLogLine::Segue: - log_line_box[i]->setBarMode(LogLineBox::Transitioning); - break; + case RDAirPlayConf::Auto: + switch(next_logline->transType()) { + case RDLogLine::Play: + case RDLogLine::Segue: + log_line_box[i]->setBarMode(LogLineBox::Transitioning); + break; - case RDLogLine::Stop: - if(lines[i]==longest_line) { - log_line_box[i]->setBarMode(LogLineBox::Stopping); - } - else { - log_line_box[i]->setBarMode(LogLineBox::Transitioning); - } - break; + case RDLogLine::Stop: + if(lines[i]==longest_line) { + log_line_box[i]->setBarMode(LogLineBox::Stopping); + } + else { + log_line_box[i]->setBarMode(LogLineBox::Transitioning); + } + break; - default: - break; - } - break; + default: + break; + } + break; - case RDAirPlayConf::LiveAssist: - case RDAirPlayConf::Manual: - switch(next_logline->status()) { - case RDLogLine::Playing: - case RDLogLine::Finishing: - log_line_box[i]->setBarMode(LogLineBox::Transitioning); - break; + case RDAirPlayConf::LiveAssist: + case RDAirPlayConf::Manual: + switch(next_logline->status()) { + case RDLogLine::Playing: + case RDLogLine::Finishing: + log_line_box[i]->setBarMode(LogLineBox::Transitioning); + break; - default: - if(lines[i]==longest_line) { - log_line_box[i]->setBarMode(LogLineBox::Stopping); - } - else { - log_line_box[i]->setBarMode(LogLineBox::Transitioning); - } - break; - } - break; + default: + if(lines[i]==longest_line) { + log_line_box[i]->setBarMode(LogLineBox::Stopping); + } + else { + log_line_box[i]->setBarMode(LogLineBox::Transitioning); + } + break; + } + break; - default: - break; + default: + break; } } else { diff --git a/rdairplay/button_log.h b/rdairplay/button_log.h index 5e2abff8..38067250 100644 --- a/rdairplay/button_log.h +++ b/rdairplay/button_log.h @@ -3,7 +3,7 @@ // // The button play widget for RDAirPlay. // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -45,7 +45,6 @@ #define BUTTON_PLAY_BUTTONS 3 #define BUTTON_TOTAL_BUTTONS 7 - class ButtonLog : public QWidget { Q_OBJECT diff --git a/rdairplay/colors.h b/rdairplay/colors.h index 4315816b..36165036 100644 --- a/rdairplay/colors.h +++ b/rdairplay/colors.h @@ -2,7 +2,7 @@ // // The color definitions for RDAirPlay. // -// (C) Copyright 2002-2004,2016 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdairplay/edit_event.cpp b/rdairplay/edit_event.cpp index c1888570..cc5f7ab0 100644 --- a/rdairplay/edit_event.cpp +++ b/rdairplay/edit_event.cpp @@ -2,7 +2,7 @@ // // Event Editor for RDAirPlay // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -22,10 +22,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -34,12 +30,14 @@ #include "globals.h" EditEvent::EditEvent(RDLogPlay *log,RDCae *cae,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + edit_log=log; edit_cae=cae; edit_height=385; - setCaption(tr("Edit Event")); + setWindowTitle("RDAirPlay - "+tr("Edit Event")); // // Create Fonts diff --git a/rdairplay/edit_event.h b/rdairplay/edit_event.h index 443ef3ef..0bfe2034 100644 --- a/rdairplay/edit_event.h +++ b/rdairplay/edit_event.h @@ -2,7 +2,7 @@ // // Event Editor for RDAirPlay // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -31,9 +31,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdairplay/globals.h b/rdairplay/globals.h index c6127eb4..e7858306 100644 --- a/rdairplay/globals.h +++ b/rdairplay/globals.h @@ -2,7 +2,7 @@ // // Global Variable Declarations for RDAirPlay // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdairplay/hourselector.cpp b/rdairplay/hourselector.cpp index 970bd6d5..d225fc11 100644 --- a/rdairplay/hourselector.cpp +++ b/rdairplay/hourselector.cpp @@ -2,7 +2,7 @@ // // Hour Selector widget for RDAirPlay // -// (C) Copyright 2012,2016-2018 Fred Gleason +// (C) Copyright 2012-2018 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 @@ -19,10 +19,8 @@ // #include -//Added by qt3to4: -#include -#include +#include "hourselector.h" HourSelector::HourSelector(QWidget *parent) : QWidget(parent) diff --git a/rdairplay/hourselector.h b/rdairplay/hourselector.h index c4e2bbbc..e7726772 100644 --- a/rdairplay/hourselector.h +++ b/rdairplay/hourselector.h @@ -2,7 +2,7 @@ // // Hour Selector widget for RDAirPlay // -// (C) Copyright 2012,2016-2018 Fred Gleason +// (C) Copyright 2012-2018 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 @@ -24,8 +24,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include diff --git a/rdairplay/lib_listview.cpp b/rdairplay/lib_listview.cpp index a414c4db..01e4ee2f 100644 --- a/rdairplay/lib_listview.cpp +++ b/rdairplay/lib_listview.cpp @@ -2,7 +2,7 @@ // // The Log ListView widget for RDAirPlay's Full Log widget. // -// (C) Copyright 2002-2013,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -18,11 +18,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include -//Added by qt3to4: -#include #include +#include + #include #include diff --git a/rdairplay/lib_listview.h b/rdairplay/lib_listview.h index 5177ad3e..fd161503 100644 --- a/rdairplay/lib_listview.h +++ b/rdairplay/lib_listview.h @@ -2,7 +2,7 @@ // // The Log ListView widget for RDAirPlay's Full Log widget. // -// (C) Copyright 2002-2013,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -23,9 +23,6 @@ #include #include -//Added by qt3to4: -#include -#include class LibListView : public RDListView { diff --git a/rdairplay/list_log.cpp b/rdairplay/list_log.cpp index 572569a9..8dcd0089 100644 --- a/rdairplay/list_log.cpp +++ b/rdairplay/list_log.cpp @@ -2,7 +2,7 @@ // // The full log list for RDAirPlay // -// (C) Copyright 2002-2006,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -22,9 +22,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include @@ -180,37 +177,37 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, list_log_list->setItemMargin(5); list_log_list->addColumn(""); list_log_list->setColumnAlignment(0,Qt::AlignHCenter); - list_log_list->addColumn(tr("EST TIME")); + list_log_list->addColumn(tr("Est Time")); list_log_list->setColumnAlignment(1,Qt::AlignRight); - list_log_list->addColumn(tr("LEN")); + list_log_list->addColumn(tr("Len")); list_log_list->setColumnAlignment(2,Qt::AlignRight); - list_log_list->addColumn(tr("TRANS")); + list_log_list->addColumn(tr("Trans")); list_log_list->setColumnAlignment(3,Qt::AlignHCenter); - list_log_list->addColumn(tr("CART")); + list_log_list->addColumn(tr("Cart")); list_log_list->setColumnAlignment(4,Qt::AlignHCenter); - list_log_list->addColumn(tr("TITLE")); + list_log_list->addColumn(tr("Title")); list_log_list->setColumnAlignment(5,Qt::AlignLeft); - list_log_list->addColumn(tr("ARTIST")); + list_log_list->addColumn(tr("Artist")); list_log_list->setColumnAlignment(6,Qt::AlignLeft); - list_log_list->addColumn(tr("GROUP")); + list_log_list->addColumn(tr("Group")); list_log_list->setColumnAlignment(7,Qt::AlignHCenter); - list_log_list->addColumn(tr("TIME")); + list_log_list->addColumn(tr("Time")); list_log_list->setColumnAlignment(8,Qt::AlignHCenter); - list_log_list->addColumn(tr("ALBUM")); + list_log_list->addColumn(tr("Album")); list_log_list->setColumnAlignment(9,Qt::AlignLeft); - list_log_list->addColumn(tr("LABEL")); + list_log_list->addColumn(tr("Label")); list_log_list->setColumnAlignment(10,Qt::AlignLeft); - list_log_list->addColumn(tr("CLIENT")); + list_log_list->addColumn(tr("Client")); list_log_list->setColumnAlignment(11,Qt::AlignLeft); - list_log_list->addColumn(tr("AGENCY")); + list_log_list->addColumn(tr("Agency")); list_log_list->setColumnAlignment(12,Qt::AlignLeft); - list_log_list->addColumn(tr("MARKER")); + list_log_list->addColumn(tr("Marker")); list_log_list->setColumnAlignment(13,Qt::AlignHCenter); - list_log_list->addColumn(tr("LINE ID")); + list_log_list->addColumn(tr("Line ID")); list_log_list->setColumnAlignment(14,Qt::AlignHCenter); - list_log_list->addColumn(tr("COUNT")); + list_log_list->addColumn(tr("Count")); list_log_list->setColumnAlignment(15,Qt::AlignHCenter); - list_log_list->addColumn(tr("STATUS")); + list_log_list->addColumn(tr("Status")); list_log_list->setColumnAlignment(16,Qt::AlignHCenter); list_log_list->setHardSortColumn(15); list_log_list->setFocusPolicy(Qt::NoFocus); @@ -231,13 +228,11 @@ ListLog::ListLog(RDLogPlay *log,RDCae *cae,int id,bool allow_pause, // // Time Counter Section // - QLabel *label=new QLabel(tr("Run Length"),this); - label->setGeometry(372,sizeHint().height()-120,75,20); - label->setFont(label_font); - label->setAlignment(Qt::AlignCenter); - label->setBackgroundColor(QColor(system_mid_color)); + QGroupBox *groupbox=new QGroupBox(tr("Run Length"),this); + groupbox->setFont(label_font); + groupbox->setGeometry(336,sizeHint().height()-116,146,58); if(!rda->airplayConf()->showCounters()) { - label->hide(); + groupbox->hide(); } // @@ -1087,28 +1082,6 @@ void ListLog::cartDroppedData(int line,RDLogLine *ll) } -void ListLog::paintEvent(QPaintEvent *e) -{ - if(!rda->airplayConf()->showCounters()) { - return; - } - int x=336; - int y=sizeHint().height()-111; - - QPainter *p=new QPainter(this); - p->setPen(Qt::black); - p->setBrush(Qt::black); - p->drawLine(x,y,x+146,y); - p->drawLine(x+146,y,x+146,y+53); - p->drawLine(x+146,y+53,x,y+53); - p->drawLine(x,y+53,x,y); - - p->end(); - delete p; - -} - - void ListLog::RefreshList() { RDListViewItem *l; diff --git a/rdairplay/list_log.h b/rdairplay/list_log.h index f8b6fda8..4c2f3d9d 100644 --- a/rdairplay/list_log.h +++ b/rdairplay/list_log.h @@ -2,7 +2,7 @@ // // The full log list widget for RDAirPlay. // -// (C) Copyright 2002-2003,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -26,8 +26,6 @@ #include #include #include -//Added by qt3to4: -#include #include #include @@ -90,9 +88,6 @@ class ListLog : public QWidget void refreshabilityChangedData(bool state); void cartDroppedData(int line,RDLogLine *ll); - protected: - void paintEvent(QPaintEvent *e); - private: enum PlayButtonMode {ButtonDisabled=0,ButtonPlay=1,ButtonStop=2}; void RefreshList(); diff --git a/rdairplay/list_logs.cpp b/rdairplay/list_logs.cpp index 13cf4ec5..33643f24 100644 --- a/rdairplay/list_logs.cpp +++ b/rdairplay/list_logs.cpp @@ -2,7 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -20,9 +20,6 @@ #include #include -//Added by qt3to4: -#include -#include #include #include @@ -33,8 +30,10 @@ #include "list_logs.h" ListLogs::ListLogs(RDLogPlay *log,QWidget *parent) - : QDialog(parent,"",true) + : QDialog(parent) { + setModal(true); + // // Fix the Window Size // @@ -47,7 +46,7 @@ ListLogs::ListLogs(RDLogPlay *log,QWidget *parent) button_font.setPixelSize(12); list_log=log; - setCaption(tr("Select Log")); + setWindowTitle("RDAirPlay - "+tr("Select Log")); // // Filter Widget diff --git a/rdairplay/list_logs.h b/rdairplay/list_logs.h index 862e876e..9678d4d5 100644 --- a/rdairplay/list_logs.h +++ b/rdairplay/list_logs.h @@ -2,7 +2,7 @@ // // Select a Rivendell Log // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -25,9 +25,6 @@ #include #include #include -//Added by qt3to4: -#include -#include #include #include diff --git a/rdairplay/local_macros.cpp b/rdairplay/local_macros.cpp index 022b4c50..68f243b0 100644 --- a/rdairplay/local_macros.cpp +++ b/rdairplay/local_macros.cpp @@ -2,7 +2,7 @@ // // Local RML Macros for the Rivendell's RDAirPlay // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdairplay/loglinebox.cpp b/rdairplay/loglinebox.cpp index b5a9bc19..f2a2d2e7 100644 --- a/rdairplay/loglinebox.cpp +++ b/rdairplay/loglinebox.cpp @@ -2,7 +2,7 @@ // // On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -19,13 +19,6 @@ // #include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include #include #include @@ -827,7 +820,7 @@ void LogLineBox::mouseDoubleClickEvent(QMouseEvent *e) void LogLineBox::paintEvent(QPaintEvent *e) { QPainter *p=new QPainter(this); - p->drawRect(0,0,sizeHint().width(),sizeHint().height()); + p->drawRect(0,0,sizeHint().width()-2,sizeHint().height()-2); p->end(); delete p; } diff --git a/rdairplay/loglinebox.h b/rdairplay/loglinebox.h index ccd0c56a..6dbf3ec5 100644 --- a/rdairplay/loglinebox.h +++ b/rdairplay/loglinebox.h @@ -2,7 +2,7 @@ // // On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2004,2016 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdairplay/mode_display.cpp b/rdairplay/mode_display.cpp index 2906bd55..0ccd21b1 100644 --- a/rdairplay/mode_display.cpp +++ b/rdairplay/mode_display.cpp @@ -2,7 +2,7 @@ // // The mode display widget for RDAirPlay in Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -19,11 +19,9 @@ // #include -//Added by qt3to4: -#include -#include -#include +#include "colors.h" +#include "mode_display.h" ModeDisplay::ModeDisplay(QWidget *parent) : QPushButton(parent) @@ -94,48 +92,48 @@ void ModeDisplay::setOpModeStyle(RDAirPlayConf::OpModeStyle style) void ModeDisplay::WriteMap() { QString str; - QPixmap *pix=new QPixmap(sizeHint().width(),sizeHint().height()); + QPixmap *pix=new QPixmap(sizeHint().width()-2,sizeHint().height()-2); QPainter *p=new QPainter(pix); if(mode_style==RDAirPlayConf::Unified) { switch(mode_mode[0]) { case RDAirPlayConf::LiveAssist: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_LIVE_ASSIST_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 22,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("LiveAssist")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("LiveAssist")))/2, 48,tr("LiveAssist")); setPalette(live_assist_color); break; case RDAirPlayConf::Auto: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_AUTO_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 22,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("Automatic")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("Automatic")))/2, 48,tr("Automatic")); setPalette(auto_color); break; case RDAirPlayConf::Manual: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_MANUAL_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 22,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("Manual")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("Manual")))/2, 48,tr("Manual")); setPalette(manual_color); break; @@ -147,43 +145,43 @@ void ModeDisplay::WriteMap() else { switch(mode_mode[0]) { case RDAirPlayConf::LiveAssist: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_LIVE_ASSIST_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 12,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("LiveAssist")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("LiveAssist")))/2, 38,tr("LiveAssist")); setPalette(live_assist_color); break; case RDAirPlayConf::Auto: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_AUTO_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 12,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("Automatic")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("Automatic")))/2, 39,tr("Automatic")); setPalette(auto_color); break; case RDAirPlayConf::Manual: - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, BUTTON_MODE_MANUAL_COLOR); p->setPen(QColor(Qt::color1)); p->setFont(mode_small_font); - p->drawText((sizeHint().width()-p->fontMetrics(). + p->drawText((sizeHint().width()-2-p->fontMetrics(). width(tr("Operating Mode")))/2, 12,tr("Operating Mode")); p->setFont(mode_large_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(tr("Manual")))/2, + p->drawText((sizeHint().width()-2-p->fontMetrics().width(tr("Manual")))/2, 38,tr("Manual")); setPalette(manual_color); break; @@ -193,9 +191,9 @@ void ModeDisplay::WriteMap() } p->setFont(mode_tiny_font); str=tr("Aux1")+": "+RDAirPlayConf::logModeText(mode_mode[1]); - p->drawText((sizeHint().width()/2-p->fontMetrics().width(str))/2,sizeHint().height()-5,str); + p->drawText((sizeHint().width()-2/2-p->fontMetrics().width(str))/2,sizeHint().height()-2-5,str); str=tr("Aux2")+": "+RDAirPlayConf::logModeText(mode_mode[2]); - p->drawText(sizeHint().width()/2+(sizeHint().width()/2-p->fontMetrics().width(str))/2,sizeHint().height()-5,str); + p->drawText(sizeHint().width()-2/2+(sizeHint().width()-2/2-p->fontMetrics().width(str))/2,sizeHint().height()-2-5,str); } p->end(); delete p; diff --git a/rdairplay/mode_display.h b/rdairplay/mode_display.h index 6212d3eb..49ed3301 100644 --- a/rdairplay/mode_display.h +++ b/rdairplay/mode_display.h @@ -2,7 +2,7 @@ // // The mode display widget for RDAirPlay in Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 diff --git a/rdairplay/pie_counter.cpp b/rdairplay/pie_counter.cpp index a14a5f29..1d576f38 100644 --- a/rdairplay/pie_counter.cpp +++ b/rdairplay/pie_counter.cpp @@ -2,7 +2,7 @@ // // The pie counter widget for Rivendell // -// (C) Copyright 2002-2004,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -21,14 +21,11 @@ #include #include #include -//Added by qt3to4: -#include -#include #include -#include -#include +#include "colors.h" +#include "pie_counter.h" PieCounter::PieCounter(int count_length,QWidget *parent) : QWidget(parent) diff --git a/rdairplay/pie_counter.h b/rdairplay/pie_counter.h index 634c18f1..6c00aa05 100644 --- a/rdairplay/pie_counter.h +++ b/rdairplay/pie_counter.h @@ -2,7 +2,7 @@ // // The pie counter widget for Rivendell // -// (C) Copyright 2002-2004,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -25,13 +25,11 @@ #include #include #include -//Added by qt3to4: -#include #include #include -#include +#include "mode_display.h" // // Inner pie timer diff --git a/rdairplay/post_counter.cpp b/rdairplay/post_counter.cpp index 31992603..e823a8b2 100644 --- a/rdairplay/post_counter.cpp +++ b/rdairplay/post_counter.cpp @@ -2,7 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -20,8 +20,6 @@ #include #include -//Added by qt3to4: -#include #include @@ -64,13 +62,13 @@ PostCounter::PostCounter(QWidget *parent) void PostCounter::setTimeMode(RDAirPlayConf::TimeMode mode) { switch(mode) { - case RDAirPlayConf::TwentyFourHour: - post_time_format="hh:mm:ss"; - break; + case RDAirPlayConf::TwentyFourHour: + post_time_format="hh:mm:ss"; + break; - case RDAirPlayConf::TwelveHour: - post_time_format="h:mm:ss ap"; - break; + case RDAirPlayConf::TwelveHour: + post_time_format="h:mm:ss ap"; + break; } UpdateDisplay(); } @@ -173,15 +171,15 @@ void PostCounter::UpdateDisplay() state="--------"; setPalette(post_idle_palette); } - QPixmap pix(sizeHint().width(),sizeHint().height()); + QPixmap pix(size().width()-2,size().height()-2); QPainter *p=new QPainter(&pix); - p->fillRect(0,0,sizeHint().width(),sizeHint().height(),color); + p->fillRect(0,0,size().width()-2,size().height()-2,color); p->setPen(QColor(system_button_text_color)); p->setFont(post_small_font); - p->drawText((sizeHint().width()-p-> + p->drawText((size().width()-2-p-> fontMetrics().width(point))/2,22,point); p->setFont(post_large_font); - p->drawText((sizeHint().width()-p-> + p->drawText((size().width()-2-p-> fontMetrics().width(state))/2,48,state); p->end(); delete p; diff --git a/rdairplay/post_counter.h b/rdairplay/post_counter.h index f1c0800f..c6aea198 100644 --- a/rdairplay/post_counter.h +++ b/rdairplay/post_counter.h @@ -2,7 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -24,9 +24,9 @@ #include #include #include -//Added by qt3to4: -#include + #include + // // Settings // diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 1b0f825e..c2ae3854 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -2,7 +2,7 @@ // // The On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2010,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -29,26 +29,10 @@ #include #include -#include -#include -#include -#include #include -#include -#include #include -#include -#include #include -#include -//Added by qt3to4: -#include -#include -#include -#include -#include -#include #include #include #include @@ -228,7 +212,7 @@ MainWidget::MainWidget(QWidget *parent) logfile=rda->config()->airplayLogname(); str=QString("RDAirPlay")+" v"+VERSION+" - "+tr("Host:"); - setCaption(str+" "+rda->config()->stationName()); + setWindowTitle(str+" "+rda->config()->stationName()); // // Master Clock Timer @@ -819,26 +803,26 @@ MainWidget::MainWidget(QWidget *parent) // for(int i=0;iairplayConf()->logStartMode(i)) { - case RDAirPlayConf::Manual: - SetManualMode(i); - break; + case RDAirPlayConf::Manual: + SetManualMode(i); + break; - case RDAirPlayConf::LiveAssist: - SetLiveAssistMode(i); - break; + case RDAirPlayConf::LiveAssist: + SetLiveAssistMode(i); + break; - case RDAirPlayConf::Auto: - SetAutoMode(i); - break; + case RDAirPlayConf::Auto: + SetAutoMode(i); + break; - case RDAirPlayConf::Previous: - if(air_op_mode_style==RDAirPlayConf::Unified) { - SetMode(i,rda->airplayConf()->opMode(0)); - } - else { - SetMode(i,rda->airplayConf()->opMode(i)); - } - break; + case RDAirPlayConf::Previous: + if(air_op_mode_style==RDAirPlayConf::Unified) { + SetMode(i,rda->airplayConf()->opMode(0)); + } + else { + SetMode(i,rda->airplayConf()->opMode(i)); + } + break; } } @@ -961,47 +945,47 @@ void MainWidget::ripcConnectedData(bool state) for(unsigned i=0;iairplayConf()->startMode(i)) { - case RDAirPlayConf::StartEmpty: - break; + case RDAirPlayConf::StartEmpty: + break; - case RDAirPlayConf::StartPrevious: - air_start_logname[i]= - RDDateTimeDecode(rda->airplayConf()->currentLog(i), - air_startup_datetime,rda->station(),rda->config()); - if(!air_start_logname[i].isEmpty()) { - if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) { - if((air_start_line[i]=rda->airplayConf()->logCurrentLine(i))>=0) { - air_start_start[i]=rda->airplayConf()->autoRestart(i)&& - rda->airplayConf()->logRunning(i); - } + case RDAirPlayConf::StartPrevious: + air_start_logname[i]= + RDDateTimeDecode(rda->airplayConf()->currentLog(i), + air_startup_datetime,rda->station(),rda->config()); + if(!air_start_logname[i].isEmpty()) { + if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) { + if((air_start_line[i]=rda->airplayConf()->logCurrentLine(i))>=0) { + air_start_start[i]=rda->airplayConf()->autoRestart(i)&& + rda->airplayConf()->logRunning(i); + } + } + else { + air_start_line[i]=0; + air_start_start[i]=false; + } + } + break; + + case RDAirPlayConf::StartSpecified: + air_start_logname[i]= + RDDateTimeDecode(rda->airplayConf()->logName(i), + air_startup_datetime,rda->station(),rda->config()); + if(!air_start_logname[i].isEmpty()) { + if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) { + if(air_start_logname[i]==rda->airplayConf()->currentLog(i)) { + if((air_start_line[i]=rda->airplayConf()->logCurrentLine(i))>= + 0) { + air_start_start[i]=rda->airplayConf()->autoRestart(i)&& + rda->airplayConf()->logRunning(i); } else { air_start_line[i]=0; air_start_start[i]=false; } } - break; - - case RDAirPlayConf::StartSpecified: - air_start_logname[i]= - RDDateTimeDecode(rda->airplayConf()->logName(i), - air_startup_datetime,rda->station(),rda->config()); - if(!air_start_logname[i].isEmpty()) { - if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) { - if(air_start_logname[i]==rda->airplayConf()->currentLog(i)) { - if((air_start_line[i]=rda->airplayConf()->logCurrentLine(i))>= - 0) { - air_start_start[i]=rda->airplayConf()->autoRestart(i)&& - rda->airplayConf()->logRunning(i); - } - else { - air_start_line[i]=0; - air_start_start[i]=false; - } - } - } - } - break; + } + } + break; } } if(!air_start_logname[i].isEmpty()) { @@ -1511,6 +1495,7 @@ void MainWidget::fullLogButtonData(int id) return; } else { + air_panel->hide(); for(int i=0;iisVisible()) { air_log_list[i]->hide(); @@ -1519,7 +1504,9 @@ void MainWidget::fullLogButtonData(int id) } air_log_list[id]->show(); air_log_button[id]->setPalette(active_color); - if (air_panel_button) air_panel_button->setPalette(palette()); + if(air_panel_button) { + air_panel_button->setPalette(palette()); + } } } @@ -1532,6 +1519,7 @@ void MainWidget::panelButtonData() air_log_button[i]->setPalette(palette()); } } + air_panel->show(); air_panel_button->setPalette(active_color); } @@ -1549,20 +1537,20 @@ void MainWidget::modeButtonData() break; } switch(air_op_mode[0]) { - case RDAirPlayConf::Manual: - SetMode(mach,RDAirPlayConf::LiveAssist); - break; + case RDAirPlayConf::Manual: + SetMode(mach,RDAirPlayConf::LiveAssist); + break; - case RDAirPlayConf::LiveAssist: - SetMode(mach,RDAirPlayConf::Auto); - break; + case RDAirPlayConf::LiveAssist: + SetMode(mach,RDAirPlayConf::Auto); + break; - case RDAirPlayConf::Auto: - SetMode(mach,RDAirPlayConf::Manual); - break; + case RDAirPlayConf::Auto: + SetMode(mach,RDAirPlayConf::Manual); + break; - default: - break; + default: + break; } } @@ -1572,119 +1560,118 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status) RDLogLine *logline; switch(air_action_mode) { - case StartButton::AddTo: - if(line<0) { - air_log[id]-> - insert(air_log[id]->size(),air_add_cart,RDLogLine::Play); - air_log[id]->logLine(air_log[id]->size()-1)-> - setTransType(rda->airplayConf()->defaultTransType()); - air_log_list[id]->refresh(air_log[id]->size()-1); - } - else { - air_log[id]-> - insert(line,air_add_cart,air_log[id]->nextTransType(line)); - air_log[id]->logLine(line)-> - setTransType(rda->airplayConf()->defaultTransType()); - air_log_list[id]->refresh(line); - } - SetActionMode(StartButton::Stop); - break; + case StartButton::AddTo: + if(line<0) { + air_log[id]-> + insert(air_log[id]->size(),air_add_cart,RDLogLine::Play); + air_log[id]->logLine(air_log[id]->size()-1)-> + setTransType(rda->airplayConf()->defaultTransType()); + air_log_list[id]->refresh(air_log[id]->size()-1); + } + else { + air_log[id]-> + insert(line,air_add_cart,air_log[id]->nextTransType(line)); + air_log[id]->logLine(line)-> + setTransType(rda->airplayConf()->defaultTransType()); + air_log_list[id]->refresh(line); + } + SetActionMode(StartButton::Stop); + break; - case StartButton::DeleteFrom: - if(status==RDLogLine::Finished) { - return; - } - air_log[id]->remove(line,1); - SetActionMode(StartButton::Stop); - break; + case StartButton::DeleteFrom: + if(status==RDLogLine::Finished) { + return; + } + air_log[id]->remove(line,1); + SetActionMode(StartButton::Stop); + break; - case StartButton::MoveFrom: - if((logline=air_log[id]->logLine(line))!=NULL) { - air_copy_line=line; - air_add_cart=logline->cartNumber(); - air_source_id=id; - SetActionMode(StartButton::MoveTo); - } - else { - SetActionMode(StartButton::Stop); - } - break; + case StartButton::MoveFrom: + if((logline=air_log[id]->logLine(line))!=NULL) { + air_copy_line=line; + air_add_cart=logline->cartNumber(); + air_source_id=id; + SetActionMode(StartButton::MoveTo); + } + else { + SetActionMode(StartButton::Stop); + } + break; - case StartButton::MoveTo: - if(air_source_id==id) { - if(line<0) { - air_log[id]->move(air_copy_line,air_log[id]->size()); - air_log_list[id]->refresh(air_log[id]->size()-1); - } - else { - if(line>air_copy_line) { - line--; - } - air_log[id]->move(air_copy_line,line); - air_log_list[id]->refresh(line); - } + case StartButton::MoveTo: + if(air_source_id==id) { + if(line<0) { + air_log[id]->move(air_copy_line,air_log[id]->size()); + air_log_list[id]->refresh(air_log[id]->size()-1); + } + else { + if(line>air_copy_line) { + line--; } - else { - air_log[air_source_id]->remove(air_copy_line,1); - if(line<0) { - air_log[id]-> - insert(air_log[id]->size(),air_add_cart,RDLogLine::Play); - air_log_list[id]->refresh(air_log[id]->size()-1); - - } - else { - air_log[id]-> - insert(line,air_add_cart,air_log[id]->nextTransType(line)); - air_log_list[id]->refresh(line); - } - } - SetActionMode(StartButton::Stop); - break; + air_log[id]->move(air_copy_line,line); + air_log_list[id]->refresh(line); + } + } + else { + air_log[air_source_id]->remove(air_copy_line,1); + if(line<0) { + air_log[id]-> + insert(air_log[id]->size(),air_add_cart,RDLogLine::Play); + air_log_list[id]->refresh(air_log[id]->size()-1); + } + else { + air_log[id]-> + insert(line,air_add_cart,air_log[id]->nextTransType(line)); + air_log_list[id]->refresh(line); + } + } + SetActionMode(StartButton::Stop); + break; - case StartButton::CopyFrom: - if((logline=air_log[id]->logLine(line))!=NULL) { - air_copy_line=line; - air_add_cart=logline->cartNumber(); - air_source_id=id; - SetActionMode(StartButton::CopyTo); - } - else { - SetActionMode(StartButton::Stop); - } - break; + case StartButton::CopyFrom: + if((logline=air_log[id]->logLine(line))!=NULL) { + air_copy_line=line; + air_add_cart=logline->cartNumber(); + air_source_id=id; + SetActionMode(StartButton::CopyTo); + } + else { + SetActionMode(StartButton::Stop); + } + break; - case StartButton::CopyTo: - if(air_source_id==id) { - if(line<0) { - air_log[id]->copy(air_copy_line,air_log[id]->size()); - } - else { - air_log[id]->copy(air_copy_line,line); - } - } - else { - if(line<0) { - air_log[id]->insert(air_log[id]->size(),air_add_cart, - rda->airplayConf()->defaultTransType(), - rda->airplayConf()->defaultTransType()); - air_log[id]->logLine(air_log[id]->size()-1)-> - setTransType(rda->airplayConf()->defaultTransType()); - air_log_list[id]->refresh(air_log[id]->size()-1); - } - else { - air_log[id]-> - insert(line,air_add_cart,air_log[id]->nextTransType(line), - rda->airplayConf()->defaultTransType()); - air_log[id]->logLine(line)-> - setTransType(rda->airplayConf()->defaultTransType()); - air_log_list[id]->refresh(line); - } - } - SetActionMode(StartButton::Stop); - break; + case StartButton::CopyTo: + if(air_source_id==id) { + if(line<0) { + air_log[id]->copy(air_copy_line,air_log[id]->size()); + } + else { + air_log[id]->copy(air_copy_line,line); + } + } + else { + if(line<0) { + air_log[id]->insert(air_log[id]->size(),air_add_cart, + rda->airplayConf()->defaultTransType(), + rda->airplayConf()->defaultTransType()); + air_log[id]->logLine(air_log[id]->size()-1)-> + setTransType(rda->airplayConf()->defaultTransType()); + air_log_list[id]->refresh(air_log[id]->size()-1); + } + else { + air_log[id]-> + insert(line,air_add_cart,air_log[id]->nextTransType(line), + rda->airplayConf()->defaultTransType()); + air_log[id]->logLine(line)-> + setTransType(rda->airplayConf()->defaultTransType()); + air_log_list[id]->refresh(line); + } + } + SetActionMode(StartButton::Stop); + break; - default: - break; + default: + break; } } @@ -1692,39 +1679,39 @@ void MainWidget::selectClickedData(int id,int line,RDLogLine::Status status) void MainWidget::selectClickedData(unsigned cartnum,int row,int col) { switch(air_action_mode) { - case StartButton::CopyFrom: - air_copy_line=-1; - air_add_cart=cartnum; - air_source_id=-1; - SetActionMode(StartButton::CopyTo); - break; + case StartButton::CopyFrom: + air_copy_line=-1; + air_add_cart=cartnum; + air_source_id=-1; + SetActionMode(StartButton::CopyTo); + break; - case StartButton::CopyTo: - if(air_panel!=NULL) { - air_panel->setButton(air_panel->currentType(), - air_panel->currentNumber(),row,col,air_add_cart); - } - SetActionMode(StartButton::Stop); - break; + case StartButton::CopyTo: + if(air_panel!=NULL) { + air_panel->setButton(air_panel->currentType(), + air_panel->currentNumber(),row,col,air_add_cart); + } + SetActionMode(StartButton::Stop); + break; - case StartButton::AddTo: - if(air_panel!=NULL) { - air_panel->setButton(air_panel->currentType(), - air_panel->currentNumber(),row,col,air_add_cart); - } - SetActionMode(StartButton::Stop); - break; + case StartButton::AddTo: + if(air_panel!=NULL) { + air_panel->setButton(air_panel->currentType(), + air_panel->currentNumber(),row,col,air_add_cart); + } + SetActionMode(StartButton::Stop); + break; - case StartButton::DeleteFrom: - if(air_panel!=NULL) { - air_panel->setButton(air_panel->currentType(), - air_panel->currentNumber(),row,col,0); - } - SetActionMode(StartButton::Stop); - break; + case StartButton::DeleteFrom: + if(air_panel!=NULL) { + air_panel->setButton(air_panel->currentType(), + air_panel->currentNumber(),row,col,0); + } + SetActionMode(StartButton::Stop); + break; - default: - break; + default: + break; } } @@ -1806,68 +1793,68 @@ void MainWidget::transportChangedData() for(int i=0;ilogLine(lines[i]))!=NULL) { switch(logline->type()) { - case RDLogLine::Cart: - if(logline->startTime(RDLogLine::Actual). - addMSecs(logline->effectiveLength()- - ((RDPlayDeck *)logline->playDeck())-> - lastStartPosition())>end_time) { - end_time=logline->startTime(RDLogLine::Actual). - addMSecs(logline->effectiveLength()- - ((RDPlayDeck *)logline->playDeck())-> - lastStartPosition()); - line=lines[i]; - } - break; + case RDLogLine::Cart: + if(logline->startTime(RDLogLine::Actual). + addMSecs(logline->effectiveLength()- + ((RDPlayDeck *)logline->playDeck())-> + lastStartPosition())>end_time) { + end_time=logline->startTime(RDLogLine::Actual). + addMSecs(logline->effectiveLength()- + ((RDPlayDeck *)logline->playDeck())-> + lastStartPosition()); + line=lines[i]; + } + break; - case RDLogLine::Macro: - line=lines[i]; - break; + case RDLogLine::Macro: + line=lines[i]; + break; - default: - break; + default: + break; } } } logline=air_log[0]->logLine(line); switch(air_op_mode[0]) { - case RDAirPlayConf::Manual: - case RDAirPlayConf::LiveAssist: - pie_end=RDAirPlayConf::CartEnd; - break; + case RDAirPlayConf::Manual: + case RDAirPlayConf::LiveAssist: + pie_end=RDAirPlayConf::CartEnd; + break; - case RDAirPlayConf::Auto: - pie_end=air_pie_end; - break; + case RDAirPlayConf::Auto: + pie_end=air_pie_end; + break; - default: - break; + default: + break; } if(logline->effectiveLength()>0) { if((air_pie_counter->line()!=logline->id())) { switch(pie_end) { - case RDAirPlayConf::CartEnd: - air_pie_counter->setTime(logline->effectiveLength()); - break; + case RDAirPlayConf::CartEnd: + air_pie_counter->setTime(logline->effectiveLength()); + break; - case RDAirPlayConf::CartTransition: - if((next_logline=air_log[0]-> - logLine(air_log[0]->nextLine(line)))!=NULL) { - if((unsigned)logline->startTime(RDLogLine::Actual). - msecsTo(QTime::currentTime())< - logline->segueLength(next_logline->transType())- - logline->playPosition()) { - air_pie_counter-> - setTime(logline->segueLength(next_logline->transType())); - } - else { - air_pie_counter->setTime(logline->effectiveLength()); - } - } - else { - air_pie_counter->setTime(logline->effectiveLength()); - } - break; + case RDAirPlayConf::CartTransition: + if((next_logline=air_log[0]-> + logLine(air_log[0]->nextLine(line)))!=NULL) { + if((unsigned)logline->startTime(RDLogLine::Actual). + msecsTo(QTime::currentTime())< + logline->segueLength(next_logline->transType())- + logline->playPosition()) { + air_pie_counter-> + setTime(logline->segueLength(next_logline->transType())); + } + else { + air_pie_counter->setTime(logline->effectiveLength()); + } + } + else { + air_pie_counter->setTime(logline->effectiveLength()); + } + break; } if(logline->talkStartPoint()==0) { air_pie_counter->setTalkStart(0); @@ -1950,31 +1937,31 @@ void MainWidget::clearSplashData() void MainWidget::keyPressEvent(QKeyEvent *e) { switch(e->key()) { - case Qt::Key_Space: - break; + case Qt::Key_Space: + break; - case Qt::Key_X: - if(((e->state()&Qt::AltModifier)!=0)&& - ((e->state()&Qt::ShiftModifier)==0)&&((e->state()&Qt::ControlModifier)==0)) { - QCloseEvent *ce=new QCloseEvent(); - closeEvent(ce); - delete ce; - } - break; + case Qt::Key_X: + if(((e->state()&Qt::AltModifier)!=0)&& + ((e->state()&Qt::ShiftModifier)==0)&&((e->state()&Qt::ControlModifier)==0)) { + QCloseEvent *ce=new QCloseEvent(); + closeEvent(ce); + delete ce; + } + break; - case Qt::Key_Alt: - keystrokecount++; - AltKeyHit = true; - break; + case Qt::Key_Alt: + keystrokecount++; + AltKeyHit = true; + break; - case Qt::Key_Control: - keystrokecount++; - CtrlKeyHit = true; - break; + case Qt::Key_Control: + keystrokecount++; + CtrlKeyHit = true; + break; - default: - QWidget::keyPressEvent(e); - break; + default: + QWidget::keyPressEvent(e); + break; } } @@ -1987,19 +1974,19 @@ void MainWidget::keyReleaseEvent(QKeyEvent *e) QString temp_string; switch(e->key()) { - case Qt::Key_Space: - switch(air_bar_action) { - case RDAirPlayConf::StartNext: - if(!e->isAutoRepeat()){ - air_log[0]-> - play(air_log[0]->nextLine(),RDLogLine::StartManual); - } - break; + case Qt::Key_Space: + switch(air_bar_action) { + case RDAirPlayConf::StartNext: + if(!e->isAutoRepeat()){ + air_log[0]-> + play(air_log[0]->nextLine(),RDLogLine::StartManual); + } + break; - default: - break; - } - break; + default: + break; + } + break; } // Try to figure out if this is a hot key combination if ( (e->key() == Qt::Key_Shift) || @@ -2143,7 +2130,7 @@ void MainWidget::closeEvent(QCloseEvent *e) air_lock->unlock(); exit(0); } - if(QMessageBox::question(this,"",tr("Exit RDAirPlay?"), + if(QMessageBox::question(this,"RDAirPlay",tr("Exit RDAirPlay?"), QMessageBox::Yes,QMessageBox::No)!= QMessageBox::Yes) { return; @@ -2193,11 +2180,11 @@ void MainWidget::SetCaption() if(log.isEmpty()) { log="-- "; } - setCaption(QString("RDAirPlay")+" v"+VERSION+" - "+tr("Host")+": "+ - rda->config()->stationName()+" "+ - tr("User:")+" "+rda->ripc()->user()+" "+ - tr("Log:")+" "+log.left(log.length()-4)+" "+ - tr("Service:")+" "+air_log[0]->serviceName()); + setWindowTitle(QString("RDAirPlay")+" v"+VERSION+" - "+tr("Host")+": "+ + rda->config()->stationName()+" "+ + tr("User:")+" "+rda->ripc()->user()+" "+ + tr("Log:")+" "+log.left(log.length()-4)+" "+ + tr("Service:")+" "+air_log[0]->serviceName()); } @@ -2213,20 +2200,20 @@ void MainWidget::SetMode(int mach,RDAirPlayConf::OpMode mode) return; } switch(mode) { - case RDAirPlayConf::Manual: - SetManualMode(mach); - break; + case RDAirPlayConf::Manual: + SetManualMode(mach); + break; - case RDAirPlayConf::LiveAssist: - SetLiveAssistMode(mach); - break; + case RDAirPlayConf::LiveAssist: + SetLiveAssistMode(mach); + break; - case RDAirPlayConf::Auto: - SetAutoMode(mach); - break; + case RDAirPlayConf::Auto: + SetAutoMode(mach); + break; - default: - break; + default: + break; } } @@ -2319,160 +2306,158 @@ void MainWidget::SetActionMode(StartButton::Mode mode) } air_action_mode=mode; switch(mode) { - case StartButton::Stop: - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::Normal); - } - air_button_list->setActionMode(RDAirPlayConf::Normal); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::Normal); - } + case StartButton::Stop: + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::Normal); + } + air_button_list->setActionMode(RDAirPlayConf::Normal); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::Normal); + } + break; - break; - - case StartButton::AddFrom: - if(air_clear_filter) { - air_add_filter=""; - } - air_add_cart=0; - for(int i=0;iserviceName(); - if(!svc_name[i].isEmpty()) { - svc_quan=RDAIRPLAY_LOG_QUANTITY; - } - } - if(svc_quan==0) { - sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+ - "STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; - q=new RDSqlQuery(sql); - while(q->next()) { - services_list.append( q->value(0).toString() ); - } - delete q; - for ( QStringList::Iterator it = services_list.begin(); - it != services_list.end()&&svc_quan<(RD_MAX_DEFAULT_SERVICES-1); - ++it ) { - svc_name[svc_quan++]=*it; - } - - } - air_add_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(true); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::Normal); - } - air_button_list->setActionMode(RDAirPlayConf::Normal); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::Normal); - } - if(rdcart_dialog->exec(&air_add_cart,RDCart::All,0,0, - rda->user()->name(),rda->user()->password())==0) { - SetActionMode(StartButton::AddTo); - } - else { - SetActionMode(StartButton::Stop); - } - break; + case StartButton::AddFrom: + if(air_clear_filter) { + air_add_filter=""; + } + air_add_cart=0; + for(int i=0;iserviceName(); + if(!svc_name[i].isEmpty()) { + svc_quan=RDAIRPLAY_LOG_QUANTITY; + } + } + if(svc_quan==0) { + sql=QString("select SERVICE_NAME from SERVICE_PERMS where ")+ + "STATION_NAME=\""+RDEscapeString(rda->station()->name())+"\""; + q=new RDSqlQuery(sql); + while(q->next()) { + services_list.append( q->value(0).toString() ); + } + delete q; + for ( QStringList::Iterator it = services_list.begin(); + it != services_list.end()&&svc_quan<(RD_MAX_DEFAULT_SERVICES-1); + ++it ) { + svc_name[svc_quan++]=*it; + } + } + air_add_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(true); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::Normal); + } + air_button_list->setActionMode(RDAirPlayConf::Normal); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::Normal); + } + if(rdcart_dialog->exec(&air_add_cart,RDCart::All,0,0, + rda->user()->name(),rda->user()->password())==0) { + SetActionMode(StartButton::AddTo); + } + else { + SetActionMode(StartButton::Stop); + } + break; - case StartButton::AddTo: - air_add_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(true); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::AddTo,&air_add_cart); - } - air_button_list->setActionMode(RDAirPlayConf::AddTo); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::AddTo); - } - break; + case StartButton::AddTo: + air_add_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(true); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::AddTo,&air_add_cart); + } + air_button_list->setActionMode(RDAirPlayConf::AddTo); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::AddTo); + } + break; - case StartButton::DeleteFrom: - air_delete_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(true); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::DeleteFrom); - } - air_button_list->setActionMode(RDAirPlayConf::DeleteFrom); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::DeleteFrom); - } - break; + case StartButton::DeleteFrom: + air_delete_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(true); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::DeleteFrom); + } + air_button_list->setActionMode(RDAirPlayConf::DeleteFrom); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::DeleteFrom); + } + break; - case StartButton::MoveFrom: - air_move_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(true); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::MoveFrom); - } - air_button_list->setActionMode(RDAirPlayConf::MoveFrom); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::MoveFrom); - } - break; + case StartButton::MoveFrom: + air_move_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(true); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::MoveFrom); + } + air_button_list->setActionMode(RDAirPlayConf::MoveFrom); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::MoveFrom); + } + break; - case StartButton::MoveTo: - air_move_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(true); - air_copy_button->setFlashingEnabled(false); - for(int i=0;isetActionMode(RDAirPlayConf::MoveTo); - } - air_button_list->setActionMode(RDAirPlayConf::MoveTo); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::MoveTo); - } - break; + case StartButton::MoveTo: + air_move_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(true); + air_copy_button->setFlashingEnabled(false); + for(int i=0;isetActionMode(RDAirPlayConf::MoveTo); + } + air_button_list->setActionMode(RDAirPlayConf::MoveTo); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::MoveTo); + } + break; - case StartButton::CopyFrom: - air_copy_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(true); - for(int i=0;isetActionMode(RDAirPlayConf::CopyFrom); - } - air_button_list->setActionMode(RDAirPlayConf::CopyFrom); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::CopyFrom); - } - break; + case StartButton::CopyFrom: + air_copy_button->setFlashColor(BUTTON_FROM_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(true); + for(int i=0;isetActionMode(RDAirPlayConf::CopyFrom); + } + air_button_list->setActionMode(RDAirPlayConf::CopyFrom); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::CopyFrom); + } + break; - case StartButton::CopyTo: - air_move_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); - air_add_button->setFlashingEnabled(false); - air_delete_button->setFlashingEnabled(false); - air_move_button->setFlashingEnabled(false); - air_copy_button->setFlashingEnabled(true); - for(int i=0;isetActionMode(RDAirPlayConf::CopyTo); - } - air_button_list->setActionMode(RDAirPlayConf::CopyTo); - if(air_panel!=NULL) { - air_panel->setActionMode(RDAirPlayConf::CopyTo); - } - break; + case StartButton::CopyTo: + air_move_button->setFlashColor(BUTTON_TO_BACKGROUND_COLOR); + air_add_button->setFlashingEnabled(false); + air_delete_button->setFlashingEnabled(false); + air_move_button->setFlashingEnabled(false); + air_copy_button->setFlashingEnabled(true); + for(int i=0;isetActionMode(RDAirPlayConf::CopyTo); + } + air_button_list->setActionMode(RDAirPlayConf::CopyTo); + if(air_panel!=NULL) { + air_panel->setActionMode(RDAirPlayConf::CopyTo); + } + break; - default: - break; + default: + break; } } diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h index 552ced75..32d0384e 100644 --- a/rdairplay/rdairplay.h +++ b/rdairplay/rdairplay.h @@ -2,7 +2,7 @@ // // The On Air Playout Utility for Rivendell. // -// (C) Copyright 2002-2006,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -36,10 +36,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -227,4 +223,4 @@ class MainWidget : public QWidget }; -#endif +#endif // RDAIRPLAY_H diff --git a/rdairplay/rdairplay_cs.ts b/rdairplay/rdairplay_cs.ts index 23751e5e..7b78ddf9 100644 --- a/rdairplay/rdairplay_cs.ts +++ b/rdairplay/rdairplay_cs.ts @@ -207,59 +207,59 @@ ListLog EST TIME - ODH. ČAS + ODH. ČAS LEN - DÉLKA + DÉLKA TRANS - PŘECHOD + PŘECHOD CART - VOZÍK + VOZÍK TITLE - NÁZEV + NÁZEV ARTIST - UMĚLEC + UMĚLEC GROUP - SKUPINA + SKUPINA TIME - ČAS + ČAS CLIENT - ZÁKAZNÍK + ZÁKAZNÍK AGENCY - AGENTURA + AGENTURA LABEL - ŠTÍTEK + ŠTÍTEK LINE ID - ID ŘÁDKU + ID ŘÁDKU COUNT - POČÍTADLO + POČÍTADLO STATUS - STAV + STAV Select @@ -396,11 +396,71 @@ Tail poslechu - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/rdairplay_de.ts b/rdairplay/rdairplay_de.ts index 1aaa9dc1..4c462d29 100644 --- a/rdairplay/rdairplay_de.ts +++ b/rdairplay/rdairplay_de.ts @@ -207,59 +207,59 @@ ListLog EST TIME - CA. ZEIT + CA. ZEIT LEN - LÄNGE + LÄNGE TRANS - ÜBERG + ÜBERG CART - CART + CART TITLE - TITEL + TITEL ARTIST - KÜNSTLER + KÜNSTLER GROUP - GRUPPE + GRUPPE TIME - ZEIT + ZEIT CLIENT - KUNDE + KUNDE AGENCY - AGENTUR + AGENTUR LABEL - LABEL + LABEL LINE ID - LINE ID + LINE ID COUNT - ZÄHLER + ZÄHLER STATUS - STATUS + STATUS Select @@ -396,11 +396,71 @@ Tail vorhören - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/rdairplay_es.ts b/rdairplay/rdairplay_es.ts index 44bbc507..a4b7e13c 100644 --- a/rdairplay/rdairplay_es.ts +++ b/rdairplay/rdairplay_es.ts @@ -207,47 +207,47 @@ ListLog TIME - HORA + HORA TRANS - TRANS + TRANS CART - CARTUCHO + CARTUCHO TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA CLIENT - CLIENTE + CLIENTE AGENCY - AGENCIA + AGENCIA LABEL - ETIQUETA + ETIQUETA LINE ID - ID DE LÍNEA + ID DE LÍNEA COUNT - CUENTA + CUENTA STATUS - ESTADO + ESTADO Select @@ -335,7 +335,7 @@ Lista LEN - LONG + LONG LINK @@ -351,11 +351,11 @@ Lista EST TIME - TIEMPO EST + TIEMPO EST GROUP - GRUPO + GRUPO Refresh @@ -396,11 +396,71 @@ Tail Final - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/rdairplay_fr.ts b/rdairplay/rdairplay_fr.ts index bd14e9ca..f052bf61 100644 --- a/rdairplay/rdairplay_fr.ts +++ b/rdairplay/rdairplay_fr.ts @@ -207,59 +207,59 @@ ListLog EST TIME - HORAIRE EST + HORAIRE EST LEN - DUREE + DUREE TRANS - TRANS + TRANS CART - CART + CART TITLE - TITRE + TITRE ARTIST - ARTISTE + ARTISTE GROUP - GROUPE + GROUPE TIME - HORAIRE + HORAIRE CLIENT - CLIENT + CLIENT AGENCY - AGENCE + AGENCE LABEL - LABEL + LABEL LINE ID - LIGNE ID + LIGNE ID COUNT - NUMERO + NUMERO STATUS - STATUT + STATUT Select @@ -397,12 +397,76 @@ la Fin ALBUM - ALBUM + ALBUM Error + + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status + + ListLogs diff --git a/rdairplay/rdairplay_nb.ts b/rdairplay/rdairplay_nb.ts index 9af3f0cb..01de57b2 100644 --- a/rdairplay/rdairplay_nb.ts +++ b/rdairplay/rdairplay_nb.ts @@ -207,59 +207,59 @@ ListLog EST TIME - OMTR TID + OMTR TID LEN - LENGD + LENGD TRANS - OVERT + OVERT CART - KORG + KORG TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST GROUP - GRUPPE + GRUPPE TIME - TID + TID CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT LABEL - SELSKAP + SELSKAP LINE ID - LINJE-ID + LINJE-ID COUNT - TELLING + TELLING STATUS - STATUS + STATUS Select @@ -402,11 +402,71 @@ Tail - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/rdairplay_nn.ts b/rdairplay/rdairplay_nn.ts index 9af3f0cb..01de57b2 100644 --- a/rdairplay/rdairplay_nn.ts +++ b/rdairplay/rdairplay_nn.ts @@ -207,59 +207,59 @@ ListLog EST TIME - OMTR TID + OMTR TID LEN - LENGD + LENGD TRANS - OVERT + OVERT CART - KORG + KORG TITLE - TITTEL + TITTEL ARTIST - ARTIST + ARTIST GROUP - GRUPPE + GRUPPE TIME - TID + TID CLIENT - KLIENT + KLIENT AGENCY - AGENT + AGENT LABEL - SELSKAP + SELSKAP LINE ID - LINJE-ID + LINJE-ID COUNT - TELLING + TELLING STATUS - STATUS + STATUS Select @@ -402,11 +402,71 @@ Tail - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/rdairplay_pt_BR.ts b/rdairplay/rdairplay_pt_BR.ts index 646714eb..307b32e7 100644 --- a/rdairplay/rdairplay_pt_BR.ts +++ b/rdairplay/rdairplay_pt_BR.ts @@ -211,59 +211,59 @@ ListLog EST TIME - HORA EST + HORA EST LEN - DURAÇÃO + DURAÇÃO TRANS - TRANSIÇÃO + TRANSIÇÃO CART - CART + CART TITLE - TÍTULO + TÍTULO ARTIST - ARTISTA + ARTISTA GROUP - GRUPO + GRUPO TIME - HORA PROGRAMDA + HORA PROGRAMDA CLIENT - CLIENTE + CLIENTE AGENCY - AGÊNCIA + AGÊNCIA LABEL - SELO + SELO LINE ID - ID de LINHA + ID de LINHA COUNT - CONTADOR + CONTADOR STATUS - STATUS + STATUS Run Length @@ -397,11 +397,71 @@ Log Parar - ALBUM + Error - Error + Est Time + + + + Len + + + + Trans + + + + Cart + + + + Title + + + + Artist + + + + Group + + + + Time + + + + Album + + + + Label + + + + Client + + + + Agency + + + + Marker + + + + Line ID + + + + Count + + + + Status diff --git a/rdairplay/start_button.cpp b/rdairplay/start_button.cpp index 331fbcf3..65c5e2b0 100644 --- a/rdairplay/start_button.cpp +++ b/rdairplay/start_button.cpp @@ -2,7 +2,7 @@ // // The Start Button for RDAirPlay Rivendell // -// (C) Copyright 2002-2004,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -116,68 +116,68 @@ void StartButton::setMode(Mode mode,RDCart::Type cart_type) } start_mode=mode; switch(mode) { - case StartButton::Stop: - setPalette(start_stop_color); - start_title=STOP_MODE_TITLE; - break; + case StartButton::Stop: + setPalette(start_stop_color); + start_title=STOP_MODE_TITLE; + break; - case StartButton::Play: - setPalette(start_play_color); - if(start_allow_pause&&(cart_type!=RDCart::Macro)) { - start_title=PLAY1_MODE_TITLE; - } - else { - start_title=PLAY0_MODE_TITLE; - } - break; + case StartButton::Play: + setPalette(start_play_color); + if(start_allow_pause&&(cart_type!=RDCart::Macro)) { + start_title=PLAY1_MODE_TITLE; + } + else { + start_title=PLAY0_MODE_TITLE; + } + break; - case StartButton::Pause: - setPalette(start_pause_color); - start_title=PAUSE_MODE_TITLE; - break; + case StartButton::Pause: + setPalette(start_pause_color); + start_title=PAUSE_MODE_TITLE; + break; - case StartButton::MoveFrom: - setPalette(start_from_color); - start_title=MOVE_FROM_MODE_TITLE; - break; + case StartButton::MoveFrom: + setPalette(start_from_color); + start_title=MOVE_FROM_MODE_TITLE; + break; - case StartButton::DeleteFrom: - setPalette(start_from_color); - start_title=DELETE_FROM_MODE_TITLE; - break; + case StartButton::DeleteFrom: + setPalette(start_from_color); + start_title=DELETE_FROM_MODE_TITLE; + break; - case StartButton::AddFrom: - break; + case StartButton::AddFrom: + break; - case StartButton::AddTo: - setPalette(start_to_color); - start_title=ADD_TO_MODE_TITLE; - break; + case StartButton::AddTo: + setPalette(start_to_color); + start_title=ADD_TO_MODE_TITLE; + break; - case StartButton::MoveTo: - setPalette(start_to_color); - start_title=MOVE_TO_MODE_TITLE; - break; + case StartButton::MoveTo: + setPalette(start_to_color); + start_title=MOVE_TO_MODE_TITLE; + break; - case StartButton::CopyTo: - setPalette(start_to_color); - start_title=COPY_TO_MODE_TITLE; - break; + case StartButton::CopyTo: + setPalette(start_to_color); + start_title=COPY_TO_MODE_TITLE; + break; - case StartButton::CopyFrom: - setPalette(start_from_color); - start_title=COPY_FROM_MODE_TITLE; - break; + case StartButton::CopyFrom: + setPalette(start_from_color); + start_title=COPY_FROM_MODE_TITLE; + break; - case StartButton::Disabled: - setPalette(start_disabled_color); - start_title=DISABLED_MODE_TITLE; - break; + case StartButton::Disabled: + setPalette(start_disabled_color); + start_title=DISABLED_MODE_TITLE; + break; - case StartButton::Error: - setPalette(start_error_color); - start_title=ERROR_MODE_TITLE; - break; + case StartButton::Error: + setPalette(start_error_color); + start_title=ERROR_MODE_TITLE; + break; } Resize(geometry().x(),geometry().y(),geometry().width(),geometry().height()); } @@ -208,11 +208,12 @@ void StartButton::setGeometry(QRect rect) void StartButton::Resize(int x,int y,int w,int h) { + w-=2; + h-=2; QPixmap *pix=new QPixmap(w,h); QPainter *p=new QPainter(); p->begin(pix); p->fillRect(0,0,w,h,palette().color(QPalette::Active,QColorGroup::Button)); - //p->eraseRect(0,0,w,h); if(start_mode!=StartButton::Disabled) { p->setPen(QColor(Qt::color1)); p->setFont(start_label_font); diff --git a/rdairplay/start_button.h b/rdairplay/start_button.h index 47b152ec..63ec1c8a 100644 --- a/rdairplay/start_button.h +++ b/rdairplay/start_button.h @@ -2,7 +2,7 @@ // // The Start Button for RDAirPlay Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -67,4 +67,4 @@ class StartButton : public QPushButton bool start_allow_pause; }; -#endif +#endif // START_BUTTON_H diff --git a/rdairplay/stop_counter.cpp b/rdairplay/stop_counter.cpp index 13f6ae5a..632a5f91 100644 --- a/rdairplay/stop_counter.cpp +++ b/rdairplay/stop_counter.cpp @@ -2,7 +2,7 @@ // // The stop counter widget for Rivendell // -// (C) Copyright 2002-2004,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -50,13 +50,13 @@ StopCounter::StopCounter(QWidget *parent) void StopCounter::setTimeMode(RDAirPlayConf::TimeMode mode) { switch(mode) { - case RDAirPlayConf::TwentyFourHour: - time_format="hh:mm:ss"; - break; + case RDAirPlayConf::TwentyFourHour: + time_format="hh:mm:ss"; + break; - case RDAirPlayConf::TwelveHour: - time_format="h:mm:ss ap"; - break; + case RDAirPlayConf::TwelveHour: + time_format="h:mm:ss ap"; + break; } old_msecs = 0; if (stop_running) { @@ -132,38 +132,38 @@ void StopCounter::UpdateTime() int msecs=QTime::currentTime(). addMSecs(rda->station()->timeOffset()).msecsTo(stop_time); - if ((old_stop_running != stop_running) || (msecs/1000 != old_msecs/1000)){ - QPixmap pix(sizeHint().width(),sizeHint().height()); - QPainter *p=new QPainter(&pix); - old_stop_running = stop_running; - old_msecs = msecs; + if((old_stop_running != stop_running) || (msecs/1000 != old_msecs/1000)){ + QPixmap pix(sizeHint().width()-2,sizeHint().height()-2); + QPainter *p=new QPainter(&pix); + old_stop_running = stop_running; + old_msecs = msecs; - p->fillRect(0,0,sizeHint().width(),sizeHint().height(), - backgroundColor()); - p->setPen(QColor(system_button_text_color)); - p->setFont(stop_text_font); - p->drawText((sizeHint().width()-p->fontMetrics().width(stop_text))/2,22, - stop_text); - p->setFont(stop_time_font); - if (msecs < 0){ - /* HACK HACK HACK TODO */ - /* msecs is **PROBABLY** in the next day - (we have a log crossing midnight - logs - longer then 24 hours are NOT supported by this, - please fix).... */ - msecs += 86400000; /* 1 day */ - } - if(stop_running) { - text=QTime(0,0,1).addMSecs(msecs).toString("hh:mm:ss"); - p->drawText((sizeHint().width()-p->fontMetrics().width(text))/2,49,text); - } - else { - p->drawText((sizeHint().width()-p-> - fontMetrics().width(tr("Stopped")))/2,49, - tr("Stopped")); - } - p->end(); - delete p; - setPixmap(pix); + p->fillRect(0,0,sizeHint().width()-2,sizeHint().height()-2, + backgroundColor()); + p->setPen(QColor(system_button_text_color)); + p->setFont(stop_text_font); + p->drawText((sizeHint().width()-2-p->fontMetrics().width(stop_text))/2,22, + stop_text); + p->setFont(stop_time_font); + if (msecs < 0){ + /* HACK HACK HACK TODO */ + /* msecs is **PROBABLY** in the next day + (we have a log crossing midnight - logs + longer then 24 hours are NOT supported by this, + please fix).... */ + msecs += 86400000; /* 1 day */ + } + if(stop_running) { + text=QTime(0,0,1).addMSecs(msecs).toString("hh:mm:ss"); + p->drawText((sizeHint().width()-2-p->fontMetrics().width(text))/2,49,text); + } + else { + p->drawText((sizeHint().width()-2-p-> + fontMetrics().width(tr("Stopped")))/2,49, + tr("Stopped")); + } + p->end(); + delete p; + setPixmap(pix); } } diff --git a/rdairplay/stop_counter.h b/rdairplay/stop_counter.h index 018615e2..22794741 100644 --- a/rdairplay/stop_counter.h +++ b/rdairplay/stop_counter.h @@ -2,7 +2,7 @@ // // The post counter widget for Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -52,4 +52,4 @@ class StopCounter : public QPushButton QString time_format; }; -#endif +#endif // STOP_COUNTER_H diff --git a/rdairplay/wall_clock.cpp b/rdairplay/wall_clock.cpp index 2cde8f54..e30dc022 100644 --- a/rdairplay/wall_clock.cpp +++ b/rdairplay/wall_clock.cpp @@ -2,7 +2,7 @@ // // A wall-clock widget with date. // -// (C) Copyright 2002-2003,2016-2018 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -18,6 +18,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#include +#include + #include #include #include @@ -25,10 +28,6 @@ #include #include #include -//Added by qt3to4: -#include -#include -#include #include #include @@ -111,7 +110,7 @@ void WallClock::tickClock() static QString date; QString accum; QColor system_button_text_color = palette().active().buttonText(); - static QPixmap *pix=new QPixmap(sizeHint().width(),sizeHint().height()); + static QPixmap *pix=new QPixmap(sizeHint().width()-2,sizeHint().height()-2); static bool synced=true; if(check_sync) { @@ -152,17 +151,17 @@ void WallClock::tickClock() } QPainter p(pix); if(flash_state) { - p.fillRect(0,0,width(),height(),BUTTON_TIME_SYNC_LOST_COLOR); + p.fillRect(0,0,width()-2,height()-2,BUTTON_TIME_SYNC_LOST_COLOR); p.setPen(Qt::color1); } else { - p.fillRect(0,0,width(),height(),backgroundColor()); + p.fillRect(0,0,width()-2,height()-2,backgroundColor()); p.setPen(QColor(system_button_text_color)); } p.setFont(label_font); - p.drawText((sizeHint().width()-p.fontMetrics().width(date))/2,22,date); + p.drawText((size().width()-2-p.fontMetrics().width(date))/2,22,date); p.setFont(time_font); - p.drawText((sizeHint().width()-p.fontMetrics().width(accum))/2,48,accum); + p.drawText((size().width()-2-p.fontMetrics().width(accum))/2,48,accum); p.end(); setPixmap(*pix); } @@ -170,7 +169,6 @@ void WallClock::tickClock() void WallClock::flashButton(bool state) { - printf("flashButton()\n"); flash_state=state; tickClock(); } diff --git a/rdairplay/wall_clock.h b/rdairplay/wall_clock.h index 058d3d62..c51912de 100644 --- a/rdairplay/wall_clock.h +++ b/rdairplay/wall_clock.h @@ -2,7 +2,7 @@ // // The wall clock widget for Rivendell // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2018 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 @@ -26,8 +26,6 @@ #include #include -//Added by qt3to4: -#include #include @@ -70,4 +68,4 @@ class WallClock : public QPushButton bool flash_state; }; -#endif +#endif // WALL_CLOCK_H