Settings link

This commit is contained in:
David Rowe 2017-03-28 15:15:33 +13:00
parent 55033df354
commit 6a3dea030e
2 changed files with 7 additions and 2 deletions

View file

@ -34,7 +34,7 @@
<div class="snapsection" id="snap-settings"> <div class="snapsection" id="snap-settings">
<span class="setting"> <span class="setting">
<input type="button" class="glyph naked" id="snapshotSettings" value="@" onclick="snapshotSettings()" /> <input type="button" class="glyph naked" id="snapshotSettings" value="@" onclick="snapshotSettings()" />
<label for="snapshotSettings">Snapshot settings</label> <label for="snapshotSettings">Settings</label>
</span> </span>
<span class="setting checkbox"> <span class="setting checkbox">
<input id="openFeed" type="checkbox" checked /> <input id="openFeed" type="checkbox" checked />

View file

@ -60,7 +60,12 @@ function onMessage(message) {
outstanding = 0; outstanding = 0;
break; break;
case 'openSettings': case 'openSettings':
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog"); if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar"))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar"))) {
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "General Preferences");
} else {
tablet.loadQMLSource("TabletGeneralPreferences.qml");
}
break; break;
case 'setOpenFeedFalse': case 'setOpenFeedFalse':
Settings.setValue('openFeedAfterShare', false); Settings.setValue('openFeedAfterShare', false);