Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 10:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kutils: allow multiple options to be passed to the KMediaWidget constructor

Browse source 
and make use of it in KHTML

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-03-27 18:18:53 +00:00
parent 314fa967a4
commit cdacdd9bc4
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
khtml/html/HTMLMediaElement.cpp
View file

@ -63,7 +63,7 @@ HTMLMediaElement::HTMLMediaElement(Document* doc)
, m_previousProgress(0) , m_previousProgress(0)
, m_previousProgressTime(doubleMax) , m_previousProgressTime(doubleMax)
, m_sentStalledEvent(false) , m_sentStalledEvent(false)
, m_player(new KMediaWidget(NULL, KMediaWidget::FullscreenVideo)) , m_player(new KMediaWidget(NULL, KMediaWidget::HiddenControls | KMediaWidget::FullscreenVideo))
{ {
} }

15
kutils/kmediaplayer/kmediawidget.h
View file

@ -55,27 +55,29 @@ class KMEDIAPLAYER_EXPORT KMediaWidget: public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
enum KMediaOptions { enum KMediaOption {
//! @brief No options at all //! @brief No options at all
NoOptions = 0, NoOptions = 0,
/*! /*!
@long When URLs are dragged to the widget it will be opened @long When URL is dragged to the widget it will be opened
*/ */
DragDrop = 1, DragDrop = 1,
/*! /*!
@long Provide fullscreen option, it is option because it will ask the parent to do it @long Provide fullscreen option, it is such because it will ask the parent to do it
*/ */
FullscreenVideo = 2, FullscreenVideo = 2,
/*! /*!
@long After a certain ammount of time the controls will hide themselfs allowing more @long After a certain amount of time the controls will hide themselfs allowing more
screen space to be taken by the display widget screen space to be taken by the video widget
*/ */
HiddenControls = 4, HiddenControls = 3,
//! @brief All available options //! @brief All available options
AllOptions = DragDrop | FullscreenVideo | HiddenControls, AllOptions = DragDrop | FullscreenVideo | HiddenControls,
//! @brief Default options, currently none //! @brief Default options, currently none
DefaultOptions = NoOptions DefaultOptions = NoOptions
}; };
Q_DECLARE_FLAGS(KMediaOptions, KMediaOption);
KMediaWidget(QWidget *parent, KMediaOptions options = DefaultOptions); KMediaWidget(QWidget *parent, KMediaOptions options = DefaultOptions);
~KMediaWidget(); ~KMediaWidget();
@ -169,5 +171,6 @@ private:
bool m_replay; bool m_replay;
Ui_KMediaWidgetPrivate *d; Ui_KMediaWidgetPrivate *d;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(KMediaWidget::KMediaOptions);
#endif // KMEDIAWIDGET_H #endif // KMEDIAWIDGET_H