Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes asked by ZappoMan on QSettings' commit.

Browse source
This commit is contained in:
atlante45 2013-06-04 19:00:38 +02:00
parent dccc44a6f5
commit c199190666
4 changed files with 37 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
interface/src/Application.cpp
View file

@ -33,6 +33,7 @@
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
#include <QFileDialog> #include <QFileDialog>
#include <QDesktopServices>
#include <PairingHandler.h> #include <PairingHandler.h>
#include <AgentTypes.h> #include <AgentTypes.h>
@ -2201,38 +2202,38 @@ void* Application::networkReceive(void* args) {
return NULL; return NULL;
} }
void Application::scanMenuBar(settingsAction f, QSettings *set) { void Application::scanMenuBar(settingsAction modifySetting, QSettings* set) {
if (NULL == _window->menuBar()) { if (!_window->menuBar()) {
return; return;
} }
QList<QMenu *> menus = _window->menuBar()->findChildren<QMenu *>(); QList<QMenu*> menus = _window->menuBar()->findChildren<QMenu *>();
for (QList<QMenu *>::const_iterator it = menus.begin(); menus.end() != it; ++it) { for (QList<QMenu *>::const_iterator it = menus.begin(); menus.end() != it; ++it) {
scanMenu(*it, f, set); scanMenu(*it, modifySetting, set);
} }
} }
void Application::scanMenu(QMenu *menu, settingsAction f, QSettings *set) { void Application::scanMenu(QMenu* menu, settingsAction modifySetting, QSettings* set) {
QList<QAction *> actions = menu->actions(); QList<QAction*> actions = menu->actions();
set->beginGroup(menu->title()); set->beginGroup(menu->title());
for (QList<QAction *>::const_iterator it = actions.begin(); actions.end() != it; ++it) { for (QList<QAction *>::const_iterator it = actions.begin(); actions.end() != it; ++it) {
if ((*it)->menu()) { if ((*it)->menu()) {
scanMenu((*it)->menu(), f, set); scanMenu((*it)->menu(), modifySetting, set);
} }
if ((*it)->isCheckable()) { if ((*it)->isCheckable()) {
f(set, *it); modifySetting(set, *it);
} }
} }
set->endGroup(); set->endGroup();
} }
void Application::loadAction(QSettings *set, QAction *action) { void Application::loadAction(QSettings* set, QAction* action) {
action->setChecked(set->value(action->text(), action->isChecked()).toBool()); action->setChecked(set->value(action->text(), action->isChecked()).toBool());
} }
void Application::saveAction(QSettings *set, QAction *action) { void Application::saveAction(QSettings* set, QAction* action) {
set->setValue(action->text(), action->isChecked()); set->setValue(action->text(), action->isChecked());
} }
@ -2240,44 +2241,41 @@ void Application::setAutosave(bool wantsAutosave) {
_autosave = wantsAutosave; _autosave = wantsAutosave;
} }
void Application::loadSettings(QSettings *set) { void Application::loadSettings(QSettings* set) {
if (!set) set = this->getSettings(); if (!set) set = getSettings();
scanMenuBar(&Application::loadAction, set); scanMenuBar(&Application::loadAction, set);
getAvatar()->getData(set); getAvatar()->loadData(set);
} }
void Application::saveSettings(QSettings *set) { void Application::saveSettings(QSettings* set) {
if (!set) set = this->getSettings(); if (!set) set = getSettings();
scanMenuBar(&Application::saveAction, set); scanMenuBar(&Application::saveAction, set);
getAvatar()->setData(set); getAvatar()->saveData(set);
} }
void Application::importSettings() { void Application::importSettings() {
QString fileName = QFileDialog::getOpenFileName(this->_window, QString locationDir(QDesktopServices::displayName(QDesktopServices::DesktopLocation));
QString fileName = QFileDialog::getOpenFileName(_window,
tr("Open .ini config file"), tr("Open .ini config file"),
"", locationDir,
tr("Text files (*.ini)")); tr("Text files (*.ini)"));
if (fileName != "") { if (fileName != "") {
QSettings tmp(fileName, QSettings::IniFormat); QSettings tmp(fileName, QSettings::IniFormat);
loadSettings(&tmp); loadSettings(&tmp);
} }
} }
void Application::exportSettings() { void Application::exportSettings() {
QString fileName = QFileDialog::getSaveFileName(this->_window, QString locationDir(QDesktopServices::displayName(QDesktopServices::DesktopLocation));
QString fileName = QFileDialog::getSaveFileName(_window,
tr("Save .ini config file"), tr("Save .ini config file"),
"", locationDir,
tr("Text files (*.ini)")); tr("Text files (*.ini)"));
if (fileName != "") { if (fileName != "") {
QSettings tmp(fileName, QSettings::IniFormat); QSettings tmp(fileName, QSettings::IniFormat);
saveSettings(&tmp); saveSettings(&tmp);
tmp.sync(); tmp.sync();
} }
} }

