Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-21 14:02:58 +02:00
Code Issues Projects Releases Wiki Activity

2022-12-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlogedit(1) that caused a newly inserted
	log event to be assigned the start time parameters of the previously
	edited event.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-12-13 16:14:59 -05:00
parent 36d4d0cd6d
commit af7c1d0885
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -23797,3 +23797,7 @@
* Cleaned up filtering SQL in 'RDLogListModel'. * Cleaned up filtering SQL in 'RDLogListModel'.
2022-12-13 Fred Gleason <fredg@paravelsystems.com> 2022-12-13 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up filtering SQL in 'RDFeedListModel'. * Cleaned up filtering SQL in 'RDFeedListModel'.
2022-12-13 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdlogedit(1) that caused a newly inserted
log event to be assigned the start time parameters of the previously
edited event.

2
lib/rdlibrarymodel.cpp
View File

@@ -573,8 +573,6 @@ void RDLibraryModel::setFilterSql(const QString &sql,int cart_limit)
void RDLibraryModel::processNotification(RDNotification *notify) void RDLibraryModel::processNotification(RDNotification *notify)
{ {
printf("RDLibraryModel::processNotification()\n");
QString sql; QString sql;
RDSqlQuery *q=NULL; RDSqlQuery *q=NULL;

2
lib/rdlog_line.cpp
View File

@@ -119,7 +119,7 @@ void RDLogLine::clear()
log_source=RDLogLine::Manual; log_source=RDLogLine::Manual;
log_cart_number=0; log_cart_number=0;
for(int i=0;i<5;i++) { for(int i=0;i<5;i++) {
log_start_time[i]=QTime(); log_start_time[i]=QTime(0,0,0);
} }
log_time_type=RDLogLine::Relative; log_time_type=RDLogLine::Relative;
log_origin_user=""; log_origin_user="";

9
rdlogedit/edit_event.cpp
View File

@@ -106,13 +106,8 @@ EditEvent::EditEvent(QWidget *parent)
int EditEvent::exec() int EditEvent::exec()
{ {
edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged)); edit_time_edit->setTime(edit_logline->startTime(RDLogLine::Logged));
if(edit_logline->timeType()==RDLogLine::Hard) { edit_timetype_box->setChecked(edit_logline->timeType()==RDLogLine::Hard);
edit_timetype_box->setChecked(true); timeToggledData(edit_logline->timeType()==RDLogLine::Hard);
timeToggledData(true);
}
else {
timeToggledData(false);
}
timeChangedData(edit_time_edit->time()); timeChangedData(edit_time_edit->time());
switch(edit_logline->graceTime()) { switch(edit_logline->graceTime()) {
case -1: case -1:

4
rdlogedit/edit_log.cpp
View File

@@ -677,13 +677,13 @@ void EditLog::insertCartButtonData()
edit_log_model->insert(line,1); edit_log_model->insert(line,1);
edit_log_model->logLine(line)->setTransType(edit_default_trans); edit_log_model->logLine(line)->setTransType(edit_default_trans);
edit_log_model->logLine(line)->setFadeupGain(-3000);
edit_log_model->logLine(line)->setFadedownGain(-3000);
int ret=edit_logline_dialog-> int ret=edit_logline_dialog->
exec(edit_service_box->currentText(),edit_log_model, exec(edit_service_box->currentText(),edit_log_model,
edit_log_model->logLine(line),line); edit_log_model->logLine(line),line);
if(ret>=0) { if(ret>=0) {
edit_log_model->update(line); edit_log_model->update(line);
timestyleChangedData(global_start_time_style);
SetLogModified(true); SetLogModified(true);
} }
else { else {