aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-03-22 12:59:34 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-03-22 12:59:34 +0000
commit06bdda5257f02147281986914360dd3a8f706cbd (patch)
tree56571af9f08326d85376e4a8a4d985bd86d260db /src
parentc06ecb1cccf9b6bbfaa0a56403e8926ba974db1f (diff)
downloadqmmp-06bdda5257f02147281986914360dd3a8f706cbd.tar.gz
qmmp-06bdda5257f02147281986914360dd3a8f706cbd.tar.bz2
qmmp-06bdda5257f02147281986914360dd3a8f706cbd.zip
some hotkey fixes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@866 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/ui/eqwidget.cpp11
-rw-r--r--src/ui/eqwidget.h1
-rw-r--r--src/ui/playlist.cpp7
3 files changed, 14 insertions, 5 deletions
diff --git a/src/ui/eqwidget.cpp b/src/ui/eqwidget.cpp
index bc9f96467..efcef55db 100644
--- a/src/ui/eqwidget.cpp
+++ b/src/ui/eqwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2006-2008 by Ilya Kotov *
+ * Copyright (C) 2006-2009 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -396,7 +396,6 @@ void EqWidget::importWinampEQF()
file.read (header, 31);
if (QString::fromAscii(header).contains("Winamp EQ library file v1.1"))
{
-
while (file.read (name, 257))
{
EQPreset* preset = new EQPreset;
@@ -411,8 +410,14 @@ void EqWidget::importWinampEQF()
preset->setPreamp(20 - bands[10]*40/64);
m_presets.append(preset);
}
-
}
file.close();
}
+
+void EqWidget::keyPressEvent (QKeyEvent *ke)
+{
+ QKeyEvent event = QKeyEvent(ke->type(), ke->key(),
+ ke->modifiers(), ke->text(),ke->isAutoRepeat(), ke->count());
+ QApplication::sendEvent(qobject_cast<MainWindow*>(parent())->playlist(), &event);
+}
diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h
index da79c3073..4d37d11f1 100644
--- a/src/ui/eqwidget.h
+++ b/src/ui/eqwidget.h
@@ -76,6 +76,7 @@ private:
void writeSettings();
void createActions();
EQPreset *findPreset(const QString &name);
+ virtual void keyPressEvent (QKeyEvent *);
Skin *m_skin;
EqTitleBar *m_titleBar;
EqSlider *m_preamp;
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index b9369d2e3..a3c9e576e 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -264,10 +264,11 @@ void PlayList::createActions()
QAction *selAllAct = new QAction (tr ("&Select All"),this);
selAllAct->setShortcut (tr ("Ctrl+A"));
+ m_actions << selAllAct;
m_selectMenu->addAction (selAllAct);
connect (selAllAct, SIGNAL (triggered()),
m_playListModel, SLOT (selectAll ()));
- this->addAction (selAllAct);
+ //this->addAction (selAllAct);
// Playlist Menu
QAction *newListAct = new QAction (tr ("&New List"),this);
@@ -279,14 +280,16 @@ void PlayList::createActions()
QAction *loadListAct = new QAction (tr ("&Load List"),this);
loadListAct->setShortcut (tr ("O"));
+ m_actions << loadListAct;
m_playlistMenu->addAction (loadListAct);
connect (loadListAct, SIGNAL (triggered()), this, SIGNAL (loadPlaylist()));
QAction *saveListAct = new QAction (tr ("&Save List"),this);
saveListAct->setShortcut (tr ("Shift+S"));
+ m_actions << saveListAct;
m_playlistMenu->addAction (saveListAct);
connect (saveListAct, SIGNAL (triggered()), this, SIGNAL (savePlaylist()));
- this->addActions (m_playlistMenu->actions());
+ //this->addActions (m_playlistMenu->actions());
Dock::getPointer()->addActions (m_actions);
}