From 26352326f07aa67814eb45ab086b58cb9ab6a2bd Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 9 Feb 2021 12:03:22 -0500 Subject: [PATCH] 2021-02-09 Fred Gleason * 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 --- ChangeLog | 6 ++++++ icons/trashcan-16x16.xpm | 2 +- icons/trashcan-32x32.xpm | 2 +- lib/Makefile.am | 6 +++--- lib/lib.pro | 4 ++-- lib/rd3cartdrag.cpp | 3 ++- lib/{rd3emptycart.cpp => rdemptycart.cpp} | 26 +++++++++++++---------- lib/{rd3emptycart.h => rdemptycart.h} | 21 +++++++++--------- rdairplay/rdairplay.cpp | 2 +- rdairplay/rdairplay.h | 4 ++-- rdlogmanager/edit_event.cpp | 2 +- rdlogmanager/edit_event.h | 4 ++-- rdpanel/rdpanel.cpp | 2 +- rdpanel/rdpanel.h | 4 ++-- 14 files changed, 49 insertions(+), 39 deletions(-) rename lib/{rd3emptycart.cpp => rdemptycart.cpp} (70%) rename lib/{rd3emptycart.h => rdemptycart.h} (78%) diff --git a/ChangeLog b/ChangeLog index 845df4aa..754ea714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21065,3 +21065,9 @@ rdlogmanger(1) to use the model based API. 2021-02-09 Fred Gleason * Removed 'ImportListView' from rdlogmanager(1). +2021-02-09 Fred Gleason + * 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. diff --git a/icons/trashcan-16x16.xpm b/icons/trashcan-16x16.xpm index fca86721..571a936c 100644 --- a/icons/trashcan-16x16.xpm +++ b/icons/trashcan-16x16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * trashcan_xpm[] = { +static const char * trashcan_16x16_xpm[] = { "16 16 53 1", " c None", ". c #204A87", diff --git a/icons/trashcan-32x32.xpm b/icons/trashcan-32x32.xpm index e8e3e4e4..ad20376d 100644 --- a/icons/trashcan-32x32.xpm +++ b/icons/trashcan-32x32.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * trashcan_xpm[] = { +static const char * trashcan_32x32_xpm[] = { "32 32 246 2", " c None", ". c #5A5B5B", diff --git a/lib/Makefile.am b/lib/Makefile.am index bf429534..74ecb575 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -60,7 +60,6 @@ dist_librd_la_SOURCES = dbversion.h\ export_textlog.cpp\ rd.h\ rd3cartdrag.cpp rd3cartdrag.h\ - rd3emptycart.cpp rd3emptycart.h\ rdadd_cart.cpp rdadd_cart.h\ rdadd_log.cpp rdadd_log.h\ rdairplay_conf.cpp rdairplay_conf.h\ @@ -128,6 +127,7 @@ dist_librd_la_SOURCES = dbversion.h\ rddummylookup.cpp rddummylookup.h\ rdedit_audio.cpp rdedit_audio.h\ rdedit_panel_name.cpp rdedit_panel_name.h\ + rdemptycart.cpp rdemptycart.h\ rdendpointlistmodel.cpp rdendpointlistmodel.h\ rdescape_string.cpp rdescape_string.h\ rdevent.cpp rdevent.h\ @@ -286,8 +286,7 @@ dist_librd_la_SOURCES = dbversion.h\ rdxport_interface.h -nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\ - moc_rdadd_cart.cpp\ +nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\ moc_rdadd_log.cpp\ moc_rdapplication.cpp\ moc_rdaudioconvert.cpp\ @@ -327,6 +326,7 @@ nodist_librd_la_SOURCES = moc_rd3emptycart.cpp\ moc_rddummylookup.cpp\ moc_rdedit_audio.cpp\ moc_rdedit_panel_name.cpp\ + moc_rdemptycart.cpp\ moc_rdendpointlistmodel.cpp\ moc_rdevent_player.cpp\ moc_rdexport_settings_dialog.cpp\ diff --git a/lib/lib.pro b/lib/lib.pro index ee1fb7bf..1ef9a124 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -39,7 +39,6 @@ SOURCES += export_technical.cpp SOURCES += export_textlog.cpp SOURCES += html_gpl2.cpp SOURCES += rd3cartdrag.cpp -SOURCES += rd3emptycart.cpp SOURCES += rdadd_log.cpp SOURCES += rdadd_cart.cpp SOURCES += rdairplay_conf.cpp @@ -95,6 +94,7 @@ SOURCES += rddropboxlistmodel.cpp SOURCES += rddummylookup.cpp SOURCES += rdedit_audio.cpp SOURCES += rdedit_panel_name.cpp +SOURCES += rdemptycart.cpp SOURCES += rdendpointlistmodel.cpp SOURCES += rdescape_string.cpp SOURCES += rdevent.cpp @@ -215,7 +215,6 @@ HEADERS += schedcartlist.h HEADERS += schedruleslist.h HEADERS += rd.h HEADERS += rd3cartdrag.h -HEADERS += rd3emptycart.h HEADERS += rdadd_cart.h HEADERS += rdadd_log.h HEADERS += rdairplay_conf.h @@ -271,6 +270,7 @@ HEADERS += rddropboxlistmodel.h HEADERS += rddummylookup.h HEADERS += rdedit_audio.h HEADERS += rdedit_panel_name.h +HEADERS += rdemptycart.h HEADERS += rdendpointlistmodel.h HEADERS += rdescape_string.h HEADERS += rdevent.h diff --git a/lib/rd3cartdrag.cpp b/lib/rd3cartdrag.cpp index c027eb33..77dc6552 100644 --- a/lib/rd3cartdrag.cpp +++ b/lib/rd3cartdrag.cpp @@ -32,6 +32,7 @@ // #include "../icons/play.xpm" #include "../icons/rml5.xpm" +#include "../icons/trashcan-32x32.xpm" #include "../icons/trashcan-16x16.xpm" 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); if(cartnum==0) { - setPixmap(QPixmap(trashcan_xpm)); + setPixmap(QPixmap(trashcan_32x32_xpm)); } else { RDCart *cart=new RDCart(cartnum); diff --git a/lib/rd3emptycart.cpp b/lib/rdemptycart.cpp similarity index 70% rename from lib/rd3emptycart.cpp rename to lib/rdemptycart.cpp index 1e145224..3c425905 100644 --- a/lib/rd3emptycart.cpp +++ b/lib/rdemptycart.cpp @@ -18,47 +18,51 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "rd3emptycart.h" +#include "rdemptycart.h" // // Icons // +#include "../icons/trashcan-16x16.xpm" #include "../icons/trashcan-32x32.xpm" -//Added by qt3to4: -#include + #include #include +#include -RD3EmptyCart::RD3EmptyCart(QWidget *parent) +RDEmptyCart::RDEmptyCart(QWidget *parent) : QWidget(parent) { 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); } -RD3EmptyCart::~RD3EmptyCart() +RDEmptyCart::~RDEmptyCart() { delete empty_label; } -QSize RD3EmptyCart::sizeHint() const +QSize RDEmptyCart::sizeHint() const { return QSize(32,32); } -QSizePolicy RD3EmptyCart::sizePolicy() const +QSizePolicy RDEmptyCart::sizePolicy() const { return QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed); } -void RD3EmptyCart::mousePressEvent(QMouseEvent *e) +void RDEmptyCart::mousePressEvent(QMouseEvent *e) { QWidget::mousePressEvent(e); - RD3CartDrag *d=new RD3CartDrag(0,"",Qt::lightGray,this); - d->dragCopy(); + QDrag *drag=new QDrag(this); + RDCartDrag *cd=new RDCartDrag(0,"",Qt::lightGray); + drag->setMimeData(cd); + drag->setPixmap(QPixmap(trashcan_16x16_xpm)); + drag->exec(); } diff --git a/lib/rd3emptycart.h b/lib/rdemptycart.h similarity index 78% rename from lib/rd3emptycart.h rename to lib/rdemptycart.h index fbbde317..2ff10c62 100644 --- a/lib/rd3emptycart.h +++ b/lib/rdemptycart.h @@ -1,4 +1,4 @@ -// rd3emptycart.h +// rdemptycart.h // // A drag source for an empty cart. // @@ -18,22 +18,21 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef RD3EMPTYCART_H -#define RD3EMPTYCART_H +#ifndef RDEMPTYCART_H +#define RDEMPTYCART_H -#include -#include -//Added by qt3to4: +#include #include +#include -#include +#include -class RD3EmptyCart : public QWidget +class RDEmptyCart : public QWidget { Q_OBJECT public: - RD3EmptyCart(QWidget *parent=0); - ~RD3EmptyCart(); + RDEmptyCart(QWidget *parent=0); + ~RDEmptyCart(); QSize sizeHint() const; QSizePolicy sizePolicy() const; @@ -45,4 +44,4 @@ class RD3EmptyCart : public QWidget }; -#endif // RD3EMPTYCART_H +#endif // RDEMPTYCART_H diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index 10492e10..117a95c5 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -634,7 +634,7 @@ MainWidget::MainWidget(RDConfig *config,QWidget *parent) // // Empty Cart // - air_empty_cart=new RD3EmptyCart(this); + air_empty_cart=new RDEmptyCart(this); air_empty_cart->setGeometry(520,sizeHint().height()-51,32,32); if(!rda->station()->enableDragdrop()) { air_empty_cart->hide(); diff --git a/rdairplay/rdairplay.h b/rdairplay/rdairplay.h index b0f92cd2..90af3497 100644 --- a/rdairplay/rdairplay.h +++ b/rdairplay/rdairplay.h @@ -21,7 +21,7 @@ #ifndef RDAIRPLAY_H #define RDAIRPLAY_H -#include +#include #include #include #include @@ -187,7 +187,7 @@ class MainWidget : public RDWidget int air_stop_gpo_lines[RDAirPlayConf::LastChannel]; RDAirPlayConf::GpioType air_channel_gpio_types[RDAirPlayConf::LastChannel]; std::map air_channel_timers[2]; - RD3EmptyCart *air_empty_cart; + RDEmptyCart *air_empty_cart; RDCartDialog *air_cart_dialog; RDEventPlayer *air_event_player; RDHotKeyList *air_keylist; diff --git a/rdlogmanager/edit_event.cpp b/rdlogmanager/edit_event.cpp index f8b100b8..22c367de 100644 --- a/rdlogmanager/edit_event.cpp +++ b/rdlogmanager/edit_event.cpp @@ -147,7 +147,7 @@ EditEvent::EditEvent(QString eventname,bool new_event, // // 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); // diff --git a/rdlogmanager/edit_event.h b/rdlogmanager/edit_event.h index 1ae94dd7..bf70d631 100644 --- a/rdlogmanager/edit_event.h +++ b/rdlogmanager/edit_event.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include @@ -171,7 +171,7 @@ class EditEvent : public RDDialog std::vector *event_new_events; RDSimplePlayer *event_player; QTextEdit *event_remarks_edit; - RD3EmptyCart *event_empty_cart; + RDEmptyCart *event_empty_cart; }; diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index 2868fdf8..ea85aec9 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -256,7 +256,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent) // // Empty Cart // - panel_empty_cart=new RD3EmptyCart(this); + panel_empty_cart=new RDEmptyCart(this); panel_empty_cart->setGeometry(373,sizeHint().height()-52,32,32); if(!rda->station()->enableDragdrop()) { panel_empty_cart->hide(); diff --git a/rdpanel/rdpanel.h b/rdpanel/rdpanel.h index 68615018..29af98c9 100644 --- a/rdpanel/rdpanel.h +++ b/rdpanel/rdpanel.h @@ -21,7 +21,7 @@ #ifndef RDPANEL_H #define RDPANEL_H -#include +#include #include #include #include @@ -66,7 +66,7 @@ class MainWidget : public RDWidget QString panel_filter; QString panel_group; QString panel_schedcode; - RD3EmptyCart *panel_empty_cart; + RDEmptyCart *panel_empty_cart; };