From f43a5dbe0862feefcd699c484c9f76ae3c751e53 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sun, 28 Apr 2019 07:27:42 -0700 Subject: [PATCH 1/9] Added ability to use QStringList for schedule codes --- lib/rdcart_search_text.cpp | 48 ++++++++++++++++++++++++++++++++++++++ lib/rdcart_search_text.h | 5 ++++ 2 files changed, 53 insertions(+) diff --git a/lib/rdcart_search_text.cpp b/lib/rdcart_search_text.cpp index 52133ed6..d26d08c1 100644 --- a/lib/rdcart_search_text.cpp +++ b/lib/rdcart_search_text.cpp @@ -116,6 +116,18 @@ QString RDSchedSearchText(const QString &schedcode) } +QString RDSchedSearchText(const QStringList &schedcodes) +{ + QString ret=""; + + for(int i=0;inext()) { + search+=QString("(CART.GROUP_NAME=\"")+ + RDEscapeString(q->value(0).toString())+"\")||"; + } + delete q; + search=search.left(search.length()-2)+QString(")"); + search+=QString("&&")+RDBaseSearchText(filter,incl_cuts); + return search; +} diff --git a/lib/rdcart_search_text.h b/lib/rdcart_search_text.h index bde7f132..8c5e2c04 100644 --- a/lib/rdcart_search_text.h +++ b/lib/rdcart_search_text.h @@ -22,14 +22,19 @@ #define RDCART_SEARCH_TEXT_H #include +#include #include QString RDCartSearchText(QString filter,const QString &group, const QString &schedcode,bool incl_cuts); +QString RDCartSearchText(QString filter,const QString &group, + const QStringList &schedcodes,bool incl_cuts); QString RDAllCartSearchText(const QString &filter,const QString &schedcode, const QString &user,bool incl_cuts); +QString RDAllCartSearchText(const QString &filter,const QStringList &schedcodes, + const QString &user,bool incl_cuts); #endif // RDCART_SEARCH_TEXT_H From 13139f1385df98fa9e964fa61173f6968b0e1599 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sun, 28 Apr 2019 07:28:48 -0700 Subject: [PATCH 2/9] Updated ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 588ec9c2..f120e7ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18608,3 +18608,5 @@ 2019-04-25 Fred Gleason * Fixed a bug in escaping JSON strings that failed to handle control characters properly. +2019-04-28 Patrick Linstruth + * Added second schedule code filter to rdlibrary(1). From 24bee4fa88d041a9b0547cdf5a9d9f5be65a17db Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sun, 28 Apr 2019 07:29:05 -0700 Subject: [PATCH 3/9] Added second schedule code filter to rdlibrary(1). --- rdlibrary/rdlibrary.cpp | 59 +++++++++++++++++++++++++++++++----- rdlibrary/rdlibrary.h | 5 +++ rdlibrary/rdlibrary_cs.ts | 4 +++ rdlibrary/rdlibrary_de.ts | 4 +++ rdlibrary/rdlibrary_es.ts | 4 +++ rdlibrary/rdlibrary_fr.ts | 4 +++ rdlibrary/rdlibrary_nb.ts | 4 +++ rdlibrary/rdlibrary_nn.ts | 4 +++ rdlibrary/rdlibrary_pt_BR.ts | 4 +++ 9 files changed, 84 insertions(+), 8 deletions(-) diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index b2a46769..b50fa0ef 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -249,6 +249,23 @@ MainWidget::MainWidget(QWidget *parent) connect(lib_codes_box,SIGNAL(activated(const QString &)), this,SLOT(groupActivatedData(const QString &))); + // + // Scheduler Codes2 Filter + // + lib_codes2_box=new QComboBox(this); + lib_codes2_box->setFont(default_font); + lib_codes2_label=new QLabel(lib_codes2_box,tr("And Scheduler Code:"),this); + lib_codes2_label->setFont(button_font); + lib_codes2_label->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + connect(lib_codes2_box,SIGNAL(activated(const QString &)), + this,SLOT(groupActivatedData(const QString &))); + + // + // Results Counter + // + lib_matches_label=new QLabel(this); + lib_matches_label->setFont(button_font); + // // Show Allow Cart Drags Checkbox // @@ -287,6 +304,7 @@ MainWidget::MainWidget(QWidget *parent) connect(lib_showmacro_box,SIGNAL(stateChanged(int)), this,SLOT(macroChangedData(int))); +#if 0 // // Show Cart Notes Checkbox // @@ -296,6 +314,7 @@ MainWidget::MainWidget(QWidget *parent) new QLabel(lib_shownotes_box,tr("Show Note Bubbles"),this); lib_shownotes_label->setFont(button_font); lib_shownotes_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); +#endif // // Show Matches Checkbox @@ -327,10 +346,12 @@ MainWidget::MainWidget(QWidget *parent) SLOT(cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int))); connect(lib_cart_list,SIGNAL(selectionChanged()), this,SLOT(cartClickedData())); +#if 0 connect(lib_cart_list,SIGNAL(onItem(Q3ListViewItem *)), this,SLOT(cartOnItemData(Q3ListViewItem *))); connect(lib_shownotes_box,SIGNAL(toggled(bool)), lib_cart_list,SLOT(enableNoteBubbles(bool))); +#endif lib_cart_list->addColumn(""); lib_cart_list->setColumnAlignment(Icon,Qt::AlignHCenter); lib_cart_list->addColumn(tr("Cart")); @@ -581,10 +602,13 @@ void MainWidget::userData() lib_codes_box->clear(); lib_codes_box->insertItem(tr("ALL")); + lib_codes2_box->clear(); + lib_codes2_box->insertItem(tr("ALL")); sql=QString().sprintf("select CODE from SCHED_CODES"); q=new RDSqlQuery(sql); while(q->next()) { lib_codes_box->insertItem(q->value(0).toString()); + lib_codes2_box->insertItem(q->value(0).toString()); } delete q; lib_search_button->setDisabled(true); @@ -729,7 +753,9 @@ void MainWidget::editData() false,profile_ripping,this); edit_cart->exec(); RefreshLine(item); +#if 0 cartOnItemData(item); +#endif SendNotification(RDNotification::ModifyAction,item->text(Cart).toUInt()); delete edit_cart; delete it; @@ -911,6 +937,7 @@ void MainWidget::reportsData() } +#if 0 void MainWidget::cartOnItemData(Q3ListViewItem *item) { if((!lib_shownotes_box->isChecked())||(item==NULL)) { @@ -919,6 +946,7 @@ void MainWidget::cartOnItemData(Q3ListViewItem *item) // lib_cart_tip-> // setCartNumber(lib_cart_list->itemRect(item),item->text(Cart).toUInt()); } +#endif void MainWidget::cartClickedData() @@ -1129,14 +1157,19 @@ void MainWidget::resizeEvent(QResizeEvent *e) lib_group_label->setGeometry(10,40,55,20); lib_codes_box->setGeometry(330,40,120,20); lib_codes_label->setGeometry(195,40,130,20); - lib_allowdrag_box->setGeometry(470,42,15,15); - lib_allowdrag_label->setGeometry(490,40,130,20); + lib_codes2_box->setGeometry(600,40,120,20); + lib_codes2_label->setGeometry(460,40,130,20); + lib_matches_label->setGeometry(740,40,130,20); + lib_allowdrag_box->setGeometry(390,67,15,15); + lib_allowdrag_label->setGeometry(410,65,130,20); lib_showaudio_box->setGeometry(70,67,15,15); lib_showaudio_label->setGeometry(90,65,130,20); lib_showmacro_box->setGeometry(230,67,15,15); lib_showmacro_label->setGeometry(250,65,130,20); +#if 0 lib_shownotes_box->setGeometry(390,67,15,15); lib_shownotes_label->setGeometry(410,65,130,20); +#endif lib_showmatches_box->setGeometry(550,67,15,15); lib_showmatches_label->setGeometry(570,65,200,20); lib_cart_list-> @@ -1291,6 +1324,7 @@ void MainWidget::RefreshList() sql+=QString().sprintf(" limit %d",RD_LIMITED_CART_SEARCH_QUANTITY); } q=new RDSqlQuery(sql); + fprintf(stderr,"rows=%d\n",q->size()); int step=0; int count=0; lib_progress_dialog->setTotalSteps(q->size()/RDLIBRARY_STEP_SIZE); @@ -1394,14 +1428,16 @@ void MainWidget::RefreshList() if(q->value(16).toUInt() > 1) { RefreshCuts(l,q->value(0).toUInt()); } + count++; } cartnum=q->value(0).toUInt(); - if(count++>RDLIBRARY_STEP_SIZE) { + if(count>RDLIBRARY_STEP_SIZE) { lib_progress_dialog->setProgress(++step); count=0; qApp->processEvents(QEventLoop::ExcludeUserInputEvents); } } + lib_matches_label->setText(QString().sprintf("%d Carts Match Filters",count)); UpdateItemColor(l,validity,end_datetime,current_datetime); lib_progress_dialog->reset(); delete q; @@ -1413,18 +1449,21 @@ QString MainWidget::WhereClause() const QString sql=""; QString type_filter=GetTypeFilter(); - QString schedcode=""; + QStringList schedcodes; if(lib_codes_box->currentText()!=tr("ALL")) { - schedcode=lib_codes_box->currentText(); + schedcodes << lib_codes_box->currentText(); + } + if(lib_codes2_box->currentText()!=tr("ALL")) { + schedcodes << lib_codes2_box->currentText(); } if(lib_group_box->currentText()==QString(tr("ALL"))) { - sql+=RDAllCartSearchText(lib_filter_edit->text(),schedcode, + sql=RDAllCartSearchText(lib_filter_edit->text(),schedcodes, rda->user()->name(),true)+" && "+type_filter; } else { - sql+=RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(), - schedcode,true)+" && "+type_filter; + sql=RDCartSearchText(lib_filter_edit->text(),lib_group_box->currentText(), + schedcodes,true)+" && "+type_filter; } return sql; @@ -1677,8 +1716,10 @@ void MainWidget::LoadGeometry() profile->setSource(geometry_file); resize(profile->intValue("RDLibrary","Width",sizeHint().width()), profile->intValue("RDLibrary","Height",sizeHint().height())); +#if 0 lib_shownotes_box-> setChecked(profile->boolValue("RDLibrary","ShowNoteBubbles",true)); +#endif lib_allowdrag_box-> setChecked(profile->boolValue("RDLibrary","AllowCartDragging",false)); @@ -1697,12 +1738,14 @@ void MainWidget::SaveGeometry() fprintf(file,"Width=%d\n",geometry().width()); fprintf(file,"Height=%d\n",geometry().height()); fprintf(file,"ShowNoteBubbles="); +#if 0 if(lib_shownotes_box->isChecked()) { fprintf(file,"Yes\n"); } else { fprintf(file,"No\n"); } +#endif fprintf(file,"AllowCartDragging="); if(lib_allowdrag_box->isChecked()) { fprintf(file,"Yes\n"); diff --git a/rdlibrary/rdlibrary.h b/rdlibrary/rdlibrary.h index dc0e6ead..bc7fbb0a 100644 --- a/rdlibrary/rdlibrary.h +++ b/rdlibrary/rdlibrary.h @@ -88,7 +88,9 @@ class MainWidget : public QWidget void ripData(); void reportsData(); void playerShortcutData(); +#if 0 void cartOnItemData(Q3ListViewItem *item); +#endif void cartClickedData(); void cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int); void audioChangedData(int state); @@ -130,6 +132,9 @@ class MainWidget : public QWidget QLabel *lib_group_label; QComboBox *lib_codes_box; QLabel *lib_codes_label; + QComboBox *lib_codes2_box; + QLabel *lib_codes2_label; + QLabel *lib_matches_label; QPushButton *lib_search_button; QPushButton *lib_clear_button; QPushButton *lib_add_button; diff --git a/rdlibrary/rdlibrary_cs.ts b/rdlibrary/rdlibrary_cs.ts index a528a87d..9a9e8b81 100644 --- a/rdlibrary/rdlibrary_cs.ts +++ b/rdlibrary/rdlibrary_cs.ts @@ -1487,6 +1487,10 @@ Přesto smazat? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_de.ts b/rdlibrary/rdlibrary_de.ts index abf7743c..e31b7b9b 100644 --- a/rdlibrary/rdlibrary_de.ts +++ b/rdlibrary/rdlibrary_de.ts @@ -1464,6 +1464,10 @@ verwendet. Trotzdem löschen? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_es.ts b/rdlibrary/rdlibrary_es.ts index 16b054ed..5333fa53 100644 --- a/rdlibrary/rdlibrary_es.ts +++ b/rdlibrary/rdlibrary_es.ts @@ -1473,6 +1473,10 @@ Do you still want to delete it? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_fr.ts b/rdlibrary/rdlibrary_fr.ts index 0d417524..6195192f 100644 --- a/rdlibrary/rdlibrary_fr.ts +++ b/rdlibrary/rdlibrary_fr.ts @@ -1177,6 +1177,10 @@ Do you still want to delete it? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_nb.ts b/rdlibrary/rdlibrary_nb.ts index bc17e7c8..de73f19b 100644 --- a/rdlibrary/rdlibrary_nb.ts +++ b/rdlibrary/rdlibrary_nb.ts @@ -1460,6 +1460,10 @@ Vil du sletta ho likevel? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_nn.ts b/rdlibrary/rdlibrary_nn.ts index bc17e7c8..de73f19b 100644 --- a/rdlibrary/rdlibrary_nn.ts +++ b/rdlibrary/rdlibrary_nn.ts @@ -1460,6 +1460,10 @@ Vil du sletta ho likevel? &Macro + + And Scheduler Code: + + RecordCut diff --git a/rdlibrary/rdlibrary_pt_BR.ts b/rdlibrary/rdlibrary_pt_BR.ts index bf965a14..7c6db164 100644 --- a/rdlibrary/rdlibrary_pt_BR.ts +++ b/rdlibrary/rdlibrary_pt_BR.ts @@ -1462,6 +1462,10 @@ Você ainda quer deletá-lo? &Macro + + And Scheduler Code: + + RecordCut From af47feef8435563c6951970021ca60395c3f243e Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sun, 28 Apr 2019 07:40:48 -0700 Subject: [PATCH 4/9] Removed debug fprintf() --- rdlibrary/rdlibrary.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index b50fa0ef..1ccdab6a 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -1324,7 +1324,6 @@ void MainWidget::RefreshList() sql+=QString().sprintf(" limit %d",RD_LIMITED_CART_SEARCH_QUANTITY); } q=new RDSqlQuery(sql); - fprintf(stderr,"rows=%d\n",q->size()); int step=0; int count=0; lib_progress_dialog->setTotalSteps(q->size()/RDLIBRARY_STEP_SIZE); From 6b22de58f3c6660a602050dbaa951e5cd9ee1614 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 29 Apr 2019 13:01:10 -0700 Subject: [PATCH 5/9] Restored note bubbles. Adjusted filter geometry. --- rdlibrary/rdlibrary.cpp | 28 +++++++--------------------- rdlibrary/rdlibrary.h | 2 -- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 1ccdab6a..a09ab784 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -304,7 +304,6 @@ MainWidget::MainWidget(QWidget *parent) connect(lib_showmacro_box,SIGNAL(stateChanged(int)), this,SLOT(macroChangedData(int))); -#if 0 // // Show Cart Notes Checkbox // @@ -314,7 +313,6 @@ MainWidget::MainWidget(QWidget *parent) new QLabel(lib_shownotes_box,tr("Show Note Bubbles"),this); lib_shownotes_label->setFont(button_font); lib_shownotes_label->setAlignment(Qt::AlignVCenter|Qt::AlignLeft); -#endif // // Show Matches Checkbox @@ -346,12 +344,10 @@ MainWidget::MainWidget(QWidget *parent) SLOT(cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int))); connect(lib_cart_list,SIGNAL(selectionChanged()), this,SLOT(cartClickedData())); -#if 0 connect(lib_cart_list,SIGNAL(onItem(Q3ListViewItem *)), this,SLOT(cartOnItemData(Q3ListViewItem *))); connect(lib_shownotes_box,SIGNAL(toggled(bool)), lib_cart_list,SLOT(enableNoteBubbles(bool))); -#endif lib_cart_list->addColumn(""); lib_cart_list->setColumnAlignment(Icon,Qt::AlignHCenter); lib_cart_list->addColumn(tr("Cart")); @@ -753,9 +749,7 @@ void MainWidget::editData() false,profile_ripping,this); edit_cart->exec(); RefreshLine(item); -#if 0 cartOnItemData(item); -#endif SendNotification(RDNotification::ModifyAction,item->text(Cart).toUInt()); delete edit_cart; delete it; @@ -937,7 +931,6 @@ void MainWidget::reportsData() } -#if 0 void MainWidget::cartOnItemData(Q3ListViewItem *item) { if((!lib_shownotes_box->isChecked())||(item==NULL)) { @@ -946,7 +939,6 @@ void MainWidget::cartOnItemData(Q3ListViewItem *item) // lib_cart_tip-> // setCartNumber(lib_cart_list->itemRect(item),item->text(Cart).toUInt()); } -#endif void MainWidget::cartClickedData() @@ -1159,19 +1151,17 @@ void MainWidget::resizeEvent(QResizeEvent *e) lib_codes_label->setGeometry(195,40,130,20); lib_codes2_box->setGeometry(600,40,120,20); lib_codes2_label->setGeometry(460,40,130,20); - lib_matches_label->setGeometry(740,40,130,20); - lib_allowdrag_box->setGeometry(390,67,15,15); - lib_allowdrag_label->setGeometry(410,65,130,20); + lib_matches_label->setGeometry(740,40,140,20); + lib_showmatches_box->setGeometry(740,67,15,15); + lib_showmatches_label->setGeometry(760,65,200,20); + lib_allowdrag_box->setGeometry(560,67,15,15); + lib_allowdrag_label->setGeometry(580,65,130,20); lib_showaudio_box->setGeometry(70,67,15,15); lib_showaudio_label->setGeometry(90,65,130,20); lib_showmacro_box->setGeometry(230,67,15,15); lib_showmacro_label->setGeometry(250,65,130,20); -#if 0 lib_shownotes_box->setGeometry(390,67,15,15); lib_shownotes_label->setGeometry(410,65,130,20); -#endif - lib_showmatches_box->setGeometry(550,67,15,15); - lib_showmatches_label->setGeometry(570,65,200,20); lib_cart_list-> setGeometry(10,90,e->size().width()-20,e->size().height()-155); lib_add_button->setGeometry(10,e->size().height()-60,80,50); @@ -1715,10 +1705,8 @@ void MainWidget::LoadGeometry() profile->setSource(geometry_file); resize(profile->intValue("RDLibrary","Width",sizeHint().width()), profile->intValue("RDLibrary","Height",sizeHint().height())); -#if 0 lib_shownotes_box-> setChecked(profile->boolValue("RDLibrary","ShowNoteBubbles",true)); -#endif lib_allowdrag_box-> setChecked(profile->boolValue("RDLibrary","AllowCartDragging",false)); @@ -1737,14 +1725,12 @@ void MainWidget::SaveGeometry() fprintf(file,"Width=%d\n",geometry().width()); fprintf(file,"Height=%d\n",geometry().height()); fprintf(file,"ShowNoteBubbles="); -#if 0 if(lib_shownotes_box->isChecked()) { - fprintf(file,"Yes\n"); + fputs("Yes\n",file); } else { - fprintf(file,"No\n"); + fputs("No\n",file); } -#endif fprintf(file,"AllowCartDragging="); if(lib_allowdrag_box->isChecked()) { fprintf(file,"Yes\n"); diff --git a/rdlibrary/rdlibrary.h b/rdlibrary/rdlibrary.h index bc7fbb0a..753b1e88 100644 --- a/rdlibrary/rdlibrary.h +++ b/rdlibrary/rdlibrary.h @@ -88,9 +88,7 @@ class MainWidget : public QWidget void ripData(); void reportsData(); void playerShortcutData(); -#if 0 void cartOnItemData(Q3ListViewItem *item); -#endif void cartClickedData(); void cartDoubleclickedData(Q3ListViewItem *,const QPoint &,int); void audioChangedData(int state); From 8f62c88d2058033ee5cdf16b6b5271bfe1075b6a Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 29 Apr 2019 15:52:03 -0700 Subject: [PATCH 6/9] Change minimum width from 850 to 975. --- rdlibrary/rdlibrary.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index a09ab784..e3489980 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -542,7 +542,7 @@ MainWidget::MainWidget(QWidget *parent) QSize MainWidget::sizeHint() const { - return QSize(850,600); + return QSize(975,600); } From bff9847ca57d777c5c198c1940f788ebda0b0b9a Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 29 Apr 2019 15:54:03 -0700 Subject: [PATCH 7/9] Update ChangeLog --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f120e7ad..2dc18c54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18608,5 +18608,6 @@ 2019-04-25 Fred Gleason * Fixed a bug in escaping JSON strings that failed to handle control characters properly. -2019-04-28 Patrick Linstruth +2019-04-29 Patrick Linstruth * Added second schedule code filter to rdlibrary(1). + * Change rdlibrary(1) minimum width from 850 to 975. From 8a9500528abd122aa0def615483cf71128e3d66b Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Thu, 9 May 2019 12:48:12 -0700 Subject: [PATCH 8/9] Change matching carts for label to label/edit combo. --- rdlibrary/rdlibrary.cpp | 12 ++++++++---- rdlibrary/rdlibrary.h | 1 + rdlibrary/rdlibrary_cs.ts | 4 ++++ rdlibrary/rdlibrary_de.ts | 4 ++++ rdlibrary/rdlibrary_es.ts | 4 ++++ rdlibrary/rdlibrary_fr.ts | 4 ++++ rdlibrary/rdlibrary_nb.ts | 4 ++++ rdlibrary/rdlibrary_nn.ts | 4 ++++ rdlibrary/rdlibrary_pt_BR.ts | 4 ++++ 9 files changed, 37 insertions(+), 4 deletions(-) diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index e3489980..82ddd0c6 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -263,7 +263,10 @@ MainWidget::MainWidget(QWidget *parent) // // Results Counter // - lib_matches_label=new QLabel(this); + lib_matches_edit=new QLineEdit(this); + lib_matches_edit->setFont(default_font); + lib_matches_edit->setReadOnly(true); + lib_matches_label=new QLabel(lib_matches_edit,tr("Matching Carts:"),this); lib_matches_label->setFont(button_font); // @@ -542,7 +545,7 @@ MainWidget::MainWidget(QWidget *parent) QSize MainWidget::sizeHint() const { - return QSize(975,600); + return QSize(1000,600); } @@ -1151,7 +1154,8 @@ void MainWidget::resizeEvent(QResizeEvent *e) lib_codes_label->setGeometry(195,40,130,20); lib_codes2_box->setGeometry(600,40,120,20); lib_codes2_label->setGeometry(460,40,130,20); - lib_matches_label->setGeometry(740,40,140,20); + lib_matches_edit->setGeometry(835,40,65,20); + lib_matches_label->setGeometry(740,40,100,20); lib_showmatches_box->setGeometry(740,67,15,15); lib_showmatches_label->setGeometry(760,65,200,20); lib_allowdrag_box->setGeometry(560,67,15,15); @@ -1426,7 +1430,7 @@ void MainWidget::RefreshList() qApp->processEvents(QEventLoop::ExcludeUserInputEvents); } } - lib_matches_label->setText(QString().sprintf("%d Carts Match Filters",count)); + lib_matches_edit->setText(QString().sprintf("%d",count)); UpdateItemColor(l,validity,end_datetime,current_datetime); lib_progress_dialog->reset(); delete q; diff --git a/rdlibrary/rdlibrary.h b/rdlibrary/rdlibrary.h index 753b1e88..26717ac7 100644 --- a/rdlibrary/rdlibrary.h +++ b/rdlibrary/rdlibrary.h @@ -132,6 +132,7 @@ class MainWidget : public QWidget QLabel *lib_codes_label; QComboBox *lib_codes2_box; QLabel *lib_codes2_label; + QLineEdit *lib_matches_edit; QLabel *lib_matches_label; QPushButton *lib_search_button; QPushButton *lib_clear_button; diff --git a/rdlibrary/rdlibrary_cs.ts b/rdlibrary/rdlibrary_cs.ts index 9a9e8b81..d5fa6e8d 100644 --- a/rdlibrary/rdlibrary_cs.ts +++ b/rdlibrary/rdlibrary_cs.ts @@ -1491,6 +1491,10 @@ Přesto smazat? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_de.ts b/rdlibrary/rdlibrary_de.ts index e31b7b9b..cd78c157 100644 --- a/rdlibrary/rdlibrary_de.ts +++ b/rdlibrary/rdlibrary_de.ts @@ -1468,6 +1468,10 @@ verwendet. Trotzdem löschen? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_es.ts b/rdlibrary/rdlibrary_es.ts index 5333fa53..5ec9800b 100644 --- a/rdlibrary/rdlibrary_es.ts +++ b/rdlibrary/rdlibrary_es.ts @@ -1477,6 +1477,10 @@ Do you still want to delete it? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_fr.ts b/rdlibrary/rdlibrary_fr.ts index 6195192f..b260b7e4 100644 --- a/rdlibrary/rdlibrary_fr.ts +++ b/rdlibrary/rdlibrary_fr.ts @@ -1181,6 +1181,10 @@ Do you still want to delete it? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_nb.ts b/rdlibrary/rdlibrary_nb.ts index de73f19b..d2b32a7c 100644 --- a/rdlibrary/rdlibrary_nb.ts +++ b/rdlibrary/rdlibrary_nb.ts @@ -1464,6 +1464,10 @@ Vil du sletta ho likevel? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_nn.ts b/rdlibrary/rdlibrary_nn.ts index de73f19b..d2b32a7c 100644 --- a/rdlibrary/rdlibrary_nn.ts +++ b/rdlibrary/rdlibrary_nn.ts @@ -1464,6 +1464,10 @@ Vil du sletta ho likevel? And Scheduler Code: + + Matching Carts: + + RecordCut diff --git a/rdlibrary/rdlibrary_pt_BR.ts b/rdlibrary/rdlibrary_pt_BR.ts index 7c6db164..2aa3370c 100644 --- a/rdlibrary/rdlibrary_pt_BR.ts +++ b/rdlibrary/rdlibrary_pt_BR.ts @@ -1466,6 +1466,10 @@ Você ainda quer deletá-lo? And Scheduler Code: + + Matching Carts: + + RecordCut From d1d85e47b98501635da2bf3d0fcabe6173f203ac Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Thu, 9 May 2019 12:49:30 -0700 Subject: [PATCH 9/9] Update ChangeLog --- ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5532b37..0f7fb1e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18608,9 +18608,6 @@ 2019-04-25 Fred Gleason * Fixed a bug in escaping JSON strings that failed to handle control characters properly. -2019-04-29 Patrick Linstruth - * Added second schedule code filter to rdlibrary(1). - * Change rdlibrary(1) minimum width from 850 to 975. 2019-04-29 Fred Gleason * Fixed a typo in 'RDLogPlay::move()'. 2019-04-29 Fred Gleason @@ -18648,3 +18645,6 @@ * Cleaned up a compiler warning for 'RDMacroEvent'. 2019-05-03 Fred Gleason * Updated the package version to 3.0.0rc02. +2019-05-09 Patrick Linstruth + * Added second schedule code filter to rdlibrary(1). + * Change rdlibrary(1) minimum width from 850 to 1000.