merge current develop branch

This commit is contained in:
Felix Kauselmann
2016-11-06 16:01:29 +01:00
parent 1732d24f71
commit 46d06f441a
30 changed files with 993 additions and 404 deletions

View File

@ -119,7 +119,12 @@ public:
*/
void setReflectionEffect(ReflectionEffect effect);
/*!
Sets the flow direction right-to-left (manga mode)
*/
void setFlowRightToLeft(bool b);
public slots:
/*!
@ -213,6 +218,7 @@ public:
void paintEvent(QPaintEvent *event);
void keyPressEvent(QKeyEvent* event);
void mousePressEvent(QMouseEvent* event);
void mousePressEvent(QMouseEvent* event, int slideWidth);
void resizeEvent(QResizeEvent* event);
private slots: