diff options
author | Reinhard Tartler <siretart@tauware.de> | 2013-03-29 20:34:22 +0100 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2013-03-29 20:34:22 +0100 |
commit | 228d763f5a95a2575a18e03e0ea77555106023c4 (patch) | |
tree | 1eb49f0c372de4eef020e4c7e1716248622a7f0b /src/defaultgui.cpp | |
parent | 038de1a143b9775f37d4848f52c59af7cee66e36 (diff) |
Imported Upstream version 0.8.4
Diffstat (limited to 'src/defaultgui.cpp')
-rw-r--r-- | src/defaultgui.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/defaultgui.cpp b/src/defaultgui.cpp index 9860842..8236a3c 100644 --- a/src/defaultgui.cpp +++ b/src/defaultgui.cpp @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net> + Copyright (C) 2006-2013 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 @@ -428,8 +428,11 @@ void DefaultGui::createFloatingControl() { #if defined(Q_OS_WIN) || defined(Q_OS_OS2) // To make work the ESC key (exit fullscreen) and Ctrl-X (close) in Windows and OS2 + /* floating_control->addAction(exitFullscreenAct); floating_control->addAction(exitAct); + */ + floating_control->addActions(actions()); #endif #if !USE_CONFIGURABLE_TOOLBARS |