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

a?adidos 2 estados para importWidget (import y update)

Browse Source 
a?adido bot?n que muestra las opciones avanzadas de YACReaderFlowGL en los di?logos de opciones

v6.2.0 rc1
This commit is contained in:
Luis Ángel San Martín 2013-05-12 15:40:21 +02:00
parent 882dd0c435
commit 65a50fb612
13 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReader/options_dialog.cpp
View File

@ -145,7 +145,7 @@ OptionsDialog::OptionsDialog(QWidget * parent)
gl->vSyncCheck->hide();
//restoreOptions(); //load options
resize(400,0);
//resize(400,0);
setModal (true);
setWindowTitle(tr("Options"));

1
YACReaderLibrary/images.qrc
View File

@ -61,6 +61,7 @@
<file>../images/noLibrariesIcon.png</file>
<file>../images/noLibrariesLine.png</file>
<file>../images/importingIcon.png</file>
<file>../images/updatingIcon.png</file>
<file>../images/importTopCoversDecoration.png</file>
<file>../images/importBottomCoversDecoration.png</file>
<file>../images/glowLine.png</file>

20
YACReaderLibrary/import_widget.cpp
View File

@ -97,7 +97,7 @@ ImportWidget::ImportWidget(QWidget *parent) :
setPalette(p);
QPixmap icon(":/images/importingIcon.png");
QLabel * iconLabel = new QLabel();
iconLabel = new QLabel();
iconLabel->setPixmap(icon);
/*QPixmap line(":/images/noLibrariesLine.png");
@ -106,9 +106,9 @@ ImportWidget::ImportWidget(QWidget *parent) :
YACReaderActivityIndicatorWidget * activityIndicator = new YACReaderActivityIndicatorWidget();
QLabel * text = new QLabel("<font color=\"#495252\">"+tr("Importing comics")+"</font>");
text = new QLabel("<font color=\"#495252\">"+tr("Importing comics")+"</font>");
text->setStyleSheet("QLabel {font-size:25px;font-weight:bold;}");
QLabel * textDescription = new QLabel("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
textDescription = new QLabel("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
textDescription->setWordWrap(true);
textDescription->setMaximumWidth(330);
currentComicLabel = new QLabel("<font color=\"#565959\">...</font>");
@ -331,6 +331,20 @@ void ImportWidget::clear()
i = 0;
}
void ImportWidget::setImportLook()
{
iconLabel->setPixmap(QPixmap(":/images/importingIcon.png"));
text->setText("<font color=\"#495252\">"+tr("Importing comics")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
}
void ImportWidget::setUpdateLook()
{
iconLabel->setPixmap(QPixmap(":/images/updatingIcon.png"));
text->setText("<font color=\"#495252\">"+tr("Updating the library")+"</font>");
textDescription->setText("<font color=\"#565959\">"+tr("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")+"</font>");
}
void ImportWidget::clearScene()
{

5
YACReaderLibrary/import_widget.h
View File

@ -23,9 +23,14 @@ public slots:
void addCoverTest();
void finishedUpdatingCover();
void clearScene();
void setImportLook();
void setUpdateLook();
private:
QLabel * currentComicLabel;
QLabel * portadasLabel;
QLabel * iconLabel;
QLabel * text;
QLabel * textDescription;
QGraphicsView * coversView;
QGraphicsScene * coversScene;
int previousWidth;

2
YACReaderLibrary/library_window.cpp
View File

@ -1019,6 +1019,7 @@ void LibraryWindow::create(QString source, QString dest, QString name)
_lastAdded = name;
_sourceLastAdded = source;
importWidget->setImportLook();
showImportingWidget();
}
@ -1115,6 +1116,7 @@ void LibraryWindow::saveLibraries()
void LibraryWindow::updateLibrary()
{
//updateLibraryDialog->show();
importWidget->setUpdateLook();
showImportingWidget();
QString currentLibrary = selectedLibrary->currentText();

2
YACReaderLibrary/options_dialog.cpp
View File

@ -43,6 +43,8 @@ OptionsDialog::OptionsDialog(QWidget * parent)
//resize(200,0);
setModal (true);
setWindowTitle(tr("Options"));
this->layout()->setSizeConstraint(QLayout::SetFixedSize);
}

29
common/custom_widgets.cpp
View File

@ -605,16 +605,19 @@ YACReaderOptionsDialog::YACReaderOptionsDialog(QWidget * parent)
:QDialog(parent)
{
sw = new YACReaderFlowConfigWidget(this);
gl = new YACReaderGLFlowConfigWidget(this);
accept = new QPushButton(tr("Save"));
cancel = new QPushButton(tr("Cancel"));
cancel->setDefault(true);
connect(accept,SIGNAL(clicked()),this,SLOT(saveOptions()));
connect(cancel,SIGNAL(clicked()),this,SLOT(restoreOptions()));
connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
sw = new YACReaderFlowConfigWidget(this);
gl = new YACReaderGLFlowConfigWidget(this);
useGL = useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)"));
useGL = new QCheckBox(tr("Use hardware acceleration (restart needed)"));
connect(useGL,SIGNAL(stateChanged(int)),this,SLOT(saveUseGL(int)));
//sw CONNECTIONS
@ -1027,10 +1030,16 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget * parent /* = 0
opt5->addWidget(lOpt5);
vbox->addLayout(opt5);
showAdvancedOptions = new QPushButton(tr("Show advanced settings"));
showAdvancedOptions->setCheckable(true);
connect(showAdvancedOptions,SIGNAL(toggled(bool)),this,SLOT(avancedOptionToogled(bool)));
vbox->addWidget(showAdvancedOptions,0,Qt::AlignRight);
groupBox->setLayout(vbox);
//OPTIONS------------------------------------------------------------------
QGroupBox *optionsGroupBox = new QGroupBox(tr("Custom:"));
optionsGroupBox = new QGroupBox(tr("Custom:"));
xRotation = new YACReaderSpinSliderWidget(this);
xRotation->setText(tr("View angle"));
@ -1122,6 +1131,8 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget * parent /* = 0
groupBoxesLayout->addWidget(groupBox);
groupBoxesLayout->addWidget(optionsGroupBox);
optionsGroupBox->hide();
QHBoxLayout * performanceSliderLayout = new QHBoxLayout;
performanceSliderLayout->addWidget(new QLabel(tr("Low Performance")));
performanceSliderLayout->addWidget(performanceSlider = new QSlider(Qt::Horizontal));
@ -1161,6 +1172,14 @@ YACReaderGLFlowConfigWidget::YACReaderGLFlowConfigWidget(QWidget * parent /* = 0
}
void YACReaderGLFlowConfigWidget::avancedOptionToogled(bool show)
{
if(show)
optionsGroupBox->show();
else
optionsGroupBox->hide();
}
void YACReaderGLFlowConfigWidget::setValues(Preset preset)
{
xRotation->setValue(preset.cfRX);

4
common/custom_widgets.h
View File

@ -313,8 +313,12 @@ public:
QSlider * performanceSlider;
QCheckBox * vSyncCheck;
QPushButton * showAdvancedOptions;
QGroupBox *optionsGroupBox;
public slots:
void setValues(Preset preset);
void avancedOptionToogled(bool show);
};
//////////////////////////////////////////////////////////////////////////

2
common/yacreader_global.h
View File

@ -1,7 +1,7 @@
#ifndef __YACREADER_GLOBAL_H
#define __YACREADER_GLOBAL_H
#define VERSION "6.0.0"
#define VERSION "6.2.0"
#define PATH "PATH"
#define MAG_GLASS_SIZE "MAG_GLASS_SIZE"

2
files/about.html
View File

@ -4,7 +4,7 @@
<body>
<p>
<img src=":/images/icon.png" /> <br/>
YACReader - Yet Another Comic Reader - version 6.0.0 <br/>
YACReader - Yet Another Comic Reader - version 6.2.0 <br/>
by Luis Ángel San Martín Rodríguez <br/>
e-mail: luisangelsm@gmail.com <br/>
web site: <a href="http://www.yacreader.com">http://www.yacreader.com</a> <br/>

2
files/about_es_ES.html
View File

@ -4,7 +4,7 @@
<body>
<p>
<img src=":/images/icon.png" /> <br/>
YACReader - Yet Another Comic Reader - versión 6.0.0 <br/>
YACReader - Yet Another Comic Reader - versión 6.2.0 <br/>
por Luis Ángel San Martín Rodríguez <br/>
e-mail: luisangelsm@gmail.com <br/>
Página web: <a href="http://www.yacreader.com">http://www.yacreader.com</a> <br/>

BIN
images/importingIcon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
images/updatingIcon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.6 KiB