Changeset 124 for smplayer/trunk/src/baseguiplus.cpp

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/baseguiplus.cpp (modified) (5 diffs)

smplayer/trunk/src/baseguiplus.cpp

@@ -1 +1 @@
 /*  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
@@ -24 +24 @@
 #include "playlist.h"
 
-#ifndef Q_OS_WIN
+#ifdef Q_OS_WIN
+#include "favorites.h"
+#else
 #include "tvlist.h"
 #endif
@@ -45 +47 @@
 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
@@ -69 +71 @@
              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);
@@ -99 +101 @@
         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();