- 无挂件时禁用websocket
- 统一设置页面样式 - 删除无用注释
This commit is contained in:
parent
1c8d05c5df
commit
6df0edd06c
@ -7,7 +7,7 @@ NVG.Module {
|
||||
initialize: function () {
|
||||
console.log("Initializing ADV-Plugin.");
|
||||
Common.execute("../bin/ADVServer.exe", "-reboot");
|
||||
Common.setWsocket(true);
|
||||
// Common.setWsocket(true);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -11,6 +11,8 @@ Item {
|
||||
readonly property var stylesURL: []
|
||||
readonly property var stylesCFG: []
|
||||
|
||||
property int widgetsNum: 0
|
||||
|
||||
signal audioDataUpdated(var audioData)
|
||||
signal wsocketClosed()
|
||||
|
||||
@ -73,7 +75,7 @@ Item {
|
||||
}
|
||||
wsPort = cfg["server"]["port"];
|
||||
}}
|
||||
active: false
|
||||
active: widgetsNum>0
|
||||
}
|
||||
|
||||
function setWsocket(status) {
|
||||
@ -117,8 +119,6 @@ Item {
|
||||
stylesCFG.push(styleCFG);
|
||||
|
||||
}
|
||||
// console.log(JSON.stringify(Object.keys(resource), null, 2));
|
||||
// console.log(JSON.stringify(resource.files(), null, 2));
|
||||
});
|
||||
}
|
||||
|
||||
@ -127,7 +127,5 @@ Item {
|
||||
parse_resource(preset_list, true);
|
||||
const third_list = NVG.Resources.filter(/.*/, /top.mashiros.advp-style/);
|
||||
parse_resource(third_list, false);
|
||||
// console.log(JSON.stringify(styles, null, 2));
|
||||
// console.log(JSON.stringify(stylesURL, null, 2));
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,5 +56,11 @@ T.Widget {
|
||||
|
||||
Component.onCompleted: {
|
||||
styleDialog.active = true;
|
||||
Common.widgetsNum++;
|
||||
}
|
||||
|
||||
Component.onDestruction: {
|
||||
styleDialog.active = false;
|
||||
Common.widgetsNum--;
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,6 +4,7 @@ import QtQuick.Controls 2.12
|
||||
import QtQuick.Layouts 1.12
|
||||
import NERvGear 1.0 as NVG
|
||||
import NERvGear.Preferences 1.0 as P
|
||||
import NERvGear.Controls 1.0
|
||||
|
||||
import "."
|
||||
|
||||
@ -27,142 +28,136 @@ NVG.Window {
|
||||
property var configuration
|
||||
property var old_style_cfg
|
||||
|
||||
ColumnLayout {
|
||||
id: root
|
||||
Page {
|
||||
id: cfg_page
|
||||
anchors.fill: parent
|
||||
anchors.margins: 16
|
||||
anchors.topMargin: 0
|
||||
|
||||
Row {
|
||||
spacing: window.width - 120
|
||||
|
||||
ToolButton {
|
||||
text: qsTr("Save")
|
||||
onClicked: {
|
||||
configuration = rootPreference.save();
|
||||
let index = configuration["index"];
|
||||
widget.settings[Common.stylesURL[index]] = configuration[Common.stylesURL[index]];
|
||||
delete configuration[Common.stylesURL[index]];
|
||||
widget.settings.styles = configuration;
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
styleDialog.active = false;
|
||||
}
|
||||
}
|
||||
|
||||
ToolButton {
|
||||
text: qsTr("Reset")
|
||||
onClicked: {
|
||||
styleLoader.load();
|
||||
let cfg = rootPreference.save();
|
||||
let index = cfg["index"];
|
||||
widget.settings[Common.stylesURL[index]] = cfg[Common.stylesURL[index]];
|
||||
widget.setStyleURL("");
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[widget.settings.styles["index"]]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
Layout.alignment: Qt.AlignCenter
|
||||
header: TitleBar {
|
||||
text: qsTr("Settings")
|
||||
font.pixelSize: 24
|
||||
|
||||
standardButtons: Dialog.Save | Dialog.Reset
|
||||
|
||||
onAccepted: {
|
||||
configuration = rootPreference.save();
|
||||
let index = configuration["index"];
|
||||
widget.settings[Common.stylesURL[index]] = configuration[Common.stylesURL[index]];
|
||||
delete configuration[Common.stylesURL[index]];
|
||||
widget.settings.styles = configuration;
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
styleDialog.active = false;
|
||||
}
|
||||
|
||||
onReset: {
|
||||
styleLoader.load();
|
||||
let cfg = rootPreference.save();
|
||||
let index = cfg["index"];
|
||||
widget.settings[Common.stylesURL[index]] = cfg[Common.stylesURL[index]];
|
||||
widget.setStyleURL("");
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[widget.settings.styles["index"]]));
|
||||
}
|
||||
}
|
||||
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
ColumnLayout {
|
||||
id: root
|
||||
anchors.fill: parent
|
||||
anchors.margins: 16
|
||||
anchors.topMargin: 0
|
||||
|
||||
clip: true
|
||||
contentWidth: preferenceLayout.implicitWidth
|
||||
contentHeight: preferenceLayout.implicitHeight
|
||||
Flickable {
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
|
||||
ColumnLayout {
|
||||
id: preferenceLayout
|
||||
width: root.width
|
||||
clip: true
|
||||
contentWidth: preferenceLayout.implicitWidth
|
||||
contentHeight: preferenceLayout.implicitHeight
|
||||
|
||||
P.PreferenceGroup {
|
||||
id: rootPreference
|
||||
Layout.fillWidth: true
|
||||
ColumnLayout {
|
||||
id: preferenceLayout
|
||||
width: root.width
|
||||
|
||||
label: qsTr("Configuration")
|
||||
P.PreferenceGroup {
|
||||
id: rootPreference
|
||||
Layout.fillWidth: true
|
||||
|
||||
onPreferenceEdited: {
|
||||
let cfg = rootPreference.save();
|
||||
// console.log(JSON.stringify(cfg, null, 2));
|
||||
let index = cfg["index"];
|
||||
if (widget.settings.styles["index"] !== index) {
|
||||
widget.setStyleURL("");
|
||||
widget.settings[Common.stylesURL[widget.settings.styles["index"]]] = old_style_cfg;
|
||||
label: qsTr("Configuration")
|
||||
|
||||
onPreferenceEdited: {
|
||||
let cfg = rootPreference.save();
|
||||
let index = cfg["index"];
|
||||
if (widget.settings.styles["index"] !== index) {
|
||||
widget.setStyleURL("");
|
||||
widget.settings[Common.stylesURL[widget.settings.styles["index"]]] = old_style_cfg;
|
||||
old_style_cfg = widget.settings[Common.stylesURL[index]];
|
||||
}
|
||||
|
||||
widget.settings[Common.stylesURL[index]] = cfg[Common.stylesURL[index]];
|
||||
delete cfg[Common.stylesURL[index]];
|
||||
widget.settings.styles = cfg;
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[index]));
|
||||
}
|
||||
|
||||
P.SelectPreference {
|
||||
id: styleList
|
||||
name: "index"
|
||||
label: qsTr("Styles")
|
||||
icon.name: "solid:\uf1fc"
|
||||
defaultValue: 0
|
||||
model: Common.styles
|
||||
}
|
||||
|
||||
P.Separator {}
|
||||
|
||||
P.PreferenceLoader {
|
||||
id: styleLoader
|
||||
name: Common.stylesURL[styleList.value]
|
||||
source: Qt.resolvedUrl(Common.stylesCFG[styleList.value])
|
||||
onLoaded: {
|
||||
let cfg = save();
|
||||
if (!widget.settings[Common.stylesURL[styleList.value]]) {
|
||||
widget.settings[Common.stylesURL[styleList.value]] = cfg;
|
||||
} else if(widget.settings[Common.stylesURL[styleList.value]]["__version"] === cfg["__version"]) {
|
||||
load(widget.settings[Common.stylesURL[styleList.value]]);
|
||||
} else {
|
||||
widget.settings[Common.stylesURL[styleList.value]] = cfg;
|
||||
}
|
||||
window.minimumHeight = cfg["__cfg_height"];
|
||||
}
|
||||
|
||||
onContentItemChanged: {
|
||||
if(contentItem) {
|
||||
contentItem.label = Common.styles[styleList.value];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
P.Separator {}
|
||||
|
||||
Component.onCompleted: {
|
||||
if(!widget.settings.styles) {
|
||||
configuration = rootPreference.save();
|
||||
let index = configuration["index"];
|
||||
widget.settings[Common.stylesURL[index]] = configuration[Common.stylesURL[index]];
|
||||
old_style_cfg = configuration[Common.stylesURL[index]];
|
||||
delete configuration[Common.stylesURL[index]];
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
widget.settings.styles = configuration;
|
||||
}
|
||||
|
||||
let index = Common.stylesURL.indexOf(widget.settings.current_style);
|
||||
if (index === -1) {
|
||||
index = 0;
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
}
|
||||
|
||||
widget.settings.styles["index"] = index;
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[widget.settings.styles["index"]]));
|
||||
|
||||
rootPreference.load(widget.settings.styles);
|
||||
configuration = widget.settings.styles;
|
||||
old_style_cfg = widget.settings[Common.stylesURL[index]];
|
||||
|
||||
styleLoader.load(widget.settings[Common.stylesURL[index]]);
|
||||
}
|
||||
|
||||
widget.settings[Common.stylesURL[index]] = cfg[Common.stylesURL[index]];
|
||||
delete cfg[Common.stylesURL[index]];
|
||||
widget.settings.styles = cfg;
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[index]));
|
||||
}
|
||||
|
||||
P.SelectPreference {
|
||||
id: styleList
|
||||
name: "index"
|
||||
label: qsTr("Styles")
|
||||
icon.name: "solid:\uf1fc"
|
||||
defaultValue: 0
|
||||
model: Common.styles
|
||||
}
|
||||
|
||||
P.Separator {}
|
||||
|
||||
P.PreferenceLoader {
|
||||
id: styleLoader
|
||||
name: Common.stylesURL[styleList.value]
|
||||
source: Qt.resolvedUrl(Common.stylesCFG[styleList.value])
|
||||
onLoaded: {
|
||||
let cfg = save();
|
||||
if (!widget.settings[Common.stylesURL[styleList.value]]) {
|
||||
widget.settings[Common.stylesURL[styleList.value]] = cfg;
|
||||
} else if(widget.settings[Common.stylesURL[styleList.value]]["__version"] === cfg["__version"]) {
|
||||
load(widget.settings[Common.stylesURL[styleList.value]]);
|
||||
} else {
|
||||
widget.settings[Common.stylesURL[styleList.value]] = cfg;
|
||||
}
|
||||
window.minimumHeight = cfg["__cfg_height"];
|
||||
}
|
||||
|
||||
onContentItemChanged: {
|
||||
if(contentItem) {
|
||||
contentItem.label = Common.styles[styleList.value];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
P.Separator {}
|
||||
|
||||
Component.onCompleted: {
|
||||
if(!widget.settings.styles) {
|
||||
configuration = rootPreference.save();
|
||||
let index = configuration["index"];
|
||||
widget.settings[Common.stylesURL[index]] = configuration[Common.stylesURL[index]];
|
||||
old_style_cfg = configuration[Common.stylesURL[index]];
|
||||
delete configuration[Common.stylesURL[index]];
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
widget.settings.styles = configuration;
|
||||
}
|
||||
|
||||
let index = Common.stylesURL.indexOf(widget.settings.current_style);
|
||||
if (index === -1) {
|
||||
index = 0;
|
||||
widget.settings.current_style = Common.stylesURL[index];
|
||||
}
|
||||
|
||||
widget.settings.styles["index"] = index;
|
||||
widget.setStyleURL(Qt.resolvedUrl(Common.stylesURL[widget.settings.styles["index"]]));
|
||||
|
||||
rootPreference.load(widget.settings.styles);
|
||||
configuration = widget.settings.styles;
|
||||
old_style_cfg = widget.settings[Common.stylesURL[index]];
|
||||
|
||||
styleLoader.load(widget.settings[Common.stylesURL[index]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,8 +18,6 @@ WebSocket {
|
||||
|
||||
onBinaryMessageReceived: {
|
||||
let arrayBuffer = new Float32Array(message);
|
||||
// Common.audioData = arrayBuffer.slice();
|
||||
Common.audioDataUpdated(arrayBuffer.slice());
|
||||
// arrayBuffer = null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,9 +3,9 @@ import QtQuick 2.12
|
||||
import ".." //显式导入单例Common.qml
|
||||
|
||||
Canvas {
|
||||
width: widget.width;
|
||||
height: widget.height;
|
||||
contextType: "2d";
|
||||
width: widget.width
|
||||
height: widget.height
|
||||
contextType: "2d"
|
||||
renderTarget: Canvas.FramebufferObject
|
||||
renderStrategy: Canvas.Cooperative
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user