renamed GeneralHandler

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2260 90c681e8-e032-0410-971d-27865f9a5e38

12 files changed, 33 insertions, 34 deletions

diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index 5b00b6078..528c6c18d 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,11 +21,10 @@
 #include <QAction>
 #include <QApplication>
 #include <QMessageBox>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/mediaplayer.h>
-#include <qmmpui/generalhandler.h>
 #include <qmmpui/metadataformatter.h>
 #include <qmmp/metadatamanager.h>
 #include "coverwidget.h"
@@ -35,7 +34,7 @@ CoverManager::CoverManager(QObject *parent) : General(parent)
 {
     m_action = new QAction(tr("Show Cover"), this);
     m_action->setShortcut(tr("Ctrl+M"));
-    GeneralHandler::instance()->addAction(m_action, GeneralHandler::PLAYLIST_MENU);
+    UiHelper::instance()->addAction(m_action, UiHelper::PLAYLIST_MENU);
     connect (m_action, SIGNAL(triggered ()), SLOT(showWindow()));
 }
 
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 1bea2038a..e661b646c 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2010 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2011 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -27,7 +27,7 @@
 #include <QFile>
 #include <QDir>
 #include <qmmp/soundcore.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
@@ -51,7 +51,7 @@ FileOps::FileOps(QObject *parent)
     settings.beginGroup("FileOps");
     int count = settings.value("count", 0).toInt();
     if (count > 0)
-        GeneralHandler::instance()->addAction(separator1, GeneralHandler::PLAYLIST_MENU);
+        UiHelper::instance()->addAction(separator1, UiHelper::PLAYLIST_MENU);
     else
         return;
 
@@ -68,12 +68,12 @@ FileOps::FileOps(QObject *parent)
             action->setShortcut(settings.value(QString("hotkey_%1").arg(i)).toString());
             connect (action, SIGNAL (triggered (bool)), mapper, SLOT (map()));
             mapper->setMapping(action, i);
-            GeneralHandler::instance()->addAction(action, GeneralHandler::PLAYLIST_MENU);
+            UiHelper::instance()->addAction(action, UiHelper::PLAYLIST_MENU);
         }
     }
     settings.endGroup();
     connect(mapper, SIGNAL(mapped(int)), SLOT(execAction(int)));
-    GeneralHandler::instance()->addAction(separator2, GeneralHandler::PLAYLIST_MENU);
+    UiHelper::instance()->addAction(separator2, UiHelper::PLAYLIST_MENU);
 }
 
 FileOps::~FileOps()
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 7d17b037d..c500ae2b4 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -22,7 +22,7 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QStyle>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/mediaplayer.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
@@ -181,7 +181,7 @@ void HalPlugin::updateActions()
                 action->setIcon(qApp->style()->standardIcon(QStyle::SP_DriveHDIcon));
 
             m_actions->addAction(action);
-            GeneralHandler::instance()->addAction(action, GeneralHandler::TOOLS_MENU);
+            UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU);
             addPath(dev_path);
         }
     }
@@ -191,7 +191,7 @@ void HalPlugin::updateActions()
         if (!findDevice(action))
         {
             m_actions->removeAction(action);
-            GeneralHandler::instance()->removeAction(action);
+            UiHelper::instance()->removeAction(action);
             removePath(action->data().toString());
             action->deleteLater();
         }
diff --git a/src/plugins/General/hotkey/hotkeymanager.cpp b/src/plugins/General/hotkey/hotkeymanager.cpp
index 9eddce3a0..6a6b3b685 100644
--- a/src/plugins/General/hotkey/hotkeymanager.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager.cpp
@@ -45,7 +45,7 @@ extern "C"
 #include <qmmp/qmmp.h>
 #include <qmmp/soundcore.h>
 #include <qmmpui/mediaplayer.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include "hotkeymanager.h"
 
 quint32 Hotkey::defaultKey()
@@ -165,7 +165,7 @@ bool HotkeyManager::eventFilter(QObject* o, QEvent* e)
                 MediaPlayer::instance()->previous();
                 break;
             case Hotkey::SHOW_HIDE:
