Commit 49476e0b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: add a QUIT button. Close #2387.

parent 3ae1f84c
......@@ -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;
......
......@@ -50,6 +50,7 @@ typedef enum actionType_e
REVERSE_ACTION,
SKIP_BACK_ACTION,
SKIP_FW_ACTION,
QUIT_ACTION,
} actionType_e;
class ActionsManager : public QObject
......
......@@ -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;
......
......@@ -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
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment