aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/General')
-rw-r--r--src/plugins/General/covermanager/covermanager.cpp7
-rw-r--r--src/plugins/General/fileops/fileops.cpp10
-rw-r--r--src/plugins/General/hal/halplugin.cpp6
-rw-r--r--src/plugins/General/hotkey/hotkeymanager.cpp4
-rw-r--r--src/plugins/General/lyrics/lyrics.cpp4
-rw-r--r--src/plugins/General/statusicon/statusicon.cpp4
-rw-r--r--src/plugins/General/udisks/udisksplugin.cpp6
7 files changed, 20 insertions, 21 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();
}
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 15:44:43 +0000