Merge - 9.0.0 release

This commit is contained in:
Luis Ángel San Martín
2018-02-18 10:35:24 +01:00
parent 0b52310089
commit 2a136e3ea3
200 changed files with 19288 additions and 5108 deletions

View File

@ -7,12 +7,7 @@ YACReaderFlow::YACReaderFlow(QWidget * parent,FlowType flowType) : PictureFlow(p
void YACReaderFlow::mousePressEvent(QMouseEvent* event)
{
if(event->x() > (width()+slideSize().width())/2)
showNext();
else
if(event->x() < (width()-slideSize().width())/2)
showPrevious();
//else (centered cover space)
PictureFlow::mousePressEvent(event, slideSize().width());
}
void YACReaderFlow::mouseDoubleClickEvent(QMouseEvent* event)

View File

@ -320,8 +320,14 @@ void YACReaderOptionsDialog::restoreOptions(QSettings * settings)
}
//END FLOW CONFIG
#endif
#endif
}
void YACReaderOptionsDialog::restoreOptions()
{
restoreOptions(settings);
}
#ifndef NO_OPENGL
void YACReaderOptionsDialog::loadConfig()
{
@ -356,46 +362,46 @@ void YACReaderOptionsDialog::setOverlappedStripeConfigSW()
#ifndef NO_OPENGL
void YACReaderOptionsDialog::setClassicConfig()
{
settings->setValue(FLOW_TYPE_GL,CoverFlowLike);
gl->setValues(presetYACReaderFlowClassicConfig);
saveFlowParameters();
settings->setValue(FLOW_TYPE_GL,CoverFlowLike);
}
void YACReaderOptionsDialog::setStripeConfig()
{
settings->setValue(FLOW_TYPE_GL,Strip);
gl->setValues(presetYACReaderFlowStripeConfig);
saveFlowParameters();
settings->setValue(FLOW_TYPE_GL,Strip);
}
void YACReaderOptionsDialog::setOverlappedStripeConfig()
{
settings->setValue(FLOW_TYPE_GL,StripOverlapped);
gl->setValues(presetYACReaderFlowOverlappedStripeConfig);
saveFlowParameters();
settings->setValue(FLOW_TYPE_GL,StripOverlapped);
}
void YACReaderOptionsDialog::setModernConfig()
{
settings->setValue(FLOW_TYPE_GL,Modern);
gl->setValues(defaultYACReaderFlowConfig);
saveFlowParameters();
settings->setValue(FLOW_TYPE_GL,Modern);
}
void YACReaderOptionsDialog::setRouletteConfig()
{
settings->setValue(FLOW_TYPE_GL,Roulette);
gl->setValues(pressetYACReaderFlowDownConfig);
saveFlowParameters();
settings->setValue(FLOW_TYPE_GL,Roulette);
}
#endif

View File

@ -34,6 +34,7 @@ public:
YACReaderOptionsDialog(QWidget * parent);
public slots:
virtual void restoreOptions(QSettings * settings);
virtual void restoreOptions();
virtual void saveOptions();
protected slots:
#ifndef NO_OPENGL