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

Making progress...

Browse source
This commit is contained in:
Zach Fox 2016-11-03 10:37:06 -07:00
parent b1582b474b
commit a12e0325bf
5 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
View file

@ -17,7 +17,7 @@ PreferencesDialog {
id: root id: root
objectName: "GeneralPreferencesDialog" objectName: "GeneralPreferencesDialog"
title: "General Settings" title: "General Settings"
showCategories: ["Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers"] showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers"]
property var settings: Settings { property var settings: Settings {
category: root.objectName category: root.objectName
property alias x: root.x property alias x: root.x

2
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -25,11 +25,13 @@ Window {
property real buttonSize: 50; property real buttonSize: 50;
property var buttons: [] property var buttons: []
property var container: horizontal ? row : column property var container: horizontal ? row : column
property bool constrainToolbarToCenterX: false
Settings { Settings {
category: "toolbar/" + window.objectName category: "toolbar/" + window.objectName
property alias x: window.x property alias x: window.x
property alias y: window.y property alias y: window.y
property alias constrainToolbarToCenterX: window.constrainToolbarToCenterX
} }
onHorizontalChanged: { onHorizontalChanged: {

5
interface/src/Application.cpp
View file

@ -523,6 +523,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
_mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)), _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
_previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION), _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION),
_fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES), _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES),
_constrainToolbarPosition("constrainToolbarToCenterX", false),
_scaleMirror(1.0f), _scaleMirror(1.0f),
_rotateMirror(0.0f), _rotateMirror(0.0f),
_raiseMirror(0.0f), _raiseMirror(0.0f),
@ -2150,6 +2151,10 @@ void Application::setFieldOfView(float fov) {
} }
} }
void Application::setSettingConstrainToolbarPosition(bool setting) {
_constrainToolbarPosition.set(setting);
}
void Application::aboutApp() { void Application::aboutApp() {
InfoView::show(INFO_WELCOME_PATH); InfoView::show(INFO_WELCOME_PATH);
} }

4
interface/src/Application.h
View file

@ -206,6 +206,9 @@ public:
float getFieldOfView() { return _fieldOfView.get(); } float getFieldOfView() { return _fieldOfView.get(); }
void setFieldOfView(float fov); void setFieldOfView(float fov);
float getSettingConstrainToolbarPosition() { return _constrainToolbarPosition.get(); }
void setSettingConstrainToolbarPosition(bool setting);
NodeToOctreeSceneStats* getOcteeSceneStats() { return &_octreeServerSceneStats; } NodeToOctreeSceneStats* getOcteeSceneStats() { return &_octreeServerSceneStats; }
virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; } virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
@ -506,6 +509,7 @@ private:
Setting::Handle<QString> _previousScriptLocation; Setting::Handle<QString> _previousScriptLocation;
Setting::Handle<float> _fieldOfView; Setting::Handle<float> _fieldOfView;
Setting::Handle<bool> _constrainToolbarPosition;
float _scaleMirror; float _scaleMirror;
float _rotateMirror; float _rotateMirror;

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

@ -66,7 +66,14 @@ void setupPreferences() {
auto getter = [=]()->bool { return myAvatar->getClearOverlayWhenMoving(); }; auto getter = [=]()->bool { return myAvatar->getClearOverlayWhenMoving(); };
auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); }; auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); };
preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter)); preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter));
} }
// UI
{
auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); };
auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(!value); };
preferences->addPreference(new CheckPreference("UI", "Constrain Toolbar Position to Horizontal Center", getter, setter));
}
// Snapshots // Snapshots
static const QString SNAPSHOTS { "Snapshots" }; static const QString SNAPSHOTS { "Snapshots" };