2023-01-30 Fred Gleason <fredg@paravelsystems.com>

* Fixed a bug in rdlogmanager(1) that would cause the pre-import
	and post-import event lists to fail to be propagated to the
	newly created event.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-01-30 12:59:10 -05:00
parent d380a62903
commit 43692497cb
4 changed files with 25 additions and 5 deletions

View File

@@ -23958,3 +23958,7 @@
2023-01-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the voice tracker widget that threw a segfault
when the user attempted to select the '--- end of log ---' marker.
2023-01-30 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that would cause the pre-import
and post-import event lists to fail to be propagated to the
newly created event.

View File

@@ -2,7 +2,7 @@
//
// Edit a Rivendell Log Event
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2023 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
@@ -1156,6 +1156,8 @@ void EditEvent::saveAsData()
if(!q->first()) {
delete event_event;
event_event=new RDEvent(event_name,true);
event_preimport_model->setEventName(event_name);
event_postimport_model->setEventName(event_name);
Save();
event_new_events->push_back(event_name);
CopyEventPerms(old_name,event_name);

View File

@@ -1,8 +1,8 @@
// importcartsmodel.cpp
//
// Data model for Rivendell hosts
// Data model for Rivendell rdlogmanager(1) pre- and post-import event lists
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2023 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
@@ -64,6 +64,18 @@ ImportCartsModel::~ImportCartsModel()
}
QString ImportCartsModel::eventName() const
{
return d_event_name;
}
void ImportCartsModel::setEventName(const QString &str)
{
d_event_name=str;
}
QPalette ImportCartsModel::palette()
{
return d_palette;

View File

@@ -1,8 +1,8 @@
// importcartsmodel.h
//
// Data model for rdlogmanager(1) cart stack lists
// Data model for Rivendell rdlogmanager(1) pre- and post-import event lists
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2021-2023 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
@@ -40,6 +40,8 @@ class ImportCartsModel : public QAbstractTableModel
ImportCartsModel(const QString &evt_name,ImportType type,
bool auto_first_trans,QObject *parent=0);
~ImportCartsModel();
QString eventName() const;
void setEventName(const QString &str);
QPalette palette();
void setPalette(const QPalette &pal);
void setFont(const QFont &font);