Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2021-01-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Renamed the 'RDVguestResourceListModel' model class to
	'RDResourceListModel'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-01-31 11:45:57 -05:00
parent f9234e4391
commit f942c448d6
14 changed files with 257 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20949,3 +20949,6 @@
* Added 'RDVguestResourceListModel'.
* Refactored the 'vGuest Switches'/'vGuest Displays' dialogs in
rdadmin(1) to use the model-based API.
2021-01-31 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'RDVguestResourceListModel' model class to
'RDResourceListModel'.

4
lib/Makefile.am
View File

@ -216,6 +216,7 @@ dist_librd_la_SOURCES = dbversion.h\
rdreplicator.cpp rdreplicator.h\
rdreplicatorlistmodel.cpp rdreplicatorlistmodel.h\
rdreport.cpp rdreport.h\
rdresourcelistmodel.cpp rdresourcelistmodel.h\
rdringbuffer.cpp rdringbuffer.h\
rdripc.cpp rdripc.h\
rdrssschemas.cpp rdrssschemas.h\
@ -265,7 +266,6 @@ dist_librd_la_SOURCES = dbversion.h\
rduser.cpp rduser.h\
rduserlistmodel.cpp rduserlistmodel.h\
rdversion.cpp rdversion.h\
rdvguestresourcelistmodel.cpp rdvguestresourcelistmodel.h\
rdwavedata.cpp rdwavedata.h\
rdwavedata_dialog.cpp rdwavedata_dialog.h\
rdwavefile.cpp rdwavefile.h\
@ -367,6 +367,7 @@ nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\
moc_rdrehash.cpp\
moc_rdrenderer.cpp\
moc_rdreplicatorlistmodel.cpp\
moc_rdresourcelistmodel.cpp\
moc_rdripc.cpp\
moc_rdschedcodes_dialog.cpp\
moc_rdrsscategorybox.cpp\
@ -393,7 +394,6 @@ nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\
moc_rdunixsocket.cpp\
moc_rduserlistmodel.cpp\
moc_rdupload.cpp\
moc_rdvguestresourcelistmodel.cpp\
moc_rdwavedata_dialog.cpp\
moc_rdwidget.cpp

4
lib/lib.pro
View File

@ -160,6 +160,7 @@ SOURCES += rdrehash.cpp
SOURCES += rdrenderer.cpp
SOURCES += rdreplicatorlistmodel.cpp
SOURCES += rdreport.cpp
SOURCES += rdresourcelistmodel.cpp
SOURCES += rdripc.cpp
SOURCES += rdrssschemas.cpp
SOURCES += rdrsscategorybox.cpp
@ -193,7 +194,6 @@ SOURCES += rdttyout.cpp
SOURCES += rduser.cpp
SOURCES += rduserlistmodel.cpp
SOURCES += rdversion.cpp
SOURCES += rdvguestresourcelistmodel.cpp
SOURCES += rdwavedata.cpp
SOURCES += rdwavefile.cpp
SOURCES += rdweb.cpp
@ -328,6 +328,7 @@ HEADERS += rdrehash.h
HEADERS += rdrenderer.h
HEADERS += rdreplicatorlistmodel.h
HEADERS += rdreport.h
HEADERS += rdresourcelistmodel.h
HEADERS += rdripc.h
HEADERS += rdrssschemas.h
HEADERS += rdrsscategorybox.h
@ -362,7 +363,6 @@ HEADERS += rdttyout.h
HEADERS += rduser.h
HEADERS += rduserlistmodel.h
HEADERS += rdversion.h
HEADERS += rdvguestresourcelistmodel.h
HEADERS += rdwavedata.h
HEADERS += rdweb.h
HEADERS += rdwidget.h

62
lib/librd_cs.ts
View File

@ -3807,6 +3807,37 @@ Zkuste to, prosím, znovu!</translation>
<translation type="obsolete">Music1 Reconciliation</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -4078,35 +4109,4 @@ Zkuste to, prosím, znovu!</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_de.ts
View File

@ -3788,6 +3788,37 @@ bitte erneut versuchen!</translation>
<translation type="obsolete">Music1 Reconciliation</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -4059,35 +4090,4 @@ bitte erneut versuchen!</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_es.ts
View File

