mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 18:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Second try: added aspect ratios to the resolution combobox

Browse Source
This commit is contained in:
Pieter van der Kloet 2012-06-29 19:13:12 +02:00
parent fc063472d0
commit 2db6e4f4cf
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/launcher/graphicspage.cpp
View File

@ -1,11 +1,25 @@
#include <QtGui> #include <QtGui>
#include <boost/math/common_factor.hpp>
#include <components/files/configurationmanager.hpp> #include <components/files/configurationmanager.hpp>
#include <components/settings/settings.hpp> #include <components/settings/settings.hpp>
#include "graphicspage.hpp" #include "graphicspage.hpp"
#include "naturalsort.hpp" #include "naturalsort.hpp"
QString getAspect(int x, int y)
{
int gcd = boost::math::gcd (x, y);
int xaspect = x / gcd;
int yaspect = y / gcd;
// special case: 8 : 5 is usually referred to as 16:10
if (xaspect == 8 && yaspect == 5)
return QString("16:10");
return QString(QString::number(xaspect) + ":" + QString::number(yaspect));
}
GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, QWidget *parent) GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, QWidget *parent)
: QWidget(parent) : QWidget(parent)
, mCfgMgr(cfg) , mCfgMgr(cfg)
@ -163,7 +177,7 @@ void GraphicsPage::readConfig()
QString resolution = QString::number(Settings::Manager::getInt("resolution x", "Video")); QString resolution = QString::number(Settings::Manager::getInt("resolution x", "Video"));
resolution.append(" x " + QString::number(Settings::Manager::getInt("resolution y", "Video"))); resolution.append(" x " + QString::number(Settings::Manager::getInt("resolution y", "Video")));
int resIndex = mResolutionComboBox->findText(resolution); int resIndex = mResolutionComboBox->findText(resolution, Qt::MatchStartsWith);
if (resIndex != -1) if (resIndex != -1)
mResolutionComboBox->setCurrentIndex(resIndex); mResolutionComboBox->setCurrentIndex(resIndex);
} }
@ -175,8 +189,8 @@ void GraphicsPage::writeConfig()
Settings::Manager::setString("antialiasing", "Video", mAntiAliasingComboBox->currentText().toStdString()); Settings::Manager::setString("antialiasing", "Video", mAntiAliasingComboBox->currentText().toStdString());
Settings::Manager::setString("render system", "Video", mRendererComboBox->currentText().toStdString()); Settings::Manager::setString("render system", "Video", mRendererComboBox->currentText().toStdString());
// parse resolution x and y from a string like "800 x 600" // Get the current resolution, but with the tabs replaced with a single space
QString resolution = mResolutionComboBox->currentText(); QString resolution = mResolutionComboBox->currentText().simplified();
QStringList tokens = resolution.split(" ", QString::SkipEmptyParts); QStringList tokens = resolution.split(" ", QString::SkipEmptyParts);
int resX = tokens.at(0).toInt(); int resX = tokens.at(0).toInt();
@ -235,22 +249,31 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer)
Ogre::StringVector::iterator opt_it; Ogre::StringVector::iterator opt_it;
uint idx = 0; uint idx = 0;
for (opt_it = i->second.possibleValues.begin (); for (opt_it = i->second.possibleValues.begin ();
opt_it != i->second.possibleValues.end (); opt_it++, idx++) opt_it != i->second.possibleValues.end (); opt_it++, idx++)
{ {
QString qval = QString::fromStdString(*opt_it).simplified(); QString qval = QString::fromStdString(*opt_it).simplified();
// remove extra tokens after the resolution (for example bpp, can be there or not depending on rendersystem) // remove extra tokens after the resolution (for example bpp, can be there or not depending on rendersystem)
QStringList tokens = qval.split(" ", QString::SkipEmptyParts); QStringList tokens = qval.split(" ", QString::SkipEmptyParts);
assert (tokens.size() >= 3); assert (tokens.size() >= 3);
QString resolutionStr = tokens.at(0) + QString(" x ") + tokens.at(2); QString resolutionStr = tokens.at(0) + QString(" x ") + tokens.at(2);
{
// do not add duplicate resolutions // do not add duplicate resolutions
if (!result.contains(resolutionStr)) if (!result.contains(resolutionStr)) {
result << resolutionStr;
QString aspect = getAspect(tokens.at(0).toInt(),tokens.at(2).toInt());
if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10")) {
resolutionStr.append(tr("\t(Widescreen ") + aspect + ")");
} else if (aspect == QLatin1String("4:3")) {
resolutionStr.append(tr("\t(Standard 4:3)"));
}
result << resolutionStr;
} }
} }
} }
// Sort the resolutions in descending order // Sort the resolutions in descending order