From f47fcc22ac3f91dec7824c011b3f23d1e8279507 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sun, 14 Dec 2008 13:55:02 +0000
Subject: mediplayer class, enabled all statusicon actions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@681 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/statusicon/statusicon.cpp             | 10 ++++++----
 src/plugins/General/statusicon/statusicon.h               |  2 ++
 .../statusicon/translations/statusicon_plugin_cs.ts       | 14 +++++++-------
 .../statusicon/translations/statusicon_plugin_de.ts       | 15 +++++++--------
 .../statusicon/translations/statusicon_plugin_ru.ts       | 15 +++++++--------
 .../statusicon/translations/statusicon_plugin_uk_UA.ts    | 15 +++++++--------
 .../statusicon/translations/statusicon_plugin_zh_CN.ts    | 14 +++++++-------
 .../statusicon/translations/statusicon_plugin_zh_TW.ts    | 14 +++++++-------
 8 files changed, 50 insertions(+), 49 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 1b2ee4bfb..8e4f05b51 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -27,6 +27,7 @@
 #include <QEvent>
 
 #include <qmmp/soundcore.h>
+#include <qmmpui/mediaplayer.h>
 
 #include "qmmptrayicon.h"
 #include "statusicon.h"
@@ -39,12 +40,13 @@ StatusIcon::StatusIcon(QObject *parent)
     m_tray->setIcon ( QIcon(":/tray_stop.png"));
     m_tray->show();
     m_core = SoundCore::instance();
+    m_player = MediaPlayer::instance();
     QMenu *menu = new QMenu(qobject_cast<QWidget *>(parent));
-    menu->addAction(tr("Play"), this, SLOT(play()));
+    menu->addAction(tr("Play"), m_player, SLOT(play()));
     menu->addAction(tr("Pause"), m_core, SLOT(pause()));
     menu->addAction(tr("Stop"), m_core, SLOT(stop()));
-    /*menu->addAction(tr("Next"), control, SLOT(next()));
-    menu->addAction(tr("Previous"), control, SLOT(previous()));*/
+    menu->addAction(tr("Next"), m_player, SLOT(next()));
+    menu->addAction(tr("Previous"), m_player, SLOT(previous()));
     menu->addSeparator();
     menu->addAction(tr("Exit"), this, SLOT(exit()));
     m_tray->setContextMenu(menu);
@@ -112,7 +114,7 @@ void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason)
     else if (reason == QSystemTrayIcon::MiddleClick)
     {
         if (SoundCore::instance()->state() == Qmmp::Stopped)
-            play();
+            m_player->play();
         else
             m_core->pause();
     }
diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h
index 67fae06e6..42978d592 100644
--- a/src/plugins/General/statusicon/statusicon.h
+++ b/src/plugins/General/statusicon/statusicon.h
@@ -27,6 +27,7 @@
 #include <qmmp/qmmp.h>
 
 class SoundCore;
+class MediaPlayer;
 class QEvent;
 
 /**
@@ -55,6 +56,7 @@ private:
     bool m_enabled;
     int m_messageDelay;
     SoundCore *m_core;
+    MediaPlayer *m_player;
 };
 
 #endif
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts
index c18335ed6..11082ac76 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_cs.ts
@@ -36,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>Další</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>Předchozí</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>Ukončit</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>Nyní hraje</translation>
     </message>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts
index e2eb485a9..f7dffe7b6 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_de.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
-<defaultcodec></defaultcodec>
 <context>
     <name>SettingsDialog</name>
     <message>
@@ -37,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>Wiedergeben</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>Anhalten</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>Nächster</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>Vorheriger</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>Aktueller Titel</translation>
     </message>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
index 94631a52c..6e292344c 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_ru.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="ru">
-<defaultcodec></defaultcodec>
 <context>
     <name>SettingsDialog</name>
     <message>
@@ -37,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>Следующий фрагмент</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>Предыдущий фрагмент</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>Сейчас играет</translation>
     </message>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts
index f96bc7df6..99fe033e8 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_uk_UA.ts
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="uk">
-<defaultcodec></defaultcodec>
 <context>
     <name>SettingsDialog</name>
     <message>
@@ -37,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>Грати</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>Вперед</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>Назад</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>Вихід</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>Зараз грає</translation>
     </message>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts
index 1c0041ed7..f583cfa25 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_CN.ts
@@ -36,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>暂停</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>下一曲</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>上一曲</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>正在播放</translation>
     </message>
diff --git a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts
index 11795bf1c..b0075fbea 100644
--- a/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts
+++ b/src/plugins/General/statusicon/translations/statusicon_plugin_zh_TW.ts
@@ -36,37 +36,37 @@
 <context>
     <name>StatusIcon</name>
     <message>
-        <location filename="../statusicon.cpp" line="39"/>
+        <location filename="../statusicon.cpp" line="45"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="40"/>
+        <location filename="../statusicon.cpp" line="46"/>
         <source>Pause</source>
         <translation>暫停</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="41"/>
+        <location filename="../statusicon.cpp" line="47"/>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="42"/>
+        <location filename="../statusicon.cpp" line="48"/>
         <source>Next</source>
         <translation>下一曲</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="43"/>
+        <location filename="../statusicon.cpp" line="49"/>
         <source>Previous</source>
         <translation>上一曲</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="45"/>
+        <location filename="../statusicon.cpp" line="51"/>
         <source>Exit</source>
         <translation>結束</translation>
     </message>
     <message>
-        <location filename="../statusicon.cpp" line="96"/>
+        <location filename="../statusicon.cpp" line="104"/>
         <source>Now Playing</source>
         <translation>正在播放</translation>
     </message>
-- 
cgit v1.2.3-13-gbd6f