Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-15 17:12:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tryphon-rdlogedit-editlog-insertattheend'

Browse Source
This commit is contained in:
Fred Gleason 2014-09-24 14:35:07 -04:00
commit 4a35111088
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -14502,3 +14502,7 @@
* Applied a patch from albanpeignier that adds a 'Clone' button
to the 'Edit Clock' dialog in 'rdlogmanager/edit_clock.cpp' and
'rdlogmanager/edit_clock.h' [GitHub pull request #000030].
2014-09-24 Fred Gleason <fredg@paravelsystems.com>
* Applied a patch from albanpeignier for RDLogEdit that appends
a new cart to a log if 'Add' is touch with no long line highlighted
[GitHub pull request #000031.

11
rdlogedit/edit_log.cpp
View File

@ -686,13 +686,12 @@ void EditLog::insertCartButtonData()
int id;
QListViewItem *item=SingleSelection();
if(item==NULL) {
return;
if(item==NULL || (line=item->text(13).toInt())<0) {
line=edit_log_event->size();
id=END_MARKER_ID;
} else {
id=item->text(12).toInt();
}
if((line=item->text(13).toInt())<0) {
line=0;
}
id=item->text(12).toInt();
edit_log_event->insert(line,1);
edit_log_event->logLine(line)->setTransType(edit_default_trans);
edit_log_event->logLine(line)->setFadeupGain(-3000);