Merge pull request #9865 from vladest/tablet-ui-graphics

Add Graphics preferences to Tablet
This commit is contained in:
Seth Alves 2017-03-14 08:32:55 -08:00 committed by GitHub
commit 5a557c9fe6
2 changed files with 36 additions and 1 deletions

View file

@ -0,0 +1,34 @@
import QtQuick 2.5
import Qt.labs.settings 1.0
import "tabletWindows"
import "../../dialogs"
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
StackView {
id: profileRoot
initialItem: root
objectName: "stack"
property var eventBridge;
signal sendToScript(var message);
function pushSource(path) {
editRoot.push(Qt.reslovedUrl(path));
}
function popSource() {
}
TabletPreferencesDialog {
id: root
property string title: "Graphics Settings"
objectName: "TabletGraphicsPreferences"
width: parent.width
height: parent.height
showCategories: ["Graphics"]
}
}

View file

@ -330,7 +330,8 @@ Menu::Menu() {
// Developer > Graphics...
action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
connect(action, &QAction::triggered, [] {
DependencyManager::get<OffscreenUi>()->toggle(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"), "GraphicsPreferencesDialog");
qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
QString("../../hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
});
// Developer > Render >>>