mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-30 17:20:32 +01:00
2022-09-27 Fred Gleason <fredg@paravelsystems.com>
* Added 'RDLogFilter::filterServiceName()' and 'RDLogFilter::filterText()' methods. * Modified rdlogedit(1) when creating a new log to default the 'Service' dropdown in the 'Add Log' dialog to the currently selected service. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -23385,3 +23385,9 @@
|
|||||||
list to be to be updated to reflected newly added carts.
|
list to be to be updated to reflected newly added carts.
|
||||||
2022-09-26 Fred Gleason <fredg@paravelsystems.com>
|
2022-09-26 Fred Gleason <fredg@paravelsystems.com>
|
||||||
* Incremented the package version to 4.0.0beta3int4.
|
* Incremented the package version to 4.0.0beta3int4.
|
||||||
|
2022-09-27 Fred Gleason <fredg@paravelsystems.com>
|
||||||
|
* Added 'RDLogFilter::filterServiceName()' and
|
||||||
|
'RDLogFilter::filterText()' methods.
|
||||||
|
* Modified rdlogedit(1) when creating a new log to default the
|
||||||
|
'Service' dropdown in the 'Add Log' dialog to the currently selected
|
||||||
|
service.
|
||||||
|
|||||||
@@ -122,6 +122,9 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname,
|
|||||||
add_service_box->
|
add_service_box->
|
||||||
insertItem(add_service_box->count(),rda->iconEngine()->serviceIcon(),
|
insertItem(add_service_box->count(),rda->iconEngine()->serviceIcon(),
|
||||||
q->value(0).toString());
|
q->value(0).toString());
|
||||||
|
if(((*log_svc)!=tr("ALL"))&&(*log_svc==q->value(0).toString())) {
|
||||||
|
add_service_box->setCurrentIndex(add_service_box->count()-1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
add_name_edit->setText(*logname);
|
add_name_edit->setText(*logname);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,6 +123,18 @@ QSizePolicy RDLogFilter::sizePolicy() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString RDLogFilter::filterServiceName() const
|
||||||
|
{
|
||||||
|
return filter_service_box->currentText();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
QString RDLogFilter::filterText() const
|
||||||
|
{
|
||||||
|
return filter_filter_edit->text();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
QString RDLogFilter::whereSql() const
|
QString RDLogFilter::whereSql() const
|
||||||
{
|
{
|
||||||
QString sql="";
|
QString sql="";
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ class RDLogFilter : public QWidget
|
|||||||
~RDLogFilter();
|
~RDLogFilter();
|
||||||
QSize sizeHint() const;
|
QSize sizeHint() const;
|
||||||
QSizePolicy sizePolicy() const;
|
QSizePolicy sizePolicy() const;
|
||||||
|
QString filterServiceName() const;
|
||||||
|
QString filterText() const;
|
||||||
QString whereSql() const;
|
QString whereSql() const;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|||||||
@@ -264,10 +264,10 @@ void MainWidget::recentData(bool state)
|
|||||||
void MainWidget::addData()
|
void MainWidget::addData()
|
||||||
{
|
{
|
||||||
QString logname;
|
QString logname;
|
||||||
QString svcname;
|
|
||||||
QStringList newlogs;
|
QStringList newlogs;
|
||||||
RDAddLog *log;
|
RDAddLog *log;
|
||||||
QModelIndex row;
|
QModelIndex row;
|
||||||
|
QString svcname=log_filter_widget->filterServiceName();
|
||||||
|
|
||||||
if(rda->user()->createLog()) {
|
if(rda->user()->createLog()) {
|
||||||
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,
|
log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,
|
||||||
|
|||||||
Reference in New Issue
Block a user