[quarkplayer] r1433 committed - Rename CommonActions to GlobalActions...
quark...@googlecode.com
Author: tkrotoff
Date: Wed Feb 23 17:15:29 2011
Log: Rename CommonActions to GlobalActions
Change ActionCollection class
http://code.google.com/p/quarkplayer/source/detail?r=1433
Modified:
/trunk/libs/TkUtil/Actions.cpp
/trunk/libs/TkUtil/Actions.h
/trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp
/trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfig.cpp
/trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfigWidget.cpp
/trunk/quarkplayer-plugins/MainWindow/CommonActions.cpp
/trunk/quarkplayer-plugins/MainWindow/MainWindow.cpp
/trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp
/trunk/quarkplayer-plugins/MediaController/MediaController.cpp
/trunk/quarkplayer-plugins/MediaController/MediaControllerToolBar.cpp
/trunk/quarkplayer-plugins/PlayToolBar/PlayToolBar.cpp
/trunk/quarkplayer-plugins/Playlist/PlaylistModel.cpp
/trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp
/trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h
/trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp
/trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.cpp
/trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.h
=======================================
--- /trunk/libs/TkUtil/Actions.cpp Wed Feb 23 10:23:21 2011
+++ /trunk/libs/TkUtil/Actions.cpp Wed Feb 23 17:15:29 2011
@@ -23,13 +23,11 @@
#include <QtGui/QtGui>
ActionCollection::ActionCollection() {
-}
-
-ActionCollection::ActionCollection(const QString & name) {
- _name = name;
+ GlobalActionCollection::instance().registerCollection(this);
}
ActionCollection::~ActionCollection() {
+ GlobalActionCollection::instance().unregisterCollection(this);
_actionHash.clear();
}
@@ -41,17 +39,18 @@
TkUtilCritical() << "QAction:" << name << "already exist";
}
+ action->setObjectName(name);
_actionHash[name] = action;
}
-QAction * ActionCollection::operator[](const QString & name) {
+QAction * ActionCollection::operator[](const QString & name) const {
QAction * action = _actionHash.value(name);
Q_ASSERT(action);
return action;
}
-QList<QAction *> ActionCollection::list() {
+QList<QAction *> ActionCollection::actions() const {
QList<QAction *> actionList;
QHashIterator<QString, QAction *> it(_actionHash);
@@ -66,7 +65,43 @@
}
-ActionCollection & GlobalActionCollection::instance() {
- static ActionCollection instance;
+GlobalActionCollection & GlobalActionCollection::instance() {
+ static GlobalActionCollection instance;
return instance;
}
+
+ActionCollection & GlobalActionCollection::collection() {
+ static ActionCollection collection;
+ return collection;
+}
+
+QList<QAction *> GlobalActionCollection::allActions() const {
+ QList<QAction *> actionList;
+ foreach (ActionCollection * collection, _collections) {
+ QList<QAction *> actions = collection->actions();
+ foreach (QAction * action, actions) {
+
+ //Remove all duplicated QAction (QAction with the same names)
+ QString name = action->objectName();
+ bool already = false;
+ /*foreach (QAction * tmp, actionList) {
+ if (tmp->objectName() == name) {
+ already = true;
+ break;
+ }
+ }*/
+ if (!already) {
+ actionList += action;
+ }
+ }
+ }
+ return actionList;
+}
+
+void GlobalActionCollection::registerCollection(ActionCollection *
collection) {
+ _collections += collection;
+}
+
+void GlobalActionCollection::unregisterCollection(ActionCollection *
collection) {
+ _collections.removeAll(collection);
+}
=======================================
--- /trunk/libs/TkUtil/Actions.h Wed Feb 23 10:23:21 2011
+++ /trunk/libs/TkUtil/Actions.h Wed Feb 23 17:15:29 2011
@@ -44,14 +44,12 @@
ActionCollection();
- ActionCollection(const QString & name);
-
~ActionCollection();
/**
* Retrieves an action given its name.
*/
- QAction * operator[](const QString & name);
+ QAction * operator[](const QString & name) const;
/**
* Adds an action with a name.
@@ -61,29 +59,45 @@
/**
* Retrieves all the actions registered.
*/
- QList<QAction *> list();
+ QList<QAction *> actions() const;
private:
- /** Name of the collection, can be empty. */
- QString _name;
-
/** Associates a name to a QAction. */
QHash<QString, QAction *> _actionHash;
};
+
/**
* Global variable ActionCollection.
*
* Singleton Pattern.
*/
class TKUTIL_API GlobalActionCollection : public Singleton {
+ friend class ActionCollection;
public:
- static ActionCollection & instance();
+ static GlobalActionCollection & instance();
+
+ static ActionCollection & collection();
+
+ /**
+ * Gets all the QAction from all ActionCollection.
+ *
+ * Implementation removes all duplicated QAction (QAction with the same
names).
+ */
+ QList<QAction *> allActions() const;
+
+private:
+
+ void registerCollection(ActionCollection * collection);
+
+ void unregisterCollection(ActionCollection * collection);
+
+ QList<ActionCollection *> _collections;
};
/** Simplify the syntax. */
-#define Actions GlobalActionCollection::instance()
+#define Actions GlobalActionCollection::collection()
#endif //ACTIONCOLLECTION_H
=======================================
--- /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp Wed Feb
23 10:23:21 2011
+++ /trunk/quarkplayer-plugins/ConfigWindow/ConfigWindowPlugin.cpp Wed Feb
23 17:15:29 2011
@@ -60,7 +60,7 @@
loadSettings();
- connect(Actions["CommonActions.Configure"], SIGNAL(triggered()),
SLOT(showConfigWindow()));
+ connect(Actions["Global.Configure"], SIGNAL(triggered()),
SLOT(showConfigWindow()));
}
ConfigWindowPlugin::~ConfigWindowPlugin() {
=======================================
--- /trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfig.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfig.cpp Wed Feb 23
17:15:29 2011
@@ -65,7 +65,7 @@
QAction * ShortcutsConfig::findAction(const QString & name) const {
QAction * result = NULL;
- QList<QAction *> actions = Actions.list();
+ QList<QAction *> actions =
GlobalActionCollection::instance().allActions();
foreach (QAction * action, actions) {
if (name == action->objectName()) {
result = action;
@@ -85,7 +85,7 @@
settings.beginWriteArray(SETTINGS_GROUP);
int count = 0;
- QList<QAction *> actions = Actions.list();
+ QList<QAction *> actions =
GlobalActionCollection::instance().allActions();
foreach (QAction * action, actions) {
QString name = action->objectName();
QString shortcuts = ShortcutsConfigWidget::toString(action->shortcuts());
=======================================
--- /trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfigWidget.cpp Wed
Feb 23 10:23:21 2011
+++ /trunk/quarkplayer-plugins/ConfigWindow/ShortcutsConfigWidget.cpp Wed
Feb 23 17:15:29 2011
@@ -100,12 +100,12 @@
_shortcutItems.clear();
_ui->actionList->clear();
- QList<QAction *> actions = Actions.list();
-
+ QList<QAction *> actions =
GlobalActionCollection::instance().allActions();
foreach (QAction * action, actions) {
TkAction * tkAction = qobject_cast<TkAction *>(action);
//If action is not a TkAction then we don't add it to the list of
actions to be
- //displayed and configurable
+ //displayed and configured
+ //Only TkAction should contain shortcuts
if (tkAction) {
QTreeWidgetItem * item = new QTreeWidgetItem(_ui->actionList);
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/CommonActions.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/MainWindow/CommonActions.cpp Wed Feb 23
17:15:29 2011
@@ -57,174 +57,174 @@
QCoreApplication * app = QApplication::instance();
Q_ASSERT(app);
- Actions.add("CommonActions.OpenFile", new TkAction(app,
QKeySequence::Open));
- Actions.add("CommonActions.Quit", new TkAction(app, tr("Ctrl+Q"),
tr("Alt+X")));
- Actions.add("CommonActions.ReportBug", new QAction(app));
- Actions.add("CommonActions.ShowMailingList", new QAction(app));
- Actions.add("CommonActions.ShowLog", new QAction(app));
- Actions.add("CommonActions.About", new TkAction(app, tr("Ctrl+F1")));
- Actions.add("CommonActions.AboutQt", new QAction(app));
- Actions.add("CommonActions.OpenDVD", new TkAction(app, tr("Ctrl+D")));
- Actions.add("CommonActions.OpenURL", new TkAction(app, tr("Ctrl+U")));
- Actions.add("CommonActions.OpenVCD", new QAction(app));
- Actions.add("CommonActions.NewMediaObject", new QAction(app));
- Actions.add("CommonActions.Equalizer", new TkAction(app, tr("Ctrl+E")));
- Actions.add("CommonActions.Configure", new QAction(app));
- Actions.add("CommonActions.EmptyMenu", new QAction(app));
+ Actions.add("Global.OpenFile", new TkAction(app, QKeySequence::Open));
+ Actions.add("Global.Quit", new TkAction(app, tr("Ctrl+Q"), tr("Alt+X")));
+ Actions.add("Global.ReportBug", new QAction(app));
+ Actions.add("Global.ShowMailingList", new QAction(app));
+ Actions.add("Global.ShowLog", new QAction(app));
+ Actions.add("Global.About", new TkAction(app, tr("Ctrl+F1")));
+ Actions.add("Global.AboutQt", new QAction(app));
+ Actions.add("Global.OpenDVD", new TkAction(app, tr("Ctrl+D")));
+ Actions.add("Global.OpenURL", new TkAction(app, tr("Ctrl+U")));
+ Actions.add("Global.OpenVCD", new QAction(app));
+ Actions.add("Global.NewMediaObject", new QAction(app));
+ Actions.add("Global.Equalizer", new TkAction(app, tr("Ctrl+E")));
+ Actions.add("Global.Configure", new QAction(app));
+ Actions.add("Global.EmptyMenu", new QAction(app));
TkAction * action = new TkAction(app, tr("Space"), Qt::Key_MediaPlay,
Qt::Key_Pause);
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.PlayPause", action);
+ Actions.add("Global.PlayPause", action);
action = new TkAction(app, Qt::Key_MediaStop);
- Actions.add("CommonActions.Stop", action);
+ Actions.add("Global.Stop", action);
action = new TkAction(app, tr("Ctrl+N"), tr(">"), Qt::Key_MediaNext);
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.NextTrack", action);
+ Actions.add("Global.NextTrack", action);
action = new TkAction(app, tr("Ctrl+P"), tr("<"), Qt::Key_MediaPrevious);
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.PreviousTrack", action);
+ Actions.add("Global.PreviousTrack", action);
action = new TkAction(app, tr("Left"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpBackward10s", action);
+ Actions.add("Global.JumpBackward10s", action);
action = new TkAction(app, tr("Ctrl+Left"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpBackward1min", action);
+ Actions.add("Global.JumpBackward1min", action);
action = new TkAction(app, tr("Shift+Left"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpBackward10min", action);
+ Actions.add("Global.JumpBackward10min", action);
action = new TkAction(app, tr("Right"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpForward10s", action);
+ Actions.add("Global.JumpForward10s", action);
action = new TkAction(app, tr("Ctrl+Right"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpForward1min", action);
+ Actions.add("Global.JumpForward1min", action);
action = new TkAction(app, tr("Shift+Right"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.JumpForward10min", action);
+ Actions.add("Global.JumpForward10min", action);
action = new TkAction(app, tr("["));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.SpeedDecrease10%", action);
+ Actions.add("Global.SpeedDecrease10%", action);
action = new TkAction(app, tr("]"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.SpeedIncrease10%", action);
+ Actions.add("Global.SpeedIncrease10%", action);
action = new TkAction(app, tr("Ctrl+M"));
action->setShortcutContext(Qt::ApplicationShortcut);
action->setCheckable(true);
- Actions.add("CommonActions.VolumeMute", action);
+ Actions.add("Global.VolumeMute", action);
action = new TkAction(app, tr("Ctrl+Down"), tr("-"), tr("Alt+-"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.VolumeDecrease10%", action);
+ Actions.add("Global.VolumeDecrease10%", action);
action = new TkAction(app, tr("Ctrl+Up"), tr("+"), tr("Alt++"));
action->setShortcutContext(Qt::ApplicationShortcut);
- Actions.add("CommonActions.VolumeIncrease10%", action);
+ Actions.add("Global.VolumeIncrease10%", action);
action = new TkAction(app, tr("Ctrl+F"), tr("Alt+Return"));
action->setShortcutContext(Qt::ApplicationShortcut);
action->setCheckable(true);
- Actions.add("CommonActions.FullScreen", action);
+ Actions.add("Global.FullScreen", action);
action = new TkAction(app, tr("Esc"));
- Actions.add("CommonActions.FullScreenExit", action);
+ Actions.add("Global.FullScreenExit", action);
}
void CommonActions::retranslate() {
- Actions["CommonActions.OpenFile"]->setText(tr("Play &File..."));
-
Actions["CommonActions.OpenFile"]->setIcon(QIcon::fromTheme("document-open"));
-
- Actions["CommonActions.Quit"]->setText(tr("&Quit"));
-
Actions["CommonActions.Quit"]->setIcon(QIcon::fromTheme("application-exit"));
-
- Actions["CommonActions.ReportBug"]->setText(tr("&Report a Problem..."));
+ Actions["Global.OpenFile"]->setText(tr("Play &File..."));
+ Actions["Global.OpenFile"]->setIcon(QIcon::fromTheme("document-open"));
+
+ Actions["Global.Quit"]->setText(tr("&Quit"));
+ Actions["Global.Quit"]->setIcon(QIcon::fromTheme("application-exit"));
+
+ Actions["Global.ReportBug"]->setText(tr("&Report a Problem..."));
if (desktopEnvironment() == GNOME) {
- Actions["CommonActions.ReportBug"]->setIcon(QIcon::fromTheme("apport"));
+ Actions["Global.ReportBug"]->setIcon(QIcon::fromTheme("apport"));
} else {
-
Actions["CommonActions.ReportBug"]->setIcon(QIcon::fromTheme("tools-report-bug"));
+
Actions["Global.ReportBug"]->setIcon(QIcon::fromTheme("tools-report-bug"));
}
- Actions["CommonActions.ShowMailingList"]->setText(tr("&Discuss about
QuarkPlayer..."));
+ Actions["Global.ShowMailingList"]->setText(tr("&Discuss about
QuarkPlayer..."));
if (desktopEnvironment() == GNOME) {
-
Actions["CommonActions.ShowMailingList"]->setIcon(QIcon::fromTheme("help-faq"));
+ Actions["Global.ShowMailingList"]->setIcon(QIcon::fromTheme("help-faq"));
} else {
-
Actions["CommonActions.ShowMailingList"]->setIcon(QIcon::fromTheme("help-hint"));
+
Actions["Global.ShowMailingList"]->setIcon(QIcon::fromTheme("help-hint"));
}
- Actions["CommonActions.ShowLog"]->setText(tr("View &Log"));
+ Actions["Global.ShowLog"]->setText(tr("View &Log"));
QIcon logIcon;
if (desktopEnvironment() == GNOME) {
logIcon = QIcon::fromTheme("logviewer");
} else {
logIcon = QIcon::fromTheme("text-x-log");
}
- Actions["CommonActions.ShowLog"]->setIcon(logIcon);
-
- Actions["CommonActions.About"]->setText(tr("&About"));
-
- Actions["CommonActions.AboutQt"]->setText(tr("About &Qt"));
-
- Actions["CommonActions.OpenDVD"]->setText(tr("Play &DVD..."));
-
Actions["CommonActions.OpenDVD"]->setIcon(QIcon::fromTheme("media-optical"));
-
- Actions["CommonActions.OpenURL"]->setText(tr("Play &URL..."));
-
- Actions["CommonActions.OpenVCD"]->setText(tr("Play &VCD..."));
+ Actions["Global.ShowLog"]->setIcon(logIcon);
+
+ Actions["Global.About"]->setText(tr("&About"));
+
+ Actions["Global.AboutQt"]->setText(tr("About &Qt"));
+
+ Actions["Global.OpenDVD"]->setText(tr("Play &DVD..."));
+ Actions["Global.OpenDVD"]->setIcon(QIcon::fromTheme("media-optical"));
+
+ Actions["Global.OpenURL"]->setText(tr("Play &URL..."));
+
+ Actions["Global.OpenVCD"]->setText(tr("Play &VCD..."));
\
- Actions["CommonActions.NewMediaObject"]->setText(tr("New Media Window"));
-
Actions["CommonActions.NewMediaObject"]->setIcon(QIcon::fromTheme("tab-new"));
-
- Actions["CommonActions.Equalizer"]->setText(tr("&Equalizer..."));
-
Actions["CommonActions.Equalizer"]->setIcon(QIcon::fromTheme("view-media-equalizer"));
-
- Actions["CommonActions.Configure"]->setText(tr("&Configure..."));
-
Actions["CommonActions.Configure"]->setIcon(QIcon::fromTheme("preferences-system"));
-
- Actions["CommonActions.EmptyMenu"]->setText(tr("<empty>"));
- Actions["CommonActions.EmptyMenu"]->setEnabled(false);
-
- Actions["CommonActions.PreviousTrack"]->setText(tr("P&revious Track"));
-
Actions["CommonActions.PreviousTrack"]->setIcon(QIcon::fromTheme("media-skip-backward"));
-
- Actions["CommonActions.PlayPause"]->setText(tr("&Play/Pause"));
-
Actions["CommonActions.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
-
- Actions["CommonActions.Stop"]->setText(tr("&Stop"));
-
Actions["CommonActions.Stop"]->setIcon(QIcon::fromTheme("media-playback-stop"));
-
- Actions["CommonActions.NextTrack"]->setText(tr("&Next Track"));
-
Actions["CommonActions.NextTrack"]->setIcon(QIcon::fromTheme("media-skip-forward"));
-
- Actions["CommonActions.JumpBackward10s"]->setText(tr("Jump &Backward
10s"));
- Actions["CommonActions.JumpBackward1min"]->setText(tr("Jump &Backward
1min"));
-
Actions["CommonActions.JumpBackward1min"]->setIcon(QIcon::fromTheme("media-seek-backward"));
- Actions["CommonActions.JumpBackward10min"]->setText(tr("Jump &Backward
10min"));
- Actions["CommonActions.JumpForward10s"]->setText(tr("Jump &Forward 10s"));
- Actions["CommonActions.JumpForward1min"]->setText(tr("Jump &Forward
1min"));
-
Actions["CommonActions.JumpForward1min"]->setIcon(QIcon::fromTheme("media-seek-forward"));
- Actions["CommonActions.JumpForward10min"]->setText(tr("Jump &Forward
10min"));
- Actions["CommonActions.SpeedDecrease10%"]->setText(tr("Decrease Speed"));
- Actions["CommonActions.SpeedIncrease10%"]->setText(tr("Increase Speed"));
-
- Actions["CommonActions.VolumeMute"]->setText(tr("&Mute"));
-
Actions["CommonActions.VolumeMute"]->setIcon(QIcon::fromTheme("audio-volume-muted"));
- Actions["CommonActions.VolumeDecrease10%"]->setText(tr("&Decrease
Volume"));
- Actions["CommonActions.VolumeIncrease10%"]->setText(tr("&Increase
Volume"));
-
- Actions["CommonActions.FullScreen"]->setText(tr("&Fullscreen"));
-
Actions["CommonActions.FullScreen"]->setIcon(QIcon::fromTheme("view-fullscreen"));
-
- Actions["CommonActions.FullScreenExit"]->setText(tr("&Exit Fullscreen"));
+ Actions["Global.NewMediaObject"]->setText(tr("New Media Window"));
+ Actions["Global.NewMediaObject"]->setIcon(QIcon::fromTheme("tab-new"));
+
+ Actions["Global.Equalizer"]->setText(tr("&Equalizer..."));
+
Actions["Global.Equalizer"]->setIcon(QIcon::fromTheme("view-media-equalizer"));
+
+ Actions["Global.Configure"]->setText(tr("&Configure..."));
+
Actions["Global.Configure"]->setIcon(QIcon::fromTheme("preferences-system"));
+
+ Actions["Global.EmptyMenu"]->setText(tr("<empty>"));
+ Actions["Global.EmptyMenu"]->setEnabled(false);
+
+ Actions["Global.PreviousTrack"]->setText(tr("P&revious Track"));
+
Actions["Global.PreviousTrack"]->setIcon(QIcon::fromTheme("media-skip-backward"));
+
+ Actions["Global.PlayPause"]->setText(tr("&Play/Pause"));
+
Actions["Global.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
+
+ Actions["Global.Stop"]->setText(tr("&Stop"));
+ Actions["Global.Stop"]->setIcon(QIcon::fromTheme("media-playback-stop"));
+
+ Actions["Global.NextTrack"]->setText(tr("&Next Track"));
+
Actions["Global.NextTrack"]->setIcon(QIcon::fromTheme("media-skip-forward"));
+
+ Actions["Global.JumpBackward10s"]->setText(tr("Jump &Backward 10s"));
+ Actions["Global.JumpBackward1min"]->setText(tr("Jump &Backward 1min"));
+
Actions["Global.JumpBackward1min"]->setIcon(QIcon::fromTheme("media-seek-backward"));
+ Actions["Global.JumpBackward10min"]->setText(tr("Jump &Backward 10min"));
+ Actions["Global.JumpForward10s"]->setText(tr("Jump &Forward 10s"));
+ Actions["Global.JumpForward1min"]->setText(tr("Jump &Forward 1min"));
+
Actions["Global.JumpForward1min"]->setIcon(QIcon::fromTheme("media-seek-forward"));
+ Actions["Global.JumpForward10min"]->setText(tr("Jump &Forward 10min"));
+ Actions["Global.SpeedDecrease10%"]->setText(tr("Decrease Speed"));
+ Actions["Global.SpeedIncrease10%"]->setText(tr("Increase Speed"));
+
+ Actions["Global.VolumeMute"]->setText(tr("&Mute"));
+
Actions["Global.VolumeMute"]->setIcon(QIcon::fromTheme("audio-volume-muted"));
+ Actions["Global.VolumeDecrease10%"]->setText(tr("&Decrease Volume"));
+ Actions["Global.VolumeIncrease10%"]->setText(tr("&Increase Volume"));
+
+ Actions["Global.FullScreen"]->setText(tr("&Fullscreen"));
+
Actions["Global.FullScreen"]->setIcon(QIcon::fromTheme("view-fullscreen"));
+
+ Actions["Global.FullScreenExit"]->setText(tr("&Exit Fullscreen"));
}
void CommonActions::stateChanged(Phonon::State newState) {
//Enabled/disabled fullscreen button depending if media is a video or
audio
if (_quarkPlayer.currentMediaObject()->hasVideo()) {
- Actions["CommonActions.FullScreen"]->setEnabled(true);
+ Actions["Global.FullScreen"]->setEnabled(true);
} else {
- Actions["CommonActions.FullScreen"]->setEnabled(false);
+ Actions["Global.FullScreen"]->setEnabled(false);
}
switch (newState) {
@@ -232,33 +232,33 @@
break;
case Phonon::PlayingState:
- Actions["CommonActions.PlayPause"]->setText(tr("&Pause"));
-
Actions["CommonActions.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-pause"));
- disconnect(Actions["CommonActions.PlayPause"], 0, 0, 0);
- connect(Actions["CommonActions.PlayPause"], SIGNAL(triggered()),
+ Actions["Global.PlayPause"]->setText(tr("&Pause"));
+
Actions["Global.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-pause"));
+ disconnect(Actions["Global.PlayPause"], 0, 0, 0);
+ connect(Actions["Global.PlayPause"], SIGNAL(triggered()),
_quarkPlayer.currentMediaObject(), SLOT(pause()));
- Actions["CommonActions.Stop"]->setEnabled(true);
+ Actions["Global.Stop"]->setEnabled(true);
break;
case Phonon::StoppedState:
- Actions["CommonActions.PlayPause"]->setText(tr("P&lay"));
-
Actions["CommonActions.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
- disconnect(Actions["CommonActions.PlayPause"], 0, 0, 0);
- connect(Actions["CommonActions.PlayPause"], SIGNAL(triggered()),
+ Actions["Global.PlayPause"]->setText(tr("P&lay"));
+
Actions["Global.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
+ disconnect(Actions["Global.PlayPause"], 0, 0, 0);
+ connect(Actions["Global.PlayPause"], SIGNAL(triggered()),
_quarkPlayer.currentMediaObject(), SLOT(play()));
- Actions["CommonActions.Stop"]->setEnabled(false);
+ Actions["Global.Stop"]->setEnabled(false);
break;
case Phonon::PausedState:
- Actions["CommonActions.PlayPause"]->setText(tr("P&lay"));
-
Actions["CommonActions.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
- disconnect(Actions["CommonActions.PlayPause"], 0, 0, 0);
- connect(Actions["CommonActions.PlayPause"], SIGNAL(triggered()),
+ Actions["Global.PlayPause"]->setText(tr("P&lay"));
+
Actions["Global.PlayPause"]->setIcon(QIcon::fromTheme("media-playback-start"));
+ disconnect(Actions["Global.PlayPause"], 0, 0, 0);
+ connect(Actions["Global.PlayPause"], SIGNAL(triggered()),
_quarkPlayer.currentMediaObject(), SLOT(play()));
- Actions["CommonActions.Stop"]->setEnabled(true);
+ Actions["Global.Stop"]->setEnabled(true);
break;
case Phonon::LoadingState:
@@ -284,7 +284,7 @@
stateChanged(mediaObject->state());
//Actions connect
- disconnect(Actions["CommonActions.Stop"], 0, 0, 0);
- connect(Actions["CommonActions.Stop"], SIGNAL(triggered()),
+ disconnect(Actions["Global.Stop"], 0, 0, 0);
+ connect(Actions["Global.Stop"], SIGNAL(triggered()),
mediaObject, SLOT(stop()));
}
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/MainWindow.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/MainWindow/MainWindow.cpp Wed Feb 23
17:15:29 2011
@@ -90,18 +90,18 @@
_playToolBar = NULL;
_statusBar = NULL;
- connect(Actions["CommonActions.OpenFile"], SIGNAL(triggered()),
SLOT(playFile()));
- connect(Actions["CommonActions.OpenDVD"], SIGNAL(triggered()),
SLOT(playDVD()));
- connect(Actions["CommonActions.OpenURL"], SIGNAL(triggered()),
SLOT(playURL()));
- connect(Actions["CommonActions.OpenVCD"], SIGNAL(triggered()),
SLOT(playVCD()));
- connect(Actions["CommonActions.NewMediaObject"], SIGNAL(triggered()),
&quarkPlayer, SLOT(createNewMediaObject()));
- connect(Actions["CommonActions.Quit"], SIGNAL(triggered()),
SLOT(close()));
- connect(Actions["CommonActions.ReportBug"], SIGNAL(triggered()),
SLOT(reportBug()));
- connect(Actions["CommonActions.ShowMailingList"], SIGNAL(triggered()),
SLOT(showMailingList()));
- connect(Actions["CommonActions.ShowLog"], SIGNAL(triggered()),
SLOT(showLog()));
- connect(Actions["CommonActions.About"], SIGNAL(triggered()),
SLOT(about()));
- connect(Actions["CommonActions.AboutQt"], SIGNAL(triggered()), qApp,
SLOT(aboutQt()));
- connect(Actions["CommonActions.VolumeMute"], SIGNAL(toggled(bool)),
SLOT(mutedToggled(bool)));
+ connect(Actions["Global.OpenFile"], SIGNAL(triggered()),
SLOT(playFile()));
+ connect(Actions["Global.OpenDVD"], SIGNAL(triggered()), SLOT(playDVD()));
+ connect(Actions["Global.OpenURL"], SIGNAL(triggered()), SLOT(playURL()));
+ connect(Actions["Global.OpenVCD"], SIGNAL(triggered()), SLOT(playVCD()));
+ connect(Actions["Global.NewMediaObject"], SIGNAL(triggered()),
&quarkPlayer, SLOT(createNewMediaObject()));
+ connect(Actions["Global.Quit"], SIGNAL(triggered()), SLOT(close()));
+ connect(Actions["Global.ReportBug"], SIGNAL(triggered()),
SLOT(reportBug()));
+ connect(Actions["Global.ShowMailingList"], SIGNAL(triggered()),
SLOT(showMailingList()));
+ connect(Actions["Global.ShowLog"], SIGNAL(triggered()), SLOT(showLog()));
+ connect(Actions["Global.About"], SIGNAL(triggered()), SLOT(about()));
+ connect(Actions["Global.AboutQt"], SIGNAL(triggered()), qApp,
SLOT(aboutQt()));
+ connect(Actions["Global.VolumeMute"], SIGNAL(toggled(bool)),
SLOT(mutedToggled(bool)));
connect(&quarkPlayer,
SIGNAL(currentMediaObjectChanged(Phonon::MediaObject *)),
SLOT(currentMediaObjectChanged(Phonon::MediaObject *)));
@@ -272,64 +272,64 @@
_menuFile = new QMenu();
menuBar()->addMenu(_menuFile);
- _menuFile->addAction(Actions["CommonActions.OpenFile"]);
- _menuFile->addAction(Actions["CommonActions.OpenURL"]);
- _menuFile->addAction(Actions["CommonActions.OpenDVD"]);
- _menuFile->addAction(Actions["CommonActions.OpenVCD"]);
+ _menuFile->addAction(Actions["Global.OpenFile"]);
+ _menuFile->addAction(Actions["Global.OpenURL"]);
+ _menuFile->addAction(Actions["Global.OpenDVD"]);
+ _menuFile->addAction(Actions["Global.OpenVCD"]);
_menuFile->addSeparator();
- _menuFile->addAction(Actions["CommonActions.Quit"]);
+ _menuFile->addAction(Actions["Global.Quit"]);
_menuPlay = new QMenu();
menuBar()->addMenu(_menuPlay);
- _menuPlay->addAction(Actions["CommonActions.PreviousTrack"]);
- _menuPlay->addAction(Actions["CommonActions.PlayPause"]);
- _menuPlay->addAction(Actions["CommonActions.Stop"]);
- _menuPlay->addAction(Actions["CommonActions.NextTrack"]);
+ _menuPlay->addAction(Actions["Global.PreviousTrack"]);
+ _menuPlay->addAction(Actions["Global.PlayPause"]);
+ _menuPlay->addAction(Actions["Global.Stop"]);
+ _menuPlay->addAction(Actions["Global.NextTrack"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.JumpBackward10s"]);
- _menuPlay->addAction(Actions["CommonActions.JumpBackward1min"]);
- _menuPlay->addAction(Actions["CommonActions.JumpBackward10min"]);
+ _menuPlay->addAction(Actions["Global.JumpBackward10s"]);
+ _menuPlay->addAction(Actions["Global.JumpBackward1min"]);
+ _menuPlay->addAction(Actions["Global.JumpBackward10min"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.JumpForward10s"]);
- _menuPlay->addAction(Actions["CommonActions.JumpForward1min"]);
- _menuPlay->addAction(Actions["CommonActions.JumpForward10min"]);
+ _menuPlay->addAction(Actions["Global.JumpForward10s"]);
+ _menuPlay->addAction(Actions["Global.JumpForward1min"]);
+ _menuPlay->addAction(Actions["Global.JumpForward10min"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.SpeedDecrease10%"]);
- _menuPlay->addAction(Actions["CommonActions.SpeedIncrease10%"]);
+ _menuPlay->addAction(Actions["Global.SpeedDecrease10%"]);
+ _menuPlay->addAction(Actions["Global.SpeedIncrease10%"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.FullScreen"]);
+ _menuPlay->addAction(Actions["Global.FullScreen"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.NewMediaObject"]);
+ _menuPlay->addAction(Actions["Global.NewMediaObject"]);
_menuAudio = new QMenu();
menuBar()->addMenu(_menuAudio);
- _menuAudio->addAction(Actions["CommonActions.VolumeMute"]);
- _menuAudio->addAction(Actions["CommonActions.VolumeIncrease10%"]);
- _menuAudio->addAction(Actions["CommonActions.VolumeDecrease10%"]);
+ _menuAudio->addAction(Actions["Global.VolumeMute"]);
+ _menuAudio->addAction(Actions["Global.VolumeIncrease10%"]);
+ _menuAudio->addAction(Actions["Global.VolumeDecrease10%"]);
_menuSettings = new QMenu();
menuBar()->addMenu(_menuSettings);
- _menuSettings->addAction(Actions["CommonActions.Equalizer"]);
- _menuSettings->addAction(Actions["CommonActions.Configure"]);
+ _menuSettings->addAction(Actions["Global.Equalizer"]);
+ _menuSettings->addAction(Actions["Global.Configure"]);
_menuHelp = new QMenu();
menuBar()->addMenu(_menuHelp);
- _menuHelp->addAction(Actions["CommonActions.ShowMailingList"]);
- _menuHelp->addAction(Actions["CommonActions.ReportBug"]);
- _menuHelp->addAction(Actions["CommonActions.ShowLog"]);
+ _menuHelp->addAction(Actions["Global.ShowMailingList"]);
+ _menuHelp->addAction(Actions["Global.ReportBug"]);
+ _menuHelp->addAction(Actions["Global.ShowLog"]);
_menuHelp->addSeparator();
- _menuHelp->addAction(Actions["CommonActions.About"]);
- _menuHelp->addAction(Actions["CommonActions.AboutQt"]);
+ _menuHelp->addAction(Actions["Global.About"]);
+ _menuHelp->addAction(Actions["Global.AboutQt"]);
//Main ToolBar
_mainToolBar = new TkToolBar(this);
TkToolBar::setToolButtonStyle(_mainToolBar);
- _mainToolBar->addAction(Actions["CommonActions.OpenFile"]);
- _mainToolBar->addAction(Actions["CommonActions.OpenDVD"]);
- //_mainToolBar->addAction(Actions["CommonActions.OpenURL"]);
+ _mainToolBar->addAction(Actions["Global.OpenFile"]);
+ _mainToolBar->addAction(Actions["Global.OpenDVD"]);
+ //_mainToolBar->addAction(Actions["Global.OpenURL"]);
//_mainToolBar->addSeparator();
- //_mainToolBar->addAction(Actions["CommonActions.Equalizer"]);
- //_mainToolBar->addAction(Actions["CommonActions.Configure"]);
+ //_mainToolBar->addAction(Actions["Global.Equalizer"]);
+ //_mainToolBar->addAction(Actions["Global.Configure"]);
addToolBar(_mainToolBar);
//Main toolbar accessible but disabled by default
@@ -498,20 +498,20 @@
//Resets the window title when needed
connect(mediaObject, SIGNAL(metaDataChanged()),
SLOT(updateWindowTitle()));
- disconnect(Actions["CommonActions.Quit"], SIGNAL(triggered()),
mediaObject, SLOT(stop()));
- connect(Actions["CommonActions.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
+ disconnect(Actions["Global.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
+ connect(Actions["Global.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
Phonon::AudioOutput * audioOutput = quarkPlayer().currentAudioOutput();
if (audioOutput) {
//Avoid a crash inside Phonon if the backend couldn't be loaded
- Actions["CommonActions.VolumeMute"]->setChecked(audioOutput->isMuted());
+ Actions["Global.VolumeMute"]->setChecked(audioOutput->isMuted());
disconnect(audioOutput, SIGNAL(mutedChanged(bool)), this,
SLOT(mutedChanged(bool)));
connect(audioOutput, SIGNAL(mutedChanged(bool)),
SLOT(mutedChanged(bool)));
}
}
void MainWindow::mutedChanged(bool muted) {
- Actions["CommonActions.VolumeMute"]->setChecked(muted);
+ Actions["Global.VolumeMute"]->setChecked(muted);
}
void MainWindow::mutedToggled(bool muted) {
=======================================
--- /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/MainWindow/MockMainWindow.cpp Wed Feb 23
17:15:29 2011
@@ -54,10 +54,10 @@
_playToolBar = NULL;
- connect(Actions["CommonActions.OpenFile"], SIGNAL(triggered()),
SLOT(playFile()));
- connect(Actions["CommonActions.Quit"], SIGNAL(triggered()),
SLOT(close()));
- connect(Actions["CommonActions.ShowLog"], SIGNAL(triggered()),
SLOT(showLog()));
- connect(Actions["CommonActions.About"], SIGNAL(triggered()),
SLOT(about()));
+ connect(Actions["Global.OpenFile"], SIGNAL(triggered()),
SLOT(playFile()));
+ connect(Actions["Global.Quit"], SIGNAL(triggered()), SLOT(close()));
+ connect(Actions["Global.ShowLog"], SIGNAL(triggered()), SLOT(showLog()));
+ connect(Actions["Global.About"], SIGNAL(triggered()), SLOT(about()));
connect(&quarkPlayer,
SIGNAL(currentMediaObjectChanged(Phonon::MediaObject *)),
SLOT(currentMediaObjectChanged(Phonon::MediaObject *)));
@@ -130,29 +130,29 @@
_menuFile = new QMenu();
_menuFile->setTitle("&File");
menuBar()->addMenu(_menuFile);
- _menuFile->addAction(Actions["CommonActions.OpenFile"]);
+ _menuFile->addAction(Actions["Global.OpenFile"]);
_menuFile->addSeparator();
- _menuFile->addAction(Actions["CommonActions.Quit"]);
+ _menuFile->addAction(Actions["Global.Quit"]);
_menuPlay = new QMenu();
_menuPlay->setTitle("&Play");
menuBar()->addMenu(_menuPlay);
- _menuPlay->addAction(Actions["CommonActions.PlayPause"]);
+ _menuPlay->addAction(Actions["Global.PlayPause"]);
_menuPlay->addSeparator();
- _menuPlay->addAction(Actions["CommonActions.FullScreen"]);
+ _menuPlay->addAction(Actions["Global.FullScreen"]);
//No menu entry for FullScreenExit, see MyVideoWidget.cpp
_menuSettings = new QMenu();
_menuSettings->setTitle("&Settings");
menuBar()->addMenu(_menuSettings);
- _menuSettings->addAction(Actions["CommonActions.Equalizer"]);
- _menuSettings->addAction(Actions["CommonActions.Configure"]);
+ _menuSettings->addAction(Actions["Global.Equalizer"]);
+ _menuSettings->addAction(Actions["Global.Configure"]);
_menuHelp = new QMenu();
_menuHelp->setTitle("&Help");
menuBar()->addMenu(_menuHelp);
- _menuHelp->addAction(Actions["CommonActions.ShowLog"]);
- _menuHelp->addAction(Actions["CommonActions.About"]);
+ _menuHelp->addAction(Actions["Global.ShowLog"]);
+ _menuHelp->addAction(Actions["Global.About"]);
}
void MockMainWindow::closeEvent(QCloseEvent * event) {
@@ -218,6 +218,6 @@
tmp->disconnect(this);
}
- disconnect(Actions["CommonActions.Quit"], SIGNAL(triggered()),
mediaObject, SLOT(stop()));
- connect(Actions["CommonActions.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
-}
+ disconnect(Actions["Global.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
+ connect(Actions["Global.Quit"], SIGNAL(triggered()), mediaObject,
SLOT(stop()));
+}
=======================================
--- /trunk/quarkplayer-plugins/MediaController/MediaController.cpp Wed Feb
23 10:23:21 2011
+++ /trunk/quarkplayer-plugins/MediaController/MediaController.cpp Wed Feb
23 17:15:29 2011
@@ -122,26 +122,26 @@
QAction * insertBeforeMenuSettings =
_mainWindow->menuSettings()->menuAction();
_menuAudioChannels = new QMenu();
- _menuAudioChannels->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuAudioChannels->addAction(Actions["Global.EmptyMenu"]);
_mainWindow->menuAudio()->addMenu(_menuAudioChannels);
_menuSubtitle = new QMenu();
menuBar->insertMenu(insertBeforeMenuSettings, _menuSubtitle);
_menuSubtitle->addAction(Actions["MediaController.OpenSubtitleFile"]);
_menuSubtitles = new QMenu();
- _menuSubtitles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuSubtitles->addAction(Actions["Global.EmptyMenu"]);
_menuSubtitle->addMenu(_menuSubtitles);
_menuBrowse = new QMenu();
menuBar->insertMenu(insertBeforeMenuSettings, _menuBrowse);
_menuTitles = new QMenu();
- _menuTitles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuTitles->addAction(Actions["Global.EmptyMenu"]);
_menuBrowse->addAction(_menuTitles->menuAction());
_menuChapters = new QMenu();
- _menuChapters->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuChapters->addAction(Actions["Global.EmptyMenu"]);
_menuBrowse->addAction(_menuChapters->menuAction());
_menuAngles = new QMenu();
- _menuAngles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuAngles->addAction(Actions["Global.EmptyMenu"]);
_menuBrowse->addAction(_menuAngles->menuAction());
}
@@ -260,8 +260,8 @@
removeAllAction(_menuAudioChannels);
removeAllAction(_toolBar->menuAudioChannels());
if (audios.isEmpty()) {
- _menuAudioChannels->addAction(Actions["CommonActions.EmptyMenu"]);
-
_toolBar->menuAudioChannels()->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuAudioChannels->addAction(Actions["Global.EmptyMenu"]);
+ _toolBar->menuAudioChannels()->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < audios.size(); i++) {
@@ -311,8 +311,8 @@
removeAllAction(_menuSubtitles);
removeAllAction(_toolBar->menuSubtitles());
if (subtitles.isEmpty()) {
- _menuSubtitles->addAction(Actions["CommonActions.EmptyMenu"]);
- _toolBar->menuSubtitles()->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuSubtitles->addAction(Actions["Global.EmptyMenu"]);
+ _toolBar->menuSubtitles()->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < subtitles.size(); i++) {
@@ -370,7 +370,7 @@
int nbTitles = titles.size();
removeAllAction(_menuTitles);
if (titles.isEmpty()) {
- _menuTitles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuTitles->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < nbTitles; i++) {
@@ -385,7 +385,7 @@
int nbTitles = titles;
removeAllAction(_menuTitles);
if (titles == 0) {
- _menuTitles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuTitles->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < nbTitles; i++) {
@@ -455,7 +455,7 @@
QList<Phonon::ChapterDescription> chapters =
_currentMediaController->availableChapters2();
removeAllAction(_menuChapters);
if (chapters.isEmpty()) {
- _menuChapters->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuChapters->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < chapters.size(); i++) {
@@ -469,7 +469,7 @@
int chapters = _currentMediaController->availableChapters();
removeAllAction(_menuChapters);
if (chapters == 0) {
- _menuChapters->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuChapters->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < chapters; i++) {
@@ -518,7 +518,7 @@
int angles = _currentMediaController->availableAngles();
removeAllAction(_menuAngles);
if (angles == 0) {
- _menuAngles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuAngles->addAction(Actions["Global.EmptyMenu"]);
}
for (int i = 0; i < angles; i++) {
=======================================
--- /trunk/quarkplayer-plugins/MediaController/MediaControllerToolBar.cpp
Wed Feb 23 10:23:21 2011
+++ /trunk/quarkplayer-plugins/MediaController/MediaControllerToolBar.cpp
Wed Feb 23 17:15:29 2011
@@ -32,13 +32,13 @@
_audioChannelsButton = new QPushButton();
_menuAudioChannels = new QMenu();
- _menuAudioChannels->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuAudioChannels->addAction(Actions["Global.EmptyMenu"]);
_audioChannelsButton->setMenu(_menuAudioChannels);
addWidget(_audioChannelsButton);
_subtitlesButton = new QPushButton();
_menuSubtitles = new QMenu();
- _menuSubtitles->addAction(Actions["CommonActions.EmptyMenu"]);
+ _menuSubtitles->addAction(Actions["Global.EmptyMenu"]);
_subtitlesButton->setMenu(_menuSubtitles);
addWidget(_subtitlesButton);
=======================================
--- /trunk/quarkplayer-plugins/PlayToolBar/PlayToolBar.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/PlayToolBar/PlayToolBar.cpp Wed Feb 23
17:15:29 2011
@@ -120,28 +120,28 @@
//_seekSlider->setIconVisible(true);
//_seekSlider->setTracking(false);
- //_seekToolBar->addAction(Actions["CommonActions.SpeedDecrease10%"));
- connect(Actions["CommonActions.SpeedDecrease10%"], SIGNAL(triggered()),
SLOT(decreaseSpeed10()));
- //_seekToolBar->addAction(Actions["CommonActions.JumpBackward10min"));
- connect(Actions["CommonActions.JumpBackward10min"], SIGNAL(triggered()),
SLOT(jumpBackward10min()));
- _seekToolBar->addAction(Actions["CommonActions.JumpBackward1min"]);
- connect(Actions["CommonActions.JumpBackward1min"], SIGNAL(triggered()),
SLOT(jumpBackward1min()));
- //_seekToolBar->addAction(Actions["CommonActions.JumpBackward10s"));
- connect(Actions["CommonActions.JumpBackward10s"], SIGNAL(triggered()),
SLOT(jumpBackward10s()));
+ //_seekToolBar->addAction(Actions["Global.SpeedDecrease10%"));
+ connect(Actions["Global.SpeedDecrease10%"], SIGNAL(triggered()),
SLOT(decreaseSpeed10()));
+ //_seekToolBar->addAction(Actions["Global.JumpBackward10min"));
+ connect(Actions["Global.JumpBackward10min"], SIGNAL(triggered()),
SLOT(jumpBackward10min()));
+ _seekToolBar->addAction(Actions["Global.JumpBackward1min"]);
+ connect(Actions["Global.JumpBackward1min"], SIGNAL(triggered()),
SLOT(jumpBackward1min()));
+ //_seekToolBar->addAction(Actions["Global.JumpBackward10s"));
+ connect(Actions["Global.JumpBackward10s"], SIGNAL(triggered()),
SLOT(jumpBackward10s()));
_seekToolBar->addWidget(_seekSlider);
- //_seekToolBar->addAction(Actions["CommonActions.JumpForward10s"));
- connect(Actions["CommonActions.JumpForward10s"], SIGNAL(triggered()),
SLOT(jumpForward10s()));
- _seekToolBar->addAction(Actions["CommonActions.JumpForward1min"]);
- connect(Actions["CommonActions.JumpForward1min"], SIGNAL(triggered()),
SLOT(jumpForward1min()));
- //_seekToolBar->addAction(Actions["CommonActions.JumpForward10min"));
- connect(Actions["CommonActions.JumpForward10min"], SIGNAL(triggered()),
SLOT(jumpForward10min()));
- //_seekToolBar->addAction(Actions["CommonActions.SpeedIncrease10%"));
- connect(Actions["CommonActions.SpeedIncrease10%"], SIGNAL(triggered()),
SLOT(increaseSpeed10()));
-
- connect(Actions["CommonActions.VolumeDecrease10%"], SIGNAL(triggered()),
SLOT(volumeDecrease10()));
- connect(Actions["CommonActions.VolumeIncrease10%"], SIGNAL(triggered()),
SLOT(volumeIncrease10()));
+ //_seekToolBar->addAction(Actions["Global.JumpForward10s"));
+ connect(Actions["Global.JumpForward10s"], SIGNAL(triggered()),
SLOT(jumpForward10s()));
+ _seekToolBar->addAction(Actions["Global.JumpForward1min"]);
+ connect(Actions["Global.JumpForward1min"], SIGNAL(triggered()),
SLOT(jumpForward1min()));
+ //_seekToolBar->addAction(Actions["Global.JumpForward10min"));
+ connect(Actions["Global.JumpForward10min"], SIGNAL(triggered()),
SLOT(jumpForward10min()));
+ //_seekToolBar->addAction(Actions["Global.SpeedIncrease10%"));
+ connect(Actions["Global.SpeedIncrease10%"], SIGNAL(triggered()),
SLOT(increaseSpeed10()));
+
+ connect(Actions["Global.VolumeDecrease10%"], SIGNAL(triggered()),
SLOT(volumeDecrease10()));
+ connect(Actions["Global.VolumeIncrease10%"], SIGNAL(triggered()),
SLOT(volumeIncrease10()));
}
void PlayToolBar::decreaseSpeed10() {
@@ -242,16 +242,16 @@
_controlToolBar = new QToolBar(NULL);
_controlToolBar->setIconSize(QSize(24, 18));
- _controlToolBar->addAction(Actions["CommonActions.PreviousTrack"]);
- _controlToolBar->addAction(Actions["CommonActions.PlayPause"]);
- _controlToolBar->addAction(Actions["CommonActions.Stop"]);
- _controlToolBar->addAction(Actions["CommonActions.NextTrack"]);
+ _controlToolBar->addAction(Actions["Global.PreviousTrack"]);
+ _controlToolBar->addAction(Actions["Global.PlayPause"]);
+ _controlToolBar->addAction(Actions["Global.Stop"]);
+ _controlToolBar->addAction(Actions["Global.NextTrack"]);
_controlToolBar->addSeparator();
- _controlToolBar->addAction(Actions["CommonActions.FullScreen"]);
+ _controlToolBar->addAction(Actions["Global.FullScreen"]);
_controlToolBar->addSeparator();
- _controlToolBar->addAction(Actions["CommonActions.NewMediaObject"]);
+ _controlToolBar->addAction(Actions["Global.NewMediaObject"]);
//volumeSlider
_controlToolBar->addSeparator();
@@ -280,11 +280,11 @@
//FIXME don't know why, seekToolBar does not get enabled afterwards
//_seekToolBar->setEnabled(enabled);
- Actions["CommonActions.PreviousTrack"]->setEnabled(enabled);
- Actions["CommonActions.PlayPause"]->setEnabled(enabled);
- Actions["CommonActions.Stop"]->setEnabled(enabled);
- Actions["CommonActions.NextTrack"]->setEnabled(enabled);
- Actions["CommonActions.FullScreen"]->setEnabled(enabled);
+ Actions["Global.PreviousTrack"]->setEnabled(enabled);
+ Actions["Global.PlayPause"]->setEnabled(enabled);
+ Actions["Global.Stop"]->setEnabled(enabled);
+ Actions["Global.NextTrack"]->setEnabled(enabled);
+ Actions["Global.FullScreen"]->setEnabled(enabled);
}
void PlayToolBar::currentMediaObjectChanged(Phonon::MediaObject *
mediaObject) {
=======================================
--- /trunk/quarkplayer-plugins/Playlist/PlaylistModel.cpp Tue Feb 22
17:14:14 2011
+++ /trunk/quarkplayer-plugins/Playlist/PlaylistModel.cpp Wed Feb 23
17:15:29 2011
@@ -83,8 +83,13 @@
connect(_mediaInfoFetcher, SIGNAL(finished(const MediaInfo &)),
SLOT(updateMediaInfo(const MediaInfo &)));
- Config::instance().addKey(PLAYLIST_TRACK_DISPLAY_MODE_KEY,
TrackDisplayModeNormal);
- Config::instance().addKey(PLAYLIST_DEFAULT_FORMAT_KEY, "xspf");
+ Config & config = Config::instance();
+ if (!config.contains(PLAYLIST_TRACK_DISPLAY_MODE_KEY)) {
+ config.addKey(PLAYLIST_TRACK_DISPLAY_MODE_KEY, TrackDisplayModeNormal);
+ }
+ if (!config.contains(PLAYLIST_DEFAULT_FORMAT_KEY)) {
+ config.addKey(PLAYLIST_DEFAULT_FORMAT_KEY, "xspf");
+ }
_playlistReader = new PlaylistReader(this);
connect(_playlistReader, SIGNAL(filesFound(const QList<MediaInfo> &)),
=======================================
--- /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.cpp Wed Feb 23
17:15:29 2011
@@ -32,7 +32,6 @@
#include <quarkplayer-plugins/ConfigWindow/PlaylistConfig.h>
#include <TkUtil/TkAction.h>
-#include <TkUtil/Actions.h>
#include <TkUtil/TkToolBar.h>
#include <TkUtil/TkFileDialog.h>
#include <TkUtil/LanguageChangeEventFilter.h>
@@ -136,7 +135,10 @@
connect(&PlaylistConfig::instance(), SIGNAL(activePlaylistChanged(const
QUuid &)),
SLOT(activePlaylistChanged(const QUuid &)));
- Config::instance().addKey(PLAYLIST_SEARCH_HISTORY_KEY, QStringList());
+ Config & config = Config::instance();
+ if (!config.contains(PLAYLIST_SEARCH_HISTORY_KEY)) {
+ config.addKey(PLAYLIST_SEARCH_HISTORY_KEY, QStringList());
+ }
RETRANSLATE(this);
retranslate();
@@ -166,14 +168,14 @@
_searchTimer->setInterval(1500);
connect(_searchTimer, SIGNAL(timeout()), SLOT(addWordToWordList()));
- toolBar->addAction(Actions["Playlist.Shuffle"]);
- connect(Actions["Playlist.Shuffle"], SIGNAL(toggled(bool)),
_playlistFilter, SLOT(setShuffle(bool)));
-
- toolBar->addAction(Actions["Playlist.Repeat"]);
- connect(Actions["Playlist.Repeat"], SIGNAL(toggled(bool)),
_playlistFilter, SLOT(setRepeat(bool)));
-
- toolBar->addAction(Actions["Playlist.JumpToCurrent"]);
- connect(Actions["Playlist.JumpToCurrent"], SIGNAL(triggered()),
SLOT(jumpToCurrent()));
+ toolBar->addAction(_actions["Playlist.Shuffle"]);
+ connect(_actions["Playlist.Shuffle"], SIGNAL(toggled(bool)),
_playlistFilter, SLOT(setShuffle(bool)));
+
+ toolBar->addAction(_actions["Playlist.Repeat"]);
+ connect(_actions["Playlist.Repeat"], SIGNAL(toggled(bool)),
_playlistFilter, SLOT(setRepeat(bool)));
+
+ toolBar->addAction(_actions["Playlist.JumpToCurrent"]);
+ connect(_actions["Playlist.JumpToCurrent"], SIGNAL(triggered()),
SLOT(jumpToCurrent()));
//Search line edit
QStringList history =
Config::instance().value(PLAYLIST_SEARCH_HISTORY_KEY).toStringList();
@@ -181,101 +183,101 @@
connect(_searchLineEdit, SIGNAL(textChanged(const QString &)),
SLOT(search()));
toolBar->addWidget(_searchLineEdit);
- toolBar->addAction(Actions["Playlist.Open"]);
- connect(Actions["Playlist.Open"], SIGNAL(triggered()),
SLOT(openPlaylist()));
-
- toolBar->addAction(Actions["Playlist.Save"]);
- connect(Actions["Playlist.Save"], SIGNAL(triggered()),
SLOT(savePlaylist()));
+ toolBar->addAction(_actions["Playlist.Open"]);
+ connect(_actions["Playlist.Open"], SIGNAL(triggered()),
SLOT(openPlaylist()));
+
+ toolBar->addAction(_actions["Playlist.Save"]);
+ connect(_actions["Playlist.Save"], SIGNAL(triggered()),
SLOT(savePlaylist()));
//We have to use a QToolButton instead of a QAction,
//otherwise we cannot use QToolButton::InstantPopup :/
QToolButton * addButton = new QToolButton();
addButton->setPopupMode(QToolButton::InstantPopup);
- addButton->setDefaultAction(Actions["Playlist.Add"]);
+ addButton->setDefaultAction(_actions["Playlist.Add"]);
toolBar->addWidget(addButton);
QMenu * addMenu = new QMenu();
- addMenu->addAction(Actions["Playlist.AddFiles"]);
- connect(Actions["Playlist.AddFiles"], SIGNAL(triggered()),
SLOT(addFiles()));
-
- addMenu->addAction(Actions["Playlist.AddDir"]);
- connect(Actions["Playlist.AddDir"], SIGNAL(triggered()), SLOT(addDir()));
-
- connect(Actions["Playlist.AddURL"], SIGNAL(triggered()), SLOT(addURL()));
+ addMenu->addAction(_actions["Playlist.AddFiles"]);
+ connect(_actions["Playlist.AddFiles"], SIGNAL(triggered()),
SLOT(addFiles()));
+
+ addMenu->addAction(_actions["Playlist.AddDir"]);
+ connect(_actions["Playlist.AddDir"], SIGNAL(triggered()), SLOT(addDir()));
+
+ connect(_actions["Playlist.AddURL"], SIGNAL(triggered()), SLOT(addURL()));
addButton->setMenu(addMenu);
KeyPressEventFilter * deleteKeyFilter = new KeyPressEventFilter(_view,
SLOT(clearSelection()),
Qt::Key_Delete);
_view->installEventFilter(deleteKeyFilter);
- toolBar->addAction(Actions["Playlist.RemoveAll"]);
- connect(Actions["Playlist.RemoveAll"], SIGNAL(triggered()),
_playlistModel, SLOT(clear()));
- connect(Actions["Playlist.RemoveAll"], SIGNAL(triggered()),
SLOT(updateWindowTitle()));
+ toolBar->addAction(_actions["Playlist.RemoveAll"]);
+ connect(_actions["Playlist.RemoveAll"], SIGNAL(triggered()),
_playlistModel, SLOT(clear()));
+ connect(_actions["Playlist.RemoveAll"], SIGNAL(triggered()),
SLOT(updateWindowTitle()));
toolBar->addSeparator();
- toolBar->addAction(Actions["Playlist.New"]);
- connect(Actions["Playlist.New"], SIGNAL(triggered()),
SLOT(createNewPlaylistWidget()));
+ toolBar->addAction(_actions["Playlist.New"]);
+ connect(_actions["Playlist.New"], SIGNAL(triggered()),
SLOT(createNewPlaylistWidget()));
}
void PlaylistWidget::populateActionCollection() {
QCoreApplication * app = QApplication::instance();
Q_ASSERT(app);
- Actions.add("Playlist.Open", new QAction(app));
- Actions.add("Playlist.Save", new QAction(app));
-
- Actions.add("Playlist.Add", new QAction(app));
- Actions.add("Playlist.AddFiles", new QAction(app));
- Actions.add("Playlist.AddDir", new QAction(app));
- Actions.add("Playlist.AddURL", new QAction(app));
-
- Actions.add("Playlist.RemoveAll", new QAction(app));
+ _actions.add("Playlist.Open", new QAction(app));
+ _actions.add("Playlist.Save", new QAction(app));
+
+ _actions.add("Playlist.Add", new QAction(app));
+ _actions.add("Playlist.AddFiles", new QAction(app));
+ _actions.add("Playlist.AddDir", new QAction(app));
+ _actions.add("Playlist.AddURL", new QAction(app));
+
+ _actions.add("Playlist.RemoveAll", new QAction(app));
TkAction * action = new TkAction(app, tr("Ctrl+S"));
action->setCheckable(true);
- Actions.add("Playlist.Shuffle", action);
+ _actions.add("Playlist.Shuffle", action);
action = new TkAction(app, tr("Ctrl+R"));
action->setCheckable(true);
- Actions.add("Playlist.Repeat", action);
-
- Actions.add("Playlist.JumpToCurrent", new TkAction(app, tr("Ctrl+J")));
-
- Actions.add("Playlist.New", new QAction(app));
+ _actions.add("Playlist.Repeat", action);
+
+ _actions.add("Playlist.JumpToCurrent", new TkAction(app, tr("Ctrl+J")));
+
+ _actions.add("Playlist.New", new QAction(app));
}
void PlaylistWidget::retranslate() {
_searchLineEdit->setToolTip(tr("Search playlist, use whitespaces to
separate words"));
_searchLineEdit->setClickMessage(tr("Search"));
- Actions["Playlist.Open"]->setText(tr("Open Playlist"));
- Actions["Playlist.Open"]->setIcon(QIcon::fromTheme("document-open"));
-
- Actions["Playlist.Save"]->setText(tr("Save Playlist"));
- Actions["Playlist.Save"]->setIcon(QIcon::fromTheme("document-save"));
-
- Actions["Playlist.Add"]->setText(tr("Add..."));
- Actions["Playlist.Add"]->setIcon(QIcon::fromTheme("list-add"));
-
- Actions["Playlist.AddFiles"]->setText(tr("Add Files"));
- Actions["Playlist.AddDir"]->setText(tr("Add Directory"));
- Actions["Playlist.AddURL"]->setText(tr("Add URL"));
-
- Actions["Playlist.RemoveAll"]->setText(tr("Remove All"));
- Actions["Playlist.RemoveAll"]->setIcon(QIcon::fromTheme("list-remove"));
-
- Actions["Playlist.Shuffle"]->setText(tr("Shuffle"));
-
Actions["Playlist.Shuffle"]->setIcon(QIcon::fromTheme("media-playlist-shuffle"));
-
- Actions["Playlist.Repeat"]->setText(tr("Repeat"));
-
Actions["Playlist.Repeat"]->setIcon(QIcon::fromTheme("media-playlist-repeat"));
-
- Actions["Playlist.JumpToCurrent"]->setText(tr("Jump to Current Playing
Media"));
- Actions["Playlist.JumpToCurrent"]->setIcon(QIcon::fromTheme("go-jump"));
-
- Actions["Playlist.New"]->setText(tr("New Playlist Window"));
- Actions["Playlist.New"]->setIcon(QIcon::fromTheme("tab-new"));
+ _actions["Playlist.Open"]->setText(tr("Open Playlist"));
+ _actions["Playlist.Open"]->setIcon(QIcon::fromTheme("document-open"));
+
+ _actions["Playlist.Save"]->setText(tr("Save Playlist"));
+ _actions["Playlist.Save"]->setIcon(QIcon::fromTheme("document-save"));
+
+ _actions["Playlist.Add"]->setText(tr("Add..."));
+ _actions["Playlist.Add"]->setIcon(QIcon::fromTheme("list-add"));
+
+ _actions["Playlist.AddFiles"]->setText(tr("Add Files"));
+ _actions["Playlist.AddDir"]->setText(tr("Add Directory"));
+ _actions["Playlist.AddURL"]->setText(tr("Add URL"));
+
+ _actions["Playlist.RemoveAll"]->setText(tr("Remove All"));
+ _actions["Playlist.RemoveAll"]->setIcon(QIcon::fromTheme("list-remove"));
+
+ _actions["Playlist.Shuffle"]->setText(tr("Shuffle"));
+
_actions["Playlist.Shuffle"]->setIcon(QIcon::fromTheme("media-playlist-shuffle"));
+
+ _actions["Playlist.Repeat"]->setText(tr("Repeat"));
+
_actions["Playlist.Repeat"]->setIcon(QIcon::fromTheme("media-playlist-repeat"));
+
+ _actions["Playlist.JumpToCurrent"]->setText(tr("Jump to Current Playing
Media"));
+ _actions["Playlist.JumpToCurrent"]->setIcon(QIcon::fromTheme("go-jump"));
+
+ _actions["Playlist.New"]->setText(tr("New Playlist Window"));
+ _actions["Playlist.New"]->setIcon(QIcon::fromTheme("tab-new"));
updateWindowTitle();
}
@@ -397,11 +399,11 @@
}
//Next track
- connect(Actions["CommonActions.NextTrack"], SIGNAL(triggered()),
+ connect(Actions["Global.NextTrack"], SIGNAL(triggered()),
_playlistFilter, SLOT(playNextTrack()));
//Previous track
- connect(Actions["CommonActions.PreviousTrack"], SIGNAL(triggered()),
+ connect(Actions["Global.PreviousTrack"], SIGNAL(triggered()),
_playlistFilter, SLOT(playPreviousTrack()));
}
@@ -412,10 +414,10 @@
}
//Next track
- Actions["CommonActions.NextTrack"]->disconnect(_playlistFilter);
+ Actions["Global.NextTrack"]->disconnect(_playlistFilter);
//Previous track
- Actions["CommonActions.PreviousTrack"]->disconnect(_playlistFilter);
+ Actions["Global.PreviousTrack"]->disconnect(_playlistFilter);
}
void PlaylistWidget::createNewPlaylistWidget() {
=======================================
--- /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h Sun Feb 20
17:34:30 2011
+++ /trunk/quarkplayer-plugins/Playlist/PlaylistWidget.h Wed Feb 23
17:15:29 2011
@@ -25,6 +25,8 @@
#include <PlaylistParser/PlaylistParser.h>
+#include <TkUtil/Actions.h>
+
#include <QtGui/QWidget>
#include <QtCore/QList>
@@ -146,6 +148,8 @@
QTimer * _searchTimer;
IMainWindow * _mainWindow;
+
+ ActionCollection _actions;
};
#include <quarkplayer/PluginFactory.h>
=======================================
--- /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp Wed
Feb 23 10:23:21 2011
+++ /trunk/quarkplayer-plugins/QuickSettings/QuickSettingsWindow.cpp Wed
Feb 23 17:15:29 2011
@@ -67,7 +67,7 @@
_nextEffect = NULL;
_ui = NULL;
- connect(Actions["CommonActions.Equalizer"], SIGNAL(triggered()),
SLOT(show()));
+ connect(Actions["Global.Equalizer"], SIGNAL(triggered()), SLOT(show()));
}
QuickSettingsWindow::~QuickSettingsWindow() {
=======================================
--- /trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.cpp Wed Feb 23
10:23:21 2011
+++ /trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.cpp Wed Feb 23
17:15:29 2011
@@ -50,7 +50,7 @@
//Lazy initialization
_widgetOverFullScreen = NULL;
- connect(Actions["CommonActions.FullScreen"], SIGNAL(toggled(bool)),
+ connect(Actions["Global.FullScreen"], SIGNAL(toggled(bool)),
SLOT(setFullScreenInternal(bool)));
//We have to add the QAction to the widget otherwise it won't work
@@ -58,9 +58,9 @@
//Note that an action must be added to a widget before it can be used;
//this is also true when the shortcut should be global
//(i.e., Qt::ApplicationShortcut as Qt::ShortcutContext).
- addAction(Actions["CommonActions.FullScreenExit"]);
-
- connect(Actions["CommonActions.FullScreenExit"], SIGNAL(triggered()),
+ addAction(Actions["Global.FullScreenExit"]);
+
+ connect(Actions["Global.FullScreenExit"], SIGNAL(triggered()),
SLOT(triggerFullScreenExitAction()));
if (_playToolBar) {
@@ -85,48 +85,37 @@
QCoreApplication * app = QApplication::instance();
Q_ASSERT(app);
- TkAction * action = new TkAction(app);
- Actions.add("VideoWidget.AspectRatioAuto", action);
-
- action = new TkAction(app);
- Actions.add("VideoWidget.AspectRatioScale", action);
-
- action = new TkAction(app);
- Actions.add("VideoWidget.AspectRatio16/9", action);
-
- action = new TkAction(app);
- Actions.add("VideoWidget.AspectRatio4/3", action);
-
- action = new TkAction(app);
- Actions.add("VideoWidget.ScaleModeFitInView", action);
-
- action = new TkAction(app);
- Actions.add("VideoWidget.ScaleModeScaleAndCrop", action);
+ _actions.add("VideoWidget.AspectRatioAuto", new QAction(app));
+ _actions.add("VideoWidget.AspectRatioScale", new QAction(app));
+ _actions.add("VideoWidget.AspectRatio16/9", new QAction(app));
+ _actions.add("VideoWidget.AspectRatio4/3", new QAction(app));
+ _actions.add("VideoWidget.ScaleModeFitInView", new QAction(app));
+ _actions.add("VideoWidget.ScaleModeScaleAndCrop", new QAction(app));
}
void MyVideoWidget::retranslate() {
- Actions["VideoWidget.AspectRatioAuto"]->setText(tr("Auto"));
- Actions["VideoWidget.AspectRatioScale"]->setText(tr("Scale"));
- Actions["VideoWidget.AspectRatio16/9"]->setText(tr("16/9"));
- Actions["VideoWidget.AspectRatio4/3"]->setText(tr("4/3"));
- Actions["VideoWidget.ScaleModeFitInView"]->setText(tr("Fit in View"));
- Actions["VideoWidget.ScaleModeScaleAndCrop"]->setText(tr("Scale and
Crop"));
+ _actions["VideoWidget.AspectRatioAuto"]->setText(tr("Auto"));
+ _actions["VideoWidget.AspectRatioScale"]->setText(tr("Scale"));
+ _actions["VideoWidget.AspectRatio16/9"]->setText(tr("16/9"));
+ _actions["VideoWidget.AspectRatio4/3"]->setText(tr("4/3"));
+ _actions["VideoWidget.ScaleModeFitInView"]->setText(tr("Fit in View"));
+ _actions["VideoWidget.ScaleModeScaleAndCrop"]->setText(tr("Scale and
Crop"));
}
void MyVideoWidget::createContextMenu() {
_contextMenu = new QMenu(this);
- _contextMenu->addAction(Actions["CommonActions.PreviousTrack"]);
- _contextMenu->addAction(Actions["CommonActions.PlayPause"]);
- _contextMenu->addAction(Actions["CommonActions.Stop"]);
- _contextMenu->addAction(Actions["CommonActions.NextTrack"]);
- _contextMenu->addAction(Actions["CommonActions.FullScreen"]);
+ _contextMenu->addAction(Actions["Global.PreviousTrack"]);
+ _contextMenu->addAction(Actions["Global.PlayPause"]);
+ _contextMenu->addAction(Actions["Global.Stop"]);
+ _contextMenu->addAction(Actions["Global.NextTrack"]);
+ _contextMenu->addAction(Actions["Global.FullScreen"]);
_contextMenu->addSeparator();
- _contextMenu->addAction(Actions["CommonActions.OpenFile"]);
- _contextMenu->addAction(Actions["CommonActions.OpenURL"]);
- _contextMenu->addAction(Actions["CommonActions.OpenDVD"]);
+ _contextMenu->addAction(Actions["Global.OpenFile"]);
+ _contextMenu->addAction(Actions["Global.OpenURL"]);
+ _contextMenu->addAction(Actions["Global.OpenDVD"]);
_contextMenu->addSeparator();
@@ -135,23 +124,23 @@
connect(aspectRatioGroup, SIGNAL(triggered(QAction *)),
SLOT(aspectRatioChanged(QAction *)));
aspectRatioGroup->setExclusive(true);
- QAction * action = Actions["VideoWidget.AspectRatioAuto"];
+ QAction * action = _actions["VideoWidget.AspectRatioAuto"];
action->setCheckable(true);
action->setChecked(true);
aspectRatioMenu->addAction(action);
aspectRatioGroup->addAction(action);
- action = Actions["VideoWidget.AspectRatioScale"];
+ action = _actions["VideoWidget.AspectRatioScale"];
action->setCheckable(true);
aspectRatioMenu->addAction(action);
aspectRatioGroup->addAction(action);
- action = Actions["VideoWidget.AspectRatio16/9"];
+ action = _actions["VideoWidget.AspectRatio16/9"];
action->setCheckable(true);
aspectRatioMenu->addAction(action);
aspectRatioGroup->addAction(action);
- action = Actions["VideoWidget.AspectRatio4/3"];
+ action = _actions["VideoWidget.AspectRatio4/3"];
action->setCheckable(true);
aspectRatioMenu->addAction(action);
aspectRatioGroup->addAction(action);
@@ -161,20 +150,20 @@
connect(scaleModeGroup, SIGNAL(triggered(QAction *)),
SLOT(scaleModeChanged(QAction *)));
scaleModeGroup->setExclusive(true);
- action = Actions["VideoWidget.ScaleModeFitInView"];
+ action = _actions["VideoWidget.ScaleModeFitInView"];
action->setCheckable(true);
action->setChecked(true);
scaleModeMenu->addAction(action);
scaleModeGroup->addAction(action);
- action = Actions["VideoWidget.ScaleModeScaleAndCrop"];
+ action = _actions["VideoWidget.ScaleModeScaleAndCrop"];
action->setCheckable(true);
scaleModeMenu->addAction(action);
scaleModeGroup->addAction(action);
_contextMenu->addSeparator();
- _contextMenu->addAction(Actions["CommonActions.Quit"]);
+ _contextMenu->addAction(Actions["Global.Quit"]);
}
void MyVideoWidget::showContextMenu(const QPoint & pos) {
@@ -182,9 +171,9 @@
}
void MyVideoWidget::scaleModeChanged(QAction * action) {
- if (action == Actions["VideoWidget.ScaleModeFitInView"]) {
+ if (action == _actions["VideoWidget.ScaleModeFitInView"]) {
setScaleMode(Phonon::VideoWidget::FitInView);
- } else if (action == Actions["VideoWidget.ScaleModeScaleAndCrop"]) {
+ } else if (action == _actions["VideoWidget.ScaleModeScaleAndCrop"]) {
setScaleMode(Phonon::VideoWidget::ScaleAndCrop);
} else {
VideoWidgetCritical() << "Unknown action:" << action->text();
@@ -192,13 +181,13 @@
}
void MyVideoWidget::aspectRatioChanged(QAction * action) {
- if (action == Actions["VideoWidget.AspectRatio16/9"]) {
+ if (action == _actions["VideoWidget.AspectRatio16/9"]) {
setAspectRatio(Phonon::VideoWidget::AspectRatio16_9);
- } else if (action == Actions["VideoWidget.AspectRatioScale"]) {
+ } else if (action == _actions["VideoWidget.AspectRatioScale"]) {
setAspectRatio(Phonon::VideoWidget::AspectRatioWidget);
- } else if (action == Actions["VideoWidget.AspectRatio4/3"]) {
+ } else if (action == _actions["VideoWidget.AspectRatio4/3"]) {
setAspectRatio(Phonon::VideoWidget::AspectRatio4_3);
- } else if (action == Actions["VideoWidget.AspectRatioAuto"]) {
+ } else if (action == _actions["VideoWidget.AspectRatioAuto"]) {
setAspectRatio(Phonon::VideoWidget::AspectRatioAuto);
} else {
VideoWidgetCritical() << "Unknown action:" << action->text();
@@ -206,7 +195,7 @@
}
void MyVideoWidget::triggerFullScreenExitAction() {
- Actions["CommonActions.FullScreen"]->setChecked(false);
+ Actions["Global.FullScreen"]->setChecked(false);
}
void MyVideoWidget::enterFullScreenInternal() {
@@ -277,7 +266,7 @@
void MyVideoWidget::mouseDoubleClickEvent(QMouseEvent * event) {
if (event->button() == Qt::LeftButton) {
event->accept();
- Actions["CommonActions.FullScreen"]->toggle();
+ Actions["Global.FullScreen"]->toggle();
} else {
event->ignore();
}
@@ -310,7 +299,7 @@
}
}
- Phonon::VideoWidget::event(event);
+ return Phonon::VideoWidget::event(event);
}
void MyVideoWidget::timerEvent(QTimerEvent * event) {
=======================================
--- /trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.h Sun Feb 20
13:15:39 2011
+++ /trunk/quarkplayer-plugins/VideoWidget/MyVideoWidget.h Wed Feb 23
17:15:29 2011
@@ -19,6 +19,8 @@
#ifndef MYVIDEOWIDGET_H
#define MYVIDEOWIDGET_H
+#include <TkUtil/Actions.h>
+
#include <phonon/videowidget.h>
#include <phonon/phononnamespace.h>
@@ -149,6 +151,8 @@
* using right button of the mouse.
*/
QMenu * _contextMenu;
+
+ ActionCollection _actions;
};
#endif //MYVIDEOWIDGET_H