[quarkplayer] r1424 committed - Refactoring: use IMainWindow/MockMainWindow
quark...@googlecode.com
Author: tkrotoff
Date: Sun Feb 20 17:34:30 2011
Log: Refactoring: use IMainWindow/MockMainWindow
http://code.google.com/p/quarkplayer/source/detail?r=1424
Modified:
/trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp
/trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.h
/trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.cpp
/trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.h
/trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.cpp
/trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.h
/trunk/quarkplayer-plugins/MainWindow/IMainWindow.h
/trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp
/trunk/quarkplayer-plugins/MainWindow/MockMainWindow.h
/trunk/quarkplayer-plugins/MediaController/MediaController.cpp
/trunk/quarkplayer-plugins/MediaController/MediaController.h
/trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp
/trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h
/trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp
/trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.h
/trunk/quarkplayer-plugins/StatusBar/StatusBar.cpp
/trunk/quarkplayer-plugins/StatusBar/StatusBar.h
/trunk/quarkplayer-plugins/Welcome/WelcomeWindow.cpp
/trunk/quarkplayer-plugins/Welcome/WelcomeWindow.h
=======================================
--- /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp Sun Feb
20 13:15:39 2011
+++ /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp Sun Feb
20 17:34:30 2011
@@ -41,7 +41,7 @@
}
PluginInterface * ConfigWindowPluginFactory::create(QuarkPlayer &
quarkPlayer, const QUuid & uuid) const {
- return new ConfigWindowPlugin(quarkPlayer, uuid);
+ return new ConfigWindowPlugin(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
ConfigWindowPlugin * ConfigWindowPluginFactory::configWindowPlugin() {
@@ -50,13 +50,15 @@
return configWindowPlugin;
}
-ConfigWindowPlugin::ConfigWindowPlugin(QuarkPlayer & quarkPlayer, const
QUuid & uuid)
- : PluginInterface(quarkPlayer, uuid) {
-
- loadSettings();
+ConfigWindowPlugin::ConfigWindowPlugin(QuarkPlayer & quarkPlayer, const
QUuid & uuid,
+ QWidget * mainWindow)
+ : QObject(mainWindow),
+ PluginInterface(quarkPlayer, uuid) {
_configWindow = NULL;
+ loadSettings();
+
connect(ActionCollection::action("CommonActions.Configure"),
SIGNAL(triggered()),
SLOT(showConfigWindow()));
}
@@ -75,19 +77,13 @@
void ConfigWindowPlugin::showConfigWindow() {
if (!_configWindow) {
- _configWindow = new ConfigWindow(MainWindowFactory::mainWindow());
+ _configWindow = new ConfigWindow(qobject_cast<QWidget *>(parent()));
//Emits the signal just once, not each time the ConfigWindow is being
showed
emit configWindowCreated(_configWindow);
}
_configWindow->exec();
-
- //Trick: MainWindow should get the focus and be the active window
- //otherwise SearchLineEdit can get the focus instead
- QApplication * app = qobject_cast<QApplication
*>(QApplication::instance());
- Q_ASSERT(app);
- app->setActiveWindow(MainWindowFactory::mainWindow());
}
ConfigWindow * ConfigWindowPlugin::configWindow() const {
=======================================
--- /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.h Fri Aug 13
02:18:04 2010
+++ /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.h Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -36,7 +36,7 @@
Q_OBJECT
public:
- ConfigWindowPlugin(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ ConfigWindowPlugin(QuarkPlayer & quarkPlayer, const QUuid & uuid, QWidget
* mainWindow);
~ConfigWindowPlugin();
=======================================
--- /trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.cpp Wed Nov 10
01:09:25 2010
+++ /trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.cpp Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -62,7 +62,7 @@
}
PluginInterface * FileBrowserWidgetFactory::create(QuarkPlayer &
quarkPlayer, const QUuid & uuid) const {
- return new FileBrowserWidget(quarkPlayer, uuid);
+ return new FileBrowserWidget(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
FileBrowserWidget * FileBrowserWidgetFactory::fileBrowserWidget() {
@@ -71,10 +71,14 @@
return fileBrowserWidget;
}
-FileBrowserWidget::FileBrowserWidget(QuarkPlayer & quarkPlayer, const
QUuid & uuid)
- : QWidget(MainWindowFactory::mainWindow()),
+FileBrowserWidget::FileBrowserWidget(QuarkPlayer & quarkPlayer, const
QUuid & uuid,
+ IMainWindow * mainWindow)
+ : QWidget(mainWindow),
PluginInterface(quarkPlayer, uuid) {
+ Q_ASSERT(mainWindow);
+ _mainWindow = mainWindow;
+
_fileSearchModel = NULL;
QVBoxLayout * layout = new QVBoxLayout();
@@ -91,7 +95,7 @@
//Add to the main window
_dockWidget = new QDockWidget();
- MainWindowFactory::mainWindow()->addBrowserDockWidget(_dockWidget);
+ mainWindow->addBrowserDockWidget(_dockWidget);
_dockWidget->setWidget(this);
ConfigWindowPlugin * configWindowPlugin =
ConfigWindowPluginFactory::configWindowPlugin();
@@ -119,8 +123,8 @@
}
FileBrowserWidget::~FileBrowserWidget() {
- MainWindowFactory::mainWindow()->removeDockWidget(_dockWidget);
- MainWindowFactory::mainWindow()->resetBrowserDockWidget();
+ _mainWindow->removeDockWidget(_dockWidget);
+ _mainWindow->resetBrowserDockWidget();
}
void FileBrowserWidget::createToolBar() {
@@ -309,7 +313,7 @@
_dockWidget->setWindowTitle(tr("Dir:") + ' ' + nameWithoutPath);
} else {
_dockWidget->setWindowTitle(statusMessage);
- QStatusBar * statusBar = MainWindowFactory::mainWindow()->statusBar();
+ QStatusBar * statusBar = _mainWindow->statusBar();
if (statusBar) {
statusBar->showMessage(statusMessage);
}
=======================================
--- /trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.h Fri Aug 13
02:18:04 2010
+++ /trunk/quarkplayer-plugins/FileBrowser/FileBrowserWidget.h Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2009 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -29,6 +29,7 @@
class QuarkPlayer;
class ConfigWindow;
class FileSearchModel;
+class IMainWindow;
class QDockWidget;
@@ -45,7 +46,7 @@
friend class FileBrowserTreeView;
public:
- FileBrowserWidget(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ FileBrowserWidget(QuarkPlayer & quarkPlayer, const QUuid & uuid,
IMainWindow * mainWindow);
~FileBrowserWidget();
@@ -87,6 +88,8 @@
SearchLineEdit * _searchLineEdit;
QDockWidget * _dockWidget;
+
+ IMainWindow * _mainWindow;
};
#include <quarkplayer/PluginFactory.h>
=======================================
--- /trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.cpp Wed Aug 25
15:38:42 2010
+++ /trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.cpp Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2009 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -49,11 +49,11 @@
}
PluginInterface * FindSubtitlesFactory::create(QuarkPlayer & quarkPlayer,
const QUuid & uuid) const {
- return new FindSubtitles(quarkPlayer, uuid);
+ return new FindSubtitles(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
-FindSubtitles::FindSubtitles(QuarkPlayer & quarkPlayer, const QUuid & uuid)
- : QObject(MainWindowFactory::mainWindow()),
+FindSubtitles::FindSubtitles(QuarkPlayer & quarkPlayer, const QUuid &
uuid, QWidget * mainWindow)
+ : QObject(mainWindow),
PluginInterface(quarkPlayer, uuid) {
populateActionCollection();
@@ -110,7 +110,7 @@
static FindSubtitlesWindow * findSubtitlesWindow = NULL;
if (!findSubtitlesWindow) {
- findSubtitlesWindow = new
FindSubtitlesWindow(MainWindowFactory::mainWindow());
+ findSubtitlesWindow = new FindSubtitlesWindow(qobject_cast<QWidget
*>(parent()));
connect(findSubtitlesWindow, SIGNAL(subtitleDownloaded(const QString
&)),
SLOT(loadSubtitle(const QString &)));
}
=======================================
--- /trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.h Fri Aug 13
02:18:04 2010
+++ /trunk/quarkplayer-plugins/FindSubtitles/FindSubtitles.h Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -38,7 +38,7 @@
Q_OBJECT
public:
- FindSubtitles(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ FindSubtitles(QuarkPlayer & quarkPlayer, const QUuid & uuid, QWidget *
mainWindow);
~FindSubtitles();
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/IMainWindow.h Sun Feb 20 13:15:39
2011
+++ /trunk/quarkplayer-plugins/MainWindow/IMainWindow.h Sun Feb 20 17:34:30
2011
@@ -46,6 +46,12 @@
virtual void setPlayToolBar(QToolBar * playToolBar) = 0;
virtual QToolBar * playToolBar() const = 0;
+ virtual QMenu * menuFile() const = 0;
+ virtual QMenu * menuPlay() const = 0;
+ virtual QMenu * menuAudio() const = 0;
+ virtual QMenu * menuSettings() const = 0;
+ virtual QMenu * menuHelp() const = 0;
+
virtual void addBrowserDockWidget(QDockWidget * dockWidget) = 0;
virtual void resetBrowserDockWidget() = 0;
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp Sun Feb 20
13:15:39 2011
+++ /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp Sun Feb 20
17:34:30 2011
@@ -75,6 +75,26 @@
QToolBar * MockMainWindow::playToolBar() const {
return _playToolBar;
}
+
+QMenu * MockMainWindow::menuFile() const {
+ return NULL;
+}
+
+QMenu * MockMainWindow::menuPlay() const {
+ return NULL;
+}
+
+QMenu * MockMainWindow::menuAudio() const {
+ return NULL;
+}
+
+QMenu * MockMainWindow::menuSettings() const {
+ return NULL;
+}
+
+QMenu * MockMainWindow::menuHelp() const {
+ return NULL;
+}
void MockMainWindow::playFile() {
QString fileName = TkFileDialog::getOpenFileName(
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.h Sun Feb 20
13:15:39 2011
+++ /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.h Sun Feb 20
17:34:30 2011
@@ -54,6 +54,12 @@
void setPlayToolBar(QToolBar * playToolBar);
QToolBar * playToolBar() const;
+ QMenu * menuFile() const;
+ QMenu * menuPlay() const;
+ QMenu * menuAudio() const;
+ QMenu * menuSettings() const;
+ QMenu * menuHelp() const;
+
void addBrowserDockWidget(QDockWidget * dockWidget);
void resetBrowserDockWidget();
=======================================
--- /trunk/quarkplayer-plugins/MediaController/MediaController.cpp Sun Feb
20 13:15:39 2011
+++ /trunk/quarkplayer-plugins/MediaController/MediaController.cpp Sun Feb
20 17:34:30 2011
@@ -55,7 +55,7 @@
}
PluginInterface * MediaControllerFactory::create(QuarkPlayer &
quarkPlayer, const QUuid & uuid) const {
- return new MediaController(quarkPlayer, uuid);
+ return new MediaController(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
MediaController * MediaControllerFactory::mediaController() {
@@ -64,13 +64,15 @@
return mediaController;
}
-MediaController::MediaController(QuarkPlayer & quarkPlayer, const QUuid &
uuid)
- : QWidget(MainWindowFactory::mainWindow()),
+MediaController::MediaController(QuarkPlayer & quarkPlayer, const QUuid &
uuid,
+ IMainWindow * mainWindow)
+ : QWidget(mainWindow),
PluginInterface(quarkPlayer, uuid) {
populateActionCollection();
- _mainWindow = MainWindowFactory::mainWindow();
+ Q_ASSERT(mainWindow);
+ _mainWindow = mainWindow;
connect(_mainWindow, SIGNAL(subtitleFileDropped(const QString &)),
SLOT(openSubtitleFile(const QString &)));
=======================================
--- /trunk/quarkplayer-plugins/MediaController/MediaController.h Fri Aug 13
02:18:04 2010
+++ /trunk/quarkplayer-plugins/MediaController/MediaController.h Sun Feb 20
17:34:30 2011
@@ -28,7 +28,7 @@
class MediaControllerToolBar;
class QuarkPlayer;
-class MainWindow;
+class IMainWindow;
namespace Phonon {
class MediaController;
@@ -52,7 +52,7 @@
Q_OBJECT
public:
- MediaController(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ MediaController(QuarkPlayer & quarkPlayer, const QUuid & uuid,
IMainWindow * mainWindow);
~MediaController();
@@ -93,7 +93,7 @@
/** Code factorization. */
static void removeAllAction(QObject * object);
- MainWindow * _mainWindow;
+ IMainWindow * _mainWindow;
MediaControllerToolBar * _toolBar;
=======================================
--- /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp Sun Feb 20
13:15:39 2011
+++ /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp Sun Feb 20
17:34:30 2011
@@ -62,19 +62,22 @@
}
PluginInterface * PlaylistWidgetFactory::create(QuarkPlayer & quarkPlayer,
const QUuid & uuid) const {
- return new PlaylistWidget(quarkPlayer, uuid);
+ return new PlaylistWidget(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
PlaylistWidget * PlaylistWidgetFactory::playlistWidget() {
PlaylistWidget * playlistWidget = dynamic_cast<PlaylistWidget
*>(PluginManager::instance().pluginInterface(PLUGIN_NAME));
- //Q_ASSERT(playlistWidget);
+ Q_ASSERT(playlistWidget);
return playlistWidget;
}
-PlaylistWidget::PlaylistWidget(QuarkPlayer & quarkPlayer, const QUuid &
uuid)
- : QWidget(MainWindowFactory::mainWindow()),
+PlaylistWidget::PlaylistWidget(QuarkPlayer & quarkPlayer, const QUuid &
uuid, IMainWindow * mainWindow)
+ : QWidget(mainWindow),
PluginInterface(quarkPlayer, uuid) {
+ Q_ASSERT(mainWindow);
+ _mainWindow = mainWindow;
+
//Model
_playlistModel = new PlaylistModel(this, quarkPlayer, uuid);
connect(_playlistModel, SIGNAL(rowsInserted(const QModelIndex &, int,
int)),
@@ -123,7 +126,7 @@
_dockWidget = new QDockWidget();
connect(_dockWidget, SIGNAL(visibilityChanged(bool)),
SLOT(dockWidgetVisibilityChanged(bool)));
- MainWindowFactory::mainWindow()->addPlaylistDockWidget(_dockWidget);
+ _mainWindow->addPlaylistDockWidget(_dockWidget);
_dockWidget->setWidget(this);
connect(&quarkPlayer,
SIGNAL(currentMediaObjectChanged(Phonon::MediaObject *)),
@@ -140,8 +143,8 @@
}
PlaylistWidget::~PlaylistWidget() {
- MainWindowFactory::mainWindow()->removeDockWidget(_dockWidget);
- MainWindowFactory::mainWindow()->resetPlaylistDockWidget();
+ _mainWindow->removeDockWidget(_dockWidget);
+ _mainWindow->resetPlaylistDockWidget();
}
PlaylistModel * PlaylistWidget::playlistModel() const {
@@ -195,6 +198,10 @@
addMenu->addAction(uuidAction("Playlist.AddDirectory"));
connect(uuidAction("Playlist.AddDirectory"), SIGNAL(triggered()),
SLOT(addDir()));
addMenu->addAction(uuidAction("Playlist.AddURL"));
+ QAction * action = new QAction("Hello", this);
+ addMenu->addAction(action);
+ addMenu->addAction(action);
+ addMenu->addAction(action);
connect(uuidAction("Playlist.AddURL"), SIGNAL(triggered()),
SLOT(addURL()));
addButton->setMenu(addMenu);
@@ -352,7 +359,7 @@
windowTitle += " - " + statusMessage;
}
_dockWidget->setWindowTitle(windowTitle);
- QStatusBar * statusBar = MainWindowFactory::mainWindow()->statusBar();
+ QStatusBar * statusBar = _mainWindow->statusBar();
if (statusBar) {
statusBar->showMessage(statusMessage);
}
=======================================
--- /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h Fri Aug 13
02:18:04 2010
+++ /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -35,8 +35,8 @@
class PlaylistFilter;
class DragAndDropTreeView;
class SearchLineEdit;
-
class QuarkPlayer;
+class IMainWindow;
namespace Phonon {
class MediaObject;
@@ -63,7 +63,7 @@
Q_OBJECT
public:
- PlaylistWidget(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ PlaylistWidget(QuarkPlayer & quarkPlayer, const QUuid & uuid, IMainWindow
* mainWindow);
~PlaylistWidget();
@@ -144,6 +144,8 @@
/** Needed by addWordToWordList(). */
QTimer * _searchTimer;
+
+ IMainWindow * _mainWindow;
};
#include <quarkplayer/PluginFactory.h>
=======================================
--- /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp Sun
Feb 20 13:15:39 2011
+++ /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp Sun
Feb 20 17:34:30 2011
@@ -51,14 +51,14 @@
}
PluginInterface * QuickSettingsWindowFactory::create(QuarkPlayer &
quarkPlayer, const QUuid & uuid) const {
- return new QuickSettingsWindow(quarkPlayer, uuid);
+ return new QuickSettingsWindow(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
static const int SLIDER_RANGE = 8;
static const int TICK_INTERVAL = 4;
-QuickSettingsWindow::QuickSettingsWindow(QuarkPlayer & quarkPlayer, const
QUuid & uuid)
- : QDialog(MainWindowFactory::mainWindow()),
+QuickSettingsWindow::QuickSettingsWindow(QuarkPlayer & quarkPlayer, const
QUuid & uuid, QWidget * mainWindow)
+ : QDialog(mainWindow),
PluginInterface(quarkPlayer, uuid) {
_audioOutput = NULL;
=======================================
--- /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.h Fri Aug
13 02:18:04 2010
+++ /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.h Sun Feb
20 17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -49,7 +49,7 @@
Q_OBJECT
public:
- QuickSettingsWindow(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ QuickSettingsWindow(QuarkPlayer & quarkPlayer, const QUuid & uuid,
QWidget * parent);
~QuickSettingsWindow();
=======================================
--- /trunk/quarkplayer-plugins/StatusBar/StatusBar.cpp Sun Feb 20 13:15:39
2011
+++ /trunk/quarkplayer-plugins/StatusBar/StatusBar.cpp Sun Feb 20 17:34:30
2011
@@ -47,13 +47,16 @@
}
PluginInterface * StatusBarFactory::create(QuarkPlayer & quarkPlayer,
const QUuid & uuid) const {
- return new StatusBar(quarkPlayer, uuid);
+ return new StatusBar(quarkPlayer, uuid, MainWindowFactory::mainWindow());
}
-StatusBar::StatusBar(QuarkPlayer & quarkPlayer, const QUuid & uuid)
- : QStatusBar(MainWindowFactory::mainWindow()),
+StatusBar::StatusBar(QuarkPlayer & quarkPlayer, const QUuid & uuid,
IMainWindow * mainWindow)
+ : QStatusBar(mainWindow),
PluginInterface(quarkPlayer, uuid) {
+ Q_ASSERT(mainWindow);
+ _mainWindow = mainWindow;
+
_blinker = NULL;
_timeLabel = new QLabel(this);
@@ -81,7 +84,7 @@
setStyle(&QuarkPlayerStyle::instance());
//Add the statusbar to the main window
- MainWindowFactory::mainWindow()->setStatusBar(this);
+ _mainWindow->setStatusBar(this);
Config::instance().addKey(STATUSBAR_TIME_DIPLAY_MODE_KEY,
TimeDisplayModeElapsed);
@@ -91,7 +94,7 @@
StatusBar::~StatusBar() {
//Remove the statusbar from the main window
- MainWindowFactory::mainWindow()->setStatusBar(NULL);
+ _mainWindow->setStatusBar(NULL);
}
void StatusBar::tick(qint64 time) {
=======================================
--- /trunk/quarkplayer-plugins/StatusBar/StatusBar.h Sun Feb 20 13:15:39
2011
+++ /trunk/quarkplayer-plugins/StatusBar/StatusBar.h Sun Feb 20 17:34:30
2011
@@ -26,6 +26,7 @@
#include <QtGui/QStatusBar>
class QuarkPlayer;
+class IMainWindow;
namespace Phonon {
class MediaObject;
@@ -42,7 +43,7 @@
Q_OBJECT
public:
- StatusBar(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ StatusBar(QuarkPlayer & quarkPlayer, const QUuid & uuid, IMainWindow *
mainWindow);
~StatusBar();
@@ -98,6 +99,8 @@
/** Status bar text color. */
QColor _textColor;
+
+ IMainWindow * _mainWindow;
};
#include <quarkplayer/PluginFactory.h>
=======================================
--- /trunk/quarkplayer-plugins/Welcome/WelcomeWindow.cpp Fri Oct 29
06:52:17 2010
+++ /trunk/quarkplayer-plugins/Welcome/WelcomeWindow.cpp Sun Feb 20
17:34:30 2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2009 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -41,11 +41,11 @@
}
PluginInterface * WelcomeWindowFactory::create(QuarkPlayer & quarkPlayer,
const QUuid & uuid) const {
- return new WelcomeWindow(quarkPlayer, uuid);
+ return new WelcomeWindow(quarkPlayer, uuid,
MainWindowFactory::mainWindow());
}
-WelcomeWindow::WelcomeWindow(QuarkPlayer & quarkPlayer, const QUuid & uuid)
- : QObject(MainWindowFactory::mainWindow()),
+WelcomeWindow::WelcomeWindow(QuarkPlayer & quarkPlayer, const QUuid &
uuid, QWidget * mainWindow)
+ : QObject(mainWindow),
PluginInterface(quarkPlayer, uuid) {
WelcomeDebug() << "Welcome plugin created";
@@ -61,7 +61,7 @@
connect(&quarkPlayer, SIGNAL(mediaObjectAdded(Phonon::MediaObject *)),
SLOT(playWebRadio()));
}
- QMessageBox * msgBox = new QMessageBox(MainWindowFactory::mainWindow());
+ QMessageBox * msgBox = new QMessageBox(mainWindow);
connect(msgBox, SIGNAL(finished(int)), SLOT(quitPlugin()));
msgBox->setWindowTitle(tr("Welcome!"));
msgBox->setIcon(QMessageBox::Information);
@@ -72,7 +72,7 @@
"QuarkPlayer can use different backends (DirectShow, MPlayer, Xine,
GStreamer, "
"VLC...) thanks to Qt and the Phonon library. "
"It also relies on an advanced plugin system and is available under "
- "Windows, Linux and soon Mac OS
X.<br><br><br>Version: %2").arg(QUARKPLAYER_VERSION).arg(quarkPlayerFullVersion())
+ "Windows, Linux and Mac OS
X.<br><br><br>Version: %2").arg(QUARKPLAYER_VERSION).arg(quarkPlayerFullVersion())
);
msgBox->show();
}
=======================================
--- /trunk/quarkplayer-plugins/Welcome/WelcomeWindow.h Fri Aug 13 02:18:04
2010
+++ /trunk/quarkplayer-plugins/Welcome/WelcomeWindow.h Sun Feb 20 17:34:30
2011
@@ -1,6 +1,6 @@
/*
* QuarkPlayer, a Phonon media player
- * Copyright (C) 2008-2010 Tanguy Krotoff <tkro...@gmail.com>
+ * Copyright (C) 2008-2011 Tanguy Krotoff <tkro...@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
published by
@@ -40,7 +40,7 @@
Q_OBJECT
public:
- WelcomeWindow(QuarkPlayer & quarkPlayer, const QUuid & uuid);
+ WelcomeWindow(QuarkPlayer & quarkPlayer, const QUuid & uuid, QWidget *
mainWindow);
~WelcomeWindow();