From 11bda15b5ecb608686718a8180ff33ff37c673f3 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Tue, 2 Oct 2018 23:08:08 +0800 Subject: Fixed layout with Qt 5.11. Minor code cleanups in qmpchannelswindow. Documentation update. --- qmidiplayer-desktop/qmpchannelswindow.hpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'qmidiplayer-desktop/qmpchannelswindow.hpp') diff --git a/qmidiplayer-desktop/qmpchannelswindow.hpp b/qmidiplayer-desktop/qmpchannelswindow.hpp index 008598c..9ff0cd0 100644 --- a/qmidiplayer-desktop/qmpchannelswindow.hpp +++ b/qmidiplayer-desktop/qmpchannelswindow.hpp @@ -17,20 +17,6 @@ namespace Ui { class qmpChannelsWindow; } -class QDCLabel:public QLabel -{ - Q_OBJECT - private: - int id; - protected: - void mouseDoubleClickEvent(QMouseEvent *event){event->accept();emit onDoubleClick(id);} - public: - QDCLabel(QString s):QLabel(s){id=-1;} - void setID(int _id){id=_id;} - signals: - void onDoubleClick(int id); -}; - class QDCPushButton:public QPushButton { Q_OBJECT @@ -41,6 +27,7 @@ class QDCPushButton:public QPushButton public: QDCPushButton(QString s):QPushButton(s){id=-1;} void setID(int _id){id=_id;} + QSize sizeHint()const{return QSize();} signals: void onClick(int id); }; @@ -53,6 +40,8 @@ class QDCComboBox:public QComboBox public: QDCComboBox():QComboBox(){id=-1;connect(this,SIGNAL(currentIndexChanged(int)),this,SLOT(indexChangedSlot(int)));} void setID(int _id){id=_id;} + QSize sizeHint()const{return QSize();} + QSize minimumSizeHint()const{return QSize();} signals: void onChange(int id,int idx); public slots: @@ -95,7 +84,7 @@ class qmpChannelsWindow:public QWidget void channelWindowsUpdate(); void updateChannelActivity(); void channelMSChanged(); - void showPresetWindow(int chid); + void showPresetWindow(int chid,int col); void showChannelEditorWindow(int chid); void changeMidiMapping(int chid,int idx); void on_pbUnmute_clicked(); -- cgit v1.2.3