mirror of
https://github.com/Serial-Studio/Serial-Studio.git
synced 2025-01-15 05:22:53 +08:00
Update UI
This commit is contained in:
parent
8a041403bb
commit
ad8100ce8a
@ -36,12 +36,12 @@ Window {
|
||||
// Properties
|
||||
//
|
||||
spacing: -1
|
||||
gradient: true
|
||||
implicitWidth: 260
|
||||
visible: opacity > 0
|
||||
opacity: enabled ? 1 : 0
|
||||
icon.source: "qrc:/icons/tab.svg"
|
||||
implicitHeight: implicitWidth + 96
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(9 / 255, 9 / 255, 12 / 255, 1)
|
||||
|
||||
//
|
||||
|
@ -36,12 +36,12 @@ Window {
|
||||
// Window properties
|
||||
//
|
||||
spacing: -1
|
||||
gradient: true
|
||||
implicitWidth: 260
|
||||
visible: opacity > 0
|
||||
opacity: enabled ? 1 : 0
|
||||
icon.source: "qrc:/icons/chart.svg"
|
||||
implicitHeight: implicitWidth + 96
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(9 / 255, 9 / 255, 12 / 255, 1)
|
||||
|
||||
//
|
||||
|
@ -76,7 +76,7 @@ Window {
|
||||
}
|
||||
|
||||
ChartView {
|
||||
antialiasing: false
|
||||
antialiasing: true
|
||||
anchors.fill: parent
|
||||
legend.visible: false
|
||||
backgroundRoundness: 0
|
||||
|
@ -37,12 +37,12 @@ Window {
|
||||
// Window properties
|
||||
//
|
||||
spacing: -1
|
||||
gradient: true
|
||||
implicitWidth: 260
|
||||
visible: opacity > 0
|
||||
opacity: enabled ? 1 : 0
|
||||
implicitHeight: implicitWidth + 96
|
||||
icon.source: "qrc:/icons/refresh.svg"
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(9 / 255, 9 / 255, 12 / 255, 1)
|
||||
|
||||
//
|
||||
|
@ -41,12 +41,12 @@ Window {
|
||||
// Window properties
|
||||
//
|
||||
spacing: -1
|
||||
gradient: true
|
||||
implicitWidth: 260
|
||||
visible: opacity > 0
|
||||
opacity: enabled ? 1 : 0
|
||||
implicitHeight: implicitWidth + 96
|
||||
icon.source: "qrc:/icons/location-on.svg"
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(9 / 255, 9 / 255, 12 / 255, 1)
|
||||
|
||||
//
|
||||
|
@ -25,6 +25,7 @@ import QtQuick.Layouts 1.12
|
||||
import QtQuick.Controls 2.12
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
import Qt.labs.settings 1.0
|
||||
import "../Widgets" as Widgets
|
||||
|
||||
Control {
|
||||
@ -34,6 +35,13 @@ Control {
|
||||
color: app.windowBackgroundColor
|
||||
}
|
||||
|
||||
//
|
||||
// Settings
|
||||
//
|
||||
Settings {
|
||||
property alias horizontalRange: slider.value
|
||||
}
|
||||
|
||||
//
|
||||
// Group/dataset updating
|
||||
//
|
||||
@ -93,11 +101,11 @@ Control {
|
||||
//
|
||||
Widgets.Window {
|
||||
id: viewOptions
|
||||
gradient: true
|
||||
title: qsTr("View")
|
||||
Layout.fillHeight: true
|
||||
Layout.minimumWidth: 240
|
||||
icon.source: "qrc:/icons/visibility.svg"
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(18 / 255, 18 / 255, 24 / 255, 1)
|
||||
|
||||
property var groups: []
|
||||
@ -108,6 +116,8 @@ Control {
|
||||
contentWidth: -1
|
||||
anchors.fill: parent
|
||||
anchors.margins: app.spacing
|
||||
anchors.topMargin: viewOptions.borderWidth
|
||||
anchors.bottomMargin: viewOptions.borderWidth
|
||||
|
||||
ColumnLayout {
|
||||
x: app.spacing
|
||||
@ -302,12 +312,12 @@ Control {
|
||||
//
|
||||
Widgets.Window {
|
||||
id: dataWin
|
||||
gradient: true
|
||||
title: qsTr("Data")
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
Layout.minimumWidth: 240
|
||||
icon.source: "qrc:/icons/scatter-plot.svg"
|
||||
borderColor: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
backgroundColor: Qt.rgba(18 / 255, 18 / 255, 24 / 255, 1)
|
||||
|
||||
Rectangle {
|
||||
@ -415,7 +425,18 @@ Control {
|
||||
radius: 5
|
||||
height: 32
|
||||
Layout.fillWidth: true
|
||||
color: Qt.rgba(45/255, 96/255, 115/255, 1)
|
||||
|
||||
gradient: Gradient {
|
||||
GradientStop {
|
||||
position: 0
|
||||
color: palette.highlight
|
||||
}
|
||||
|
||||
GradientStop {
|
||||
position: 1
|
||||
color: Qt.rgba(5/255, 139/255, 167/255, 1)
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
spacing: app.spacing
|
||||
|
@ -167,6 +167,7 @@ Control {
|
||||
text: qsTr("CSV Export")
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
onCheckedChanged: CppExport.exportEnabled = checked
|
||||
palette.highlight: Qt.rgba(46/255, 137/255, 92/255, 1)
|
||||
}
|
||||
|
||||
Button {
|
||||
|
@ -35,7 +35,7 @@ Control {
|
||||
//
|
||||
// Custom properties
|
||||
//
|
||||
readonly property int minimumWidgetSize: 340
|
||||
readonly property int minimumWidgetSize: 320
|
||||
|
||||
//
|
||||
// Group/dataset updating
|
||||
@ -78,16 +78,12 @@ Control {
|
||||
clip: false
|
||||
contentWidth: -1
|
||||
anchors.fill: parent
|
||||
anchors.rightMargin: 10
|
||||
anchors.rightMargin: 5
|
||||
anchors.margins: app.spacing * 1.5
|
||||
anchors.leftMargin: app.spacing * 2 + 10
|
||||
|
||||
ColumnLayout {
|
||||
width: _sv.width - 2 * app.spacing
|
||||
|
||||
Item {
|
||||
Layout.minimumHeight: 10
|
||||
}
|
||||
x: 0
|
||||
width: _sv.width - 15
|
||||
|
||||
GridLayout {
|
||||
Layout.fillWidth: true
|
||||
|
@ -53,8 +53,8 @@ ApplicationWindow {
|
||||
// Window geometry
|
||||
//
|
||||
visible: false
|
||||
minimumWidth: 1120
|
||||
minimumHeight: 640
|
||||
minimumWidth: 1080
|
||||
minimumHeight: minimumWidth * 9/16
|
||||
title: CppAppName + " v" + CppAppVersion
|
||||
|
||||
//
|
||||
|
Loading…
x
Reference in New Issue
Block a user