jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:cgutman/moonlight-qt

Browse source
This commit is contained in:
R. Aidan Campbell 2018-07-08 11:38:07 -07:00
commit 67eb09d753
2 changed files with 221 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

220
app/gui/SettingsView.qml
View file

@ -1,8 +1,222 @@
import QtQuick 2.9 import QtQuick 2.9
Rectangle { import QtQuick.Controls 2.2
ScrollView {
id: settingsPage id: settingsPage
color: "#333333"
objectName: "Settings" objectName: "Settings"
// TODO - add settings Column {
x: 10
y: 10
width: settingsPage.width
height: 400
GroupBox {
// TODO save the settings
id: basicSettingsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">Basic Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
Label {
width: parent.width
id: resFPStitle
text: qsTr("Resolution and FPS target")
font.pointSize: 12
wrapMode: Text.Wrap
color: "white"
}
Label {
width: parent.width
id: resFPSdesc
text: qsTr("Setting values too high for your device may cause lag or crashing")
font.pointSize: 9
wrapMode: Text.Wrap
color: "white"
}
ComboBox {
id: resolutionComboBox
currentIndex : 4
width: Math.min(bitrateDesc.implicitWidth, parent.width)
font.pointSize: 9
model: ListModel {
id: resolutionListModel
// TODO have values associated with the text.
ListElement { text: "360p 30 FPS" }
ListElement { text: "360p 60 FPS" }
ListElement { text: "720p 30 FPS" }
ListElement { text: "720p 60 FPS" }
ListElement { text: "1080p 30 FPS" }
ListElement { text: "1080p 60 FPS" }
ListElement { text: "4K 30 FPS" }
ListElement { text: "4K 60 FPS" }
}
onCurrentIndexChanged: console.debug(resolutionListModel.get(currentIndex).text + " selected resolution")
}
Label {
width: parent.width
id: bitrateTitle
text: qsTr("Video bitrate target")
font.pointSize: 12
wrapMode: Text.Wrap
color: "white"
}
Label {
width: parent.width
id: bitrateDesc
text: qsTr("Lower bitrate to reduce stuttering. Raise bitrate to increase image quality.")
font.pointSize: 9
wrapMode: Text.Wrap
color: "white"
}
Slider {
id: slider
wheelEnabled: true
// TODO value should be loaded as the current value.
value: 500
stepSize: 500
from : 500
to: 10000
snapMode: "SnapOnRelease"
width: Math.min(bitrateDesc.implicitWidth, parent.width)
// TODO store the value
// TODO display the current value to the user
onValueChanged:
{
console.debug(slider.value + " Slider moved")
}
}
CheckBox {
id: fullScreenCheck
text: "<font color=\"white\">Stretch video to full-screen</font>"
font.pointSize: 12
}
CheckBox {
id: pipObserverCheck
text: "<font color=\"white\">Enable Picture-in-Picture observer mode</font>"
font.pointSize: 12
}
}
}
GroupBox {
id: audioSettingsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">Audio Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
CheckBox {
id: surroundSoundCheck
text: "<font color=\"white\">Enable 5.1 surround sound</font>"
font.pointSize: 12
}
}
}
GroupBox {
id: gamepadSettingsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">Gamepad Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
CheckBox {
id: multiControllerCheck
text: "<font color=\"white\">Multiple controller support</font>"
font.pointSize: 12
}
CheckBox {
id: mouseEmulationCheck
text: "<font color=\"white\">Mouse emulation via gamepad</font>"
font.pointSize: 12
}
}
}
GroupBox {
id: onScreenControlsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">On-screen Controls Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
CheckBox {
id: onScreenControlsCheck
text: "<font color=\"white\">Show on-screen controls</font>"
font.pointSize: 12
}
}
}
GroupBox {
id: hostSettingsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">Host Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
CheckBox {
id: optimizeGameSettingsCheck
text: "<font color=\"white\">Optimize game settings</font>"
font.pointSize: 12
}
CheckBox {
id: audioPcCheck
text: "<font color=\"white\">Play audio on PC</font>"
font.pointSize: 12
}
}
}
GroupBox {
id: advancedSettingsGroupBox
width: (parent.width - 20)
padding: 12
title: "<font color=\"skyblue\">Advanced Settings</font>"
font.pointSize: 12
Column {
anchors.fill: parent
spacing: 5
CheckBox {
id: neverDropFramesCheck
text: "<font color=\"white\">Never drop frames</font>"
font.pointSize: 12
}
}
}
}
} }

4
app/main.cpp
View file

@ -1,5 +1,6 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QIcon>
// Don't let SDL hook our main function, since Qt is already // Don't let SDL hook our main function, since Qt is already
// doing the same thing. This needs to be before any headers // doing the same thing. This needs to be before any headers
@ -29,6 +30,9 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
// FIXME this icon is low-resolution and appears a little fuzzy.
app.setWindowIcon(QIcon(":/res/icon128.png"));
// Register our C++ types for QML // Register our C++ types for QML
qmlRegisterType<ComputerModel>("ComputerModel", 1, 0, "ComputerModel"); qmlRegisterType<ComputerModel>("ComputerModel", 1, 0, "ComputerModel");
qmlRegisterType<AppModel>("AppModel", 1, 0, "AppModel"); qmlRegisterType<AppModel>("AppModel", 1, 0, "AppModel");