krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Cleaned up and got some signals going.

Browse source
This commit is contained in:
cc9cii 2014-09-17 06:11:41 +10:00
parent d679e0e012
commit e3da37567b
4 changed files with 139 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/editor.cpp
View file

@ -284,7 +284,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
params.insert(std::make_pair("macAPI", "cocoa")); params.insert(std::make_pair("macAPI", "cocoa"));
#endif #endif
// FIXME: don't apply the fullscreen here, apply to the editor window // FIXME: don't apply the fullscreen here, apply to the editor window
bool fullscreen = mUserSettings.settingValue("Video/fullscreen").toStdString() == "true" ? true : false; //bool fullscreen = mUserSettings.settingValue("Video/fullscreen").toStdString() == "true" ? true : false;
//Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, fullscreen, &params); //Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, fullscreen, &params);
Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, false, &params); Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, false, &params);
hiddenWindow->setActive(false); hiddenWindow->setActive(false);

282
apps/opencs/view/settings/settingsdialog.cpp
View file

@ -1,37 +1,17 @@
#include "settingsdialog.hpp" #include "settingsdialog.hpp"
#include <QListWidgetItem> #include <boost/math/common_factor.hpp>
#include <QApplication>
#include <QWidget>
#include <QStackedWidget>
#include <QtGui>
#include "../../model/settings/usersettings.hpp"
//#include "ui_settingstab.h"
#include "page.hpp"
#include <QApplication>
#include <QSplitter>
#include <QTreeView>
#include <QListView>
#include <QTableView>
#include <QStandardItemModel>
#include <QStandardItem>
#include <OgreRoot.h> #include <OgreRoot.h>
#include <boost/math/common_factor.hpp>
#include <QMessageBox>
//#include <QTranslator>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <components/contentselector/model/naturalsort.hpp>
#include "../../model/settings/usersettings.hpp"
namespace namespace
{ {
// copied from launcher // copied from the launcher & adapted
QString getAspect(int x, int y) QString getAspect(int x, int y)
{ {
int gcd = boost::math::gcd (x, y); int gcd = boost::math::gcd (x, y);
@ -61,34 +41,20 @@ QRect getMaximumResolution()
QString getCurrentResolution() QString getCurrentResolution()
{ {
QString result;
Ogre::ConfigOptionMap& renderOpt = Ogre::ConfigOptionMap& renderOpt =
Ogre::Root::getSingleton().getRenderSystem()->getConfigOptions(); Ogre::Root::getSingleton().getRenderSystem()->getConfigOptions();
Ogre::ConfigOptionMap::iterator it = renderOpt.begin(); Ogre::ConfigOptionMap::iterator it = renderOpt.begin();
for(;it != renderOpt.end(); ++it) for(; it != renderOpt.end(); ++it)
{ {
if(it->first == "Video Mode" ) if(it->first == "Video Mode" )
{ {
QRegExp re("^(\\d+) x (\\d+)"); QRegExp re("^(\\d+ x \\d+)");
int pos = re.indexIn(it->second.currentValue.c_str(), 0); int pos = re.indexIn(it->second.currentValue.c_str(), 0);
if (pos > -1) if (pos > -1)
{ return re.cap(1);
QString aspect = getAspect(re.cap(1).toInt(), re.cap(2).toInt());
result = re.cap(1) + QString(" x ") + re.cap(2);
if (aspect == QLatin1String("16:9") || aspect == QLatin1String("16:10"))
{
//result.append(QObject::tr("\t(Wide ") + aspect + ")");
}
else if (aspect == QLatin1String("4:3"))
{
//result.append(QObject::tr("\t(Standard 4:3)"));
} }
} }
} return QString(); // found nothing
}
return result;
} }
QStringList getAvailableResolutions() QStringList getAvailableResolutions()
@ -104,15 +70,8 @@ QStringList getAvailableResolutions()
{ {
if(it->second.possibleValues.empty()) if(it->second.possibleValues.empty())
{ {
QMessageBox msgBox; return result; // FIXME: add error message
msgBox.setWindowTitle(QObject::tr("Error retrieving rendering device"));
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(QObject::tr("<br><b>Ogre Rendering Device empty<./b><br><br>"));
msgBox.exec();
return result;
} }
//std::cout << "rd current: " << it->second.currentValue << std::endl; // FIXME: debug
// Store Available Rendering Devices // Store Available Rendering Devices
std::vector<std::string>::iterator iter = it->second.possibleValues.begin(); std::vector<std::string>::iterator iter = it->second.possibleValues.begin();
for(;iter != it->second.possibleValues.end(); ++iter) for(;iter != it->second.possibleValues.end(); ++iter)
@ -124,19 +83,13 @@ QStringList getAvailableResolutions()
{ {
if(it->second.possibleValues.empty()) if(it->second.possibleValues.empty())
{ {
QMessageBox msgBox; return result; // FIXME: add error message
msgBox.setWindowTitle(QObject::tr("Error receiving resolutions"));
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(QObject::tr("<br><b>Ogre Video Modes empty.</b><br><br>"));
msgBox.exec();
return result;
} }
// FIXME: how to default to the current value? // FIXME: how to default to the current value?
std::cout << "vm current: " << it->second.currentValue << std::endl; // FIXME: debug std::cout << "vm current: " << it->second.currentValue << std::endl; // FIXME: debug
// Store Available Resolutions // Store Available Resolutions
std::vector<std::string>::iterator iter = it->second.possibleValues.begin(); std::vector<std::string>::iterator iter = it->second.possibleValues.begin();
for(;iter != it->second.possibleValues.end(); ++iter) for(; iter != it->second.possibleValues.end(); ++iter)
{ {
// extract x and y values // extract x and y values
QRegExp re("^(\\d+) x (\\d+)"); QRegExp re("^(\\d+) x (\\d+)");
@ -160,10 +113,46 @@ QStringList getAvailableResolutions()
return result; return result;
} }
QStringList getAvailableOptions(const QString &key)
{
QStringList result;
Ogre::ConfigOptionMap& renderOpt =
Ogre::Root::getSingleton().getRenderSystem()->getConfigOptions();
Ogre::ConfigOptionMap::iterator it = renderOpt.begin();
uint row = 0;
for(; it != renderOpt.end(); ++it, ++row)
{
Ogre::StringVector::iterator opt_it = it->second.possibleValues.begin();
uint idx = 0;
for(; opt_it != it->second.possibleValues.end(); ++opt_it, ++idx)
{
if(strcmp (key.toStdString().c_str(), it->first.c_str()) == 0)
{
result << ((key == "FSAA") ? QString("MSAA ") : QString(""))
+ QString::fromStdString((*opt_it).c_str()).simplified();
}
}
}
// Sort ascending
qSort(result.begin(), result.end(), naturalSortLessThanCI);
// Replace the zero option with Off
int index = result.indexOf("MSAA 0");
if(index != -1)
result.replace(index, QObject::tr("Off"));
return result;
}
} }
CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent) CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent)
: /*mStackedWidget (0), mDebugMode (false),*/ QTabWidget (parent) : /*mDebugMode (false),*/ QTabWidget (parent)
{ {
setObjectName("User Settings"); setObjectName("User Settings");
@ -174,97 +163,61 @@ CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent)
spinBox_x->setMaximum(res.width()); spinBox_x->setMaximum(res.width());
spinBox_y->setMaximum(res.height()); spinBox_y->setMaximum(res.height());
//connect (mPageListWidget, connect(comboBox_rendersystem, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(rendererChanged(const QString&)));
//SIGNAL (currentItemChanged(QListWidgetItem*, QListWidgetItem*)), connect(checkBox_fullscreen, SIGNAL(stateChanged(int)), this, SLOT(slotFullScreenChanged(int)));
//this, connect(radioButton_standard_res, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
//SLOT (slotChangePage (QListWidgetItem*, QListWidgetItem*)));
} }
// FIXME: don't need this one, as we don't use pages void CSVSettings::SettingsDialog::rendererChanged()
void CSVSettings::SettingsDialog::slotChangePage
(QListWidgetItem *cur, QListWidgetItem *prev)
{ {
//mStackedWidget->changePage comboBox_antialiasing->clear();
//(mPageListWidget->row (cur), mPageListWidget->row (prev)); comboBox_antialiasing->addItems(getAvailableOptions(QString("FSAA")));
layout()->activate();
setFixedSize(minimumSizeHint());
} }
// FIXME: don't need this one since we use setupUi void CSVSettings::SettingsDialog::slotFullScreenChanged(int state)
void CSVSettings::SettingsDialog::setupDialog()
{ {
//create central widget with it's layout and immediate children if (state == Qt::Checked) {
QWidget *centralWidget = new QGroupBox (this); label_Resolution->setEnabled(false);
radioButton_standard_res->setEnabled(false);
centralWidget->setLayout (new QHBoxLayout()); radioButton_custom_res->setEnabled(false);
centralWidget->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred); comboBox_std_window_size->setEnabled(false);
//setCentralWidget (centralWidget); spinBox_x->setEnabled(false);
//setDockOptions (QMainWindow::AllowNestedDocks); spinBox_y->setEnabled(false);
buildPageListWidget (centralWidget);
buildStackedWidget (centralWidget);
}
void CSVSettings::SettingsDialog::buildPages()
{
#if 0
SettingWindow::createPages ();
QFontMetrics fm (QApplication::font());
foreach (Page *page, SettingWindow::pages())
{
QString pageName = page->objectName();
//int textWidth = fm.width(pageName);
//new QListWidgetItem (pageName, mPageListWidget);
//mPageListWidget->setFixedWidth (textWidth + 50);
//mStackedWidget->addWidget (&dynamic_cast<QWidget &>(*(page)));
} }
else
//resize (mStackedWidget->sizeHint());
#endif
}
void CSVSettings::SettingsDialog::buildPageListWidget (QWidget *centralWidget)
{
//mPageListWidget = new QListWidget (centralWidget);
//mPageListWidget->setMinimumWidth(50);
//mPageListWidget->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Expanding);
//mPageListWidget->setSelectionBehavior (QAbstractItemView::SelectItems);
//centralWidget->layout()->addWidget(mPageListWidget);
}
void CSVSettings::SettingsDialog::buildStackedWidget (QWidget *centralWidget)
{
//mStackedWidget = new ResizeableStackedWidget (centralWidget);
//centralWidget->layout()->addWidget (mStackedWidget);
}
void CSVSettings::SettingsDialog::closeEvent (QCloseEvent *event)
{
//SettingWindow::closeEvent() must be called first to ensure
//model is updated
//SettingWindow::closeEvent (event);
//saveSettings();
}
void CSVSettings::SettingsDialog::show()
{
//if (pages().isEmpty())
{ {
//buildPages(); label_Resolution->setEnabled(true);
//setViewValues(); radioButton_standard_res->setEnabled(true);
radioButton_custom_res->setEnabled(true);
comboBox_std_window_size->setEnabled(true);
spinBox_x->setEnabled(true);
spinBox_y->setEnabled(true);
} }
}
if(CSMSettings::UserSettings::instance().settingValue("Video/use settings.cfg").toStdString() == "true") // FIXME: what to do with updating window size
void CSVSettings::SettingsDialog::slotStandardToggled(bool checked)
{
if (checked)
{
comboBox_std_window_size->setEnabled(true);
spinBox_x->setEnabled(false);
spinBox_y->setEnabled(false);
}
else
{
comboBox_std_window_size->setEnabled(false);
spinBox_x->setEnabled(true);
spinBox_y->setEnabled(true);
}
}
void CSVSettings::SettingsDialog::setViewValues()
{
//rendererChanged(Ogre::Root::getSingleton().getRenderSystemByName(renderer.toStdString()));
rendererChanged(); // setup antialiasing options
if(CSMSettings::UserSettings::instance().settingValue("Video/use settings.cfg") == "true")
{ {
label_RenderingSubsystem->setEnabled(false); label_RenderingSubsystem->setEnabled(false);
comboBox_rendersystem->setEnabled(false); comboBox_rendersystem->setEnabled(false);
@ -278,20 +231,16 @@ void CSVSettings::SettingsDialog::show()
else else
checkBox_override->setChecked(false); checkBox_override->setChecked(false);
if(CSMSettings::UserSettings::instance().settingValue("Video/fullscreen").toStdString() == "true") if(CSMSettings::UserSettings::instance().settingValue("Window Size/Width") != "")
{ {
checkBox_fullscreen->setChecked(true); spinBox_x->setValue(
CSMSettings::UserSettings::instance().settingValue("Window Size/Width").toInt());
label_Resolution->setEnabled(false);
radioButton_standard_res->setEnabled(false);
radioButton_custom_res->setEnabled(false);
comboBox_std_window_size->setEnabled(false);
spinBox_x->setEnabled(false);
spinBox_y->setEnabled(false);
} }
else
if(CSMSettings::UserSettings::instance().settingValue("Window Size/Height") != "")
{ {
checkBox_fullscreen->setChecked(false); spinBox_y->setValue(
CSMSettings::UserSettings::instance().settingValue("Window Size/Height").toInt());
} }
// update display resolution combo box // update display resolution combo box
@ -304,6 +253,33 @@ void CSVSettings::SettingsDialog::show()
if(index != -1) if(index != -1)
comboBox_std_window_size->setCurrentIndex(index); comboBox_std_window_size->setCurrentIndex(index);
slotStandardToggled(radioButton_standard_res->isChecked() ? true : false);
if(CSMSettings::UserSettings::instance().settingValue("Video/fullscreen") == "true")
{
checkBox_fullscreen->setChecked(true);
slotFullScreenChanged(Qt::Checked);
}
else
{
checkBox_fullscreen->setChecked(false);
slotFullScreenChanged(Qt::Unchecked);
}
}
void CSVSettings::SettingsDialog::closeEvent (QCloseEvent *event)
{
//SettingWindow::closeEvent() must be called first to ensure
//model is updated
//SettingWindow::closeEvent (event);
//saveSettings();
}
void CSVSettings::SettingsDialog::show()
{
setViewValues();
// place the widget and make it visible // place the widget and make it visible
QWidget *currView = QApplication::activeWindow(); QWidget *currView = QApplication::activeWindow();
if(currView) if(currView)

36
apps/opencs/view/settings/settingsdialog.hpp
View file

@ -1,62 +1,44 @@
#ifndef CSVSETTINGS_SETTINGSDIALOG_H #ifndef CSVSETTINGS_SETTINGSDIALOG_H
#define CSVSETTINGS_SETTINGSDIALOG_H #define CSVSETTINGS_SETTINGSDIALOG_H
//#include "settingwindow.hpp"
//#include "resizeablestackedwidget.hpp"
#include <QStandardItem> #include <QStandardItem>
#include "ui_settingstab.h" #include "ui_settingstab.h"
//class QStackedWidget;
//class QListWidget;
class QListWidgetItem; class QListWidgetItem;
#if 0
namespace Ui {
class TabWidget;
}
#endif
namespace CSVSettings { namespace CSVSettings {
//class Page;
class SettingsDialog : public QTabWidget, private Ui::TabWidget class SettingsDialog : public QTabWidget, private Ui::TabWidget
{ {
Q_OBJECT Q_OBJECT
//QListWidget *mPageListWidget;
//ResizeableStackedWidget *mStackedWidget;
bool mDebugMode;
public: public:
/*explicit*/ SettingsDialog (QTabWidget *parent = 0); SettingsDialog (QTabWidget *parent = 0);
int windowWidth();
int windowHeight();
///Enables setting debug mode. When the dialog opens, a page is created ///Enables setting debug mode. When the dialog opens, a page is created
///which displays the SettingModel's contents in a Tree view. ///which displays the SettingModel's contents in a Tree view.
void enableDebugMode (bool state, QStandardItemModel *model = 0); //void enableDebugMode (bool state, QStandardItemModel *model = 0);
protected: protected:
/// Settings are written on close /// Settings are written on close
void closeEvent (QCloseEvent *event); void closeEvent (QCloseEvent *event);
void setupDialog();
private: private:
void buildPages(); void setViewValues();
void buildPageListWidget (QWidget *centralWidget);
void buildStackedWidget (QWidget *centralWidget);
public slots: public slots:
void show(); void show();
void rendererChanged();
private slots: void slotFullScreenChanged(int state);
void slotStandardToggled(bool checked);
void slotChangePage (QListWidgetItem *, QListWidgetItem *);
}; };
} }
#endif // CSVSETTINGS_SETTINGSDIALOG_H #endif // CSVSETTINGS_SETTINGSDIALOG_H

25
files/ui/settingstab.ui
View file

@ -212,31 +212,6 @@
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QComboBox" name="comboBox_antialiasing"> <widget class="QComboBox" name="comboBox_antialiasing">
<item>
<property name="text">
<string>Off</string>
</property>
</item>
<item>
<property name="text">
<string>MSAA 2</string>
</property>
</item>
<item>
<property name="text">
<string>MSAA 4</string>
</property>
</item>
<item>
<property name="text">
<string>MSAA 8</string>
</property>
</item>
<item>
<property name="text">
<string>MSAA 8 (Quality)</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">