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 16:16:57 +02:00
commit d1e5fcf2d3
5 changed files with 7 additions and 7 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
YACReaderLibrary/library_window.cpp
View File

@ -188,7 +188,7 @@ void LibraryWindow::doLayout()
librariesTitle->addAction(createLibraryAction); librariesTitle->addAction(createLibraryAction);
librariesTitle->addAction(openLibraryAction); librariesTitle->addAction(openLibraryAction);
librariesTitle->addSpacing(4); librariesTitle->addSpacing(3);
foldersTitle->addAction(setRootIndexAction); foldersTitle->addAction(setRootIndexAction);
foldersTitle->addAction(expandAllNodesAction); foldersTitle->addAction(expandAllNodesAction);

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()));

2
custom_widgets/yacreader_search_line_edit.cpp
View File

@ -27,7 +27,7 @@ YACReaderSearchLineEdit::YACReaderSearchLineEdit(QWidget *parent)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
setStyleSheet(QString("QLineEdit {border-top:1px solid #9F9F9F; border-bottom:1px solid #ACACAC; border-right:1px solid #ACACAC; border-left:1px solid #ACACAC; border-radius: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CACACA, stop: 0.15 #FFFFFF); padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 1px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2)); setStyleSheet(QString("QLineEdit {border-top:1px solid #9F9F9F; border-bottom:1px solid #ACACAC; border-right:1px solid #ACACAC; border-left:1px solid #ACACAC; border-radius: 10px; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CACACA, stop: 0.15 #FFFFFF); padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 1px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2));
#else #else
setStyleSheet(QString("QLineEdit {border:none; background-color:#FFFFFF; padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 0px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2)); setStyleSheet(QString("QLineEdit {border:none; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CACACA, stop: 0.15 #FFFFFF);; padding-left: %1px; padding-right: %2px; padding-bottom: 1px; margin-bottom: 0px;} ").arg(searchLabel->sizeHint().width() + frameWidth + 6).arg(clearButton->sizeHint().width() + frameWidth + 2));
#endif #endif
QSize msz = minimumSizeHint(); QSize msz = minimumSizeHint();
setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2), setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2 + 2),