From 7457599cb1bbf1d28b4b29bc12d07801b37ad410 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 21 Apr 2016 22:11:04 +0800 Subject: Minor UI changes. --- ChangeLog | 4 + qmidiplayer-desktop/qmpinfowindow.hpp | 18 + qmidiplayer-desktop/qmpinfowindow.ui | 23 +- qmidiplayer-desktop/qmpmainwindow.ui | 701 +++++++++++++++++----------------- 4 files changed, 393 insertions(+), 353 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ae9c10..6f8dbb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-04-21 0.7.2 beta +Minor change to the main window. +Added "click to copy" to the file information window. + 2016-04-20 0.7.2 beta UI refinements: Use Qt layouts in most of the dialogs. diff --git a/qmidiplayer-desktop/qmpinfowindow.hpp b/qmidiplayer-desktop/qmpinfowindow.hpp index 9a1e389..a76b46b 100644 --- a/qmidiplayer-desktop/qmpinfowindow.hpp +++ b/qmidiplayer-desktop/qmpinfowindow.hpp @@ -2,11 +2,29 @@ #define QMPINFOWINDOW_HPP #include +#include +#include +#include +#include namespace Ui { class qmpInfoWindow; } +class QClickableLabel : public QLabel +{ + Q_OBJECT + public: + explicit QClickableLabel(QWidget *parent=0):QLabel(parent){} + protected: + void mousePressEvent(QMouseEvent *e) + { + QLabel::mousePressEvent(e); + if(e->buttons()&Qt::LeftButton) + QApplication::clipboard()->setText(text()); + } +}; + class qmpInfoWindow : public QDialog { Q_OBJECT diff --git a/qmidiplayer-desktop/qmpinfowindow.ui b/qmidiplayer-desktop/qmpinfowindow.ui index 664531a..cd76336 100644 --- a/qmidiplayer-desktop/qmpinfowindow.ui +++ b/qmidiplayer-desktop/qmpinfowindow.ui @@ -21,7 +21,7 @@ - + File name: @@ -30,21 +30,21 @@ - + Tempo: - + Key Sig.: - + Time Sig.: @@ -53,14 +53,14 @@ - + Title: - + Copyright: @@ -69,14 +69,14 @@ - + Note count: - + File standard: @@ -86,6 +86,13 @@ + + + QClickableLabel + QLabel +
qmpinfowindow.hpp
+
+
diff --git a/qmidiplayer-desktop/qmpmainwindow.ui b/qmidiplayer-desktop/qmpmainwindow.ui index e61c3d4..2a9a420 100644 --- a/qmidiplayer-desktop/qmpmainwindow.ui +++ b/qmidiplayer-desktop/qmpmainwindow.ui @@ -51,7 +51,7 @@ 0 0 - 451 + 441 241 @@ -61,6 +61,9 @@ + + 0 + @@ -81,7 +84,7 @@ somefile.mid - Qt::AlignBottom|Qt::AlignHCenter + Qt::AlignCenter @@ -93,7 +96,7 @@ - + 0 0 @@ -101,12 +104,57 @@ 00:00 + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + 0 + + + + + + 0 + 0 + + + + <html><head/><body><p>Poly</p></body></html> + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + 84 + 16777215 + + + + QFrame::NoFrame + + + 11 + + + QLCDNumber::Flat + + + + + - + 0 0 @@ -115,7 +163,7 @@ 00:00 - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing @@ -141,308 +189,312 @@
- - - 0 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 34 - - - - - - - - :/img/play.png:/img/play.png - - - - 32 - 32 - - - - + - - - - 0 - 34 - - - - - 16777215 - 34 - - - - - - - - :/img/stop.png:/img/stop.png - - - - 32 - 32 - - - + + + 0 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 34 + + + + + + + + :/img/play.png:/img/play.png + + + + 32 + 32 + + + + + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + + + + + :/img/stop.png:/img/stop.png + + + + 32 + 32 + + + + + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + + + + + :/img/prev.png:/img/prev.png + + + + 32 + 32 + + + + + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + + + + + :/img/next.png:/img/next.png + + + + 32 + 32 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 0 + 34 + + + + + 16777215 + 34 + + + + + + + + :/img/settings.png:/img/settings.png + + + + 32 + 32 + + + + true + + + + - - - - 0 - 34 - - - - - 16777215 - 34 - - - - - - - - :/img/prev.png:/img/prev.png - - - - 32 - 32 - - - - - - - - - 0 - 34 - - - - - 16777215 - 34 - - - - - - - - :/img/next.png:/img/next.png - - - - 32 - 32 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 32 - 32 - - - - - - - - - 0 - 0 - - - - - 0 - 34 - - - - - 16777215 - 34 - - - - - - - - :/img/settings.png:/img/settings.png - - - - 32 - 32 - - - - true - - - - - - - - - - - - 16777215 - 36 - - - - text-align:left - - - Channels - - - - :/img/channel.png:/img/channel.png - - - - 32 - 32 - - - - true - - - - - - - - 16777215 - 36 - - - - text-align:left - - - Playlist - - - - :/img/list.png:/img/list.png - - - - 32 - 32 - - - - true - - - false - - - false - - - - - - - - 16777215 - 36 - - - - text-align:left - - - Effects - - - - :/img/effects.png:/img/effects.png - - - - 32 - 32 - - - - true - - - - - - - - 16777215 - 36 - - - - text-align:left - - - Visualization - - - - :/img/visualization.png:/img/visualization.png - - - - 32 - 32 - - - + + + + + + 16777215 + 36 + + + + text-align:left + + + Channels + + + + :/img/channel.png:/img/channel.png + + + + 32 + 32 + + + + true + + + + + + + + 16777215 + 36 + + + + text-align:left + + + Playlist + + + + :/img/list.png:/img/list.png + + + + 32 + 32 + + + + true + + + false + + + false + + + + + + + + 16777215 + 36 + + + + text-align:left + + + Effects + + + + :/img/effects.png:/img/effects.png + + + + 32 + 32 + + + + true + + + + + + + + 16777215 + 36 + + + + text-align:left + + + Visualization + + + + :/img/visualization.png:/img/visualization.png + + + + 32 + 32 + + + + + @@ -456,47 +508,6 @@ 4 - - - - - 0 - 0 - - - - <html><head/><body><p>Poly</p></body></html> - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - - 0 - 0 - - - - - 84 - 16777215 - - - - QFrame::NoFrame - - - 11 - - - QLCDNumber::Flat - - - -- cgit v1.2.3