2021-02-02 Fred Gleason <fredg@paravelsystems.com>

* Refactored the 'Autofill Carts' dialog in rdadmin(1) to use the
	model-based API.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-02 16:56:15 -05:00
parent ffea0d3279
commit 7d25c0c040
14 changed files with 186 additions and 197 deletions

View File

@ -20978,3 +20978,6 @@
* Refactored the 'Host Variables' dialog in rdadmin(1) to use the
model-based API.
* Removed the 'Add Host Variable' dialog from rdadmin(1).
2021-02-02 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'Autofill Carts' dialog in rdadmin(1) to use the
model-based API.

View File

@ -182,7 +182,6 @@ QSize RDCartDialog::sizeHint() const
int RDCartDialog::exec(int *cartnum,RDCart::Type type,const QString &svc,
bool *temp_allowed)
{
printf("RDCartDialog service: %s\n",svc.toUtf8().constData());
LoadState();
cart_cart_filter->setShowCartType(type);
cart_cart_filter->setService(svc);
@ -416,7 +415,7 @@ void RDCartDialog::loadFileData()
delete conv;
delete cart;
delete cut;
done(0);
done(true);
}
}
@ -438,7 +437,7 @@ void RDCartDialog::okData()
}
}
done(0);
done(true);
}
@ -448,7 +447,7 @@ void RDCartDialog::cancelData()
if(cart_player!=NULL) {
cart_player->stop();
}
done(-1);
done(false);
}

View File

@ -51,11 +51,6 @@ class RDCartDialog : public RDDialog
public slots:
int exec(int *cartnum,RDCart::Type type,const QString &svc,
bool *temp_allowed);
// int exec(int *cartnum,RDCart::Type type,QString *svcname,int svc_quan,
// bool *temp_allowed);
// int exec(int *cartnum,RDCart::Type type,QString *svcname,int svc_quan,
// const QString &username,const QString &passwd,
// bool *temp_allowed=NULL);
private slots:
void modelResetData();

View File

