Qt: add a QUIT button. Close #2387.

diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp
index ed6b9b88cc14203e06a7fb60815a4c7ba9ba6664..9e5cd8cba2b51488edf18dfec44a1e6a241d338e 100644 (file)
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -86,6 +86,8 @@ void ActionsManager::doAction( int id_action )
             var_SetInteger( p_intf->p_libvlc, "key-pressed",
                     ACTIONID_JUMP_FORWARD_SHORT );
             break;
+        case QUIT_ACTION:
+            THEDP->quit();  break;
         default:
             msg_Dbg( p_intf, "Action: %i", id_action );
             break;

diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 6bef13faed9440391f8f176a74f9c160801a0817..6ab208978be8ce2eaef90384d4d74fcfa7b024ac 100644 (file)
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -50,6 +50,7 @@ typedef enum actionType_e
     REVERSE_ACTION,
     SKIP_BACK_ACTION,
     SKIP_FW_ACTION,
+    QUIT_ACTION,
 } actionType_e;
 
 class ActionsManager : public QObject

diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index b5e0d1120cff03cf0d279c68950baf2be1572931..7314a8800075beeb4a4805cc36f92f0526544db6 100644 (file)
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -399,6 +399,14 @@ QWidget *AbstractController::createWidget( buttonType_e button, int options )
         widget = skipFwButton;
         }
         break;
+    case QUIT_BUTTON: {
+        QToolButton *quitButton = new QToolButton;
+        setupButton( quitButton );
+        CONNECT_MAP_SET( quitButton, QUIT_ACTION );
+        BUTTON_SET_BAR(  quitButton );
+        widget = quitButton;
+        }
+        break;
     default:
         msg_Warn( p_intf, "This should not happen %i", button );
         break;

diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
index 759ccd6cea372c028f0ae9264d6132fc96e5e5ed..1dedbfbb4600221c124e3c6c581674c1be31994e 100644 (file)
--- a/modules/gui/qt4/components/controller.hpp
+++ b/modules/gui/qt4/components/controller.hpp
@@ -79,6 +79,7 @@ typedef enum buttonType_e
     REVERSE_BUTTON,
     SKIP_BACK_BUTTON,
     SKIP_FW_BUTTON,
+    QUIT_BUTTON,
     BUTTON_MAX,
 
     SPLITTER = 0x20,
@@ -99,7 +100,8 @@ typedef enum buttonType_e
 static const QString nameL[BUTTON_MAX] = { "Play", "Stop", "Open",
     "Previous", "Next", "Slower", "Faster", "Fullscreen", "De-Fullscreen",
     "Extended panel", "Playlist", "Snapshot", "Record", "A->B Loop",
-    "Frame By Frame", "Reverse", "Skip backward" , "Skip forward" };
+    "Frame By Frame", "Reverse", "Skip backward" , "Skip forward",
+    "Quit" };
 static const QString tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
     _("Stop playback"), _("Open a media"),
     _("Previous media in the playlist"),
@@ -107,11 +109,13 @@ static const QString tooltipL[BUTTON_MAX] = { I_PLAY_TOOLTIP,
     _("Toggle the video in fullscreen"), _("Toggle the video out fullscreen"),
     _("Show extended settings" ), _( "Show playlist" ), _( "Take a snapshot" ),
     _( "Record" ), _( "Loop from point A to point B continuously." ),
-    _("Frame by frame"), _("Reverse"), _("Skip backward"), _("Skip forward") };
+    _("Frame by frame"), _("Reverse"), _("Skip backward"), _("Skip forward"),
+    _("Quit") };
 static const QString iconL[BUTTON_MAX] ={ ":/play_b", ":/stop_b", ":/eject",
     ":/previous_b", ":/next_b", ":/slower", ":/faster", ":/fullscreen",
     ":/defullscreen", ":/extended", ":/playlist", ":/snapshot", ":/record",
-    ":/atob_nob", ":/frame", ":/reverse", ":/skip_back", ":/skip_fw" };
+    ":/atob_nob", ":/frame", ":/reverse", ":/skip_back", ":/skip_fw",
+    ":/quit"};
 
 enum
 {