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

@ -61,8 +61,9 @@ private slots:
void setNumSlides(unsigned int slides);
void setImageReady(int index,const QByteArray & image);
void setFlowType(FlowType flowType);
void updateSize();
void updateConfig(QSettings * settings);
void setFlowRightToLeft(bool b);
signals:
void goToPage(unsigned int page);