@ -3767,6 +3767,37 @@ please try again!</source>
<translation type="obsolete">Reconciliación Music1</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -4040,35 +4071,4 @@ please try again!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_fr.ts
View File

@ -3060,6 +3060,37 @@ please try again!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -3316,35 +3347,4 @@ please try again!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_nb.ts
View File

@ -3670,6 +3670,37 @@ prøv ein gong til!</translation>
<translation type="obsolete">Greidde ikkje opna rapportfil!</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -3948,35 +3979,4 @@ prøv ein gong til!</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_nn.ts
View File

@ -3670,6 +3670,37 @@ prøv ein gong til!</translation>
<translation type="obsolete">Greidde ikkje opna rapportfil!</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -3948,35 +3979,4 @@ prøv ein gong til!</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

62
lib/librd_pt_BR.ts
View File

@ -3721,6 +3721,37 @@ por favor, tente novamente!</translation>
<translation type="obsolete">Não foi possível abrir o Relatório!</translation>
</message>
</context>
<context>
<name>RDResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDServiceListModel</name>
<message>
@ -3994,35 +4025,4 @@ por favor, tente novamente!</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDVguestResourceListModel</name>
<message>
<source>GPIO Line</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Engine</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Device (Hex)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Surface</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Bus/Relay</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

44
lib/rdvguestresourcelistmodel.cpp → lib/rdresourcelistmodel.cpp
View File

