From 631e337f63cd0e5ef75e2969b7d5babad9ae9486 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 27 Sep 2022 13:17:22 -0400 Subject: [PATCH] 2022-09-27 Fred Gleason * 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 --- ChangeLog | 6 ++++++ lib/rdadd_log.cpp | 3 +++ lib/rdlogfilter.cpp | 12 ++++++++++++ lib/rdlogfilter.h | 2 ++ rdlogedit/rdlogedit.cpp | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a35c5a75..8b553be5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23385,3 +23385,9 @@ list to be to be updated to reflected newly added carts. 2022-09-26 Fred Gleason * Incremented the package version to 4.0.0beta3int4. +2022-09-27 Fred Gleason + * 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. diff --git a/lib/rdadd_log.cpp b/lib/rdadd_log.cpp index b497ace0..385d4ce5 100644 --- a/lib/rdadd_log.cpp +++ b/lib/rdadd_log.cpp @@ -122,6 +122,9 @@ RDAddLog::RDAddLog(QString *logname,QString *svcname, add_service_box-> insertItem(add_service_box->count(),rda->iconEngine()->serviceIcon(), 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); } diff --git a/lib/rdlogfilter.cpp b/lib/rdlogfilter.cpp index 0b379706..7e877b63 100644 --- a/lib/rdlogfilter.cpp +++ b/lib/rdlogfilter.cpp @@ -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 sql=""; diff --git a/lib/rdlogfilter.h b/lib/rdlogfilter.h index 4dd77b03..c68a6b15 100644 --- a/lib/rdlogfilter.h +++ b/lib/rdlogfilter.h @@ -39,6 +39,8 @@ class RDLogFilter : public QWidget ~RDLogFilter(); QSize sizeHint() const; QSizePolicy sizePolicy() const; + QString filterServiceName() const; + QString filterText() const; QString whereSql() const; public slots: diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 16de671d..8ab69a77 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -264,10 +264,10 @@ void MainWidget::recentData(bool state) void MainWidget::addData() { QString logname; - QString svcname; QStringList newlogs; RDAddLog *log; QModelIndex row; + QString svcname=log_filter_widget->filterServiceName(); if(rda->user()->createLog()) { log=new RDAddLog(&logname,&svcname,RDLogFilter::UserFilter,