-                GeneralHandler::instance()->toggleVisibility();
+                UiHelper::instance()->toggleVisibility();
                 break;
             case Hotkey::VOLUME_UP:
             case Hotkey::VOLUME_DOWN:
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index 779f19cf1..e3fe003c3 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -22,7 +22,7 @@
 #include <QApplication>
 
 #include <qmmp/soundcore.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/mediaplayer.h>
@@ -34,7 +34,7 @@ Lyrics::Lyrics(QObject *parent)
 {
     m_action = new QAction(tr("View Lyrics"), this);
     m_action->setShortcut(tr("Ctrl+L"));
-    GeneralHandler::instance()->addAction(m_action, GeneralHandler::PLAYLIST_MENU);
+    UiHelper::instance()->addAction(m_action, UiHelper::PLAYLIST_MENU);
     connect (m_action, SIGNAL(triggered ()), SLOT(showLyrics()));
 }
 
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 8311f7137..28b765e19 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -30,7 +30,7 @@
 
 #include <qmmp/soundcore.h>
 #include <qmmpui/mediaplayer.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 
 #include "qmmptrayicon.h"
 #include "statusicon.h"
@@ -130,7 +130,7 @@ void StatusIcon::showMetaData()
 void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason)
 {
     if (reason == QSystemTrayIcon::Trigger)
-        GeneralHandler::instance()->toggleVisibility();
+        UiHelper::instance()->toggleVisibility();
     else if (reason == QSystemTrayIcon::MiddleClick)
     {
         if (SoundCore::instance()->state() == Qmmp::Stopped)
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index 471d64a41..57b54eb9d 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -22,7 +22,7 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QStyle>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/mediaplayer.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
@@ -174,7 +174,7 @@ void UDisksPlugin::updateActions()
             action->setText(actionText);
             action->setData(dev_path);
             m_actions->addAction(action);
-            GeneralHandler::instance()->addAction(action, GeneralHandler::TOOLS_MENU);
+            UiHelper::instance()->addAction(action, UiHelper::TOOLS_MENU);
             addPath(dev_path);
         }
     }
@@ -184,7 +184,7 @@ void UDisksPlugin::updateActions()
         if (!findDevice(action))
         {
             m_actions->removeAction(action);
-            GeneralHandler::instance()->removeAction(action);
+            UiHelper::instance()->removeAction(action);
             removePath(action->data().toString());
             action->deleteLater();
         }
diff --git a/src/plugins/Ui/skinned/configdialog.cpp b/src/plugins/Ui/skinned/configdialog.cpp
index 26a71e38d..94e32b0f2 100644
--- a/src/plugins/Ui/skinned/configdialog.cpp
+++ b/src/plugins/Ui/skinned/configdialog.cpp
@@ -41,7 +41,7 @@
 #include <qmmp/inputsourcefactory.h>
 #include <qmmpui/generalfactory.h>
 #include <qmmpui/general.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/filedialog.h>
 #include <qmmpui/mediaplayer.h>
 #include <qmmpui/playlistmodel.h>
@@ -158,8 +158,8 @@ void ConfigDialog::on_contentsWidget_currentItemChanged (QListWidgetItem *curren
     if (!current)
         current = previous;
     ui.stackedWidget->setCurrentIndex (ui.contentsWidget->row (current));
-    ui.hiddenCheckBox->setEnabled(GeneralHandler::instance()->visibilityControl());
-    ui.hideOnCloseCheckBox->setEnabled(GeneralHandler::instance()->visibilityControl());
+    ui.hiddenCheckBox->setEnabled(UiHelper::instance()->visibilityControl());
+    ui.hideOnCloseCheckBox->setEnabled(UiHelper::instance()->visibilityControl());
 }
 
 void ConfigDialog::changeSkin()
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 972cf967e..5e54fc1a1 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -26,7 +26,7 @@
 #include <qmmp/soundcore.h>
 #include <qmmp/visual.h>
 #include <qmmp/metadatamanager.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmpui/general.h>
 #include <qmmpui/playlistparser.h>
 #include <qmmpui/playlistformat.h>
@@ -72,7 +72,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     m_pl_manager = PlayListManager::instance();
     //additional featuries
     //new PlaylistParser(this);
