diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-03-04 11:40:07 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-03-04 11:40:07 +0000 |
| commit | 1484a13bf2f2398236d51f33bb8311db9b9920c5 (patch) | |
| tree | 5644efc460ef00790b83e52148e49a1cd32adc30 /src/plugins/Ui/skinned | |
| parent | c3972ebea91d079c1effd76788143011841d9e46 (diff) | |
| download | qmmp-1484a13bf2f2398236d51f33bb8311db9b9920c5.tar.gz qmmp-1484a13bf2f2398236d51f33bb8311db9b9920c5.tar.bz2 qmmp-1484a13bf2f2398236d51f33bb8311db9b9920c5.zip | |
fixed 'eject' button function
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4118 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui/skinned')
| -rw-r--r-- | src/plugins/Ui/skinned/display.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/mainwindow.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/mainwindow.h | 3 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/titlebar.cpp | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp index e72bf75d7..a91f62af9 100644 --- a/src/plugins/Ui/skinned/display.cpp +++ b/src/plugins/Ui/skinned/display.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -71,8 +71,8 @@ MainDisplay::MainDisplay (MainWindow *parent) m_next->setToolTip(tr("Next")); connect (m_next,SIGNAL (clicked()),parent,SLOT (next())); m_eject = new Button (this, Skin::BT_EJECT_N,Skin::BT_EJECT_P, Skin::CUR_NORMAL); - m_eject->setToolTip(tr("Add file")); - connect (m_eject,SIGNAL (clicked()),parent,SLOT (addFile())); + m_eject->setToolTip(tr("Play files")); + connect (m_eject,SIGNAL (clicked()),parent, SLOT(playFiles())); connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin())); m_vis = new MainVisual (this); diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp index 0ef4c1053..374c7558e 100644 --- a/src/plugins/Ui/skinned/mainwindow.cpp +++ b/src/plugins/Ui/skinned/mainwindow.cpp @@ -97,7 +97,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) connect (m_playlist,SIGNAL(play()),SLOT(play())); connect (m_playlist,SIGNAL(pause()), m_core ,SLOT(pause())); connect (m_playlist,SIGNAL(stop()),SLOT(stop())); - connect (m_playlist,SIGNAL(eject()),SLOT(addFile())); + connect (m_playlist,SIGNAL(eject()),SLOT(playFiles())); connect (m_playlist,SIGNAL(loadPlaylist()),SLOT(loadPlaylist())); connect (m_playlist,SIGNAL(savePlaylist()),SLOT(savePlaylist())); @@ -212,6 +212,11 @@ void MainWindow::addFile() m_uiHelper->addFile(this); } +void MainWindow::playFiles() +{ + m_uiHelper->playFiles(this); +} + void MainWindow::changeEvent (QEvent * event) { if (event->type() == QEvent::ActivationChange) diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h index 95b42f2da..da5e704f1 100644 --- a/src/plugins/Ui/skinned/mainwindow.h +++ b/src/plugins/Ui/skinned/mainwindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -72,6 +72,7 @@ public slots: void addDir(); void addFile(); + void playFiles(); void addUrl(); void loadPlaylist(); diff --git a/src/plugins/Ui/skinned/titlebar.cpp b/src/plugins/Ui/skinned/titlebar.cpp index a1c24435b..2cb0a9365 100644 --- a/src/plugins/Ui/skinned/titlebar.cpp +++ b/src/plugins/Ui/skinned/titlebar.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2009 by Ilya Kotov * + * Copyright (C) 2007-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -168,7 +168,7 @@ void TitleBar::shade() connect (m_control, SIGNAL (playClicked()), m_mw, SLOT (play())); connect (m_control, SIGNAL (pauseClicked()), m_mw, SLOT (pause())); connect (m_control, SIGNAL (stopClicked()), m_mw, SLOT (stop())); - connect (m_control, SIGNAL (ejectClicked()), m_mw, SLOT (addFile())); + connect (m_control, SIGNAL (ejectClicked()), m_mw, SLOT (playFiles())); m_visual = new ShadedVisual(this); Visual::add(m_visual); m_visual->show(); |