Changeset 142 for smplayer/trunk/src/defaultgui.cpp

Timestamp:

May 27, 2013, 3:28:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.5

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/defaultgui.cpp (modified) (3 diffs)

smplayer/trunk/src/defaultgui.cpp

@@ -1 +1 @@
 /*  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
@@ -221 +221 @@
         toolbar1_actions << "open_file" << "open_url" << "favorites_menu" << "separator"
                      << "screenshot" << "separator" << "show_file_properties" << "show_playlist"
-                     << "show_preferences" << "separator" << "play_prev" << "play_next";
+                     << "show_tube_browser" << "separator" << "show_preferences"
+                     << "separator" << "play_prev" << "play_next";
+
         toolbar1->setDefaultActions(toolbar1_actions);
 #else
@@ -429 +431 @@
 #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