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

2022-03-25 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Reverted the following changes:
	2022-03-09 Fred Gleason <fredg@paravelsystems.com>
 	  * Fixed a regression in rdlogedit(1) that caused events from
	  previously viewed logs to be prepended to subsequent logs viewed
	  during the same session.
	2022-03-09 Fred Gleason <fredg@paravelsystems.com>
	  * Refactored the 'RDAddLog' dialog to allow for instance reuse.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-03-25 12:04:39 -04:00
parent 672bd74a7c
commit 2fbc9681b4
25 changed files with 132 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rdlogedit/edit_log.cpp
View File

@@ -978,8 +978,9 @@ void EditLog::saveasData()
QString err_msg;
if(rda->user()->createLog()) {
log=new RDAddLog(RDLogFilter::UserFilter,"RDLogEdit",this);
if(log->exec(&logname,&svcname)<0) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,
tr("Add Log"),this);
if(log->exec()<0) {
return;
}
if(!RDLog::create(logname,svcname,QDate(),rda->ripc()->user(),&err_msg,
@@ -1070,8 +1071,6 @@ void EditLog::okData()
void EditLog::cancelData()
{
bool ret=false;
if(edit_changed) {
switch(QMessageBox::question(this,
tr("RDLogEdit"),
@@ -1085,7 +1084,6 @@ void EditLog::cancelData()
return;
}
SaveLog();
ret=true;
break;
case QMessageBox::Cancel:
@@ -1100,7 +1098,7 @@ void EditLog::cancelData()
}
delete edit_log_lock;
edit_log_lock=NULL;
done(ret);
done(false);
}

7
rdlogedit/logmodel.cpp
View File

@@ -20,6 +20,13 @@
#include "logmodel.h"
LogModel::LogModel(const QString &logname,QObject *parent)
: RDLogModel(logname,false,parent)
{
d_group_list=new RDGroupList();
}
LogModel::LogModel(QObject *parent)
: RDLogModel(parent)
{

1
rdlogedit/logmodel.h
View File

@@ -28,6 +28,7 @@ class LogModel : public RDLogModel
{
Q_OBJECT
public:
LogModel(const QString &logname,QObject *parent=0);
LogModel(QObject *parent=0);
~LogModel();
QString serviceName() const;

58
rdlogedit/rdlogedit.cpp
View File

@@ -22,6 +22,7 @@
#include <QMessageBox>
#include <QTranslator>
#include <rdadd_log.h>
#include <rdconf.h>
#include <rdescape_string.h>
#include <rdprofile.h>
@@ -104,6 +105,8 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
log_filter_widget=
new RDLogFilter(RDLogFilter::UserFilter,this);
connect(log_filter_widget,SIGNAL(filterChanged(const QString &)),
this,SLOT(filterChangedData(const QString &)));
//
// Dialogs
@@ -112,8 +115,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
new EditLog(&log_filter,&log_group,&log_schedcode,&log_clipboard,this);
log_tracker_dialog=new VoiceTracker(&log_import_path,this);
log_addlog_dialog=
new RDAddLog(RDLogFilter::UserFilter,"RDLogEdit - "+tr("Add Log"),this);
//
// Log List
@@ -228,7 +229,8 @@ void MainWidget::userData()
log_filter_widget->changeUser();
log_log_model->setFilterSql(log_filter_widget->whereSql());
log_log_view->resizeColumnsToContents();
// RefreshList();
//
// Set Control Perms
//
@@ -238,17 +240,28 @@ void MainWidget::userData()
}
void MainWidget::recentData(bool state)
{
// RefreshList();
}
void MainWidget::addData()
{
QString logname;
QString svcname=log_filter_widget->currentServiceName();
QString svcname;
QStringList newlogs;
RDAddLog *log;
QModelIndex row;
if(rda->user()->createLog()) {
if(log_addlog_dialog->exec(&logname,&svcname)!=0) {
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,
tr("Add Log"),this);
if(log->exec()!=0) {
delete log;
return;
}
delete log;
QString username(rda->ripc()->user());
QString err_msg;
if(!RDLog::create(logname,svcname,QDate(),username,&err_msg,
@@ -257,14 +270,10 @@ void MainWidget::addData()
return;
}
LockList();
if(log_edit_dialog->exec(logname,&newlogs)) {
SendNotification(RDNotification::AddAction,logname);
row=log_log_model->addLog(logname);
log_log_view->selectRow(row.row());
}
else {
RDLog::remove(logname);
}
SendNotification(RDNotification::AddAction,logname);
log_edit_dialog->exec(logname,&newlogs);
row=log_log_model->addLog(logname);
log_log_view->selectRow(row.row());
UnlockList();
}
}
@@ -415,6 +424,23 @@ void MainWidget::trackData()
UnlockList();
}
/*
void MainWidget::trackData()
{
QModelIndex row=SingleSelectedRow();
if(!row.isValid()) {
return;
}
LockList();
VoiceTracker *dialog=
new VoiceTracker(log_log_model->logName(row),&log_import_path);
dialog->exec();
delete dialog;
log_log_model->refresh(row);
UnlockList();
}
*/
void MainWidget::reportData()
{
@@ -538,6 +564,12 @@ void MainWidget::reportData()
}
void MainWidget::filterChangedData(const QString &str)
{
// RefreshList();
}
void MainWidget::selectionChangedData(const QItemSelection &selected,
const QItemSelection &deselected)
{

4
rdlogedit/rdlogedit.h
View File

@@ -23,7 +23,6 @@
#include <QList>
#include <rdadd_log.h>
#include <rdlog_line.h>
#include <rdlogfilter.h>
#include <rdloglistmodel.h>
@@ -51,11 +50,13 @@ class MainWidget : public RDMainWindow
private slots:
void caeConnectedData(bool state);
void userData();
void recentData(bool state);
void addData();
void editData();
void deleteData();
void trackData();
void reportData();
void filterChangedData(const QString &str);
void selectionChangedData(const QItemSelection &selected,
const QItemSelection &deselected);
void doubleClickedData(const QModelIndex &index);
@@ -93,7 +94,6 @@ class MainWidget : public RDMainWindow
QStringList log_deleted_logs;
EditLog *log_edit_dialog;
VoiceTracker *log_tracker_dialog;
RDAddLog *log_addlog_dialog;
};