From 4f5e12128725d77ff8c84078c2640481dd6f46d3 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Wed, 20 Jan 2021 15:06:40 -0500 Subject: [PATCH] Rename 'device manager' to 'setup' --- assets/assets.qrc | 2 +- .../Windows/{DeviceManager.qml => Setup.qml} | 2 +- assets/qml/Windows/Toolbar.qml | 12 +-- assets/qml/main.qml | 14 +-- assets/translations/en.qm | Bin 7789 -> 7691 bytes assets/translations/en.ts | 91 ++++++++++++------ assets/translations/es.qm | Bin 14105 -> 14009 bytes assets/translations/es.ts | 81 +++++++++++++--- assets/translations/zh.qm | Bin 9498 -> 9400 bytes assets/translations/zh.ts | 81 +++++++++++++--- 10 files changed, 210 insertions(+), 73 deletions(-) rename assets/qml/Windows/{DeviceManager.qml => Setup.qml} (99%) diff --git a/assets/assets.qrc b/assets/assets.qrc index 253b26ba..74b5e5f4 100644 --- a/assets/assets.qrc +++ b/assets/assets.qrc @@ -64,7 +64,7 @@ qml/Windows/Console.qml qml/Windows/CsvPlayer.qml qml/Windows/DataGrid.qml - qml/Windows/DeviceManager.qml + qml/Windows/Setup.qml qml/Windows/Toolbar.qml qml/Windows/Widgets.qml qml/main.qml diff --git a/assets/qml/Windows/DeviceManager.qml b/assets/qml/Windows/Setup.qml similarity index 99% rename from assets/qml/Windows/DeviceManager.qml rename to assets/qml/Windows/Setup.qml index 1fbf04f0..2a07c79c 100644 --- a/assets/qml/Windows/DeviceManager.qml +++ b/assets/qml/Windows/Setup.qml @@ -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 diff --git a/assets/qml/Windows/Toolbar.qml b/assets/qml/Windows/Toolbar.qml index d8a5b74a..8b4cd949 100644 --- a/assets/qml/Windows/Toolbar.qml +++ b/assets/qml/Windows/Toolbar.qml @@ -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 { diff --git a/assets/qml/main.qml b/assets/qml/main.qml index af9fba11..5e547189 100644 --- a/assets/qml/main.qml +++ b/assets/qml/main.qml @@ -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() { diff --git a/assets/translations/en.qm b/assets/translations/en.qm index 1c4c3dd797494f0ff495a5c568816dd085e24cf1..cff60ac6ec6cfc21466a7b6b2271a18aec3b6ee8 100644 GIT binary patch delta 1133 zcmX|9ZBSHY6h4>tzV}}4$F2(q?&4I#*PxZ;2#(gOiBrhV1_gnllu)iKVweo;q-ERK z$COS4El}p7k?As{(a5UN;27msilQ*ak0Kg|5rKwc(4ErB>OoxZ%$?_)`@ZKn&w0)r zv+uIkBzTQKi1Jqu#WA9SFNvaOli1uuB)v!C#gjx)uM=Oe3)n=w@F|>&#Mj}wo<{so z2{4cN<#R;xE0mf(0j#Ffj3{6$Wi_0p$>%P{=8$84Ju=4>s#)Y1I8R=R9wq1Qmxwf? zmFH0qah8fYJ0R$3TIEJT^eHOd0byn6anR=!QoM36+xpHKBHqW^4(AYwd#2E0Vf}lp zMAQ8&R2f4QvqF@!gD~WdxPNFFj17o~KYJI3o)bI&#d+)|KC2ssYVY&spU5DJyu;Vm ze2e-ke2bh3{i~)hww||U37E5-4>x5_8kfs&M@<$cNlBv&L{{kq?HU?>BduFliUEI> zwwJ>gW18fF64wVF>s}?NHROfDZOYmU*aT}=HeSGFY==_!MlA>uB8#8Bflby& zp16JrL@ALYQ6dEPt3sCrLVi)1@-l?gsp&t@1COlQk0xQ$Z>jbhE;#B|T?c`&?dpf@ z77X{O)iIkPv`F>W{Dk}C>Q}qH)tGRb`d3p6R$8m&Za70^S*^J`lHovtHZ}rl<9^ep zH$Dg4spl2qzOfvL`zEu#VduxlEA)Mf--OVRVf$nP`S(V0aUVABGSbg>fv?smaV~+N zI%89y5-Tn;DjjpNqSuV}a`8J%)@bysxsHO5jN5&KXyi7fe0>0Uo2j8^CY0JumohmD zj+rJl!deWLJ0oA+^`jV;()ou{wY?&%|90W0HGOWM7G4> z0Q1YirKV!tw_Qt=c)qL3^Qx~!OACj;YmbD(WIZ(;uGSslFsR?ZJFYKConjE!e|Qwg zA_=eJEUj>RO5H9Q$-N#W#+)#P->`+l)5d)fAtOz`$L1SgGkgKtA)hCHS@>p0e0;Di H{#eBSTB$AK delta 1221 zcmZWne@v8h9Dd$=@4ff#eebxp!Ec%zW>nC1@HVFjJ(sRsqkLuK?rg)igrB#XeUtC z!v@_clvlIR@fs>Nl2F2rSnJ*dB>s+ldr836i_S1(t&+H(*n&&_?{aVumrGUv&f^&R z;{qU#3F#lL2h>ACku;O-+U5~2F1?~E(i2`rqO;;y!^HcFufwiYLft? zs+S9+6ylhE|IlIz+Mz$VyO9Dm>3eVT-EmIJ?4J^{NLqP+4q!eetqp(9{v%SIoKODc z)98pv-30>g%#udh@+p|ZF5O6Eqc&ogH7asJvf(lH8W+B3Sd;7L9c_k}o}w_;3x>!w zIwL5CqsxZqaJ%8JzXwP_ly4uU>vq5V;A#r3+U3&ukMnMmyr*LWJmu`Y3`llj2pGt6@zp>Q_DWp$9bh%Wzj+s z+pay+QA?{=X|*Bm-So<%9oBzIsr=f&>R~pNXg3D0a#4>Z{eyPK4VKn{G%~hXzR8zZ zUvC*-M~QLOGWi?5lpe5pM{-E?4(o=5Tq?2D+FH+f`YYBh&zoG_V?AB^6$woSse7aN z4?iQ@VL)_D49k)4Qf6ATC4stNRbZKay}vq88__wl;#2oJ=ftOi&W!lfPNz3MHGJ!= zG}nUos&ZFae5%1UH$L^D%N?Kk)^!W}NmrKn{|80FYI5{dwags(Ra7Dc?gK`7`rPLt RZ@5z<#U+O2ie*w^}Q$hd$ diff --git a/assets/translations/en.ts b/assets/translations/en.ts index 8948c6ec..c8da2b7d 100644 --- a/assets/translations/en.ts +++ b/assets/translations/en.ts @@ -152,51 +152,27 @@ DeviceManager Communication Mode - Communication mode - - - Auto (JSON from serial device) - - - - Manual (use JSON map file) - - - - Change map file (%1) - - - - Select map file - + Communication mode COM Port - COM port + COM port Baud Rate - Baud rate + Baud rate Data Bits - Data bits - - - Parity - + Data bits Stop Bits - Stop bits + Stop bits Flow Control - Flow control - - - Language - + Flow control @@ -453,11 +429,58 @@ - Toolbar + Setup - Devices + Communication Mode + Communication mode + + + Auto (JSON from serial device) + + Manual (use JSON map file) + + + + Change map file (%1) + + + + Select map file + + + + COM Port + COM port + + + Baud Rate + Baud rate + + + Data Bits + Data bits + + + Parity + + + + Stop Bits + Stop bits + + + Flow Control + Flow control + + + Language + + + + + Toolbar Console @@ -490,6 +513,10 @@ Open CSV + + Setup + + Updater diff --git a/assets/translations/es.qm b/assets/translations/es.qm index e3807164983c184b7b75490ca874086cf3a570e4..2ae5e287173375872a5ffc2652e335c515c2e459 100644 GIT binary patch delta 1151 zcmXw24Nw$y9DU2)?%gf7d%@k29AGIQ9iZ}cU=)Lh;}{pBNl-Qz8Xbrz)&-R_)j3%+ zjt)eeU}Q*0Cgw*IXQ`7GlOLrR1r{|%7MTdnG-D8BijzH~yP2E!e*gXdzTVqysXn@{ zVWv0Y7*O~akXQ;7y$8e|g08b2P+x@Z+-E?{Pmu24%5y!W;)TSGkji;JZ7-yKD~SV; zzWEZ+yl^lEaXeke4Zlg9_a%jPYa*)WIKT%m(VLc1k4bEirt-TlpFMJ zWfB`W#reyYvtg!~XQ4vjjbdKf9sJpsFT{DZF>%9dr-0yV;*tFYfH83jXS9kJcZLIw zTjGSr3fxzv)93jCbGWW!cmaj&(CvTwbqYCG*YgjbCp;&`_fgQW3(}(xrURB8(&~nz zKzxn#ygnC@cTQo#VX148z@`jNKvoF4LhPo!q^6n8Mb}f8Xk-vt|0}SG$0F+w?i56x!URFUok5!X4M|*i*y! zoW7^OmIGw!2O=i`QP#qi3QiR?RK$oP5hB6>RQ=AvlSm$9S>rf1xPF1qT-GDNwxZfux zOe%Ha4GL~l>aEYxh)Lz0hVQA&F6BUrx1JVOE7#i(($d?(OV*qMX66OEyJM-q1Hpfc zQrcO6nry9)5R*;Iih19@jmY~EL#8!b8X13UYRi6wgZfqb_A#Ej)!33jz5(l0=jmS7 z+pDh3pGS*})%ANkfT2$HxKe=7Z1vMB-RFF#B(=Zv3KO=gHwQ0q!`oWihr1bfYt8+U z+-$S$^o-$B%L2gs<|d4lLNP#n>VnY@x1w9)>}aI59Y6m zzTkpUl|X8re@NV?`D?;Lrup6oeLDG1Po*0}+? z#hMeKKUy6Ds@XgNT5ofhrdkLhwaxGiY4N^!HnlMm_{itAJDznkg+QGU|Cf%ovzuK z+2W=t7I82U8FLaJT}F-3xPXzd2{;yTy2KC@A|jZOIUG*dvh6VbT5odm-Sho^=lst1 zo!`BM8BItP@}xA`b!9c_U04rJH508rIy%Mg`KKP(Mg@UFx zfS6{y)JF-N7q4uhjg~Da`+yo+Jc}wr9gx_9))s2O8HWx(#nJtQ?Uc6+H;2BU!XeyV zUks$Yi}Bxo27~}({H6xbw=xA>BCR`_6B9$gQ$gnZKsFHJVg|X@HXvy-!tLn*mRKT= zS37{E4Q$T3m+8R8Y@UvsiQCQQrOsn-poB5{w71w@ANB&u2keD2MS#M(fXVyV+s9&n z$P{+Qs|PgOWI|pD&@r<1@fXO@cG;QcePm#QY~XKNw_NAULu91k3Rm)6IuKRIRrxPc zevqpbasmF>0$QWE&Q%QQ-N{X~<&t6M0d7u9i7{9Cr28y6ozK6fybCN+@EbEL$gpC5 z?-nv9ei0wIOOuI^@s|t70h^hB{MRr|GGBf(Yn1tX~ye-BTo4Ip(;7Ox&N!CpYr=;QXdz9dl=0@(&LFH=W z*C#0MP&W?8lEPE!A9Fd{e@Q*Pl`Lj@)Uyw0mf~5BYa*R~nq`_Dk(t!+X-(rUs;9WF z31)o;Jl(CiT6%?qa@9bplO>5-~d)K*t|3M*N z~Y~aqxQ@&Dzsm#iw-5HBrt3=Rs?cHy$;*uR0ll0!h#js1F4SM(3s-}|1Y%*TaW+% diff --git a/assets/translations/es.ts b/assets/translations/es.ts index 31158d82..a63c36d7 100644 --- a/assets/translations/es.ts +++ b/assets/translations/es.ts @@ -164,51 +164,51 @@ DeviceManager Communication Mode - Modo de comunicación + Modo de comunicación Auto (JSON from serial device) - Automático (JSON desde puerto serial) + Automático (JSON desde puerto serial) Manual (use JSON map file) - Manual (usar archivo de mapa JSON) + Manual (usar archivo de mapa JSON) Change map file (%1) - Cambiar archivo (%1) + Cambiar archivo (%1) Select map file - Seleccionar archivo de mapa + Seleccionar archivo de mapa COM Port - Puerto COM + Puerto COM Baud Rate - Baudios + Baudios Data Bits - Bits de datos + Bits de datos Parity - Paridad + Paridad Stop Bits - Bits de parada + Bits de parada Flow Control - Control de flujo + Control de flujo Language - Idioma + Idioma @@ -547,11 +547,62 @@ Error crítico del puerto serie + + Setup + + Communication Mode + Modo de comunicación + + + Auto (JSON from serial device) + Automático (JSON desde puerto serial) + + + Manual (use JSON map file) + Manual (usar archivo de mapa JSON) + + + Change map file (%1) + Cambiar archivo (%1) + + + Select map file + Seleccionar archivo de mapa + + + COM Port + Puerto COM + + + Baud Rate + Baudios + + + Data Bits + Bits de datos + + + Parity + Paridad + + + Stop Bits + Bits de parada + + + Flow Control + Control de flujo + + + Language + Idioma + + Toolbar Devices - Dispositivos + Dispositivos Console @@ -597,6 +648,10 @@ Open CSV Abrir CSV + + Setup + Configuración + Updater diff --git a/assets/translations/zh.qm b/assets/translations/zh.qm index 3caa574a639ab74018344037616759ff0bec7c38..312cea8730d720d98e15eeba10e4a0b23985af03 100644 GIT binary patch delta 1120 zcmYLIeN5DK82|kEz1{upe!sipC3!gw1WC6RGhRw%ShRL>A*cvuVP4w#zC?y?SJrK5 z{ZZn`6MTyh@r9OY9$7Yv$bF@o4WR#k zr@Q$;3}R((2MPU#XV&vUl8(yPNi22>8B8~RKIU64e9~Kx0|>i?kh};;SQt~`Z3W^| zV~%XhVu6>%$Cs^SL0v40qe6D4Sd@Jimj;T3OuzYx=-br^s9oauQzd|+MlhjCy!Kua zkUS<%RL7J5Wl1e+12kD`8F_-j4oIgCy+J|4Qtv;!Pq{A7>7$^=E_wNaT)?_t-ca`$ z{qyCQ)Ivb2il8%24!Q*PnI?}m7gD&ydii!NAL^4z#+b+l^~x&CFbgkG*3EmK4Ynw+ zZl*ByHRJswq2S0yPpJd)frSc!$JG$G^wVrn(fv=(q=XgR-RGtX8n|Kkj<*3Vl0EiV;)K=Ym;I$c_= z80Ly~YkT6ik!Yj#Zrx98)T4cP(7%TrCTf2*pXNy4x0G(`1@N zrA7l5+1yd{$p7AuEi3A^*wfWWVIeRiIs+-GT>(?tl6a}KY{!&|Gl0T>B%;lg_M`YO DY`rXR delta 1228 zcmZWneN5DK9DaWM-tKesP|Pupb_d)mKV+0Ui2$a|ZFBKlAoy$6VN;n)!paK@pfj&aCR;t66gt`2_8!Bx1Cl?gb$!r0v( z0NExaoZk-UlR~;2$M-nl$6mPibn@6Q$ze5NL`YVRdL?GoEhX8?*ii%}Kgjid8`;8JnAG91us zlA6{=A%>+BV{0hrHR<%BcPLpFq&zsuu|sT9oSk?&dA7}Bl8Pl#Obpt3o5lnWb_;^YF};Z&NKuTIH|%LnI)pj)_(Z+OMwOLZNk+nzQmn-W{oa)Vz~%q1rdJiv$wYtM+LU zUt)+H;T-1vSG7+Z{!y)@|qLQon*YISDXJ|5&$h6c~ah_6SIh%5ji#sgcITuOjd>Jr5 zS>%b*25&~K0ce{P-!l4_$7GoGr#!pMiahHJwilFmD*bz7;sR4=ViE#VKgOg4rfiOf z15=rfIkR4M%$e2Xa0WK^I^2P&=-4?`t7Df1R_%%n+}KvGU$*#1#VCJAY*$3}g-t52 Vr$qd#vzL4Q70$x8Kb#lEe*sxvQP%(f diff --git a/assets/translations/zh.ts b/assets/translations/zh.ts index b27ddfd4..922423f4 100644 --- a/assets/translations/zh.ts +++ b/assets/translations/zh.ts @@ -156,51 +156,51 @@ DeviceManager Communication Mode - 通讯方式 + 通讯方式 Auto (JSON from serial device) - 自动(来自串行设备的JSON) + 自动(来自串行设备的JSON) Manual (use JSON map file) - 手动(使用JSON映射文件) + 手动(使用JSON映射文件) Change map file (%1) - 更改地图文件(%1) + 更改地图文件(%1) Select map file - 选择地图文件 + 选择地图文件 COM Port - COM端口 + COM端口 Baud Rate - 波特率 + 波特率 Data Bits - 数据位 + 数据位 Parity - 校验位 + 校验位 Stop Bits - 停止位 + 停止位 Flow Control - 流控位 + 流控位 Language - 语言 + 语言 @@ -460,11 +460,62 @@ 严重的串行端口错误 + + Setup + + Communication Mode + 通讯方式 + + + Auto (JSON from serial device) + 自动(来自串行设备的JSON) + + + Manual (use JSON map file) + 手动(使用JSON映射文件) + + + Change map file (%1) + 更改地图文件(%1) + + + Select map file + 选择地图文件 + + + COM Port + COM端口 + + + Baud Rate + 波特率 + + + Data Bits + 数据位 + + + Parity + 校验位 + + + Stop Bits + 停止位 + + + Flow Control + 流控位 + + + Language + 语言 + + Toolbar Devices - 设备 + 设备 Console @@ -498,6 +549,10 @@ Open CSV 打开CSV + + Setup + 体系 + Updater