vlc | branch: master | Rohan Rajpal <[email protected]> | Sun Jul 28 23:32:20 2019 +0530| [9b2781f00fd9e0432922b9b2564354ae466ed74e] | committer: Jean-Baptiste Kempf
qml: ButtonType enum changes Change enum for buttons to support buttons till date. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b2781f00fd9e0432922b9b2564354ae466ed74e --- .../gui/qt/components/playercontrolbarmodel.cpp | 2 +- .../gui/qt/components/playercontrolbarmodel.hpp | 83 +++++++++------------- modules/gui/qt/qml/player/ControlButtons.qml | 4 +- 3 files changed, 37 insertions(+), 52 deletions(-) diff --git a/modules/gui/qt/components/playercontrolbarmodel.cpp b/modules/gui/qt/components/playercontrolbarmodel.cpp index b7ddcaf3e9..724c98813f 100644 --- a/modules/gui/qt/components/playercontrolbarmodel.cpp +++ b/modules/gui/qt/components/playercontrolbarmodel.cpp @@ -20,7 +20,7 @@ #include "qt.hpp" #include "playercontrolbarmodel.hpp" -#define MAIN_TB1_DEFAULT "68;37;65;19;22;0-2;1-2;23;20;65;35;7" +#define MAIN_TB1_DEFAULT "20;21;65;17;3;0-2;1-2;4;18;65;33;7" PlayerControlBarModel::PlayerControlBarModel(QObject *_parent) : QAbstractListModel(_parent) { diff --git a/modules/gui/qt/components/playercontrolbarmodel.hpp b/modules/gui/qt/components/playercontrolbarmodel.hpp index f10f29ce0e..23320d0c46 100644 --- a/modules/gui/qt/components/playercontrolbarmodel.hpp +++ b/modules/gui/qt/components/playercontrolbarmodel.hpp @@ -42,55 +42,40 @@ public: }; enum ButtonType_e { - - PLAY_BUTTON, //0 - STOP_BUTTON, //1 - OPEN_BUTTON, //2 - PREV_SLOW_BUTTON, //3 - NEXT_FAST_BUTTON, //4 - SLOWER_BUTTON, //5 - FASTER_BUTTON, //6 - FULLSCREEN_BUTTON, //7 - DEFULLSCREEN_BUTTON, //8 - EXTENDED_BUTTON, //9 - PLAYLIST_BUTTON, //10 - SNAPSHOT_BUTTON, //11 - RECORD_BUTTON, //12 - ATOB_BUTTON, //13 - FRAME_BUTTON, //14 - REVERSE_BUTTON, //15 - SKIP_BACK_BUTTON, //16 - SKIP_FW_BUTTON, //17 - QUIT_BUTTON, //18 - RANDOM_BUTTON, //19 - LOOP_BUTTON, //20 - INFO_BUTTON, //21 - PREVIOUS_BUTTON, //22 - NEXT_BUTTON, //23 - OPEN_SUB_BUTTON, //24 - FULLWIDTH_BUTTON, //25 - BUTTON_MAX, //26 - - SPLITTER = 0x20, //32 - INPUT_SLIDER, //33 - TIME_LABEL, //34 - VOLUME, //35 - VOLUME_SPECIAL, //36 - MENU_BUTTONS, //37 - TELETEXT_BUTTONS, //38 - ADVANCED_CONTROLLER, //39 - PLAYBACK_BUTTONS, //40 - ASPECT_RATIO_COMBOBOX, //41 - SPEED_LABEL, //42 - TIME_LABEL_ELAPSED, //43 - TIME_LABEL_REMAINING, //44 - SPECIAL_MAX, //45 - - WIDGET_SPACER = 0x40, //64 - WIDGET_SPACER_EXTEND, //65 - WIDGET_MAX, //66 - GOBACK_BUTTON, //67 - LANG_BUTTON //68 + PLAY_BUTTON, + STOP_BUTTON, + OPEN_BUTTON, + PREVIOUS_BUTTON, + NEXT_BUTTON, + SLOWER_BUTTON, + FASTER_BUTTON, + FULLSCREEN_BUTTON, + EXTENDED_BUTTON, + PLAYLIST_BUTTON, + SNAPSHOT_BUTTON, + RECORD_BUTTON, + ATOB_BUTTON, + FRAME_BUTTON, + SKIP_BACK_BUTTON, + SKIP_FW_BUTTON, + QUIT_BUTTON, + RANDOM_BUTTON, + LOOP_BUTTON, + INFO_BUTTON, + LANG_BUTTON, + MENU_BUTTON, + BACK_BUTTON, + BUTTON_MAX, + + SPLITTER = 0x20, + VOLUME, + TELETEXT_BUTTONS, + ASPECT_RATIO_COMBOBOX, + SPECIAL_MAX, + + WIDGET_SPACER = 0x40, + WIDGET_SPACER_EXTEND, + WIDGET_MAX }; Q_ENUM(ButtonType_e) diff --git a/modules/gui/qt/qml/player/ControlButtons.qml b/modules/gui/qt/qml/player/ControlButtons.qml index dcec914c6b..317bd364a3 100644 --- a/modules/gui/qt/qml/player/ControlButtons.qml +++ b/modules/gui/qt/qml/player/ControlButtons.qml @@ -37,8 +37,8 @@ Item{ case PlayerControlBarModel.LOOP_BUTTON: return repeatBtnDelegate case PlayerControlBarModel.LANG_BUTTON: return langBtnDelegate case PlayerControlBarModel.PLAYLIST_BUTTON:return playlistBtnDelegate - case PlayerControlBarModel.MENU_BUTTONS:return menuBtnDelegate - case PlayerControlBarModel.GOBACK_BUTTON:return backBtnDelegate + case PlayerControlBarModel.MENU_BUTTON:return menuBtnDelegate + case PlayerControlBarModel.BACK_BUTTON:return backBtnDelegate case PlayerControlBarModel.WIDGET_SPACER:return spacerDelegate case PlayerControlBarModel.WIDGET_SPACER_EXTEND:return extendiblespacerDelegate case PlayerControlBarModel.RECORD_BUTTON: return recordBtnDelegate _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
