diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-03-19 20:36:22 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-03-19 20:36:22 +0000 |
| commit | bfe01d737226a5034010bc3db19b99c46d062387 (patch) | |
| tree | 4bd14e119bdc0c7e744c9ada593244bbe47145e4 /src/ui | |
| parent | 1ed6c3a1639d2b3b7bab15bbe6b31a7c81f5ad9e (diff) | |
| download | qmmp-bfe01d737226a5034010bc3db19b99c46d062387.tar.gz qmmp-bfe01d737226a5034010bc3db19b99c46d062387.tar.bz2 qmmp-bfe01d737226a5034010bc3db19b99c46d062387.zip | |
added 'about' button
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1633 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/display.cpp | 7 | ||||
| -rw-r--r-- | src/ui/display.h | 3 | ||||
| -rw-r--r-- | src/ui/mainwindow.h | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/ui/display.cpp b/src/ui/display.cpp index 641857a38..e86f873ad 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -105,7 +105,7 @@ MainDisplay::MainDisplay (QWidget *parent) connect(m_balanceBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume())); m_balanceBar->setToolTip(tr("Balance")); m_timeIndicator = new TimeIndicator(this); - + m_aboutWidget = new QWidget(this); m_core = SoundCore::instance(); connect(m_core, SIGNAL(elapsedChanged(qint64)), SLOT(setTime(qint64))); connect(m_core, SIGNAL(bitrateChanged(int)), m_kbps, SLOT(display(int))); @@ -153,6 +153,7 @@ void MainDisplay::updatePositions() m_volumeBar->move(r*107, r*57); m_balanceBar->move(r*177, r*57); m_timeIndicator->move(r*34, r*26); + m_aboutWidget->setGeometry(r*247,r*83,r*20,r*25); } void MainDisplay::setTime (qint64 t) @@ -295,9 +296,9 @@ void MainDisplay::setIsShuffle(bool yes) void MainDisplay::mousePressEvent(QMouseEvent *e) { if (e->button() == Qt::RightButton) - { m_mw->menu()->exec(e->globalPos()); - } + else if(e->button() == Qt::LeftButton && m_aboutWidget->underMouse()) + m_mw->about(); PixmapWidget::mousePressEvent(e); } diff --git a/src/ui/display.h b/src/ui/display.h index 7f1541081..67c472048 100644 --- a/src/ui/display.h +++ b/src/ui/display.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Ilya Kotov * + * Copyright (C) 2006-2010 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -113,6 +113,7 @@ private: TimeIndicator* m_timeIndicator; TitleBar *m_titlebar; SoundCore *m_core; + QWidget *m_aboutWidget; }; #endif diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 0fefc57b2..dd3bd2beb 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -81,8 +81,8 @@ public slots: void loadPlaylist(); void savePlaylist(); - void setFileList(const QStringList&); + void about(); protected: virtual void closeEvent (QCloseEvent *); @@ -96,7 +96,6 @@ private slots: void updateEQ(); void forward(); void backward(); - void about(); void handleCloseRequest(); private: |
