terminada la maquetaci?n de la secci?n de opciones ajustes de imagen

This commit is contained in:
Luis Ángel San Martín
2013-01-23 07:43:43 +01:00
parent eaa86b2169
commit a94a2b30c5
5 changed files with 48 additions and 30 deletions

View File

@ -36,8 +36,8 @@ int main(int argc, char * argv[])
app.installTranslator(&translator);
app.setApplicationName("YACReader");
MainWindowViewer mwv;
mwv.show();
MainWindowViewer * mwv = new MainWindowViewer();
mwv->show();
int ret = app.exec();

View File

@ -21,7 +21,8 @@ OptionsDialog::OptionsDialog(QWidget * parent)
QWidget * pageImage = new QWidget();
QVBoxLayout * layoutGeneral = new QVBoxLayout();
QVBoxLayout * layoutFlow = new QVBoxLayout();
QVBoxLayout * layoutImage = new QVBoxLayout();
QVBoxLayout * layoutImageV = new QVBoxLayout();
QGridLayout * layoutImage = new QGridLayout();
QGroupBox *slideSizeBox = new QGroupBox(tr("\"Go to flow\" size"));
//slideSizeLabel = new QLabel(,this);
@ -75,27 +76,21 @@ OptionsDialog::OptionsDialog(QWidget * parent)
connect(selectBackgroundColorButton, SIGNAL(clicked()), colorDialog, SLOT(show()));
colorBox->setLayout(colorSelection);
brightnessS = new QSlider();
brightnessS->setMinimum(0);
brightnessS->setMaximum(100);
brightnessS->setPageStep(1);
brightnessS->setOrientation(Qt::Horizontal);
brightnessS = new YACReaderSpinSliderWidget(this,true);
brightnessS->setRange(0,100);
//brightnessS->setText(tr("Brightness"));
brightnessS->setTracking(false);
connect(brightnessS,SIGNAL(valueChanged(int)),this,SLOT(brightnessChanged(int)));
contrastS = new QSlider();
contrastS->setMinimum(0);
contrastS->setMaximum(250);
contrastS->setPageStep(1);
contrastS->setOrientation(Qt::Horizontal);
contrastS = new YACReaderSpinSliderWidget(this,true);
contrastS->setRange(0,250);
//contrastS->setText(tr("Contrast"));
contrastS->setTracking(false);
connect(contrastS,SIGNAL(valueChanged(int)),this,SLOT(contrastChanged(int)));
gammaS = new QSlider();
gammaS->setMinimum(0);
gammaS->setMaximum(250);
gammaS->setPageStep(1);
gammaS->setOrientation(Qt::Horizontal);
gammaS = new YACReaderSpinSliderWidget(this,true);
gammaS->setRange(0,250);
//gammaS->setText(tr("Gamma"));
gammaS->setTracking(false);
connect(gammaS,SIGNAL(valueChanged(int)),this,SLOT(gammaChanged(int)));
//connect(brightnessS,SIGNAL(valueChanged(int)),this,SIGNAL(changedOptions()));
@ -115,18 +110,28 @@ OptionsDialog::OptionsDialog(QWidget * parent)
layoutFlow->addWidget(gl);
layoutFlow->addWidget(useGL);
layoutFlow->addStretch();
layoutImage->addWidget(brightnessS);
layoutImage->addWidget(contrastS);
layoutImage->addWidget(gammaS);
layoutImage->addStretch();
layoutImage->addWidget(new QLabel(tr("Brightness")),0,0);
layoutImage->addWidget(new QLabel(tr("Contrast")),1,0);
layoutImage->addWidget(new QLabel(tr("Gamma")),2,0);
layoutImage->addWidget(brightnessS,0,1);
layoutImage->addWidget(contrastS,1,1);
layoutImage->addWidget(gammaS,2,1);
layoutImage->setColumnStretch(1,1);
QGroupBox *imageBox = new QGroupBox(tr("Image options"));
imageBox->setLayout(layoutImage);
layoutImageV->addWidget(imageBox);
layoutImageV->addStretch();
pageGeneral->setLayout(layoutGeneral);
pageFlow->setLayout(layoutFlow);
pageImage->setLayout(layoutImage);
pageImage->setLayout(layoutImageV);
tabWidget->addTab(pageGeneral,tr("General"));
tabWidget->addTab(pageFlow,tr("Page Flow"));
tabWidget->addTab(pageImage,tr("Immage adjustment"));
tabWidget->addTab(pageImage,tr("Image adjustment"));
layout->addWidget(tabWidget);
layout->addLayout(buttons);

View File

@ -37,11 +37,11 @@ Q_OBJECT
QColorDialog * colorDialog;
QSlider * brightnessS;
YACReaderSpinSliderWidget * brightnessS;
QSlider * contrastS;
YACReaderSpinSliderWidget * contrastS;
QSlider * gammaS;
YACReaderSpinSliderWidget * gammaS;
public slots:
void saveOptions();

View File

@ -512,16 +512,23 @@ void YACReaderFieldPlainTextEdit::setDisabled(bool disabled)
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
YACReaderSpinSliderWidget::YACReaderSpinSliderWidget(QWidget * parent)
YACReaderSpinSliderWidget::YACReaderSpinSliderWidget(QWidget * parent,bool strechableSlider)
:QWidget(parent)
{
QHBoxLayout * layout = new QHBoxLayout;
layout->addWidget(label = new QLabel(this),1);
layout->addStretch();
if(!strechableSlider)
layout->addStretch();
spinBox = new QSpinBox(this);
layout->addWidget(spinBox);
slider = new QSlider(Qt::Horizontal,this);
layout->addWidget(slider);
if(strechableSlider)
{
layout->setStretchFactor(slider,0.85);
layout->setStretchFactor(spinBox,0);
layout->setStretchFactor(label,0.15);
}
connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int)));
connect(slider, SIGNAL(valueChanged(int)), spinBox, SLOT(setValue(int)));
@ -564,6 +571,11 @@ QSize YACReaderSpinSliderWidget::minimumSizeHint() const
return QSize(270, 25);
}
void YACReaderSpinSliderWidget::setTracking(bool b)
{
slider->setTracking(b);
}
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////

View File

@ -249,13 +249,14 @@ private:
QSpinBox * spinBox;
QSlider * slider;
public:
YACReaderSpinSliderWidget(QWidget * parent = 0);
YACReaderSpinSliderWidget(QWidget * parent = 0,bool strechableSlider = false);
public slots:
void setRange(int lowValue, int topValue, int step=1);
void setValue(int value);
void setText(const QString & text);
int getValue();
QSize minimumSizeHint() const;
void setTracking(bool b);
signals:
void valueChanged(int);