From 5cc86c49b93716869cb76166274177a102279d7d Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 26 Feb 2019 10:50:00 +0100 Subject: [PATCH] Added tooltips for mode buttons. + some clean of an unused code + fix of #1861 --- resources/localization/uk/Slic3rPE.mo | Bin 128643 -> 129379 bytes resources/localization/uk/Slic3rPE_uk.po | 30 ++++++++++++++--------- src/slic3r/GUI/wxExtensions.cpp | 26 +++----------------- src/slic3r/GUI/wxExtensions.hpp | 2 ++ 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/resources/localization/uk/Slic3rPE.mo b/resources/localization/uk/Slic3rPE.mo index 08bf555b589bf67c38bc6a25ba05944a9d7361de..8c5c5437b5ec5ed4dba3cdea473173acd42fae85 100644 GIT binary patch delta 15380 zcmaLd2Xq$2qxbPy2%&}ELm&wq>7n=DyL6M=45|&^szkK@$N% z5djqesiJ^Nd%wSDhX3Wh_uRYZjGt*cJ3BKwyH9ZZ-ITvPOzHb6bHD<_u{oJBAvhtM zF^iHLbLS1^8q=tl+hj(0E>R;gl4O00`1uqg&$Yt(t|F*OdyoanD=MMl=Dwn9ntNH@eFY>er#J;q=ZX2$O@9B*MdOk2%%Bp0fFII2UXF%T=bbahk* z>-y6^?$8yqKwYq{OZP;b*cWxeAeSGDy5mu(JBve|HysP%VmyS0UH*I3ZT;yOO8z{Y zf(iH$*EiK_81pt>MGa}Qn)VLcp++VenGq9@MQ{@4z^#}EPoU~uM|JEa*1?puj7ft{ zFcY>z)$5C47>B;BL_Q>?eu)QC++mHXxs(HySFq4*hUZpt^ZL)8%5l5T}s z3u{qpWh+j^Q>YHKY^;Zw#f2Kl8~7$Z!^$deV%OGG)b&WP3*&jrkI(S{ zhBq~)0RDt&FgfF=DN2upusDWd8*GWOcppE%F|up`kH)!{DKRb3uNWHcGy zB0VzAX(c1JMfEfa)q!!SHLw=7vmJHmtEj1ah6OQAD?7BMQ8!i>HDVo57aoFYcPggR zkgXx2Io^!vaWAUkNz8y(aT7kkcX4@ZI~BoFtk8^%8~kw3`L1p`=V+CZ|SdRzhzV+3+7^AJDA`t9t6@1gGSA5_OodwZeun37}; z)Ke0QS~HhXQ}GlFc`V2djK8L!T1VT^0aVXE$3FNCsv{LT*$!4kvP^S4itF%ujPA@d zVx70xp791UTV_xfyS5JFVA55(^623Pyo3?HZp=54^xchFjVGP`d+-R-!=Rpw2G;3i z8|u{C&iOgio&SnC@wUqkh_rW@71i;Qm=VjO)=E9hg>7BFZ;&hSq2_2ds^P_`safgD zw>v*W)%zB;b}pgj^d{=OXQ-)29%ZK}6Y8B3;*3BozD5|L!GDv8P8{qUfnlV_q8^hK zm>u_`?jRA>fvc#7Zeeo#)0IC#&2`E?)`FOobX`oqj;Q)UebpY5pOHuqLmY;o6qJaz z9cqs1KwB(^gPlvACoq8gKT#d|8{flZ{p@*hs1aO-hj1&Z{-FN0JQf4EzL`ZN1Qt1v%qLoKFrsD=u@&4R>Vu?FTI!2Duo)KfIexeD1T%y!fo2^eS>cOF!|qUckk zDv^TN9ChJXEQjM!7uth`@IDsC?1PN?8f&1=OE=hdye#TQs$dY-LOo5*QB&9nwV%YG zM#eYTJ^ypbNJ++8=VnYtdM9SU&+!dBi)!!%rp7cewxO(;hIC<6y$IAuc13kO(v?ql zE=1kP>KMjfTkR<_)bKUb8n}x^Fx?Q_u?namtbw|N4#;enJ}#YvT4YyIH}VKG;&arE zq#tVA4?)!{f@-h2&lR*s4P7r(&!bU`Ww0wB=F;O(cRmqo<7|8rlTbHMAl43bX;cRq zVm|DMdhW-d+FyW~(6@|;hG+|FwV!tt9-v0%2^PZ)!|Zcj6*bf?QT02c>J4}KGf@pM z#=N)z)sa)!6o0@LSZKJv!#*>dh#HK;Fr0zv;bv5icVK4x8Z|=Kuo~V#Evf<|>=0K) zjX+~mhuWd)4|L_Rs3DI-P4N;8(euBLhSme9KXdJ_!2dBIVLdw>Tv`S71TkE zKxb4#!%%ZK26e|XFaS4VR@{a~@fd2T@1ySc5$Y-NCfa=GHFyg37@bEg)?ZK!q?u$dkQ=o|ieNUZikiaKu6!V>{%EX<)A0eG zn8eV=5ZN=C7X%iaVmF3?n1b{ItcXidJK9-XjaN}46+hLk>Sd@4-$Y&b1s=rUX|#bC zu>cO5ZaXj!wHChd5vfJNiy8J#YtFPbMRlM9>cU-77wnIzZ~|&>XQJ+GC29n>VHFzw z3X6~qoNX^$3e~Z;$n2OH3`5@|A`F7b{=RK+A#$$y7&Ye==GeJwhnk8=REJ`4DULF}Gf5XO@{sW$U?1+tU3ogMYSO@2lD2eAWzivH%+t@@#5u8g; z&*L4^(aVk5h3!_bJ}`)G|BlCyC(mqK#W~b3yIMaa_(AcZ{awEgXOdr+-u^{?(i%1% z(#O}@jqA!fdxIhCX;aVt79y>2|Ho`boRDsVG3-I+Bv!$i8;$9Sqp>Rfh}$tIy&i&J z;V7)W*?wg1#?zz=Z{fE;{)NS9zvfmu^aHjT^Dp^9pECZ3h@_-7&DC-2jEfT34e=rV zj9>0xf#T+!e5BwehNS}5+HHSkkHpf+`1=9=%Y|<4Wi8<^``z2{fc+|djscuEfkz`V zPCdx@Yc($;BO|VL?!p|TPhcQk!EE>&YObGQIxIl%Ghl?X4(hx&F%x>xiJf|^A~J3_y-QfW5?{!S2}L@h0~}Dev2BJ z%P#$=^M%V#eS(Edc_`+^DOeuYqi)o9nTQ^{hp4&DchXkag~>_Z!7lg!%VP6W3^&Fh z?;T6txsI|5QGje@%#1$l=PW&FVYHy4@t3yi-;U@;lL;04s%YX3$4s6hJm_jd7I|G}>Mf3Yz6B`(43xY~HK(yTDhPh<{aMH43_6eq4$g^21mizeJsw>KZ>P z7@=U);_CIYJ%1EtBOQ-faWR&`&Da#LV1F#eFgL-4*j&&5H6og`Qoq`lPc77im!cY2 zhc)mbhGLHE_G`8xmLMI8C2=llNRMIzyob}2kE}3j`~pTZNXTs zZ;letkd?n}e@HYzUC4)La2FQA33u!o*o^Z?A3%*CRccE@% z)qVRnq~rK5>Dmvth8jLZq%__@^(^Nf_Bk$w9Y_zr7Wf5r=MJ+xw5vY$PdgF^P*e0H z*2Ubc#HQFC7vM(R%6YXPQ4jxkY;UCW-|qRZ`M2$HE8NWqBe572OYsb*C;isHcFy}_ zJ<^M?8UBcsvFKCVf!?U}hge+YsCucN**S0T9F673U-69buSw)A8Fetrb2|dB=wd6lP?fRQ-aO3+rQH?C$a>V;a)yQSEQ{5z)qR67}5v zjae|CXRUx4NjE`V_$^dN;!yQBpe}R{^Wr_sjp>rv3m3(3(yehM#^Oc1jcV8TMRMEF zdDMkpVgbw&;Q8MHl~4`zM)iCmMsw%y<4V&1q_F7^0_`0oOXd0ZlbopY!cmV~UDO5p z;yBKK2U+Ak^AA65t58rn4R@A|y&ahiGoQc71>u}@wqq;sd(zuc4b4dJ`JeaY_#x?2 zIEaP^Wbn)B^U&!K_vDCYk)iZ1*rh7JzuV^0&iXY?p1bc#WFclx` z{cs5%XpJx+w`Uq)^AOL}r-SqJc;+zaA3{AtTV_eP=l}b_)_kOC_zddt{TVeyx$=Ad zr=u>WA{~!fBhxXQ>zj>4YT_BxVo6uPS{^mzT~SX#G)CY^d;>S2R{42U!^sNTDM*W2 z3*o5zTBvp!qeiqXhG9?iDH2aaJ^BbM;peCeK0^(4+CrXbgCVGn#-KW|4Yk-VVNQI4 z+CMTD_WWCIe$-=D1smXCY=pb8BEBr_`TRp&v4|bI)kW--sYrx7J>hpHokYT9E*@<;P-*J3=2ZODI8ir-%;$!J=}Gqtb{ zs)6~aJ70;K(`~57>=VP`WZ|(eyxF zU@_`xIE3o(A9w~c)U@f#sD0%rYB5)+W#_&=YGnGM|L_0PUBOaRgNIQUeu!x?b#2@8 zY^b5khZ>1usI^iXHMGsJ8+OCZco5aj+jZ=Y8jpHh*Q1_-b6CblBu`yiu_fjs-3Rp= zor)#!3~DH!Vr@)c&puAAP>XR9YDB(6o%amOV6FPL-Jz)Rsn{5|qBf>~&^MY${sx}^ zuT?8hJ?_%b4pA)X0t-+bIER{o8?HQ*?NN7L8)LBz>ScBUbt6wu7Yc4{_mz66sThkI z!5NKt{x!EBl2IN{VSRjwdI{C%9jnKrKkCjtMxA&EHH68U+No)Zn(L031LvVWKsKV< ze}d{r-ez{OH^K^}qnq*kznP5ZoQ#_Iu!U#d#fa8Cez=ugB7bsz{j~SYQ_=-HdFCvJ zccB4%)Xg)AJa)x`#A2j-U~in^BT|*f15}TS_px`- z8%vTNgW5tjpoZ=WY7yN-&1LSsb_AkOBQ_K@Qj1XaFQK;R-!TLOqwUj?AC>miCZaj- zhI;u7$7o!RS~P+EJpb>4;;4rDp`QPVsG;44nu-gUAH(|F^Xg$~(*05Il%=StJ%`$W zg5UPn_nC4;CX&$+6Bx>$@E6i^2YO}^ju_Sc{(1o6l)k8eYszq`ZjUS4GcTP$<<9ggF~3Zv{D?{=O= zJq7pCzlDyrPeTZ5pJ+# z*$ynqYq$|Lq%+6ySW*5dYL#D$v#U8I-cDTu)T-}_S*SN0HI-Ax+b#T4%t!h-YO&tJ zU^=vKBF}#^GR{x-OdY&9#jeWS(>ybm6MU%0DD!mBbfUZ)rouflJaeA>qchptNiUk^ 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 ht9p44Gw\n" "Language-Team: \n" "Language: uk\n" @@ -51,6 +51,12 @@ msgstr "Відстань координат 0,0 G-коду від нижньог msgid "Circular" msgstr "Круговий" +msgid "Switch to %s mode" +msgstr "Перейти до режиму %s" + +msgid "Current mode is %s" +msgstr "Поточний режим - %s" + #: src/slic3r/GUI/BedShapeDialog.cpp:69 src/slic3r/GUI/ConfigWizard.cpp:92 #: src/slic3r/GUI/ConfigWizard.cpp:456 src/slic3r/GUI/ConfigWizard.cpp:470 #: src/slic3r/GUI/GUI_ObjectManipulation.cpp:204 @@ -730,11 +736,11 @@ msgstr "Преференції застосування" #: src/slic3r/GUI/GUI_App.cpp:616 msgid "Simple" -msgstr "" +msgstr "Простий" #: src/slic3r/GUI/GUI_App.cpp:616 msgid "Simple View Mode" -msgstr "" +msgstr "Простий режим перегляду" #: src/slic3r/GUI/GUI_App.cpp:617 src/slic3r/GUI/GUI_ObjectList.cpp:39 #: src/slic3r/GUI/Tab.cpp:948 src/slic3r/GUI/Tab.cpp:962 @@ -747,23 +753,23 @@ msgstr "Розширений" #: src/slic3r/GUI/GUI_App.cpp:617 msgid "Advanced View Mode" -msgstr "" +msgstr "Розширений режим перегляду" #: src/slic3r/GUI/GUI_App.cpp:618 msgid "Expert" -msgstr "" +msgstr "Експерт" #: src/slic3r/GUI/GUI_App.cpp:618 msgid "Expert View Mode" -msgstr "" +msgstr "Режим перегляду Експерт" #: src/slic3r/GUI/GUI_App.cpp:620 msgid "Mode" -msgstr "" +msgstr "Режим" #: src/slic3r/GUI/GUI_App.cpp:620 msgid "Slic3r View Mode" -msgstr "" +msgstr "Режим перегляду Slic3r'у" #: src/slic3r/GUI/GUI_App.cpp:622 msgid "Change Application &Language" @@ -1752,7 +1758,7 @@ msgstr "Вид" #: src/slic3r/GUI/MainFrame.cpp:445 msgid "&Help" -msgstr "Доромога" +msgstr "Допомога" #: src/slic3r/GUI/MainFrame.cpp:472 msgid "Choose a file to slice (STL/OBJ/AMF/3MF/PRUSA):" @@ -5064,11 +5070,11 @@ msgstr "Вертикальна відстань між об'єктом та ін #: src/libslic3r/PrintConfig.cpp:1923 msgid "soluble" -msgstr "" +msgstr "розчинний" #: src/libslic3r/PrintConfig.cpp:1924 msgid "detachable" -msgstr "" +msgstr "відривний" #: src/libslic3r/PrintConfig.cpp:1929 msgid "Enforce support for the first" @@ -5672,7 +5678,7 @@ msgstr "" #: src/libslic3r/PrintConfig.cpp:3050 msgid "Help" -msgstr "" +msgstr "Допомога" #: src/libslic3r/PrintConfig.cpp:3051 msgid "Show this help." diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index a3eeb45f4..7eb600a52 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -42,7 +42,6 @@ wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxMenuItem* append_menu_item(wxMenu* menu, int id, const wxString& string, const wxString& description, std::function cb, const std::string& icon, wxEvtHandler* event_handler) { -// const wxBitmap& bmp = !icon.empty() ? wxBitmap(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG) : wxNullBitmap; const wxBitmap& bmp = !icon.empty() ? create_scaled_bitmap(icon) : wxNullBitmap; return append_menu_item(menu, id, string, description, cb, bmp, event_handler); } @@ -54,7 +53,6 @@ wxMenuItem* append_submenu(wxMenu* menu, wxMenu* sub_menu, int id, const wxStrin wxMenuItem* item = new wxMenuItem(menu, id, string, description); if (!icon.empty()) -// item->SetBitmap(wxBitmap(from_u8(Slic3r::var(icon)), wxBITMAP_TYPE_PNG)); item->SetBitmap(create_scaled_bitmap(icon)); item->SetSubMenu(sub_menu); @@ -421,11 +419,9 @@ wxBitmap create_scaled_bitmap(const std::string& bmp_name) } void PrusaObjectDataViewModelNode::set_object_action_icon() { -// m_action_icon = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("add_object.png")), wxBITMAP_TYPE_PNG); m_action_icon = create_scaled_bitmap("add_object.png"); } void PrusaObjectDataViewModelNode::set_part_action_icon() { -// m_action_icon = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var(m_type == itVolume ? "cog.png" : "brick_go.png")), wxBITMAP_TYPE_PNG); m_action_icon = create_scaled_bitmap(m_type == itVolume ? "cog.png" : "brick_go.png"); } @@ -1440,28 +1436,16 @@ PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent, SetDoubleBuffered(true); #endif //__WXOSX__ -// m_bmp_thumb_higher = wxBitmap(style == wxSL_HORIZONTAL ? Slic3r::GUI::from_u8(Slic3r::var("right_half_circle.png")) : -// Slic3r::GUI::from_u8(Slic3r::var("up_half_circle.png")), wxBITMAP_TYPE_PNG); -// m_bmp_thumb_lower = wxBitmap(style == wxSL_HORIZONTAL ? Slic3r::GUI::from_u8(Slic3r::var("left_half_circle.png")) : -// Slic3r::GUI::from_u8(Slic3r::var("down_half_circle.png")), wxBITMAP_TYPE_PNG); m_bmp_thumb_higher = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "right_half_circle.png" : "up_half_circle.png")); m_bmp_thumb_lower = wxBitmap(create_scaled_bitmap(style == wxSL_HORIZONTAL ? "left_half_circle.png" : "down_half_circle.png")); m_thumb_size = m_bmp_thumb_lower.GetSize(); -// m_bmp_add_tick_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_add_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_add_tick_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_add_off.png")), wxBITMAP_TYPE_PNG); -// m_bmp_del_tick_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_delete_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_del_tick_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("colorchange_delete_off.png")), wxBITMAP_TYPE_PNG); m_bmp_add_tick_on = create_scaled_bitmap("colorchange_add_on.png"); m_bmp_add_tick_off = create_scaled_bitmap("colorchange_add_off.png"); m_bmp_del_tick_on = create_scaled_bitmap("colorchange_delete_on.png"); m_bmp_del_tick_off = create_scaled_bitmap("colorchange_delete_off.png"); m_tick_icon_dim = m_bmp_add_tick_on.GetSize().x; -// m_bmp_one_layer_lock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_one_layer_lock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_off.png")), wxBITMAP_TYPE_PNG); -// m_bmp_one_layer_unlock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_one_layer_unlock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_off.png")), wxBITMAP_TYPE_PNG); m_bmp_one_layer_lock_on = create_scaled_bitmap("one_layer_lock_on.png"); m_bmp_one_layer_lock_off = create_scaled_bitmap("one_layer_lock_off.png"); m_bmp_one_layer_unlock_on = create_scaled_bitmap("one_layer_unlock_on.png"); @@ -2283,11 +2267,6 @@ PrusaLockButton::PrusaLockButton( wxWindow *parent, const wxSize& size /*= wxDefaultSize*/): wxButton(parent, id, wxEmptyString, pos, size, wxBU_EXACTFIT | wxNO_BORDER) { -// m_bmp_lock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_lock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_lock_off.png")), wxBITMAP_TYPE_PNG); -// m_bmp_unlock_on = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_on.png")), wxBITMAP_TYPE_PNG); -// m_bmp_unlock_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("one_layer_unlock_off.png")), wxBITMAP_TYPE_PNG); - m_bmp_lock_on = create_scaled_bitmap("one_layer_lock_on.png"); m_bmp_lock_off = create_scaled_bitmap("one_layer_lock_off.png"); m_bmp_unlock_on = create_scaled_bitmap("one_layer_unlock_on.png"); @@ -2349,9 +2328,11 @@ PrusaModeButton::PrusaModeButton( wxWindow *parent, #ifdef __WXMSW__ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #endif // __WXMSW__ -// m_bmp_off = wxBitmap(Slic3r::GUI::from_u8(Slic3r::var("mode_off_sq.png")), wxBITMAP_TYPE_PNG); m_bmp_off = create_scaled_bitmap("mode_off_sq.png"); + m_tt_focused = wxString::Format(_(L("Switch to the %s mode")), mode); + m_tt_selected = wxString::Format(_(L("Current mode is %s")), mode); + SetBitmap(m_bmp_on); //button events @@ -2372,6 +2353,7 @@ void PrusaModeButton::SetState(const bool state) { m_is_selected = state; focus_button(m_is_selected); + SetToolTip(state ? m_tt_selected : m_tt_focused); } void PrusaModeButton::focus_button(const bool focus) diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp index 1a1fe0f45..22884bff4 100644 --- a/src/slic3r/GUI/wxExtensions.hpp +++ b/src/slic3r/GUI/wxExtensions.hpp @@ -906,6 +906,8 @@ private: wxBitmap m_bmp_on; wxBitmap m_bmp_off; + wxString m_tt_selected; + wxString m_tt_focused; };