# HG changeset patch # User koda # Date 1315835939 -7200 # Node ID 514b639c40da4ce694168f7203a2faca738d959f # Parent 7d52d7174619908f370a6aac9d9434f08d6dcd79 remove the forced fullscreen resolution since everyone is hating it; kept it around only for stereo rendering (where it's mandatory) diff -r 7d52d7174619 -r 514b639c40da QTfrontend/pageoptions.cpp --- a/QTfrontend/pageoptions.cpp Mon Sep 12 14:56:24 2011 +0200 +++ b/QTfrontend/pageoptions.cpp Mon Sep 12 15:58:59 2011 +0200 @@ -299,7 +299,6 @@ CBFullscreen = new QCheckBox(AGGroupBox); CBFullscreen->setText(QCheckBox::tr("Fullscreen")); GBAlayout->addWidget(CBFullscreen); - connect(CBFullscreen, SIGNAL(stateChanged(int)), this, SLOT(setFullscreen(void))); QLabel * quality = new QLabel(AGGroupBox); quality->setText(QLabel::tr("Quality")); @@ -413,24 +412,19 @@ previousQuality = this->SLQuality->value(); this->SLQuality->setValue(this->SLQuality->maximum()); this->SLQuality->setEnabled(false); + previousResolutionIndex = this->CBResolution->currentIndex(); + this->CBResolution->setCurrentIndex(0); + this->CBResolution->setEnabled(false); } else { this->CBFullscreen->setChecked(previousFullscreenValue); this->CBFullscreen->setEnabled(true); this->SLQuality->setValue(previousQuality); this->SLQuality->setEnabled(true); + this->CBResolution->setCurrentIndex(previousResolutionIndex); + this->CBResolution->setEnabled(true); } } -void PageOptions::setFullscreen(void) -{ - int tmp = this->CBResolution->currentIndex(); - if (this->CBFullscreen->isChecked()) - this->CBResolution->setCurrentIndex(0); - else - this->CBResolution->setCurrentIndex(previousResolutionIndex); - previousResolutionIndex = tmp; -} - void PageOptions::trimNetNick() { editNetNick->setText(editNetNick->text().trimmed()); diff -r 7d52d7174619 -r 514b639c40da QTfrontend/pageoptions.h --- a/QTfrontend/pageoptions.h Mon Sep 12 14:56:24 2011 +0200 +++ b/QTfrontend/pageoptions.h Mon Sep 12 15:58:59 2011 +0200 @@ -84,7 +84,6 @@ private slots: void forceFullscreen(int index); - void setFullscreen(void); void trimNetNick(); };