|
|
|
@ -4,6 +4,7 @@ import QtQuick.Controls 2.12
|
|
|
|
|
import QtQuick.Layouts 1.12 |
|
|
|
|
|
|
|
|
|
import NERvGear 1.0 as NVG |
|
|
|
|
import NERvGear.Controls 1.0 |
|
|
|
|
import NERvGear.Templates 1.0 as T |
|
|
|
|
import NERvGear.Preferences 1.0 as P |
|
|
|
|
|
|
|
|
@ -139,7 +140,7 @@ T.Widget {
|
|
|
|
|
renderTarget: Canvas.FramebufferObject |
|
|
|
|
renderStrategy: Canvas.Cooperative |
|
|
|
|
|
|
|
|
|
rotation: thour*30+tmin*0.5+tsec*0.6/60 |
|
|
|
|
rotation: thour*30+tmin*0.5+tsec*0.01 |
|
|
|
|
|
|
|
|
|
onWidthChanged: { |
|
|
|
|
requestPaint(); |
|
|
|
@ -318,8 +319,6 @@ T.Widget {
|
|
|
|
|
visible: true |
|
|
|
|
minimumWidth: 380 |
|
|
|
|
minimumHeight: 540 |
|
|
|
|
maximumWidth: minimumWidth |
|
|
|
|
maximumHeight: minimumHeight |
|
|
|
|
width: minimumWidth |
|
|
|
|
height: minimumHeight |
|
|
|
|
|
|
|
|
@ -327,39 +326,33 @@ T.Widget {
|
|
|
|
|
|
|
|
|
|
property var configuration |
|
|
|
|
|
|
|
|
|
ColumnLayout { |
|
|
|
|
id: root |
|
|
|
|
Page { |
|
|
|
|
id: cfg_page |
|
|
|
|
anchors.fill: parent |
|
|
|
|
anchors.margins: 16 |
|
|
|
|
anchors.topMargin: 0 |
|
|
|
|
|
|
|
|
|
Row { |
|
|
|
|
spacing: 234 |
|
|
|
|
header: TitleBar { |
|
|
|
|
text: qsTr("Settings") |
|
|
|
|
|
|
|
|
|
standardButtons: Dialog.Save | Dialog.Reset |
|
|
|
|
|
|
|
|
|
ToolButton { |
|
|
|
|
text: qsTr("Save") |
|
|
|
|
onClicked: { |
|
|
|
|
onAccepted: { |
|
|
|
|
configuration = rootPreference.save(); |
|
|
|
|
widget.settings.styles = configuration; |
|
|
|
|
styleDialog.active = false; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ToolButton { |
|
|
|
|
text: qsTr("Reset") |
|
|
|
|
onClicked: { |
|
|
|
|
onReset: { |
|
|
|
|
rootPreference.load(); |
|
|
|
|
let cfg = rootPreference.save(); |
|
|
|
|
widget.settings.styles = cfg; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Label { |
|
|
|
|
Layout.alignment: Qt.AlignCenter |
|
|
|
|
text: qsTr("Settings") |
|
|
|
|
font.pixelSize: 24 |
|
|
|
|
} |
|
|
|
|
ColumnLayout { |
|
|
|
|
id: root |
|
|
|
|
anchors.fill: parent |
|
|
|
|
anchors.margins: 16 |
|
|
|
|
anchors.topMargin: 0 |
|
|
|
|
|
|
|
|
|
Flickable { |
|
|
|
|
Layout.fillWidth: true |
|
|
|
@ -453,6 +446,7 @@ T.Widget {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
onClosing: { |
|
|
|
|
widget.settings.styles = configuration; |
|
|
|
|