QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

Rename 'device manager' to 'setup'

Browse Source
This commit is contained in:
Alex Spataru 2021-01-20 15:06:40 -05:00
parent c8c8884e45
commit 4f5e121287
10 changed files with 210 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/assets.qrc
View File

@ -64,7 +64,7 @@
<file>qml/Windows/Console.qml</file>
<file>qml/Windows/CsvPlayer.qml</file>
<file>qml/Windows/DataGrid.qml</file>
<file>qml/Windows/DeviceManager.qml</file>
<file>qml/Windows/Setup.qml</file>
<file>qml/Windows/Toolbar.qml</file>
<file>qml/Windows/Widgets.qml</file>
<file>qml/main.qml</file>

2
assets/qml/Windows/DeviceManager.qml → assets/qml/Windows/Setup.qml
View File

@ -39,7 +39,7 @@ Control {
// Save settings
//
Settings {
category: "Device Manager"
category: "Setup"
property alias dmAuto: commAuto.checked
property alias dmManual: commManual.checked
property alias dmParity: parity.currentIndex

12
assets/qml/Windows/Toolbar.qml
View File

@ -39,7 +39,7 @@ Control {
//
signal dataClicked()
signal aboutClicked()
signal devicesClicked()
signal setupClicked()
signal consoleClicked()
signal widgetsClicked()
@ -48,9 +48,9 @@ Control {
//
property alias dataChecked: dataBt.checked
property alias aboutChecked: aboutBt.checked
property alias setupChecked: setupBt.checked
property alias consoleChecked: consoleBt.checked
property alias widgetsChecked: widgetsBt.checked
property alias devicesChecked: devicesBt.checked
//
// Settings
@ -88,16 +88,16 @@ Control {
anchors.margins: app.spacing
Button {
id: devicesBt
id: setupBt
flat: true
icon.width: 24
icon.height: 24
Layout.fillHeight: true
icon.color: palette.text
onClicked: root.devicesClicked()
icon.source: "qrc:/icons/usb.svg"
text: qsTr("Devices") + _btSpacer + CppTranslator.dummy
onClicked: root.setupClicked()
icon.source: "qrc:/icons/settings.svg"
text: qsTr("Setup") + _btSpacer + CppTranslator.dummy
}
Button {

14
assets/qml/main.qml
View File

@ -104,7 +104,7 @@ ApplicationWindow {
Component.onCompleted: {
// Hide dialogs, show devices pane
about.hide()
devices.show()
setup.show()
csvPlayer.hide()
// Hide everything except the terminal
@ -192,7 +192,7 @@ ApplicationWindow {
id: uiConfigTimer
interval: 250
onTriggered: {
devices.hide()
setup.hide()
toolbar.dataClicked()
}
}
@ -204,7 +204,7 @@ ApplicationWindow {
target: CppDataProvider
function onDataReset() {
toolbar.consoleClicked()
devices.show()
setup.show()
app.firstValidPacket = false
}
}
@ -239,9 +239,9 @@ ApplicationWindow {
aboutChecked: about.visible
consoleChecked: terminal.visible
widgetsChecked: widgets.visible
devicesChecked: devices.visible
setupChecked: setup.visible
onAboutClicked: about.visible ? about.hide() : about.show()
onDevicesClicked: devices.visible ? devices.hide() : devices.show()
onSetupClicked: setup.visible ? setup.hide() : setup.show()
onDataClicked: {
data.opacity = 1
@ -319,8 +319,8 @@ ApplicationWindow {
}
}
DeviceManager {
id: devices
Setup {
id: setup
property int displayedWidth: 320
function show() {

BIN
assets/translations/en.qm
View File

Binary file not shown.

91
assets/translations/en.ts
View File

@ -152,51 +152,27 @@
<name>DeviceManager</name>
<message>
<source>Communication Mode</source>
<translation>Communication mode</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation></translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation></translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation></translation>
</message>
<message>
<source>Select map file</source>
<translation></translation>
<translation type="vanished">Communication mode</translation>
</message>
<message>
<source>COM Port</source>
<translation>COM port</translation>
<translation type="vanished">COM port</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>Baud rate</translation>
<translation type="vanished">Baud rate</translation>
</message>
<message>
<source>Data Bits</source>
<translation>Data bits</translation>
</message>
<message>
<source>Parity</source>
<translation></translation>
<translation type="vanished">Data bits</translation>
</message>
<message>
<source>Stop Bits</source>
<translation>Stop bits</translation>
<translation type="vanished">Stop bits</translation>
</message>
<message>
<source>Flow Control</source>
<translation>Flow control</translation>
</message>
<message>
<source>Language</source>
<translation></translation>
<translation type="vanished">Flow control</translation>
</message>
</context>
<context>
@ -453,11 +429,58 @@
</message>
</context>
<context>
<name>Toolbar</name>
<name>Setup</name>
<message>
<source>Devices</source>
<source>Communication Mode</source>
<translation>Communication mode</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation></translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation></translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation></translation>
</message>
<message>
<source>Select map file</source>
<translation></translation>
</message>
<message>
<source>COM Port</source>
<translation>COM port</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>Baud rate</translation>
</message>
<message>
<source>Data Bits</source>
<translation>Data bits</translation>
</message>
<message>
<source>Parity</source>
<translation></translation>
</message>
<message>
<source>Stop Bits</source>
<translation>Stop bits</translation>
</message>
<message>
<source>Flow Control</source>
<translation>Flow control</translation>
</message>
<message>
<source>Language</source>
<translation></translation>
</message>
</context>
<context>
<name>Toolbar</name>
<message>
<source>Console</source>
<translation></translation>
@ -490,6 +513,10 @@
<source>Open CSV</source>
<translation></translation>
</message>
<message>
<source>Setup</source>
<translation></translation>
</message>
</context>
<context>
<name>Updater</name>

BIN
assets/translations/es.qm
View File

Binary file not shown.

81
assets/translations/es.ts
View File

@ -164,51 +164,51 @@
<name>DeviceManager</name>
<message>
<source>Communication Mode</source>
<translation>Modo de comunicación</translation>
<translation type="vanished">Modo de comunicación</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation>Automático (JSON desde puerto serial)</translation>
<translation type="vanished">Automático (JSON desde puerto serial)</translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation>Manual (usar archivo de mapa JSON)</translation>
<translation type="vanished">Manual (usar archivo de mapa JSON)</translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation>Cambiar archivo (%1)</translation>
<translation type="vanished">Cambiar archivo (%1)</translation>
</message>
<message>
<source>Select map file</source>
<translation>Seleccionar archivo de mapa</translation>
<translation type="vanished">Seleccionar archivo de mapa</translation>
</message>
<message>
<source>COM Port</source>
<translation>Puerto COM</translation>
<translation type="vanished">Puerto COM</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>Baudios</translation>
<translation type="vanished">Baudios</translation>
</message>
<message>
<source>Data Bits</source>
<translation>Bits de datos</translation>
<translation type="vanished">Bits de datos</translation>
</message>
<message>
<source>Parity</source>
<translation>Paridad</translation>
<translation type="vanished">Paridad</translation>
</message>
<message>
<source>Stop Bits</source>
<translation>Bits de parada</translation>
<translation type="vanished">Bits de parada</translation>
</message>
<message>
<source>Flow Control</source>
<translation>Control de flujo</translation>
<translation type="vanished">Control de flujo</translation>
</message>
<message>
<source>Language</source>
<translation>Idioma</translation>
<translation type="vanished">Idioma</translation>
</message>
</context>
<context>
@ -547,11 +547,62 @@
<translation>Error crítico del puerto serie</translation>
</message>
</context>
<context>
<name>Setup</name>
<message>
<source>Communication Mode</source>
<translation>Modo de comunicación</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation>Automático (JSON desde puerto serial)</translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation>Manual (usar archivo de mapa JSON)</translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation>Cambiar archivo (%1)</translation>
</message>
<message>
<source>Select map file</source>
<translation>Seleccionar archivo de mapa</translation>
</message>
<message>
<source>COM Port</source>
<translation>Puerto COM</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>Baudios</translation>
</message>
<message>
<source>Data Bits</source>
<translation>Bits de datos</translation>
</message>
<message>
<source>Parity</source>
<translation>Paridad</translation>
</message>
<message>
<source>Stop Bits</source>
<translation>Bits de parada</translation>
</message>
<message>
<source>Flow Control</source>
<translation>Control de flujo</translation>
</message>
<message>
<source>Language</source>
<translation>Idioma</translation>
</message>
</context>
<context>
<name>Toolbar</name>
<message>
<source>Devices</source>
<translation>Dispositivos</translation>
<translation type="vanished">Dispositivos</translation>
</message>
<message>
<source>Console</source>
@ -597,6 +648,10 @@
<source>Open CSV</source>
<translation>Abrir CSV</translation>
</message>
<message>
<source>Setup</source>
<translation>Configuración</translation>
</message>
</context>
<context>
<name>Updater</name>

BIN
assets/translations/zh.qm
View File

Binary file not shown.

81
assets/translations/zh.ts
View File

@ -156,51 +156,51 @@
<name>DeviceManager</name>
<message>
<source>Communication Mode</source>
<translation>通讯方式</translation>
<translation type="vanished">通讯方式</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation>自动（来自串行设备的JSON）</translation>
<translation type="vanished">自动（来自串行设备的JSON）</translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation>手动（使用JSON映射文件）</translation>
<translation type="vanished">手动（使用JSON映射文件）</translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation>更改地图文件（%1）</translation>
<translation type="vanished">更改地图文件（%1）</translation>
</message>
<message>
<source>Select map file</source>
<translation>选择地图文件</translation>
<translation type="vanished">选择地图文件</translation>
</message>
<message>
<source>COM Port</source>
<translation>COM端口</translation>
<translation type="vanished">COM端口</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>波特率</translation>
<translation type="vanished">波特率</translation>
</message>
<message>
<source>Data Bits</source>
<translation>数据位</translation>
<translation type="vanished">数据位</translation>
</message>
<message>
<source>Parity</source>
<translation>校验位</translation>
<translation type="vanished">校验位</translation>
</message>
<message>
<source>Stop Bits</source>
<translation>停止位</translation>
<translation type="vanished">停止位</translation>
</message>
<message>
<source>Flow Control</source>
<translation>流控位</translation>
<translation type="vanished">流控位</translation>
</message>
<message>
<source>Language</source>
<translation>语言</translation>
<translation type="vanished">语言</translation>
</message>
</context>
<context>
@ -460,11 +460,62 @@
<translation>严重的串行端口错误</translation>
</message>
</context>
<context>
<name>Setup</name>
<message>
<source>Communication Mode</source>
<translation>通讯方式</translation>
</message>
<message>
<source>Auto (JSON from serial device)</source>
<translation>自动（来自串行设备的JSON）</translation>
</message>
<message>
<source>Manual (use JSON map file)</source>
<translation>手动（使用JSON映射文件）</translation>
</message>
<message>
<source>Change map file (%1)</source>
<translation>更改地图文件（%1）</translation>
</message>
<message>
<source>Select map file</source>
<translation>选择地图文件</translation>
</message>
<message>
<source>COM Port</source>
<translation>COM端口</translation>
</message>
<message>
<source>Baud Rate</source>
<translation>波特率</translation>
</message>
<message>
<source>Data Bits</source>
<translation>数据位</translation>
</message>
<message>
<source>Parity</source>
<translation>校验位</translation>
</message>
<message>
<source>Stop Bits</source>
<translation>停止位</translation>
</message>
<message>
<source>Flow Control</source>
<translation>流控位</translation>
</message>
<message>
<source>Language</source>
<translation>语言</translation>
</message>
</context>
<context>
<name>Toolbar</name>
<message>
<source>Devices</source>
<translation>设备</translation>
<translation type="vanished">设备</translation>
</message>
<message>
<source>Console</source>
@ -498,6 +549,10 @@
<source>Open CSV</source>
<translation>打开CSV</translation>
</message>
<message>
<source>Setup</source>
<translation>体系</translation>
</message>
</context>
<context>
<name>Updater</name>