diff options
| author | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:08:45 +0100 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2012-02-16 11:08:45 +0100 |
| commit | 65a64d260e05c7bf8d3bdf82e796637dc820e574 (patch) | |
| tree | 600c2becea7f28fdefff51200bb3ed33514e4cc7 /src/baseguiplus.cpp | |
| parent | 1d323e54ee434609cf035598486075c9a918a2d3 (diff) | |
Imported Upstream version 0.7.0
Diffstat (limited to 'src/baseguiplus.cpp')
| -rw-r--r-- | src/baseguiplus.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/baseguiplus.cpp b/src/baseguiplus.cpp index 1a9c9e7..d77f3c0 100644 --- a/src/baseguiplus.cpp +++ b/src/baseguiplus.cpp @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org> + Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,9 @@ #include "images.h" #include "playlist.h" -#ifndef Q_OS_WIN +#ifdef Q_OS_WIN +#include "favorites.h" +#else #include "tvlist.h" #endif @@ -44,8 +46,8 @@ using namespace Global; -BaseGuiPlus::BaseGuiPlus( QWidget * parent, Qt::WindowFlags flags ) - : BaseGui( parent, flags ) +BaseGuiPlus::BaseGuiPlus( bool use_server, QWidget * parent, Qt::WindowFlags flags) + : BaseGui( use_server, parent, flags ) { // Initialize variables mainwindow_visible = true; @@ -68,7 +70,7 @@ BaseGuiPlus::BaseGuiPlus( QWidget * parent, Qt::WindowFlags flags ) connect( tray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason))); - quitAct = new MyAction(this, "quit"); + quitAct = new MyAction(QKeySequence("Ctrl+Q"), this, "quit"); connect( quitAct, SIGNAL(triggered()), this, SLOT(quit()) ); openMenu->addAction(quitAct); @@ -98,9 +100,10 @@ BaseGuiPlus::BaseGuiPlus( QWidget * parent, Qt::WindowFlags flags ) context_menu->addAction(openDirectoryAct); context_menu->addAction(openDVDAct); context_menu->addAction(openURLAct); + context_menu->addMenu(favorites); #ifndef Q_OS_WIN - context_menu->addMenu(tvlist->menu()); - context_menu->addMenu(radiolist->menu()); + context_menu->addMenu(tvlist); + context_menu->addMenu(radiolist); #endif context_menu->addSeparator(); context_menu->addAction(playOrPauseAct); |