moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 23:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ComputerModel and remove root Frame from PcView

Browse Source
This commit is contained in:
Cameron Gutman 2018-07-05 20:11:35 -07:00
parent b0151da455
commit f83c13ad85
3 changed files with 80 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
app/gui/PcView.qml
View File

@ -5,100 +5,96 @@ import QtQuick.Layouts 1.11
import ComputerModel 1.0
Frame {
GridView {
anchors.fill: parent
anchors.leftMargin: 5
anchors.topMargin: 5
anchors.rightMargin: 5
anchors.bottomMargin: 5
cellWidth: 350; cellHeight: 350;
focus: true
GridView {
anchors.fill: parent
anchors.leftMargin: 5
anchors.topMargin: 5
anchors.rightMargin: 5
anchors.bottomMargin: 5
cellWidth: 350; cellHeight: 350;
focus: true
model: ComputerModel {}
model: ComputerModel {}
delegate: Item {
width: 300; height: 300;
delegate: Item {
width: 300; height: 300;
Image {
id: pcIcon
anchors.horizontalCenter: parent.horizontalCenter;
source: {
model.addPc ? "ic_add_to_queue_white_48px.svg" : "ic_tv_white_48px.svg"
}
sourceSize {
width: 200
height: 200
}
Image {
id: pcIcon
anchors.horizontalCenter: parent.horizontalCenter;
source: {
model.addPc ? "ic_add_to_queue_white_48px.svg" : "ic_tv_white_48px.svg"
}
Text {
id: pcNameText
text: model.name
color: "white"
width: parent.width
anchors.top: pcIcon.bottom
minimumPointSize: 12
font.pointSize: 48
horizontalAlignment: Text.AlignHCenter
fontSizeMode: Text.HorizontalFit
sourceSize {
width: 200
height: 200
}
}
Text {
function getStatusText(model)
{
if (model.online) {
var text = "<font color=\"green\">Online</font>"
text += "<font color=\"white\"> - </font>"
if (model.paired) {
text += "<font color=\"skyblue\">Paired</font>"
}
else if (model.busy) {
text += "<font color=\"red\">Busy</font>"
}
else {
text += "<font color=\"red\">Not Paired</font>"
}
return text
Text {
id: pcNameText
text: model.name
color: "white"
width: parent.width
anchors.top: pcIcon.bottom
minimumPointSize: 12
font.pointSize: 48
horizontalAlignment: Text.AlignHCenter
fontSizeMode: Text.HorizontalFit
}
Text {
function getStatusText(model)
{
if (model.online) {
var text = "<font color=\"green\">Online</font>"
text += "<font color=\"white\"> - </font>"
if (model.paired) {
text += "<font color=\"skyblue\">Paired</font>"
}
else if (model.busy) {
text += "<font color=\"red\">Busy</font>"
}
else {
return "<font color=\"red\">Offline</font>";
text += "<font color=\"red\">Not Paired</font>"
}
return text
}
else {
return "<font color=\"red\">Offline</font>";
}
id: pcPairedText
text: getStatusText(model)
visible: !model.addPc
width: parent.width
anchors.top: pcNameText.bottom
minimumPointSize: 12
font.pointSize: 36
horizontalAlignment: Text.AlignHCenter
fontSizeMode: Text.HorizontalFit
}
MouseArea {
anchors.fill: parent
onClicked: {
parent.GridView.view.currentIndex = index
if(model.addPc) {
// TODO: read the output of the dialog
inputDialog.on
inputDialog.open()
id: pcPairedText
text: getStatusText(model)
visible: !model.addPc
} else if(!model.paired && !model.busy) {
width: parent.width
anchors.top: pcNameText.bottom
minimumPointSize: 12
font.pointSize: 36
horizontalAlignment: Text.AlignHCenter
fontSizeMode: Text.HorizontalFit
}
// TODO: generate pin
pairDialog.text = pairDialog.text.replace("XXXX", "1234")
// TODO: initiate pairing request
pairDialog.open()
} else if (model.online) {
// go to game view
}
MouseArea {
anchors.fill: parent
onClicked: {
parent.GridView.view.currentIndex = index
if(model.addPc) {
// TODO: read the output of the dialog
inputDialog.on
inputDialog.open()
} else if(!model.paired && !model.busy) {
// TODO: generate pin
pairDialog.text = pairDialog.text.replace("XXXX", "1234")
// TODO: initiate pairing request
pairDialog.open()
} else if (model.online) {
// go to game view
}
}
}

6
app/gui/computermodel.cpp
View File

@ -27,10 +27,8 @@ QVariant ComputerModel::data(const QModelIndex& index, int role) const
return QVariant();
}
}
else if (index.row() > m_Computers.count()) {
qWarning() << "Index out of bounds: " << index.row();
return QVariant();
}
Q_ASSERT(index.row() < m_Computers.count());
NvComputer* computer = m_Computers[index.row()];
QReadLocker lock(&computer->lock);

4
app/gui/computermodel.h
View File

@ -4,6 +4,8 @@
class ComputerModel : public QAbstractListModel
{
Q_OBJECT
enum Roles
{
NameRole = Qt::UserRole,
@ -14,7 +16,7 @@ class ComputerModel : public QAbstractListModel
};
public:
ComputerModel(QObject* object = nullptr);
explicit ComputerModel(QObject* object = nullptr);
QVariant data(const QModelIndex &index, int role) const override;