Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01: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

77
lib/rdadd_log.cpp
View File

@@ -26,14 +26,16 @@
#include "rdidvalidator.h"
#include "rdadd_log.h"
RDAddLog::RDAddLog(RDLogFilter::FilterMode mode,const QString &caption,
RDAddLog::RDAddLog(QString *logname,QString *svcname,
RDLogFilter::FilterMode mode,const QString &caption,
QWidget *parent)
: RDDialog(parent)
{
QStringList services_list;
log_name=NULL;
log_svc=NULL;
log_filter_mode=mode;
QString sql;
RDSqlQuery *q;
log_name=logname;
log_svc=svcname;
//
// Fix the Window Size
@@ -41,7 +43,7 @@ RDAddLog::RDAddLog(RDLogFilter::FilterMode mode,const QString &caption,
setMinimumSize(sizeHint());
setMinimumSize(sizeHint());
setWindowTitle(caption);
setWindowTitle(tr("Create Log"));
//
// Validator
@@ -94,6 +96,33 @@ RDAddLog::RDAddLog(RDLogFilter::FilterMode mode,const QString &caption,
add_cancel_button->setFont(buttonFont());
add_cancel_button->setText(tr("Cancel"));
connect(add_cancel_button,SIGNAL(clicked()),this,SLOT(cancelData()));
//
// Populate Data
//
switch(mode) {
case RDLogFilter::NoFilter:
sql=QString("select `NAME` from `SERVICES` order by `NAME`");
break;
case RDLogFilter::UserFilter:
sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+
"`USER_NAME`='"+RDEscapeString(rda->user()->name())+"' "+
"order by `SERVICE_NAME`";
break;
case RDLogFilter::StationFilter:
sql=QString("select `SERVICE_NAME` from `SERVICE_PERMS` where ")+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' "+
"order by `SERVICE_NAME`";
break;
}
q=new RDSqlQuery(sql);
while(q->next()) {
add_service_box->
insertItem(add_service_box->count(),q->value(0).toString());
}
add_name_edit->setText(*logname);
}
@@ -115,44 +144,6 @@ QSizePolicy RDAddLog::sizePolicy() const
}
int RDAddLog::exec(QString *logname,QString *svcname)
{
QString sql;
RDSqlQuery *q;
log_name=logname;
log_svc=svcname;
switch(log_filter_mode) {
case RDLogFilter::NoFilter:
sql=QString("select `NAME` from `SERVICES` order by `NAME`");
break;
case RDLogFilter::UserFilter:
sql=QString("select `SERVICE_NAME` from `USER_SERVICE_PERMS` where ")+
"`USER_NAME`='"+RDEscapeString(rda->user()->name())+"' "+
"order by `SERVICE_NAME`";
break;
case RDLogFilter::StationFilter:
sql=QString("select `SERVICE_NAME` from `SERVICE_PERMS` where ")+
"`STATION_NAME`='"+RDEscapeString(rda->station()->name())+"' "+
"order by `SERVICE_NAME`";
break;
}
q=new RDSqlQuery(sql);
add_service_box->clear();
while(q->next()) {
add_service_box->
insertItem(add_service_box->count(),q->value(0).toString());
if(q->value(0).toString()==*log_svc) {
add_service_box->setCurrentIndex(add_service_box->count()-1);
}
}
add_name_edit->setText(*logname);
return QDialog::exec();
}
void RDAddLog::okData()
{
if(add_service_box->currentText().isEmpty()){