From dd4454e913b094bad34470f539667cba23e8cfdd Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Fri, 21 Feb 2020 20:15:34 +0800 Subject: [PATCH] Fix language and UI issue --- DSView/icons/dark/start.png | Bin 2902 -> 4293 bytes DSView/icons/dark/stop.png | Bin 2686 -> 2933 bytes DSView/icons/light/start.png | Bin 1776 -> 4293 bytes DSView/icons/light/stop.png | Bin 1677 -> 2933 bytes DSView/languages/my_25.qm | Bin 30023 -> 31345 bytes DSView/pv/view/view.cpp | 3 ++- DSView/pv/view/view.h | 1 + DSView/pv/view/viewport.cpp | 8 ++++---- 8 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DSView/icons/dark/start.png b/DSView/icons/dark/start.png index 40e181d08fb6b97d2dc8ffc2882b8ff1fdc229cc..47ccc89535ab0e42db5020d2354534c2d2143950 100755 GIT binary patch delta 4057 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 LNkvXXu0mjfFTSxa delta 2655 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 N002ovPDHLkV1f&HP;gSTT zmC}YoIcb$rN(Zq`r`XMoU@zVu*sf<1^mvO343nO^ZTCX`8~heLn4#O@PB{I z9yK?+!Ib0HMB0t(>m|(Jv={j4nBG}j!{r!(DaUOD76J}152yngfVn^;P-||Do4|44 z8ZZQm0As))5CE6Gz`qt#dtt+I5twq^dPG_)uo7qo+RX3yh`a_g`Vs|RQz|k*8j&{y zTmjAl$AKhp3OI+z9F3#Fk_k*XZZ&`40-prdntv|?nt{b=#MPD7%~@j%jmV2YA0n?C zI0zg9d@t}PN@-x$1g0Ff0ay+^0(=?~=po`N8GS$s5%_Q50C3g|{E^wbY*qxO9M=Ih z0G|V%M$@$ssLHu@0_mkRnqHHUqa3J;90{Z@YJuvU`zF!IOagm>e**7#fggX&w80q@ zm~!0Zz?Xq%(CAy5r-Ktn_nbg_rw{3*L15Gf5clepK*ZIfg=;RF4fg>LAYGiVpXbmh z{4?;X7x-sq)M&8;CblLL$?dCF1K$9)Abpps+s*;LIgSG-fe(R8z%csiW0ZFU)}h%j z2UrB$3*3(uG}jzUbDkSRdU1aj@Td09W8Il;#Sv2!fyQ=w82C2utm%x!Brt$T+Yh`6 z{1@nL@9Y@MY}CJopr#+fOWu=z(z#m0+z|2=_j`dq6hj9=zUrsYDz^p^GKu1a z=Yc-}FC%*lU~gHE$9Ffd)ND z<|mK~3*y8x?O!MGx(-Y^ZWW5}-ETSt8X3oc?%Br63ZRBCyl?wq-KlzWEgGn(Gw15f z@9Ie38_l)Y@;gS>ZX~-^3r&cd<%X;49k-ZA81}K98AKy6?u8?RA|Ux(zqC0Yjo3^Q z#ualhZr*UYE^Y9(x^UeZRew+HNLL6CZ zAdA36iyVwVZMk<6=8qzQYHRN7I9OUKrirzQ;vHWIE=o)JTwYD;ETZfD9Bh6OnGfLMdnyc zZSz5MlpFUVSv|rTI*2$qoSV+gr-M!dZ3mfyjMrC<(MF@%n$y;#^QF0!F4yNX9loZmu9M-p&`+D^%Li1MEZ0 z+ZAUHs#fSoZu#xH__|&hFfw%@8Ev>~9C5IZ0!g*Ji5M^NCsK}k2&EQVP@zo~GA=g* zS5uCg29De=C2fUZa^VjF-$Aljr(qK1!(Rpt6{_Z+uDIwURA~4&vXe^ppeldW9|Ic` zFRrQ0^XzQ_)Ax-?mS>S{7QIOJR}dHZ-!WZ%ps9;~0{98i4f7+HKSE^?yHL`-U?Y`? zl;bW#P-J0pp9P&~gXxFE8+KXq*?l&B546>w#~f zeIhG!ZW%<5_7UV6^qAu;vfhVnu~4~Tijiyzayc4tD-eMXlam}b_yB)+6?hToDz$k}enxn&epOnpeWSL8e*co6xl<(lHvDCIcM9Ib?VL~KI5A?KN^$h-Or zu*(bl12buG#`PraogD|0+jm-mzJx~QGQyx^z4_gWzP63vrp+-*{*sP3P;1(^dy*Rn zvuL>%$2eLDyU=R;kM@7gj?*&@>6EhBa0#j%ejHV}KZF91m2TG9u-y@ihXK6r1%Cgu zPZdBM+g+Pc-Q0TM6DSC|7)3JXa|?FG=fGB2TtbV)Ddb&r0S8LmWf04TYhy1qBSpOu z>7CW)-z|v9dcvB%a&EY`x!h4i+y%5ibR&KI0npRld91J4{cvj2A=WMbrf$xrLR-+z zCI_vE4d(C7*z!M&^zJaS>v{Q=5EYqKZ(#TO|)=_)jO$ s$QuR5+n=kR%shXztiF2L3B1$sKc6>j80nhzApigX07*qoM6N<$g0~?PBme*a delta 2437 zcmV;033~SR7XB2FKnVi`2M-gHuVtT+N!EV}Nl8RORCt{2n_FxgR~g6u-+GrJ~s zNSnk_0UXYMVK>-O$DxgIa8Z`<6 z1W_dvRZ1JFsH&RQv9tAV9IUiSU6<5NV)imK=koE;b#M#4WM=HP!ar#x?;h{}`_6y= zoZWL>VrDFp9`SxB@L^}!z>F*#n2}`zGqP-8MwSiC$g+VMSvD{u?otPwoSc-#7^#$U zJqK;kna?|p^EeSb6-9s1`JthqD|yx7ZR0Pdft5<7jhR2=IL@8c+S`L5 zC@gk^5fP#&Y6u~oFvc7qqCb~PrP`v!TdWF|%jMm!>wcApK2<0bkR)$>vWV!~|5$60 zB#9-WR7o&1NhyU8V&Q8504XIJjRu(cZ(8d^0|Nucvef78$lbsbCrmx^?SZE`i=7r%s((Q7jhs64AE` zg+f;x$M8H4^?LnJ#+bYF8esA=(5X}^_XR<)-xveW^AN}J(@_+Cb7+5P=;=HHq-A`3 zd?W~hpZdN(qLhN;IA}B)2RCinbO3blmZbYaU6fWR4V-{t9E7s&z(E>39a?f#C2V0tznG0YjkvUQx?rkYvCXW?r6=y5Jl095aLi8ol1YDvL^_FZ$wc9$8lh- zwE(`?*VlIf0IJpM4gfz8LI`6Ff*?Q?ML#Q*N{?P|EFr|9D2hHUrCjT}?rI{s1HcPu z@&+>Wz@tZx3TECZrG)SMu+}~{Jw2T&5oX@r(a|x|*48!>hT%wOXXkCqyk$Z8md?)3 z+rls$X=`g6>F9sx7-8n^X<|)JPrqQTea!cLNGZY0JC7bcn%aldZyXpH7y{4-07;S< z04I0s*pX^lKt!fit6~1pT7q30-I$phjRqF}4-ut`)ynZ?D`x=cYtlCOSWk#%?~8)X|=NSz`E8N%nW7@CMPFl2CXG!a&l5KbHL2dS_42m ztycQsTZn&4Q54NTZ5KkMZpEdhm1{cyL{S7G#HG|)Y2RqAecc$7SZiUeU2Tj>{YAXg z7-LphYgb!q(W=AiX|=LUW6m=36>BYmAh?N{2h(aTHOxF11i?+#S}^k!B08H^E46{X z@1G)~DP~3(hCVajnpTUMT`46NK8VPfFDD}Bt>u5roO&6`%(u331`$p9zJDsMR%!#g zy1HU!eo`rgIF3O?yQ|e|S4z1`yl+C9UmtX#C5Cl)GSndukUUE zHmzpX4OPp`_eW9m8WAB3!!-a7mdoWe8FhbirBEN) zKc|#>KnQ`>h`iHv-FwUBaxtrRUX;t_qU*Z%20^gXS_>frlu{2IK79DOtlGI8DossI ztx!rmSSS=epCk!{5J-~bQKi&(1_uW(W)6^nGiT1M_dM@MQp!EnT1Y8TtJVJC`~H8v z?(Xi)>-Su)w{>@S&k@mqTCMhs@B3(-IqdN~??|Om*_B6(G*l{;U7qJ13Bz!Y)*8O= zqgJauqqRPehj~EGHxtIj#s;O7_ZN%BPtG4?$8mhs81qK}5BK-?pUf@TJ1{XZu^qr( z$8kRA`+ocUL4Unoe=i+)-mF%%sgSO zeZup+r?l3uT)ler(%Q9a<11IvT@vW%=)la(jNjhgexvKUol2=~LWtXms6PzDHP%`X z5wzCUTKjvg^>_RG`*Yp5T$I~c7cN`~>h=0P0KO6gK~L+T2t|g%E`>3^Ctm#u!9VGzs9B#bWUn8#Zi+-dXYbS=9T1larI(N~tfouDjcH z-GLwo=4b!NJ1!A{h~Rl1q9}sax~#Q6=6T+)dwP1N-d!PO+_$U9!h3vK85ttk|cj8QtH(3@NlZ--a_83p_jzKg|g%0f+@e_f62NaveS~=PyiSOZ!ExrNMF#48UQyqF^6P;w#?Y3*5D+%T#Kgp# ziX;7>`IL^U|5g6hUi)Dow;uSSHee!$mOS!A2>Gw00000NkvXXu0mjf D`W&_q diff --git a/DSView/icons/light/start.png b/DSView/icons/light/start.png index 8f1b00531a562365be3980852de6d2203c294026..47ccc89535ab0e42db5020d2354534c2d2143950 100755 GIT binary patch delta 4057 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 LNkvXXu0mjfJwLHP delta 1520 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 delta 1420 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 CF{udv diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp index 8c99c094..0631df0b 100755 --- a/DSView/pv/view/view.cpp +++ b/DSView/pv/view/view.cpp @@ -77,6 +77,7 @@ const QColor View::Blue = QColor(17, 133, 209, 255); const QColor View::Green = QColor(0, 153, 37, 255); const QColor View::Purple = QColor(109, 50, 156, 255); const QColor View::LightBlue = QColor(17, 133, 209, 200); +const QColor View::LightRed = QColor(213, 15, 37, 200); View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent) : @@ -206,7 +207,7 @@ View::View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget fore.setAlpha(View::BackAlpha); _show_trig_cursor = false; - _trig_cursor = new Cursor(*this, View::Red, 0); + _trig_cursor = new Cursor(*this, View::LightRed, 0); _show_search_cursor = false; _search_pos = 0; _search_cursor = new Cursor(*this, fore, _search_pos); diff --git a/DSView/pv/view/view.h b/DSView/pv/view/view.h index 73a65d01..1d4ab633 100755 --- a/DSView/pv/view/view.h +++ b/DSView/pv/view/view.h @@ -101,6 +101,7 @@ public: static const QColor Green; static const QColor Purple; static const QColor LightBlue; + static const QColor LightRed; public: explicit View(SigSession &session, pv::toolbars::SamplingBar *sampling_bar, QWidget *parent = 0); diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp index 56b0748e..a1d405c2 100755 --- a/DSView/pv/view/viewport.cpp +++ b/DSView/pv/view/viewport.cpp @@ -329,16 +329,16 @@ void Viewport::paintSignals(QPainter &p, QColor fore, QColor back) type = g_variant_get_byte(gvar); g_variant_unref(gvar); if (type == DSO_TRIGGER_AUTO && roll) { - type_str = "Auto(Roll)"; + type_str = tr("Auto(Roll)"); } else if (type == DSO_TRIGGER_AUTO && !_view.session().trigd()) { - type_str = "Auto"; + type_str = tr("Auto"); } else if (_waiting_trig > 0) { - type_str = "Waiting Trig"; + type_str = tr("Waiting Trig"); for (int i = 1; i < _waiting_trig; i++) if (i % (WaitLoopTime / SigSession::FeedInterval) == 0) type_str += "."; } else { - type_str = "Trig'd"; + type_str = tr("Trig'd"); } } p.setPen(fore);