diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-07-02 11:58:53 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2011-07-02 11:58:53 +0000 |
| commit | 1763b5effcfba6dd51f805c5948c9108f7c97348 (patch) | |
| tree | f617f836ed835bb11f6a81675a2513956bc624e5 /src/plugins/General | |
| parent | 87208d0c0953b953136b22e3d4f342984f0c138a (diff) | |
| download | qmmp-1763b5effcfba6dd51f805c5948c9108f7c97348.tar.gz qmmp-1763b5effcfba6dd51f805c5948c9108f7c97348.tar.bz2 qmmp-1763b5effcfba6dd51f805c5948c9108f7c97348.zip | |
fixed command line option, removed unused code
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2259 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General')
| -rw-r--r-- | src/plugins/General/hotkey/hotkeymanager.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/General/statusicon/statusicon.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/General/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp index c21431cea..9eddce3a0 100644 --- a/src/plugins/General/hotkey/hotkeymanager.cpp +++ b/src/plugins/General/hotkey/hotkeymanager.cpp @@ -45,6 +45,7 @@ extern "C" #include <qmmp/qmmp.h> #include <qmmp/soundcore.h> #include <qmmpui/mediaplayer.h> +#include <qmmpui/generalhandler.h> #include "hotkeymanager.h" quint32 Hotkey::defaultKey() @@ -164,7 +165,7 @@ bool HotkeyManager::eventFilter(QObject* o, QEvent* e) MediaPlayer::instance()->previous(); break; case Hotkey::SHOW_HIDE: - toggleVisibility(); + GeneralHandler::instance()->toggleVisibility(); break; case Hotkey::VOLUME_UP: case Hotkey::VOLUME_DOWN: diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp index 78302ecd1..8311f7137 100644 --- a/src/plugins/General/statusicon/statusicon.cpp +++ b/src/plugins/General/statusicon/statusicon.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2010 by Ilya Kotov * + * Copyright (C) 2008-2011 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -30,6 +30,7 @@ #include <qmmp/soundcore.h> #include <qmmpui/mediaplayer.h> +#include <qmmpui/generalhandler.h> #include "qmmptrayicon.h" #include "statusicon.h" @@ -129,7 +130,7 @@ void StatusIcon::showMetaData() void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason) { if (reason == QSystemTrayIcon::Trigger) - toggleVisibility(); + GeneralHandler::instance()->toggleVisibility(); else if (reason == QSystemTrayIcon::MiddleClick) { if (SoundCore::instance()->state() == Qmmp::Stopped) |