-    m_generalHandler = GeneralHandler::instance();
+    m_generalHandler = UiHelper::instance();
 
     //user interface
     m_skin = new Skin(this);
@@ -434,7 +434,7 @@ void MainWindow::createActions()
 
     m_visMenu = new VisualMenu(this);
     m_mainMenu->addMenu(m_visMenu);
-    m_mainMenu->addMenu(m_generalHandler->createMenu(GeneralHandler::TOOLS_MENU, tr("Tools"), this));
+    m_mainMenu->addMenu(m_generalHandler->createMenu(UiHelper::TOOLS_MENU, tr("Tools"), this));
     m_mainMenu->addSeparator();
     m_mainMenu->addAction(SET_ACTION(ActionManager::SETTINGS, this, SLOT(showSettings())));
     m_mainMenu->addSeparator();
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index 542b154a9..4fa4656c4 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -37,7 +37,7 @@ class Skin;
 class SoundCore;
 class JumpToTrackDialog;
 class VisualMenu;
-class GeneralHandler;
+class UiHelper;
 class MediaPlayer;
 class QMenu;
 class QKeyEvent;
@@ -112,7 +112,7 @@ private:
     JumpToTrackDialog* m_jumpDialog;
     bool m_hideOnClose, m_startHidden;
     VisualMenu *m_visMenu;
-    GeneralHandler *m_generalHandler;
+    UiHelper *m_generalHandler;
     MediaPlayer *m_player;
 };
 
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 75a6110ea..de9fa38a8 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -28,7 +28,7 @@
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/playlistmodel.h>
 #include <qmmpui/playlistmanager.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 #include <qmmp/soundcore.h>
 #include "dock.h"
 #include "skin.h"
@@ -279,7 +279,7 @@ void PlayList::createActions()
     m_listWidget->menu()->addAction(ActionManager::instance()->action(ActionManager::PL_SHOW_INFO));
     m_listWidget->menu()->addSeparator();
     m_listWidget->menu()->addActions (m_subMenu->actions().mid(0,3)); //use 3 first actions
-    m_listWidget->menu()->addMenu(GeneralHandler::instance()->createMenu(GeneralHandler::PLAYLIST_MENU,
+    m_listWidget->menu()->addMenu(UiHelper::instance()->createMenu(UiHelper::PLAYLIST_MENU,
                                   tr("Actions"), this));
     m_listWidget->menu()->addSeparator();
     m_listWidget->menu()->addAction(SET_ACTION(ActionManager::PL_ENQUEUE, m_pl_manager, SLOT(addToQueue())));
diff --git a/src/plugins/Ui/skinned/pluginitem.cpp b/src/plugins/Ui/skinned/pluginitem.cpp
index 0f0fa1f58..0f2679bb0 100644
--- a/src/plugins/Ui/skinned/pluginitem.cpp
+++ b/src/plugins/Ui/skinned/pluginitem.cpp
@@ -32,7 +32,7 @@
 #include <qmmp/abstractengine.h>
 #include <qmmpui/generalfactory.h>
 #include <qmmpui/general.h>
-#include <qmmpui/generalhandler.h>
+#include <qmmpui/uihelper.h>
 
 #include "pluginitem.h"
 
@@ -153,7 +153,7 @@ void PluginItem::showSettings(QWidget *parent)
         Visual::showSettings(static_cast<VisualFactory *>(m_factory), parent);
         break;
     case PluginItem::GENERAL:
-        GeneralHandler::instance()->showSettings(static_cast<GeneralFactory *>(m_factory), parent);
+        UiHelper::instance()->showSettings(static_cast<GeneralFactory *>(m_factory), parent);
         break;
     default:
         ;
@@ -180,7 +180,7 @@ void PluginItem::setEnabled(bool enabled)
         Visual::setEnabled(static_cast<VisualFactory *>(m_factory), enabled);
         break;
     case PluginItem::GENERAL:
-        GeneralHandler::instance()->setEnabled(static_cast<GeneralFactory *>(m_factory), enabled);
+        UiHelper::instance()->setEnabled(static_cast<GeneralFactory *>(m_factory), enabled);
         break;
     default:
         ;