Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-20 15:02:27 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Added an 'RDEmptyCart' widget.
	* Removed 'RD3EmptyCart' dependency from rdairplay(1).
	* Removed 'RD3EmptyCart' dependency from rdlogmanager(1).
	* Removed 'RD3EmptyCart' dependency from rdpanel(1).
	* Removed the 'RD3EmptyCart' widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-09 12:03:22 -05:00
parent 6b43e1772b
commit 26352326f0
14 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -21065,3 +21065,9 @@
rdlogmanger(1) to use the model based API. rdlogmanger(1) to use the model based API.
2021-02-09 Fred Gleason <fredg@paravelsystems.com> 2021-02-09 Fred Gleason <fredg@paravelsystems.com>
* Removed 'ImportListView' from rdlogmanager(1). * Removed 'ImportListView' from rdlogmanager(1).
2021-02-09 Fred Gleason <fredg@paravelsystems.com>
* Added an 'RDEmptyCart' widget.
* Removed 'RD3EmptyCart' dependency from rdairplay(1).
* Removed 'RD3EmptyCart' dependency from rdlogmanager(1).
* Removed 'RD3EmptyCart' dependency from rdpanel(1).
* Removed the 'RD3EmptyCart' widget.

2
icons/trashcan-16x16.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char * trashcan_xpm[] = { static const char * trashcan_16x16_xpm[] = {
"16 16 53 1", "16 16 53 1",
" c None", " c None",
". c #204A87", ". c #204A87",

2
icons/trashcan-32x32.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char * trashcan_xpm[] = { static const char * trashcan_32x32_xpm[] = {
"32 32 246 2", "32 32 246 2",
" c None", " c None",
". c #5A5B5B", ". c #5A5B5B",

6
lib/Makefile.am
View File

@ -60,7 +60,6 @@ dist_librd_la_SOURCES = dbversion.h\
export_textlog.cpp\ export_textlog.cpp\
rd.h\ rd.h\
rd3cartdrag.cpp rd3cartdrag.h\ rd3cartdrag.cpp rd3cartdrag.h\
rd3emptycart.cpp rd3emptycart.h\
rdadd_cart.cpp rdadd_cart.h\ rdadd_cart.cpp rdadd_cart.h\
rdadd_log.cpp rdadd_log.h\ rdadd_log.cpp rdadd_log.h\
rdairplay_conf.cpp rdairplay_conf.h\ rdairplay_conf.cpp rdairplay_conf.h\
@ -128,6 +127,7 @@ dist_librd_la_SOURCES = dbversion.h\
rddummylookup.cpp rddummylookup.h\ rddummylookup.cpp rddummylookup.h\
rdedit_audio.cpp rdedit_audio.h\ rdedit_audio.cpp rdedit_audio.h\
rdedit_panel_name.cpp rdedit_panel_name.h\ rdedit_panel_name.cpp rdedit_panel_name.h\
rdemptycart.cpp rdemptycart.h\
rdendpointlistmodel.cpp rdendpointlistmodel.h\ rdendpointlistmodel.cpp rdendpointlistmodel.h\
rdescape_string.cpp rdescape_string.h\ rdescape_string.cpp rdescape_string.h\
rdevent.cpp rdevent.h\ rdevent.cpp rdevent.h\
@ -286,8 +286,7 @@ dist_librd_la_SOURCES = dbversion.h\
rdxport_interface.h rdxport_interface.h
nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
moc_rdadd_cart.cpp\
moc_rdadd_log.cpp\ moc_rdadd_log.cpp\
moc_rdapplication.cpp\ moc_rdapplication.cpp\
moc_rdaudioconvert.cpp\ moc_rdaudioconvert.cpp\
@ -327,6 +326,7 @@ nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\
moc_rddummylookup.cpp\ moc_rddummylookup.cpp\
moc_rdedit_audio.cpp\ moc_rdedit_audio.cpp\
moc_rdedit_panel_name.cpp\ moc_rdedit_panel_name.cpp\
moc_rdemptycart.cpp\
moc_rdendpointlistmodel.cpp\ moc_rdendpointlistmodel.cpp\
moc_rdevent_player.cpp\ moc_rdevent_player.cpp\
moc_rdexport_settings_dialog.cpp\ moc_rdexport_settings_dialog.cpp\

4
lib/lib.pro
View File

@ -39,7 +39,6 @@ SOURCES += export_technical.cpp
SOURCES += export_textlog.cpp SOURCES += export_textlog.cpp
SOURCES += html_gpl2.cpp SOURCES += html_gpl2.cpp
SOURCES += rd3cartdrag.cpp SOURCES += rd3cartdrag.cpp
SOURCES += rd3emptycart.cpp
SOURCES += rdadd_log.cpp SOURCES += rdadd_log.cpp
SOURCES += rdadd_cart.cpp SOURCES += rdadd_cart.cpp
SOURCES += rdairplay_conf.cpp SOURCES += rdairplay_conf.cpp
@ -95,6 +94,7 @@ SOURCES += rddropboxlistmodel.cpp
SOURCES += rddummylookup.cpp SOURCES += rddummylookup.cpp
SOURCES += rdedit_audio.cpp SOURCES += rdedit_audio.cpp
SOURCES += rdedit_panel_name.cpp SOURCES += rdedit_panel_name.cpp
SOURCES += rdemptycart.cpp
SOURCES += rdendpointlistmodel.cpp SOURCES += rdendpointlistmodel.cpp
SOURCES += rdescape_string.cpp SOURCES += rdescape_string.cpp
SOURCES += rdevent.cpp SOURCES += rdevent.cpp
@ -215,7 +215,6 @@ HEADERS += schedcartlist.h
HEADERS += schedruleslist.h HEADERS += schedruleslist.h
HEADERS += rd.h HEADERS += rd.h
HEADERS += rd3cartdrag.h HEADERS += rd3cartdrag.h
HEADERS += rd3emptycart.h
HEADERS += rdadd_cart.h HEADERS += rdadd_cart.h
HEADERS += rdadd_log.h HEADERS += rdadd_log.h
HEADERS += rdairplay_conf.h HEADERS += rdairplay_conf.h
@ -271,6 +270,7 @@ HEADERS += rddropboxlistmodel.h
HEADERS += rddummylookup.h HEADERS += rddummylookup.h
HEADERS += rdedit_audio.h HEADERS += rdedit_audio.h
HEADERS += rdedit_panel_name.h HEADERS += rdedit_panel_name.h
HEADERS += rdemptycart.h
HEADERS += rdendpointlistmodel.h HEADERS += rdendpointlistmodel.h
HEADERS += rdescape_string.h HEADERS += rdescape_string.h
HEADERS += rdevent.h HEADERS += rdevent.h

3
lib/rd3cartdrag.cpp
View File

@ -32,6 +32,7 @@
// //
#include "../icons/play.xpm" #include "../icons/play.xpm"
#include "../icons/rml5.xpm" #include "../icons/rml5.xpm"
#include "../icons/trashcan-32x32.xpm"
#include "../icons/trashcan-16x16.xpm" #include "../icons/trashcan-16x16.xpm"
RD3CartDrag::RD3CartDrag(unsigned cartnum,const QPixmap *icon,const QColor &color, RD3CartDrag::RD3CartDrag(unsigned cartnum,const QPixmap *icon,const QColor &color,
@ -67,7 +68,7 @@ RD3CartDrag::RD3CartDrag(unsigned cartnum,const QString &title,
{ {
SetData(cartnum,color,title); SetData(cartnum,color,title);
if(cartnum==0) { if(cartnum==0) {
setPixmap(QPixmap(trashcan_xpm)); setPixmap(QPixmap(trashcan_32x32_xpm));
} }
else { else {
RDCart *cart=new RDCart(cartnum); RDCart *cart=new RDCart(cartnum);

26
lib/rd3emptycart.cpp → lib/rdemptycart.cpp
View File

@ -18,47 +18,51 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include "rd3emptycart.h" #include "rdemptycart.h"
// //
// Icons // Icons
// //
#include "../icons/trashcan-16x16.xpm"
#include "../icons/trashcan-32x32.xpm" #include "../icons/trashcan-32x32.xpm"
//Added by qt3to4:
#include <QPixmap>
#include <QLabel> #include <QLabel>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPixmap>
RD3EmptyCart::RD3EmptyCart(QWidget *parent) RDEmptyCart::RDEmptyCart(QWidget *parent)
: QWidget(parent) : QWidget(parent)
{ {
empty_label=new QLabel(this); empty_label=new QLabel(this);
empty_label->setPixmap(QPixmap(trashcan_xpm)); empty_label->setPixmap(QPixmap(trashcan_32x32_xpm));
empty_label->setGeometry(0,0,32,32); empty_label->setGeometry(0,0,32,32);
} }
RD3EmptyCart::~RD3EmptyCart() RDEmptyCart::~RDEmptyCart()
{ {
delete empty_label; delete empty_label;
} }
QSize RD3EmptyCart::sizeHint() const QSize RDEmptyCart::sizeHint() const
{ {
return QSize(32,32); return QSize(32,32);
} }
QSizePolicy RD3EmptyCart::sizePolicy() const QSizePolicy RDEmptyCart::sizePolicy() const
{ {
return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
} }
void RD3EmptyCart::mousePressEvent(QMouseEvent *e) void RDEmptyCart::mousePressEvent(QMouseEvent *e)
{ {
QWidget::mousePressEvent(e); QWidget::mousePressEvent(e);
RD3CartDrag *d=new RD3CartDrag(0,"",Qt::lightGray,this); QDrag *drag=new QDrag(this);
d->dragCopy(); RDCartDrag *cd=new RDCartDrag(0,"",Qt::lightGray);
drag->setMimeData(cd);
drag->setPixmap(QPixmap(trashcan_16x16_xpm));
drag->exec();
} }

21
lib/rd3emptycart.h → lib/rdemptycart.h
View File

@ -1,4 +1,4 @@
// rd3emptycart.h // rdemptycart.h
// //
// A drag source for an empty cart. // A drag source for an empty cart.
// //
@ -18,22 +18,21 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#ifndef RD3EMPTYCART_H #ifndef RDEMPTYCART_H
#define RD3EMPTYCART_H #define RDEMPTYCART_H
#include <qlabel.h> #include <QLabel>
#include <qwidget.h>
//Added by qt3to4:
#include <QMouseEvent> #include <QMouseEvent>
#include <QWidget>
#include <rd3cartdrag.h> #include <rdcartdrag.h>
class RD3EmptyCart : public QWidget class RDEmptyCart : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
RD3EmptyCart(QWidget *parent=0); RDEmptyCart(QWidget *parent=0);
~RD3EmptyCart(); ~RDEmptyCart();
QSize sizeHint() const; QSize sizeHint() const;
QSizePolicy sizePolicy() const; QSizePolicy sizePolicy() const;
@ -45,4 +44,4 @@ class RD3EmptyCart : public QWidget
}; };
#endif // RD3EMPTYCART_H #endif // RDEMPTYCART_H

2
rdairplay/rdairplay.cpp
View File

@ -634,7 +634,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent)
// //
// Empty Cart // Empty Cart
// //
air_empty_cart=new RD3EmptyCart(this); air_empty_cart=new RDEmptyCart(this);
air_empty_cart->setGeometry(520,sizeHint().height()-51,32,32); air_empty_cart->setGeometry(520,sizeHint().height()-51,32,32);
if(!rda->station()->enableDragdrop()) { if(!rda->station()->enableDragdrop()) {
air_empty_cart->hide(); air_empty_cart->hide();

4
rdairplay/rdairplay.h
View File

@ -21,7 +21,7 @@
#ifndef RDAIRPLAY_H #ifndef RDAIRPLAY_H
#define RDAIRPLAY_H #define RDAIRPLAY_H
#include <rd3emptycart.h> #include <rdemptycart.h>
#include <rdhotkeylist.h> #include <rdhotkeylist.h>
#include <rdhotkeys.h> #include <rdhotkeys.h>
#include <rdinstancelock.h> #include <rdinstancelock.h>
@ -187,7 +187,7 @@ class MainWidget : public RDWidget
int air_stop_gpo_lines[RDAirPlayConf::LastChannel]; int air_stop_gpo_lines[RDAirPlayConf::LastChannel];
RDAirPlayConf::GpioType air_channel_gpio_types[RDAirPlayConf::LastChannel]; RDAirPlayConf::GpioType air_channel_gpio_types[RDAirPlayConf::LastChannel];
std::map<unsigned,QTimer *> air_channel_timers[2]; std::map<unsigned,QTimer *> air_channel_timers[2];
RD3EmptyCart *air_empty_cart; RDEmptyCart *air_empty_cart;
RDCartDialog *air_cart_dialog; RDCartDialog *air_cart_dialog;
RDEventPlayer *air_event_player; RDEventPlayer *air_event_player;
RDHotKeyList *air_keylist; RDHotKeyList *air_keylist;

2
rdlogmanager/edit_event.cpp
View File

@ -147,7 +147,7 @@ EditEvent::EditEvent(QString eventname,bool new_event,
// //
// Empty Cart Source // Empty Cart Source
// //
event_empty_cart=new RD3EmptyCart(this); event_empty_cart=new RDEmptyCart(this);
event_empty_cart->setGeometry(CENTER_LINE-227,sizeHint().height()-202,32,32); event_empty_cart->setGeometry(CENTER_LINE-227,sizeHint().height()-202,32,32);
// //

4
rdlogmanager/edit_event.h
View File

@ -33,7 +33,7 @@
#include <QTextEdit> #include <QTextEdit>
#include <rddialog.h> #include <rddialog.h>
#include <rd3emptycart.h> #include <rdemptycart.h>
#include <rdevent.h> #include <rdevent.h>
#include <rdgrouplistmodel.h> #include <rdgrouplistmodel.h>
#include <rdlibrarymodel.h> #include <rdlibrarymodel.h>
@ -171,7 +171,7 @@ class EditEvent : public RDDialog
std::vector<QString> *event_new_events; std::vector<QString> *event_new_events;
RDSimplePlayer *event_player; RDSimplePlayer *event_player;
QTextEdit *event_remarks_edit; QTextEdit *event_remarks_edit;
RD3EmptyCart *event_empty_cart; RDEmptyCart *event_empty_cart;
}; };

2
rdpanel/rdpanel.cpp
View File

@ -256,7 +256,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// //
// Empty Cart // Empty Cart
// //
panel_empty_cart=new RD3EmptyCart(this); panel_empty_cart=new RDEmptyCart(this);
panel_empty_cart->setGeometry(373,sizeHint().height()-52,32,32); panel_empty_cart->setGeometry(373,sizeHint().height()-52,32,32);
if(!rda->station()->enableDragdrop()) { if(!rda->station()->enableDragdrop()) {
panel_empty_cart->hide(); panel_empty_cart->hide();

4
rdpanel/rdpanel.h
View File

@ -21,7 +21,7 @@
#ifndef RDPANEL_H #ifndef RDPANEL_H
#define RDPANEL_H #define RDPANEL_H
#include <rd3emptycart.h> #include <rdemptycart.h>
#include <rdsound_panel.h> #include <rdsound_panel.h>
#include <rdstereometer.h> #include <rdstereometer.h>
#include <rdwidget.h> #include <rdwidget.h>
@ -66,7 +66,7 @@ class MainWidget : public RDWidget
QString panel_filter; QString panel_filter;
QString panel_group; QString panel_group;
QString panel_schedcode; QString panel_schedcode;
RD3EmptyCart *panel_empty_cart; RDEmptyCart *panel_empty_cart;
}; };