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

Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates

Browse source
This commit is contained in:
Dante Ruiz 2018-05-15 11:32:23 -07:00
commit c6ff301aac
4 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
View file

@ -27,6 +27,7 @@ Rectangle {
sourceSize.height: 75
source: "../../../images/about-highfidelity.png"
}
Item { height: 30; width: 1 }
Column {
id: buildColumm
anchors.left: parent.left

10
interface/src/AboutUtil.cpp
View file

@ -8,6 +8,8 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QDate>
#include <QLocale>
#include "AboutUtil.h"
#include "BuildInfo.h"
@ -17,7 +19,11 @@
#include "Application.h"
#include <OffscreenQmlDialog.h>
AboutUtil::AboutUtil(QObject *parent) : QObject(parent) {}
AboutUtil::AboutUtil(QObject *parent) : QObject(parent) {
QLocale locale_;
m_DateConverted = QDate::fromString(BuildInfo::BUILD_TIME, "dd/MM/yyyy").
toString(locale_.dateFormat(QLocale::ShortFormat));
}
AboutUtil *AboutUtil::getInstance()
{
@ -27,7 +33,7 @@ AboutUtil *AboutUtil::getInstance()
QString AboutUtil::buildDate() const
{
return BuildInfo::BUILD_TIME;
return m_DateConverted;
}
QString AboutUtil::buildVersion() const

2
interface/src/AboutUtil.h
View file

@ -35,6 +35,8 @@ public:
public slots:
void openUrl(const QString &url) const;
private:
QString m_DateConverted;
};
#endif // hifi_AboutUtil_h

5
interface/src/ui/PreferencesDialog.cpp
View file

@ -252,9 +252,12 @@ void setupPreferences() {
static const QString MOVEMENT{ "VR Movement" };
{
auto getterFJ = [=]()->bool { return myAvatar->getFlyingEnabled(); };
auto setterFJ = [=](bool value) { myAvatar->setFlyingEnabled(value); };
preferences->addPreference(new CheckPreference(MOVEMENT, "Flying & jumping", getterFJ, setterFJ));
auto getter = [=]()->bool { return myAvatar->getSnapTurn(); };
auto setter = [=](bool value) { myAvatar->setSnapTurn(value); };
preferences->addPreference(new CheckPreference(MOVEMENT, "Snap turn rotation", getter, setter));
preferences->addPreference(new CheckPreference(MOVEMENT, "Snap turn / Smooth turn", getter, setter));
}
//TODO: Update with advanced movement logic, test that it works