mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-07-12 06:37:57 +02:00
2019-11-21 Fred Gleason <fredg@paravelsystems.com>
* Restored 'End of List' markers to the 'PRE-IMPORT CARTS' and 'POST-IMPORT CARTS' lists in the 'Editing Event' dialog in rdlogmanager(1).
This commit is contained in:
parent
7bffeb2b09
commit
1451bffc1e
@ -19252,3 +19252,7 @@
|
||||
* Reindented switch statements in 'rdadmin/edit_matrix.cpp'.
|
||||
2019-11-20 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Reindented switch statements in 'rdadmin/edit_ttys.cpp'.
|
||||
2019-11-21 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Restored 'End of List' markers to the 'PRE-IMPORT CARTS' and
|
||||
'POST-IMPORT CARTS' lists in the 'Editing Event' dialog in
|
||||
rdlogmanager(1).
|
||||
|
@ -761,6 +761,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -757,6 +757,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -757,6 +757,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -727,6 +727,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -757,6 +757,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -757,6 +757,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -757,6 +757,10 @@
|
||||
<source>No carts found in group</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>-- End of List --</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDAddCart</name>
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// Abstract an rdlogmanager(1) Import List
|
||||
//
|
||||
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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,8 +22,9 @@
|
||||
#include "rdescape_string.h"
|
||||
#include "rdeventimportlist.h"
|
||||
|
||||
RDEventImportItem::RDEventImportItem()
|
||||
RDEventImportItem::RDEventImportItem(bool end_marker)
|
||||
{
|
||||
event_end_marker=end_marker;
|
||||
event_type=RDLogLine::UnknownType;
|
||||
event_cart_number=0;
|
||||
event_trans_type=RDLogLine::Play;
|
||||
@ -31,6 +32,12 @@ RDEventImportItem::RDEventImportItem()
|
||||
}
|
||||
|
||||
|
||||
bool RDEventImportItem::isEndMarker() const
|
||||
{
|
||||
return event_end_marker;
|
||||
}
|
||||
|
||||
|
||||
RDLogLine::Type RDEventImportItem::eventType() const
|
||||
{
|
||||
return event_type;
|
||||
@ -69,6 +76,9 @@ void RDEventImportItem::setTransType(RDLogLine::TransType type)
|
||||
|
||||
QString RDEventImportItem::markerComment() const
|
||||
{
|
||||
if(event_end_marker) {
|
||||
return QObject::tr("-- End of List --");
|
||||
}
|
||||
return event_marker_comment;
|
||||
}
|
||||
|
||||
@ -124,6 +134,12 @@ RDEventImportItem *RDEventImportList::item(int n) const
|
||||
}
|
||||
|
||||
|
||||
RDEventImportItem *RDEventImportList::endMarkerItem() const
|
||||
{
|
||||
return list_items.back();
|
||||
}
|
||||
|
||||
|
||||
void RDEventImportList::takeItem(int before_line,RDEventImportItem *item)
|
||||
{
|
||||
list_items.insert(list_items.begin()+before_line,item);
|
||||
@ -171,6 +187,7 @@ void RDEventImportList::load()
|
||||
list_items.back()->setMarkerComment(q->value(3).toString());
|
||||
}
|
||||
delete q;
|
||||
list_items.push_back(new RDEventImportItem(true));
|
||||
}
|
||||
|
||||
|
||||
@ -180,7 +197,7 @@ void RDEventImportList::save() const
|
||||
"EVENT_NAME=\""+RDEscapeString(list_event_name)+"\" && "+
|
||||
QString().sprintf("TYPE=%d",list_type);
|
||||
RDSqlQuery::apply(sql);
|
||||
for(unsigned i=0;i<list_items.size();i++) {
|
||||
for(int i=0;i<(list_items.size()-1);i++) {
|
||||
RDEventImportItem *item=list_items.at(i);
|
||||
sql=QString("insert into EVENT_LINES set ")+
|
||||
"EVENT_NAME=\""+RDEscapeString(list_event_name)+"\","+
|
||||
@ -199,7 +216,7 @@ void RDEventImportList::clear()
|
||||
{
|
||||
list_event_name="";
|
||||
list_type=RDEventImportList::PreImport;
|
||||
for(unsigned i=0;i<list_items.size();i++) {
|
||||
for(int i=0;i<list_items.size();i++) {
|
||||
delete list_items.at(i);
|
||||
}
|
||||
list_items.clear();
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// Abstract an rdlogmanager(1) Import List
|
||||
//
|
||||
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2018-2019 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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,15 @@
|
||||
#ifndef RDEVENTIMPORTLIST_H
|
||||
#define RDEVENTIMPORTLIST_H
|
||||
|
||||
#include <vector>
|
||||
#include <qlist.h>
|
||||
|
||||
#include <rdlog_line.h>
|
||||
|
||||
class RDEventImportItem
|
||||
{
|
||||
public:
|
||||
RDEventImportItem();
|
||||
RDEventImportItem(bool end_marker=false);
|
||||
bool isEndMarker() const;
|
||||
RDLogLine::Type eventType() const;
|
||||
void setEventType(RDLogLine::Type type);
|
||||
unsigned cartNumber() const;
|
||||
@ -39,6 +40,7 @@ class RDEventImportItem
|
||||
void setMarkerComment(const QString &str);
|
||||
|
||||
private:
|
||||
bool event_end_marker;
|
||||
RDLogLine::Type event_type;
|
||||
unsigned event_cart_number;
|
||||
RDLogLine::TransType event_trans_type;
|
||||
@ -57,6 +59,7 @@ class RDEventImportList
|
||||
void setType(ImportType type);
|
||||
int size();
|
||||
RDEventImportItem *item(int n) const;
|
||||
RDEventImportItem *endMarkerItem() const;
|
||||
void takeItem(int before_line,RDEventImportItem *item);
|
||||
void removeItem(int n);
|
||||
void moveItem(int from_line,int to_line);
|
||||
@ -67,7 +70,7 @@ class RDEventImportList
|
||||
private:
|
||||
QString list_event_name;
|
||||
ImportType list_type;
|
||||
std::vector<RDEventImportItem *> list_items;
|
||||
QList<RDEventImportItem *> list_items;
|
||||
};
|
||||
|
||||
|
||||
|
@ -47,7 +47,8 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_new_events=new_events;
|
||||
event_event=new RDEvent(eventname);
|
||||
|
||||
setWindowTitle("RDLogManager - "+tr("Editing Event")+" - "+event_event->name());
|
||||
setWindowTitle("RDLogManager - "+tr("Editing Event")+" - "+
|
||||
event_event->name());
|
||||
|
||||
//
|
||||
// Fix the Window Size
|
||||
@ -398,7 +399,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
label->setGeometry(CENTER_LINE+15,362,200,16);
|
||||
|
||||
event_source_group=new QButtonGroup(this);
|
||||
// event_source_group->hide();
|
||||
connect(event_source_group,SIGNAL(buttonClicked(int)),
|
||||
this,SLOT(importClickedData(int)));
|
||||
rbutton=new QRadioButton(this);
|
||||
@ -433,9 +433,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
label->setGeometry(CENTER_LINE+420,362,150,15);
|
||||
label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft);
|
||||
|
||||
|
||||
// Scheduler Group
|
||||
|
||||
//
|
||||
// Scheduler Group
|
||||
//
|
||||
event_sched_group_box=new QComboBox(this);
|
||||
event_sched_group_box->setGeometry(CENTER_LINE+510,359,100,20);
|
||||
QString sql2="select NAME from GROUPS order by NAME";
|
||||
@ -444,9 +444,10 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_sched_group_box->insertItem(q2->value(0).toString());
|
||||
}
|
||||
delete q2;
|
||||
|
||||
// Artist Separation SpinBox
|
||||
|
||||
//
|
||||
// Artist Separation SpinBox
|
||||
//
|
||||
event_artist_sep_label=new QLabel(tr("Artist Separation"),this);
|
||||
event_artist_sep_label->setFont(defaultFont());
|
||||
event_artist_sep_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
|
||||
@ -464,8 +465,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_artist_none_button->setText(tr("None"));
|
||||
connect(event_artist_none_button,SIGNAL(clicked()),this,SLOT(artistData()));
|
||||
|
||||
// Title Separation SpinBox
|
||||
|
||||
//
|
||||
// Title Separation SpinBox
|
||||
//
|
||||
event_title_sep_label=new QLabel(tr("Title Separation"),this);
|
||||
event_title_sep_label->setFont(defaultFont());
|
||||
event_title_sep_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
|
||||
@ -483,8 +485,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_title_none_button->setText(tr("None"));
|
||||
connect(event_title_none_button,SIGNAL(clicked()),this,SLOT(titleData()));
|
||||
|
||||
//
|
||||
// Must have code..
|
||||
|
||||
//
|
||||
event_have_code_label=new QLabel(tr("Must have code"),this);
|
||||
event_have_code_label->setFont(defaultFont());
|
||||
event_have_code_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
|
||||
@ -493,8 +496,9 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
event_have_code_box=new QComboBox(this);
|
||||
event_have_code_box->setGeometry(CENTER_LINE+515,427,100,20);
|
||||
|
||||
//
|
||||
// And code
|
||||
|
||||
//
|
||||
event_have_code2_label=new QLabel(tr("and code"),this);
|
||||
event_have_code2_label->setFont(defaultFont());
|
||||
event_have_code2_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
|
||||
@ -517,7 +521,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
}
|
||||
delete q2;
|
||||
|
||||
|
||||
//
|
||||
// Start Slop Time
|
||||
//
|
||||
@ -797,14 +800,6 @@ EditEvent::EditEvent(QString eventname,bool new_event,
|
||||
}
|
||||
}
|
||||
delete q;
|
||||
|
||||
if(!new_event) {
|
||||
event_preimport_list->load(event_name,RDEventImportList::PreImport);
|
||||
event_preimport_list->refreshList();
|
||||
event_postimport_list->load(event_name,RDEventImportList::PostImport);
|
||||
event_postimport_list->refreshList();
|
||||
}
|
||||
|
||||
prepositionToggledData(event_position_box->isChecked());
|
||||
timeToggledData(event_timetype_box->isChecked());
|
||||
importClickedData(event_source_group->checkedId());
|
||||
@ -1086,7 +1081,7 @@ void EditEvent::preimportUpData()
|
||||
{
|
||||
int line;
|
||||
Q3ListViewItem *item=event_preimport_list->selectedItem();
|
||||
if(item==NULL) {
|
||||
if((item==NULL)||(item->text(6).isEmpty())) {
|
||||
return;
|
||||
}
|
||||
if((line=item->text(6).toInt())<1) {
|
||||
@ -1104,10 +1099,10 @@ void EditEvent::preimportDownData()
|
||||
{
|
||||
int line;
|
||||
Q3ListViewItem *item=event_preimport_list->selectedItem();
|
||||
if(item==NULL) {
|
||||
if((item==NULL)||(item->text(6).isEmpty())) {
|
||||
return;
|
||||
}
|
||||
if((line=item->text(6).toInt())>=(event_preimport_list->childCount()-1)) {
|
||||
if((line=item->text(6).toInt())>=(event_preimport_list->childCount()-2)) {
|
||||
event_preimport_list->setSelected(item,true);
|
||||
event_preimport_list->ensureItemVisible(item);
|
||||
return;
|
||||
@ -1474,12 +1469,16 @@ void EditEvent::Save()
|
||||
event_event->setHaveCode2(event_have_code2_box->currentText());
|
||||
}
|
||||
|
||||
//
|
||||
// If both codes are the same, remove second code
|
||||
//
|
||||
if (event_event->HaveCode()==event_event->HaveCode2()) {
|
||||
event_event->setHaveCode2("");
|
||||
}
|
||||
|
||||
//
|
||||
// Save second code as first code when first code isn't defined
|
||||
//
|
||||
if (event_event->HaveCode().isEmpty()) {
|
||||
event_event->setHaveCode(event_event->HaveCode2());
|
||||
event_event->setHaveCode2("");
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// The Import Carts ListView widget for RDLogManager.
|
||||
//
|
||||
// (C) Copyright 2002-2018 Fred Gleason <fredg@paravelsystems.com>
|
||||
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
|
||||
//
|
||||
// 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
|
||||
@ -72,12 +72,10 @@ ImportListView::ImportListView(QWidget *parent)
|
||||
import_menu->
|
||||
insertItem(tr("Edit Voice Track"),this,SLOT(editTrackMenuData()),0,3);
|
||||
import_menu->insertSeparator();
|
||||
import_menu->insertItem(tr("PLAY Transition"),this,SLOT(playMenuData()),0,4);
|
||||
import_menu->
|
||||
insertItem(tr("Set PLAY Transition"),this,SLOT(playMenuData()),0,4);
|
||||
import_menu->
|
||||
insertItem(tr("Set SEGUE Transition"),this,SLOT(segueMenuData()),0,5);
|
||||
import_menu->
|
||||
insertItem(tr("Set STOP Transition"),this,SLOT(stopMenuData()),0,6);
|
||||
insertItem(tr("SEGUE Transition"),this,SLOT(segueMenuData()),0,5);
|
||||
import_menu->insertItem(tr("STOP Transition"),this,SLOT(stopMenuData()),0,6);
|
||||
import_menu->insertSeparator();
|
||||
import_menu->
|
||||
insertItem(tr("Delete"),this,SLOT(deleteMenuData()),0,8);
|
||||
@ -150,68 +148,78 @@ void ImportListView::refreshList(int line)
|
||||
for(int i=import_list->size()-1;i>=0;i--) {
|
||||
item=new Q3ListViewItem(this);
|
||||
if((i_item=import_list->item(i))!=NULL) {
|
||||
if((i_item->eventType()==RDLogLine::Cart)||
|
||||
(i_item->eventType()==RDLogLine::Macro)) {
|
||||
cart=new RDCart(i_item->cartNumber());
|
||||
if(i_item->isEndMarker()) {
|
||||
item->setText(4,i_item->markerComment());
|
||||
}
|
||||
switch(i_item->eventType()) {
|
||||
case RDLogLine::Cart:
|
||||
item->setPixmap(0,*import_playout_map);
|
||||
item->setText(1,QString().sprintf("%06u",i_item->cartNumber()));
|
||||
item->setText(2,cart->groupName());
|
||||
item->setText(3,RDGetTimeLength(cart->forcedLength(),false,false));
|
||||
item->setText(4,cart->title());
|
||||
total_len+=cart->forcedLength();
|
||||
break;
|
||||
else {
|
||||
if((i_item->eventType()==RDLogLine::Cart)||
|
||||
(i_item->eventType()==RDLogLine::Macro)) {
|
||||
cart=new RDCart(i_item->cartNumber());
|
||||
}
|
||||
switch(i_item->eventType()) {
|
||||
case RDLogLine::Cart:
|
||||
item->setPixmap(0,*import_playout_map);
|
||||
item->setText(1,QString().sprintf("%06u",i_item->cartNumber()));
|
||||
item->setText(2,cart->groupName());
|
||||
item->setText(3,RDGetTimeLength(cart->forcedLength(),false,false));
|
||||
item->setText(4,cart->title());
|
||||
total_len+=cart->forcedLength();
|
||||
break;
|
||||
|
||||
case RDLogLine::Macro:
|
||||
item->setPixmap(0,*import_macro_map);
|
||||
item->setText(1,QString().sprintf("%06u",i_item->cartNumber()));
|
||||
item->setText(2,cart->groupName());
|
||||
item->setText(3,RDGetTimeLength(cart->forcedLength(),false,false));
|
||||
item->setText(4,cart->title());
|
||||
total_len+=cart->forcedLength();
|
||||
break;
|
||||
case RDLogLine::Macro:
|
||||
item->setPixmap(0,*import_macro_map);
|
||||
item->setText(1,QString().sprintf("%06u",i_item->cartNumber()));
|
||||
item->setText(2,cart->groupName());
|
||||
item->setText(3,RDGetTimeLength(cart->forcedLength(),false,false));
|
||||
item->setText(4,cart->title());
|
||||
total_len+=cart->forcedLength();
|
||||
break;
|
||||
|
||||
case RDLogLine::Marker:
|
||||
item->setPixmap(0,*import_notemarker_map);
|
||||
item->setText(2,tr("Marker"));
|
||||
item->setText(4,tr("[Log Note]"));
|
||||
break;
|
||||
case RDLogLine::Marker:
|
||||
item->setPixmap(0,*import_notemarker_map);
|
||||
item->setText(2,tr("Marker"));
|
||||
item->setText(4,tr("[Log Note]"));
|
||||
break;
|
||||
|
||||
case RDLogLine::Track:
|
||||
item->setPixmap(0,*import_mic16_map);
|
||||
item->setText(2,tr("Track"));
|
||||
item->setText(4,tr("[Voice Track]"));
|
||||
break;
|
||||
case RDLogLine::Track:
|
||||
item->setPixmap(0,*import_mic16_map);
|
||||
item->setText(2,tr("Track"));
|
||||
item->setText(4,tr("[Voice Track]"));
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
switch(i_item->transType()) {
|
||||
case RDLogLine::Play:
|
||||
item->setText(5,tr("PLAY"));
|
||||
break;
|
||||
|
||||
case RDLogLine::Segue:
|
||||
item->setText(5,tr("SEGUE"));
|
||||
break;
|
||||
|
||||
case RDLogLine::Stop:
|
||||
item->setText(5,tr("STOP"));
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
item->setText(6,QString().sprintf("%d",i));
|
||||
/*
|
||||
if(i==line) {
|
||||
select_item=item;
|
||||
}
|
||||
*/
|
||||
if(cart!=NULL) {
|
||||
delete cart;
|
||||
cart=NULL;
|
||||
}
|
||||
}
|
||||
switch(i_item->transType()) {
|
||||
case RDLogLine::Play:
|
||||
item->setText(5,tr("PLAY"));
|
||||
break;
|
||||
|
||||
case RDLogLine::Segue:
|
||||
item->setText(5,tr("SEGUE"));
|
||||
break;
|
||||
|
||||
case RDLogLine::Stop:
|
||||
item->setText(5,tr("STOP"));
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
item->setText(6,QString().sprintf("%d",i));
|
||||
if(i==line) {
|
||||
select_item=item;
|
||||
}
|
||||
if(cart!=NULL) {
|
||||
delete cart;
|
||||
cart=NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(select_item!=NULL) {
|
||||
@ -224,7 +232,7 @@ void ImportListView::refreshList(int line)
|
||||
|
||||
void ImportListView::validateTransitions()
|
||||
{
|
||||
if(import_list->size()>0) {
|
||||
if(import_list->size()>1) {
|
||||
if(import_force_trans!=RDLogLine::NoTrans) {
|
||||
import_list->item(0)->setTransType(import_force_trans);
|
||||
}
|
||||
@ -235,7 +243,7 @@ void ImportListView::validateTransitions()
|
||||
}
|
||||
}
|
||||
}
|
||||
for(int i=1;i<import_list->size();i++) {
|
||||
for(int i=1;i<(import_list->size()-1);i++) {
|
||||
if(import_list->item(i)->transType()==RDLogLine::Stop) {
|
||||
import_list->item(1)->setTransType(RDLogLine::Segue);
|
||||
}
|
||||
@ -245,14 +253,10 @@ void ImportListView::validateTransitions()
|
||||
|
||||
void ImportListView::aboutToShowData()
|
||||
{
|
||||
if(import_menu_item==NULL) {
|
||||
import_menu->setItemChecked(0,false);
|
||||
if((import_menu_item==NULL)||(import_menu_i_item->isEndMarker())) {
|
||||
import_menu->setItemEnabled(0,true);
|
||||
import_menu->setItemChecked(1,false);
|
||||
import_menu->setItemEnabled(1,false);
|
||||
import_menu->setItemChecked(2,false);
|
||||
import_menu->setItemEnabled(2,true);
|
||||
import_menu->setItemChecked(3,false);
|
||||
import_menu->setItemEnabled(3,false);
|
||||
import_menu->setItemChecked(4,false);
|
||||
import_menu->setItemEnabled(4,false);
|
||||
@ -262,7 +266,6 @@ void ImportListView::aboutToShowData()
|
||||
import_menu->setItemEnabled(6,false);
|
||||
import_menu->setItemChecked(7,false);
|
||||
import_menu->setItemEnabled(7,false);
|
||||
import_menu->setItemChecked(8,false);
|
||||
import_menu->setItemEnabled(8,false);
|
||||
return;
|
||||
}
|
||||
@ -287,7 +290,6 @@ void ImportListView::aboutToShowData()
|
||||
import_menu->setItemEnabled(5,import_allow_first_trans);
|
||||
import_menu->setItemEnabled(7,import_allow_first_trans);
|
||||
if((import_menu_line==0)&&import_allow_stop&&import_allow_first_trans) {
|
||||
// import_menu->setItemEnabled(4,true);
|
||||
import_menu->setItemEnabled(6,true);
|
||||
}
|
||||
else {
|
||||
@ -338,6 +340,11 @@ void ImportListView::insertNoteMenuData()
|
||||
if(import_menu_item==NULL) {
|
||||
import_menu_line=0;
|
||||
}
|
||||
else {
|
||||
if((import_menu_i_item!=NULL)&&(import_menu_i_item->isEndMarker())) {
|
||||
import_menu_line=import_list->size()-1;
|
||||
}
|
||||
}
|
||||
RDEventImportItem *i_item=new RDEventImportItem();
|
||||
i_item->setEventType(RDLogLine::Marker);
|
||||
i_item->setMarkerComment(note);
|
||||
@ -373,6 +380,11 @@ void ImportListView::insertTrackMenuData()
|
||||
if(import_menu_item==NULL) {
|
||||
import_menu_line=0;
|
||||
}
|
||||
else {
|
||||
if((import_menu_i_item!=NULL)&&(import_menu_i_item->isEndMarker())) {
|
||||
import_menu_line=import_list->size()-1;
|
||||
}
|
||||
}
|
||||
RDEventImportItem *i_item=new RDEventImportItem();
|
||||
i_item->setEventType(RDLogLine::Track);
|
||||
i_item->setMarkerComment(note);
|
||||
@ -432,28 +444,33 @@ void ImportListView::contentsMousePressEvent(QMouseEvent *e)
|
||||
import_menu_item=selectedItem();
|
||||
if(import_menu_item==NULL) {
|
||||
import_menu_i_item=NULL;
|
||||
return;
|
||||
}
|
||||
else {
|
||||
if((import_menu_i_item=import_list->
|
||||
item(import_menu_line=import_menu_item->text(6).toInt()))==NULL) {
|
||||
return;
|
||||
if(import_menu_item->text(6).isEmpty()) { // End of List Marker
|
||||
import_menu_i_item=import_list->endMarkerItem();
|
||||
}
|
||||
else {
|
||||
import_menu_i_item=import_list->
|
||||
item(import_menu_line=import_menu_item->text(6).toInt());
|
||||
}
|
||||
}
|
||||
switch(e->button()) {
|
||||
case Qt::RightButton:
|
||||
import_menu->setGeometry(import_parent->geometry().x()+
|
||||
geometry().x()+e->pos().x()+2,
|
||||
import_parent->geometry().y()+
|
||||
geometry().y()+e->pos().y()+
|
||||
header()->geometry().height()+2,
|
||||
import_menu->sizeHint().width(),
|
||||
import_menu->sizeHint().height());
|
||||
import_menu->exec();
|
||||
break;
|
||||
case Qt::RightButton:
|
||||
import_menu->setGeometry(import_parent->geometry().x()+
|
||||
geometry().x()+e->pos().x()+2,
|
||||
import_parent->geometry().y()+
|
||||
geometry().y()+e->pos().y()+
|
||||
header()->geometry().height()+2-
|
||||
contentsY(),
|
||||
import_menu->sizeHint().width(),
|
||||
import_menu->sizeHint().height());
|
||||
import_menu->exec();
|
||||
break;
|
||||
|
||||
default:
|
||||
e->ignore();
|
||||
break;
|
||||
default:
|
||||
e->ignore();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -462,13 +479,17 @@ void ImportListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
|
||||
{
|
||||
Q3ListView::contentsMouseDoubleClickEvent(e);
|
||||
import_menu_item=selectedItem();
|
||||
if(import_menu_item==NULL) {
|
||||
if((import_menu_item==NULL)||(import_menu_item->text(6).isEmpty())) {
|
||||
return;
|
||||
}
|
||||
if(import_list->
|
||||
item(import_menu_item->text(6).toInt())->eventType()==RDLogLine::Marker) {
|
||||
editNoteMenuData();
|
||||
}
|
||||
if(import_list->
|
||||
item(import_menu_item->text(6).toInt())->eventType()==RDLogLine::Track) {
|
||||
editTrackMenuData();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -487,14 +508,15 @@ void ImportListView::dropEvent(QDropEvent *e)
|
||||
|
||||
if(RDCartDrag::decode(e,&cartnum)) {
|
||||
if(cartnum==0) {
|
||||
if((item=itemAt(pos))==NULL) {
|
||||
if(((item=itemAt(pos))==NULL)||(item->text(6).isEmpty())) {
|
||||
return;
|
||||
}
|
||||
line=item->text(6).toInt();
|
||||
import_list->removeItem(item->text(6).toInt());
|
||||
}
|
||||
else {
|
||||
if((item=itemAt(pos))==NULL) {
|
||||
line=childCount();
|
||||
line=childCount()-1;
|
||||
}
|
||||
else {
|
||||
line=item->text(6).toInt();
|
||||
|
@ -1061,15 +1061,15 @@ Opětovné sloučení tato data smaže. Sloučit znovu?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>Nastavit přechod PŘEHRÁT</translation>
|
||||
<translation type="obsolete">Nastavit přechod PŘEHRÁT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>Nastavit přechod PŘECHOD</translation>
|
||||
<translation type="obsolete">Nastavit přechod PŘECHOD</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>Nastavit přechod ZASTAVIT</translation>
|
||||
<translation type="obsolete">Nastavit přechod ZASTAVIT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete</source>
|
||||
@ -1103,6 +1103,18 @@ Opětovné sloučení tato data smaže. Sloučit znovu?</translation>
|
||||
<source>STOP</source>
|
||||
<translation>ZASTAVIT</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -1061,15 +1061,15 @@ Einbinden wird diese entfernen. Fortfahren?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>PLAY-Übergang setzen</translation>
|
||||
<translation type="obsolete">PLAY-Übergang setzen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>SEGUE-Übergang setzen</translation>
|
||||
<translation type="obsolete">SEGUE-Übergang setzen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>STOP-Übergang setzen</translation>
|
||||
<translation type="obsolete">STOP-Übergang setzen</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete</source>
|
||||
@ -1103,6 +1103,18 @@ Einbinden wird diese entfernen. Fortfahren?</translation>
|
||||
<source>STOP</source>
|
||||
<translation>STOP</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -1055,15 +1055,15 @@ removerá estos datos. ¿Remezclar?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>Asignar transición REPROD</translation>
|
||||
<translation type="obsolete">Asignar transición REPROD</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>Asignar transición SEGUE</translation>
|
||||
<translation type="obsolete">Asignar transición SEGUE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>Asignar transición PARAR</translation>
|
||||
<translation type="obsolete">Asignar transición PARAR</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete</source>
|
||||
@ -1105,6 +1105,18 @@ removerá estos datos. ¿Remezclar?</translation>
|
||||
<source>Edit Voice Track</source>
|
||||
<translation>Editar pista de voz</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -947,18 +947,6 @@ Do you want to save?</source>
|
||||
<source>Edit Voice Track</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete</source>
|
||||
<translation type="unfinished"></translation>
|
||||
@ -991,6 +979,18 @@ Do you want to save?</source>
|
||||
<source>STOP</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -1066,15 +1066,15 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>Set SPEL-overgang</translation>
|
||||
<translation type="obsolete">Set SPEL-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>Set KRYSSTONING-overgang</translation>
|
||||
<translation type="obsolete">Set KRYSSTONING-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>Set STOPP-overgang</translation>
|
||||
<translation type="obsolete">Set STOPP-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set OVERLAP Transition</source>
|
||||
@ -1116,6 +1116,18 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
|
||||
<source>OVERLAP</source>
|
||||
<translation type="obsolete">OVERLAPP</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -1066,15 +1066,15 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>Set SPEL-overgang</translation>
|
||||
<translation type="obsolete">Set SPEL-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>Set KRYSSTONING-overgang</translation>
|
||||
<translation type="obsolete">Set KRYSSTONING-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>Set STOPP-overgang</translation>
|
||||
<translation type="obsolete">Set STOPP-overgang</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set OVERLAP Transition</source>
|
||||
@ -1116,6 +1116,18 @@ Flettar du på nytt, vil du fjerna desse dataa. Flett på nytt?</translation>
|
||||
<source>OVERLAP</source>
|
||||
<translation type="obsolete">OVERLAPP</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
@ -1063,15 +1063,15 @@ Re-agregar removerá estes dados. Re-agregar? </translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set PLAY Transition</source>
|
||||
<translation>Setar transição SIMPLES</translation>
|
||||
<translation type="obsolete">Setar transição SIMPLES</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set SEGUE Transition</source>
|
||||
<translation>Setar transição SOBRE</translation>
|
||||
<translation type="obsolete">Setar transição SOBRE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Set STOP Transition</source>
|
||||
<translation>Setar transição PARE</translation>
|
||||
<translation type="obsolete">Setar transição PARE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Delete</source>
|
||||
@ -1105,6 +1105,18 @@ Re-agregar removerá estes dados. Re-agregar? </translation>
|
||||
<source>STOP</source>
|
||||
<translation>PARE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PLAY Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>SEGUE Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>STOP Transition</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ListClocks</name>
|
||||
|
Loading…
x
Reference in New Issue
Block a user