@ -1,6 +1,6 @@
// rdvguestresourcelistmodel.cpp
// rdresourcelistmodel.cpp
//
// Data model for Rivendell Logitek vGuest resource settings
// Data model for Rivendell console router resource settings
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
@ -21,11 +21,11 @@
#include "rdapplication.h"
#include "rdescape_string.h"
#include "rdmatrix.h"
#include "rdvguestresourcelistmodel.h"
#include "rdresourcelistmodel.h"
RDVguestResourceListModel::RDVguestResourceListModel(RDMatrix *mtx,
RDMatrix::VguestType type,
QObject *parent)
RDResourceListModel::RDResourceListModel(RDMatrix *mtx,
RDMatrix::VguestType type,
QObject *parent)
: QAbstractTableModel(parent)
{
d_mtx=mtx;
@ -75,24 +75,24 @@ RDVguestResourceListModel::RDVguestResourceListModel(RDMatrix *mtx,
}
RDVguestResourceListModel::~RDVguestResourceListModel()
RDResourceListModel::~RDResourceListModel()
{
}
QPalette RDVguestResourceListModel::palette()
QPalette RDResourceListModel::palette()
{
return d_palette;
}
void RDVguestResourceListModel::setPalette(const QPalette &pal)
void RDResourceListModel::setPalette(const QPalette &pal)
{
d_palette=pal;
}
void RDVguestResourceListModel::setFont(const QFont &font)
void RDResourceListModel::setFont(const QFont &font)
{
d_font=font;
d_bold_font=font;
@ -100,19 +100,19 @@ void RDVguestResourceListModel::setFont(const QFont &font)
}
int RDVguestResourceListModel::columnCount(const QModelIndex &parent) const
int RDResourceListModel::columnCount(const QModelIndex &parent) const
{
return d_headers.size();
}
int RDVguestResourceListModel::rowCount(const QModelIndex &parent) const
int RDResourceListModel::rowCount(const QModelIndex &parent) const
{
return d_texts.size();
}
QVariant RDVguestResourceListModel::headerData(int section,
QVariant RDResourceListModel::headerData(int section,
Qt::Orientation orient,
int role) const
{
@ -123,7 +123,7 @@ QVariant RDVguestResourceListModel::headerData(int section,
}
QVariant RDVguestResourceListModel::data(const QModelIndex &index,int role) const
QVariant RDResourceListModel::data(const QModelIndex &index,int role) const
{
QString str;
int col=index.column();
@ -164,19 +164,19 @@ QVariant RDVguestResourceListModel::data(const QModelIndex &index,int role) cons
}
int RDVguestResourceListModel::resourceId(const QModelIndex &row) const
int RDResourceListModel::resourceId(const QModelIndex &row) const
{
return d_ids.at(row.row());
}
int RDVguestResourceListModel::resourceNumber(const QModelIndex &row) const
int RDResourceListModel::resourceNumber(const QModelIndex &row) const
{
return d_texts.at(row.row()).at(0).toInt();
}
void RDVguestResourceListModel::refresh(const QModelIndex &row)
void RDResourceListModel::refresh(const QModelIndex &row)
{
if(row.row()<d_texts.size()) {
QString sql=sqlFields()+
@ -193,7 +193,7 @@ void RDVguestResourceListModel::refresh(const QModelIndex &row)
}
void RDVguestResourceListModel::refresh(int id)
void RDResourceListModel::refresh(int id)
{
for(int i=0;i<d_texts.size();i++) {
if(d_texts.at(i).at(0)==id) {
@ -204,7 +204,7 @@ void RDVguestResourceListModel::refresh(int id)
}
void RDVguestResourceListModel::updateModel()
void RDResourceListModel::updateModel()
{
QList<QVariant> texts;
@ -238,7 +238,7 @@ void RDVguestResourceListModel::updateModel()
}
void RDVguestResourceListModel::updateRowLine(int line)
void RDResourceListModel::updateRowLine(int line)
{
if(line<d_texts.size()) {
QString sql=sqlFields()+
@ -253,7 +253,7 @@ void RDVguestResourceListModel::updateRowLine(int line)
}
void RDVguestResourceListModel::updateRow(int row,RDSqlQuery *q)
void RDResourceListModel::updateRow(int row,RDSqlQuery *q)
{
QList<QVariant> texts;
@ -305,7 +305,7 @@ void RDVguestResourceListModel::updateRow(int row,RDSqlQuery *q)
}
QString RDVguestResourceListModel::sqlFields() const
QString RDResourceListModel::sqlFields() const
{
QString sql=QString("select ")+
"ID,"+ // 00

16
lib/rdvguestresourcelistmodel.h → lib/rdresourcelistmodel.h
View File

@ -1,6 +1,6 @@
// rdvguestresourcelistmodel.h
// rdresourcelistmodel.h
//
// Data model for Rivendell Logitek vGuest resource settings
// Data model for Rivendell console router resource settings
//
// (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
//
@ -18,8 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef RDVGUESTRESOURCELISTMODEL_H
#define RDVGUESTRESOURCELISTMODEL_H
#ifndef RDRESOURCELISTMODEL_H
#define RDRESOURCELISTMODEL_H
#include <QAbstractTableModel>
#include <QFont>
@ -31,13 +31,13 @@
#include <rdnotification.h>
#include <rduser.h>
class RDVguestResourceListModel : public QAbstractTableModel
class RDResourceListModel : public QAbstractTableModel
{
Q_OBJECT
public:
RDVguestResourceListModel(RDMatrix *mtx,RDMatrix::VguestType type,
RDResourceListModel(RDMatrix *mtx,RDMatrix::VguestType type,
QObject *parent=0);
~RDVguestResourceListModel();
~RDResourceListModel();
QPalette palette();
void setPalette(const QPalette &pal);
void setFont(const QFont &font);
@ -71,4 +71,4 @@ class RDVguestResourceListModel : public QAbstractTableModel
};
#endif // RDVGUESTRESOURCELISTMODEL_H
#endif // RDRESOURCELISTMODEL_H

2
rdadmin/list_vguest_resources.cpp
View File

@ -63,7 +63,7 @@ ListVguestResources::ListVguestResources(RDMatrix *matrix,
// Resources List Box
//
list_list_view=new RDTableView(this);
list_list_model=new RDVguestResourceListModel(list_matrix,type,this);
list_list_model=new RDResourceListModel(list_matrix,type,this);
list_list_model->setFont(defaultFont());
list_list_model->setPalette(palette());
list_list_view->setModel(list_list_model);

4
rdadmin/list_vguest_resources.h
View File

@ -29,7 +29,7 @@
#include <rdmatrix.h>
#include <rdtableview.h>
#include <rduser.h>
#include <rdvguestresourcelistmodel.h>
#include <rdresourcelistmodel.h>
#include "edit_vguest_resource.h"
@ -57,7 +57,7 @@ class ListVguestResources : public RDDialog
RDMatrix::VguestType list_type;
QLabel *list_title_label;
RDTableView *list_list_view;
RDVguestResourceListModel *list_list_model;
RDResourceListModel *list_list_model;
QPushButton *list_edit_button;
QPushButton *list_close_button;
int list_size;