14
interface/src/Application.h
View file

@ -108,8 +108,8 @@ private slots:
void chooseVoxelPaintColor(); void chooseVoxelPaintColor();
void setAutosave(bool wantsAutosave); void setAutosave(bool wantsAutosave);
void loadSettings(QSettings *set = NULL); void loadSettings(QSettings* set = NULL);
void saveSettings(QSettings *set = NULL); void saveSettings(QSettings* set = NULL);
void importSettings(); void importSettings();
void exportSettings(); void exportSettings();
@ -148,11 +148,11 @@ private:
static void* networkReceive(void* args); static void* networkReceive(void* args);
// methodes handling menu settings // methodes handling menu settings
typedef void(*settingsAction)(QSettings *, QAction *); typedef void(*settingsAction)(QSettings*, QAction*);
static void loadAction(QSettings *set, QAction *action); static void loadAction(QSettings* set, QAction* action);
static void saveAction(QSettings *set, QAction *action); static void saveAction(QSettings* set, QAction* action);
void scanMenuBar(settingsAction, QSettings *set); void scanMenuBar(settingsAction modifySetting, QSettings* set);
void scanMenu(QMenu *menu, settingsAction f, QSettings *set); void scanMenu(QMenu* menu, settingsAction modifySetting, QSettings* set);
QMainWindow* _window; QMainWindow* _window;
QGLWidget* _glWidget; QGLWidget* _glWidget;

8
interface/src/Avatar.cpp
View file

@ -1114,10 +1114,10 @@ void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity
} }
} }
void Avatar::getData(QSettings *set) { void Avatar::loadData(QSettings* set) {
set->beginGroup("Avatar"); set->beginGroup("Avatar");
_bodyYaw = set->value("bodyYawn", _bodyYaw).toFloat(); _bodyYaw = set->value("bodyYaw", _bodyYaw).toFloat();
_bodyPitch = set->value("bodyPitch", _bodyPitch).toFloat(); _bodyPitch = set->value("bodyPitch", _bodyPitch).toFloat();
_bodyRoll = set->value("bodyRoll", _bodyRoll).toFloat(); _bodyRoll = set->value("bodyRoll", _bodyRoll).toFloat();
@ -1128,10 +1128,10 @@ void Avatar::getData(QSettings *set) {
set->endGroup(); set->endGroup();
} }
void Avatar::setData(QSettings *set) { void Avatar::saveData(QSettings* set) {
set->beginGroup("Avatar"); set->beginGroup("Avatar");
set->setValue("bodyYawn", _bodyYaw); set->setValue("bodyYaw", _bodyYaw);
set->setValue("bodyPitch", _bodyPitch); set->setValue("bodyPitch", _bodyPitch);
set->setValue("bodyRoll", _bodyRoll); set->setValue("bodyRoll", _bodyRoll);

4
interface/src/Avatar.h
View file

@ -97,8 +97,8 @@ public:
glm::vec3 getThrust() { return _thrust; }; glm::vec3 getThrust() { return _thrust; };
// get/set avatar data // get/set avatar data
void setData(QSettings *set); void saveData(QSettings* set);
void getData(QSettings *set); void loadData(QSettings* set);
private: private:
// privatize copy constructor and assignment operator to avoid copying // privatize copy constructor and assignment operator to avoid copying