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

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2019-01-25 08:52:02 -08:00
commit 18fc166128
6 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18420,3 +18420,5 @@
2019-01-25 Patrick Linstruth <patrick@deltecent.com> 2019-01-25 Patrick Linstruth <patrick@deltecent.com>
* Reduced size of PyPAD edit window in rdadmin(1) to match * Reduced size of PyPAD edit window in rdadmin(1) to match
rdairplay(1). rdairplay(1).
2019-01-25 Patrick Linstruth <patrick@deltecent.com>
* Fixed regression with RDTransportButton taking focus from lists.

1
lib/rdtransportbutton.cpp
View File

@ -41,6 +41,7 @@ RDTransportButton::RDTransportButton(RDTransportButton::TransType type,
off_cap=new QPixmap(); off_cap=new QPixmap();
drawOffCap(); drawOffCap();
setPixmap(*off_cap); setPixmap(*off_cap);
setFocusPolicy(Qt::NoFocus);
flash_timer=new QTimer(this,"flash_timer"); flash_timer=new QTimer(this,"flash_timer");
connect(flash_timer,SIGNAL(timeout()),this,SLOT(flashClock())); connect(flash_timer,SIGNAL(timeout()),this,SLOT(flashClock()));

10
rdlogmanager/import_listview.cpp
View File

@ -472,16 +472,6 @@ void ImportListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
} }
void ImportListView::focusOutEvent(QFocusEvent *e)
{
Q3ListViewItem *item=selectedItem();
if(item==NULL) {
return;
}
setSelected(item,false);
}
void ImportListView::dragEnterEvent(QDragEnterEvent *e) void ImportListView::dragEnterEvent(QDragEnterEvent *e)
{ {
e->accept(RDCartDrag::canDecode(e)); e->accept(RDCartDrag::canDecode(e));

1
rdlogmanager/import_listview.h
View File

@ -61,7 +61,6 @@ class ImportListView : public Q3ListView
protected: protected:
void contentsMousePressEvent(QMouseEvent *e); void contentsMousePressEvent(QMouseEvent *e);
void contentsMouseDoubleClickEvent(QMouseEvent *e); void contentsMouseDoubleClickEvent(QMouseEvent *e);
void focusOutEvent(QFocusEvent *e);
void dragEnterEvent(QDragEnterEvent *e); void dragEnterEvent(QDragEnterEvent *e);
void dropEvent(QDropEvent *e); void dropEvent(QDropEvent *e);

10
rdlogmanager/lib_listview.cpp
View File

@ -29,16 +29,6 @@ LibListView::LibListView(QWidget *parent)
} }
void LibListView::focusOutEvent(QFocusEvent *e)
{
Q3ListViewItem *item=selectedItem();
if(item==NULL) {
return;
}
setSelected(item,false);
}
void LibListView::contentsMousePressEvent(QMouseEvent *e) void LibListView::contentsMousePressEvent(QMouseEvent *e)
{ {
Q3ListView::contentsMousePressEvent(e); Q3ListView::contentsMousePressEvent(e);

1
rdlogmanager/lib_listview.h
View File

@ -37,7 +37,6 @@ class LibListView : public Q3ListView
LibListView(QWidget *parent); LibListView(QWidget *parent);
protected: protected:
void focusOutEvent(QFocusEvent *e);
void contentsMousePressEvent(QMouseEvent *e); void contentsMousePressEvent(QMouseEvent *e);
}; };