@ -420,6 +420,24 @@ QModelIndex RDLibraryModel::addCart(unsigned cartnum)
}
void RDLibraryModel::removeCart(const QModelIndex &index)
{
beginRemoveRows(QModelIndex(),index.row(),index.row());
d_texts.removeAt(index.row());
d_notes.removeAt(index.row());
d_cart_numbers.removeAt(index.row());
d_cut_texts.removeAt(index.row());
d_cut_cutnames.removeAt(index.row());
d_background_colors.removeAt(index.row());
d_cart_types.removeAt(index.row());
d_icons.removeAt(index.row());
endRemoveRows();
emit rowCountChanged(d_texts.size());
}
void RDLibraryModel::removeCart(unsigned cartnum)
{
for(int i=0;i<d_texts.size();i++) {

View File

@ -60,6 +60,7 @@ class RDLibraryModel : public QAbstractItemModel
QString cutName(const QModelIndex &index) const;
QString cartOwnedBy(const QModelIndex &index);
QModelIndex addCart(unsigned cartnum);
void removeCart(const QModelIndex &index);
void removeCart(unsigned cartnum);
void refreshRow(const QModelIndex &index);
void refreshCart(unsigned cartnum);

View File

@ -2,7 +2,7 @@
//
// Edit a List of Autofill Carts
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -18,24 +18,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qstring.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <q3textedit.h>
#include <qlabel.h>
#include <qpainter.h>
#include <qevent.h>
#include <qmessagebox.h>
#include <qcheckbox.h>
#include <q3buttongroup.h>
#include <rd.h>
#include <rdapplication.h>
#include <rdcart_dialog.h>
#include <rdconf.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rduser.h>
#include "autofill_carts.h"
#include "globals.h"
@ -43,17 +31,12 @@
AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent)
: RDDialog(parent)
{
setModal(true);
QString str;
//
// Fix the Window Size
//
setMinimumWidth(sizeHint().width());
setMaximumWidth(sizeHint().width());
setMinimumHeight(sizeHint().height());
setMaximumHeight(sizeHint().height());
setMinimumSize(sizeHint());
svc_svc=svc;
@ -62,59 +45,42 @@ AutofillCarts::AutofillCarts(RDSvc *svc,QWidget *parent)
//
// Cart List
//
svc_cart_list=new Q3ListView(this);
svc_cart_list->
setGeometry(10,10,sizeHint().width()-20,sizeHint().height()-110);
svc_cart_list->setAllColumnsShowFocus(true);
svc_cart_list->setItemMargin(5);
svc_cart_list->addColumn(tr("Cart"));
svc_cart_list->setColumnAlignment(0,Qt::AlignCenter);
svc_cart_list->addColumn(tr("Length"));
svc_cart_list->setColumnAlignment(1,Qt::AlignRight);
svc_cart_list->addColumn(tr("Title"));
svc_cart_list->setColumnAlignment(2,Qt::AlignLeft);
svc_cart_list->addColumn(tr("Artist"));
svc_cart_list->setColumnAlignment(3,Qt::AlignLeft);
svc_cart_list->setSortColumn(1);
svc_cart_view=new RDTableView(this);
svc_cart_model=new RDLibraryModel(this);
svc_cart_model->setFont(font());
svc_cart_model->setPalette(palette());
svc_cart_view->setModel(svc_cart_model);
connect(svc_cart_model,SIGNAL(modelReset()),
svc_cart_view,SLOT(resizeColumnsToContents()));
//
// Add Button
//
QPushButton *button=new QPushButton(this);
button->setGeometry(20,sizeHint().height()-90,60,40);
button->setFont(buttonFont());
button->setText(tr("&Add"));
connect(button,SIGNAL(clicked()),this,SLOT(addData()));
svc_add_button=new QPushButton(this);
svc_add_button->setFont(buttonFont());
svc_add_button->setText(tr("&Add"));
connect(svc_add_button,SIGNAL(clicked()),this,SLOT(addData()));
//
// Delete Button
// Remove Button
//
button=new QPushButton(this);
button->setGeometry(90,sizeHint().height()-90,60,40);
button->setFont(buttonFont());
button->setText(tr("&Delete"));
connect(button,SIGNAL(clicked()),this,SLOT(deleteData()));
svc_remove_button=new QPushButton(this);
svc_remove_button->setFont(buttonFont());
svc_remove_button->setText(tr("&Remove"));
connect(svc_remove_button,SIGNAL(clicked()),this,SLOT(deleteData()));
//
// Ok Button
// Close Button
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-180,sizeHint().height()-60,80,50);
button->setDefault(true);
button->setFont(buttonFont());
button->setText(tr("&OK"));
connect(button,SIGNAL(clicked()),this,SLOT(okData()));
svc_close_button=new QPushButton(this);
svc_close_button->setFont(buttonFont());
svc_close_button->setText(tr("&Close"));
connect(svc_close_button,SIGNAL(clicked()),this,SLOT(closeData()));
//
// Cancel Button
//
button=new QPushButton(this);
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setFont(buttonFont());
button->setText(tr("&Cancel"));
connect(button,SIGNAL(clicked()),this,SLOT(cancelData()));
RefreshList();
QString sql=QString("left join AUTOFILLS ")+
"on CART.NUMBER=AUTOFILLS.CART_NUMBER where "+
"AUTOFILLS.SERVICE=\""+RDEscapeString(svc_svc->name())+"\"";
svc_cart_model->setFilterSql(sql);
}
@ -125,7 +91,7 @@ AutofillCarts::~AutofillCarts()
QSize AutofillCarts::sizeHint() const
{
return QSize(375,310);
return QSize(640,480);
}
@ -137,76 +103,50 @@ QSizePolicy AutofillCarts::sizePolicy() const
void AutofillCarts::addData()
{
int cart=0;
if(admin_cart_dialog->exec(&cart,RDCart::Audio,QString(),NULL)<0) {
return;
QString sql;
int cartnum=0;
if(admin_cart_dialog->exec(&cartnum,RDCart::Audio,svc_svc->name(),NULL)) {
sql=QString("insert into AUTOFILLS set ")+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\","+
QString().sprintf("CART_NUMBER=%d",cartnum);
RDSqlQuery::apply(sql);
QModelIndex index=svc_cart_model->addCart(cartnum);
if(index.isValid()) {
svc_cart_view->selectRow(index.row());
}
}
RDCart *rdcart=new RDCart(cart);
Q3ListViewItem *item=new Q3ListViewItem(svc_cart_list);
item->setText(0,QString().sprintf("%06d",cart));
item->setText(1,RDGetTimeLength(rdcart->forcedLength(),false,true));
item->setText(2,rdcart->title());
item->setText(3,rdcart->artist());
svc_cart_list->setSelected(item,true);
svc_cart_list->ensureItemVisible(item);
delete rdcart;
}
void AutofillCarts::deleteData()
{
Q3ListViewItem *item=svc_cart_list->selectedItem();
if(item==NULL) {
QModelIndexList rows=svc_cart_view->selectionModel()->selectedRows();
if(rows.size()!=1) {
return;
}
delete item;
}
void AutofillCarts::okData()
{
QString sql=QString("delete from AUTOFILLS where ")+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
delete q;
Q3ListViewItem *item=svc_cart_list->firstChild();
while(item!=NULL) {
sql=QString("insert into AUTOFILLS set ")+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\","+
QString().sprintf("CART_NUMBER=%u",item->text(0).toUInt());
q=new RDSqlQuery(sql);
delete q;
item=item->nextSibling();
}
done(0);
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\" && "+
QString().sprintf("CART_NUMBER=%u",
svc_cart_model->cartNumber(rows.first()));
RDSqlQuery::apply(sql);
svc_cart_model->removeCart(rows.first());
}
void AutofillCarts::cancelData()
void AutofillCarts::closeData()
{
done(1);
done(true);
}
void AutofillCarts::RefreshList()
void AutofillCarts::resizeEvent(QResizeEvent *e)
{
Q3ListViewItem *item;
svc_cart_view->setGeometry(10,10,size().width()-20,size().height()-110);
svc_add_button->setGeometry(20,size().height()-90,80,50);
svc_remove_button->setGeometry(110,size().height()-90,80,50);
svc_cart_list->clear();
QString sql=QString("select ")+
"AUTOFILLS.CART_NUMBER,"+ // 00
"CART.FORCED_LENGTH,"+ // 01
"CART.TITLE,CART.ARTIST "+ // 02
"from AUTOFILLS left join CART "+
"on AUTOFILLS.CART_NUMBER=CART.NUMBER where "+
"SERVICE=\""+RDEscapeString(svc_svc->name())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
item=new Q3ListViewItem(svc_cart_list);
item->setText(0,QString().sprintf("%06u",q->value(0).toUInt()));
item->setText(1,RDGetTimeLength(q->value(1).toInt(),false,true));
item->setText(2,q->value(2).toString());
item->setText(3,q->value(3).toString());
}
delete q;
svc_close_button->setGeometry(size().width()-90,size().height()-60,80,50);
}

View File

@ -2,7 +2,7 @@
//
// Edit a List of Autofill Carts
//
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -21,11 +21,12 @@
#ifndef AUTOFILL_CARTS_H
#define AUTOFILL_CARTS_H
#include <qsqldatabase.h>
#include <q3listview.h>
#include <QPushButton>
#include <rddialog.h>
#include <rdlibrarymodel.h>
#include <rdsvc.h>
#include <rdtableview.h>
class AutofillCarts : public RDDialog
{
@ -39,17 +40,21 @@ class AutofillCarts : public RDDialog
private slots:
void addData();
void deleteData();
void okData();
void cancelData();
void closeData();
protected:
void resizeEvent(QResizeEvent *e);
private:
void RefreshList();
RDSvc *svc_svc;
Q3ListView *svc_cart_list;
RDTableView *svc_cart_view;
RDLibraryModel *svc_cart_model;
QPushButton *svc_add_button;
QPushButton *svc_remove_button;
QPushButton *svc_close_button;
QString svc_cart_filter;
QString svc_cart_group;
};
#endif
#endif // AUTOFILL_CARTS_H

View File

@ -627,19 +627,19 @@ a záloha původní databáze uložena v </translation>
</message>
<message>
<source>Cart</source>
<translation>Vozík</translation>
<translation type="obsolete">Vozík</translation>
</message>
<message>
<source>Length</source>
<translation>Délka</translation>
<translation type="obsolete">Délka</translation>
</message>
<message>
<source>Title</source>
<translation>Název</translation>
<translation type="obsolete">Název</translation>
</message>
<message>
<source>Artist</source>
<translation>Umělec</translation>
<translation type="obsolete">Umělec</translation>
</message>
<message>
<source>&amp;Add</source>
@ -647,15 +647,23 @@ a záloha původní databáze uložena v </translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>S&amp;mazat</translation>
<translation type="obsolete">S&amp;mazat</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>Z&amp;rušit</translation>
<translation type="obsolete">Z&amp;rušit</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Zavřít</translation>
</message>
</context>
<context>

View File

@ -549,19 +549,19 @@ worden. Aktuelle Version</translation>
</message>
<message>
<source>Cart</source>
<translation>Cart</translation>
<translation type="obsolete">Cart</translation>
</message>
<message>
<source>Length</source>
<translation>Länge</translation>
<translation type="obsolete">Länge</translation>
</message>
<message>
<source>Title</source>
<translation>Titel</translation>
<translation type="obsolete">Titel</translation>
</message>
<message>
<source>Artist</source>
<translation>Künstler</translation>
<translation type="obsolete">Künstler</translation>
</message>
<message>
<source>&amp;Add</source>
@ -569,15 +569,23 @@ worden. Aktuelle Version</translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>&amp;Löschen</translation>
<translation type="obsolete">&amp;Löschen</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>Abbre&amp;chen</translation>
<translation type="obsolete">Abbre&amp;chen</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Schliessen</translation>
</message>
</context>
<context>

View File

@ -635,19 +635,19 @@ y un respaldo de la base de datos se guardó en </translation>
</message>
<message>
<source>Cart</source>
<translation>Cartucho</translation>
<translation type="obsolete">Cartucho</translation>
</message>
<message>
<source>Length</source>
<translation>Duración</translation>
<translation type="obsolete">Duración</translation>
</message>
<message>
<source>Title</source>
<translation>Título</translation>
<translation type="obsolete">Título</translation>
</message>
<message>
<source>Artist</source>
<translation>Artista</translation>
<translation type="obsolete">Artista</translation>
</message>
<message>
<source>&amp;Add</source>
@ -655,15 +655,23 @@ y un respaldo de la base de datos se guardó en </translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>E&amp;liminar</translation>
<translation type="obsolete">E&amp;liminar</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;Aceptar</translation>
<translation type="obsolete">&amp;Aceptar</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Cancelar</translation>
<translation type="obsolete">&amp;Cancelar</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Cerrar</translation>
</message>
</context>
<context>

View File

@ -299,36 +299,16 @@
<source>Autofill Carts - Service:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cart</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Length</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Delete</source>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;OK</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Cancel</source>
<source>&amp;Close</source>
<translation type="unfinished"></translation>
</message>
</context>

View File

@ -531,19 +531,19 @@ oppdatert til versjon </translation>
</message>
<message>
<source>Cart</source>
<translation>Korg</translation>
<translation type="obsolete">Korg</translation>
</message>
<message>
<source>Length</source>
<translation>Lengd</translation>
<translation type="obsolete">Lengd</translation>
</message>
<message>
<source>Title</source>
<translation>Tittel</translation>
<translation type="obsolete">Tittel</translation>
</message>
<message>
<source>Artist</source>
<translation>Artist</translation>
<translation type="obsolete">Artist</translation>
</message>
<message>
<source>&amp;Add</source>
@ -551,15 +551,23 @@ oppdatert til versjon </translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>&amp;Slett</translation>
<translation type="obsolete">&amp;Slett</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Avbryt</translation>
<translation type="obsolete">&amp;Avbryt</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Lukk</translation>
</message>
</context>
<context>

View File

@ -531,19 +531,19 @@ oppdatert til versjon </translation>
</message>
<message>
<source>Cart</source>
<translation>Korg</translation>
<translation type="obsolete">Korg</translation>
</message>
<message>
<source>Length</source>
<translation>Lengd</translation>
<translation type="obsolete">Lengd</translation>
</message>
<message>
<source>Title</source>
<translation>Tittel</translation>
<translation type="obsolete">Tittel</translation>
</message>
<message>
<source>Artist</source>
<translation>Artist</translation>
<translation type="obsolete">Artist</translation>
</message>
<message>
<source>&amp;Add</source>
@ -551,15 +551,23 @@ oppdatert til versjon </translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>&amp;Slett</translation>
<translation type="obsolete">&amp;Slett</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Avbryt</translation>
<translation type="obsolete">&amp;Avbryt</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Lukk</translation>
</message>
</context>
<context>

View File

@ -524,19 +524,19 @@ atualizada para a Versão</translation>
</message>
<message>
<source>Cart</source>
<translation>Cartão</translation>
<translation type="obsolete">Cartão</translation>
</message>
<message>
<source>Length</source>
<translation>Duração</translation>
<translation type="obsolete">Duração</translation>
</message>
<message>
<source>Title</source>
<translation>Título</translation>
<translation type="obsolete">Título</translation>
</message>
<message>
<source>Artist</source>
<translation>Artista</translation>
<translation type="obsolete">Artista</translation>
</message>
<message>
<source>&amp;Add</source>
@ -544,15 +544,23 @@ atualizada para a Versão</translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>&amp;Deletar</translation>
<translation type="obsolete">&amp;Deletar</translation>
</message>
<message>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
<translation type="obsolete">&amp;OK</translation>
</message>
<message>
<source>&amp;Cancel</source>
<translation>&amp;Cancelar</translation>
<translation type="obsolete">&amp;Cancelar</translation>
</message>
<message>
<source>&amp;Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&amp;Close</source>
<translation type="unfinished">&amp;Fechar</translation>
</message>
</context>
<context>