mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-06-18 13:21:29 +02:00
commit 30c77f7ce6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
YACReaderLibrary/comic_flow_widget.cpp
View File

@ -123,13 +123,13 @@ void ComicFlowWidgetSW::updateConfig(QSettings * settings)
{ {
switch (settings->value(FLOW_TYPE_SW).toInt()) switch (settings->value(FLOW_TYPE_SW).toInt())
{ {
case 0: case CoverFlowLike:
flow->setFlowType(CoverFlowLike); flow->setFlowType(CoverFlowLike);
return; return;
case 1: case Strip:
flow->setFlowType(Strip); flow->setFlowType(Strip);
return; return;
case 2: case StripOverlapped:
flow->setFlowType(StripOverlapped); flow->setFlowType(StripOverlapped);
return; return;
} }

2
common/yacreader_flow_gl.cpp
View File

@ -32,7 +32,7 @@ struct Preset defaultYACReaderFlowConfig = {
0.f, //CF_X the X Position of the Coverflow 0.f, //CF_X the X Position of the Coverflow
0.f, //CF_Y the Y Position of the Coverflow 0.f, //CF_Y the Y Position of the Coverflow
-12.f, //CF_Z the Z Position of the Coverflow -8.f, //CF_Z the Z Position of the Coverflow
15.f, //CF_RX the X Rotation of the Coverflow 15.f, //CF_RX the X Rotation of the Coverflow
0.f, //CF_RY the Y Rotation of the Coverflow 0.f, //CF_RY the Y Rotation of the Coverflow

2
custom_widgets/yacreader_options_dialog.cpp
View File

@ -33,7 +33,7 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
//sw CONNECTIONS //sw CONNECTIONS
connect(sw->radio1,SIGNAL(toggled(bool)),this,SLOT(setClassicConfigSW())); connect(sw->radio1,SIGNAL(toggled(bool)),this,SLOT(setClassicConfigSW()));
connect(sw->radio2,SIGNAL(toggled(bool)),this,SLOT(setStripeConfigSW())); connect(sw->radio2,SIGNAL(toggled(bool)),this,SLOT(setStripeConfigSW()));
connect(sw->radio3,SIGNAL(togg+led(bool)),this,SLOT(setOverlappedStripeConfigSW())); connect(sw->radio3,SIGNAL(toggled(bool)),this,SLOT(setOverlappedStripeConfigSW()));
//gl CONNECTIONS //gl CONNECTIONS
connect(gl->radioClassic,SIGNAL(toggled(bool)),this,SLOT(setClassicConfig())); connect(gl->radioClassic,SIGNAL(toggled(bool)),this,SLOT(setClassicConfig()));