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

4 files changed, 5 insertions, 38 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)
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index cfb6bf927..972cf967e 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -49,7 +49,6 @@
 #include "visualmenu.h"
 #include "windowsystem.h"
 #include "actionmanager.h"
-//#include "builtincommandlineoption.h"
 
 #define KEY_OFFSET 10000
 
@@ -183,7 +182,6 @@ void MainWindow::previous()
 
 void MainWindow::showState(Qmmp::State state)
 {
-    disconnectPl();
     switch ((int) state)
     {
     case Qmmp::Playing:
@@ -525,26 +523,6 @@ void MainWindow::savePlaylist()
         qWarning("Error: There is no registered playlist parsers");
 }
 
-void MainWindow::setFileList(const QStringList &l, bool clear)
-{
-    m_pl_manager->activatePlayList(m_pl_manager->selectedPlayList());
-    if(!clear)
-    {
-        m_pl_manager->selectedPlayList()->add(l);
-        return;
-    }
-    if (m_core->state() != Qmmp::Stopped)
-    {
-        stop();
-        qApp->processEvents(); //receive stop signal
-    }
-    m_model = m_pl_manager->selectedPlayList();
-    m_model->clear();
-    connect(m_model, SIGNAL(itemAdded(PlayListItem*)), SLOT(play()));
-    connect(m_model, SIGNAL(loaderFinished()), SLOT(disconnectPl()));
-    m_model->add(l);
-}
-
 void MainWindow::playPause()
 {
     if (m_core->state() == Qmmp::Playing)
@@ -570,16 +548,6 @@ void MainWindow::handleCloseRequest()
         QApplication::closeAllWindows();
 }
 
-void MainWindow::disconnectPl()
-{
-    if(m_model)
-    {
-        disconnect(m_model, SIGNAL(itemAdded(PlayListItem*)), this, SLOT(play()));
-        disconnect(m_model, SIGNAL(loaderFinished()), this, SLOT(disconnectPl()));
-        m_model = 0;
-    }
-}
-
 void MainWindow::addUrl()
 {
     AddUrlDialog::popup(this, m_pl_manager->selectedPlayList());
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index 0069ecafb..542b154a9 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -77,9 +77,7 @@ public slots:
 
     void loadPlaylist();
     void savePlaylist();
-    void setFileList(const QStringList&, bool clear = true);
     void about();
-
     void updateSettings();
 
 protected:
@@ -94,7 +92,6 @@ private slots:
     void forward();
     void backward();
     void handleCloseRequest();
-    void disconnectPl();
 
 private:
     void readSettings();