diff options
author | Marc Zinnschlag <marc@zpages.de> | 2012-06-29 14:41:19 +0200 |
---|---|---|
committer | Marc Zinnschlag <marc@zpages.de> | 2012-06-29 14:41:19 +0200 |
commit | fc063472d051d3e909286e3274c3023fc6e5081c (patch) | |
tree | ea070dbdd3e27c6ec52ab0990988f85192ad4f2e | |
parent | e5cdc988a604608a422e724943618a00a9975cc9 (diff) |
Revert "Added aspect ratio info to the list of resolutions"openmw-0.16.0
This reverts commit be5e0471067549cf48f9a882f4961151bb934fcb.
-rw-r--r-- | apps/launcher/graphicspage.cpp | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 9edbe984c4..b202b1ecf3 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,25 +1,11 @@ #include <QtGui> -#include <boost/math/common_factor.hpp> - #include <components/files/configurationmanager.hpp> #include <components/settings/settings.hpp> #include "graphicspage.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) : QWidget(parent) , mCfgMgr(cfg) @@ -257,21 +243,12 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer) QStringList tokens = qval.split(" ", QString::SkipEmptyParts); assert (tokens.size() >= 3); QString resolutionStr = tokens.at(0) + QString(" x ") + tokens.at(2); + { - // do not add duplicate resolutions - if (!result.contains(resolutionStr)) { - // Add the aspect ratio - 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; - } + // do not add duplicate resolutions + if (!result.contains(resolutionStr)) + result << resolutionStr; + } } } |