Commit Graph

231 Commits

Author SHA1 Message Date
tao wang f06b214c30 ENH:optimize ams settings and virtual tray
1. separate virtual tray and extrustion calibrations
2. only when confirming will the disabled materials be checked
3. uptimize ams style

Change-Id: Ie435555d0cad45fbc0cb1bf7e1706985ec1aaa78
2023-04-17 15:39:02 +08:00
tao wang 1eb96b6979 ENH:synchronize the status of AMS and printers
Change-Id: Ied38fbee8d78a984df9d7a46d3f69b54fea7fef2
2023-04-17 15:39:02 +08:00
tao wang 00e1c50947 NEW:AMS supports ams filament backup
Change-Id: I0bc84f52bcd88dbbc1b9614b15474433c748cc14
2023-04-17 15:39:02 +08:00
tao wang ee2ef44dc7 NEW:ams control support for more gradient colors
Change-Id: I3e7e7e1f340a443200b9225b142f6398b4824513
2023-04-17 15:39:02 +08:00
tao wang e3d89f2154 FIX:fixed ams cannot displayed when amsid does not start from 0
Change-Id: I2beee54bc99ced5faf9ea58e6ff3f5aaa3504a64
2023-04-17 15:39:02 +08:00
chunmao.guo 8c39fbaf22 ENH: [STUDIO-2549] remember my choice on unsaved project/presets
Change-Id: Ib9fc9074075bfce19f9a02be3aff7b3d04e3802a
2023-04-17 15:39:02 +08:00
chunmao.guo bda92795bb FIX: [STUDIO-1033] rm webview script handler on webview destory
Change-Id: I2e9390dfaad46da9e158a43026ef872aaf88d589
2023-04-17 15:39:02 +08:00
tao wang bf08a0b2e2 FIX:fixed some ui issues
Change-Id: I96f3e3ec56a07a7b5ca4723c92715df58e0baaf6
2023-04-17 15:39:02 +08:00
tao wang ad70e58e14 FIX:fixed incomplete display of filament material names
fixed STUDIO-2464

Change-Id: I8310cc519d0143aa180109d70ebe25b0f068bd52
2023-04-17 15:39:02 +08:00
tao wang 8d6c56e4aa NEW:AMS control supports gradient color filaments display
Change-Id: I38d8a313d84b3acf643b489a1e62ebd073b35c1d
2023-04-17 15:39:02 +08:00
chunmao.guo c44a240ec0 FIX: [STUDIO-2511] handle dbl click in ComboBox
Change-Id: I27075e43de4a78446972806b57771f0880677935
2023-04-17 15:39:02 +08:00
zhimin.zeng e031708043 FIX: translation for cut
Change-Id: I31f755b857f07e920fe6e50d48f4aa34a53e07da
2023-04-17 15:39:02 +08:00
tao wang c6e49af3fe ENH:add some protection for fan control
Change-Id: Ic60deaec60b5238f9307b7b4bb928293701c2fd5
2023-04-17 15:39:02 +08:00
tao wang 47c04e75a7 NEW:use new humidity img
Change-Id: I8e5b68f929e2638d9c94bab3d9ed6b8d7133d586
2023-04-17 15:39:02 +08:00
tao wang d9395e6405 ENH:optimize the switching of multiple AMS and vams
Change-Id: I031e3248164aa2fc243c6ebf7418c535119e7ffc
2023-04-17 15:39:02 +08:00
zhimin.zeng cd4cddfca4 ENH: Cut optimization, support for custom connectors
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
tao wang 304e29529b ENH:optimize ams ui layout and add vams load/unload display
Change-Id: I17db70fe01f3fd00b60804e9a076248eb14fa845
2023-04-17 15:39:02 +08:00
chunmao.guo 9f3a89320b FIX: [STUDIO-1033] rm webview script handler on webview destory
Change-Id: If1465ba6bf997bf17b8a33bc33d0f20d34fcbdc7
2023-04-17 15:39:02 +08:00
tao.jin 0f152c635c FIX: [STUDIO-169] handle text baseline on Mac
Change-Id: I13bde2dcd6d19107f5fe6fb66aa35d2aa55ab03d
2023-04-17 15:39:02 +08:00
tao wang a11cce7b26 ENH:optimize ams humidity display
Change-Id: Ied40225c6618d6961f5fd8c357bb227b512437ea
2023-04-17 15:39:02 +08:00
tao wang cee236e1aa FIX:fixed that the load/unload text is not translated
Change-Id: I99a4212568b056a212a0874622e5e2f4f2a581b7
2023-02-28 18:44:28 +08:00
chunmao.guo 60dbf71cd6 FIX: [STUDIO-2331] gtk resize popup window
Change-Id: I3ad2c26c5c1fcc94964fa838ce2596b727712195
2023-02-24 17:44:15 +08:00
tao.jin 394391fd12 FIX: chinese translation (STUDIO-2311~13)
Change-Id: I341bae62a88cb6130a2558cbea4083abc360d444
2023-02-24 17:44:15 +08:00
tao wang 14c5215b48 ENH:optimize the logic related to the virtual tray
Change-Id: I4d3b78f86191a4f3760d16234006b3aa603dd09e
2023-02-24 17:44:15 +08:00
tao wang eefe65321f FIX:fixed fan control will close after operation
Change-Id: Ic512dd7838bc843dc71f4bc75bdf719443b98124
2023-02-24 17:44:15 +08:00
Stone Li a48c36fde1 ENH: refine load/unload for spool holder filament
update ams load/unload gcode

Change-Id: Ia3d4a26efb14325c89f0c9f9571268c1834361ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li b731ac8db8 ENH: support load and edit with virtual tray
Change-Id: I36cd8d9f6da719526c38b7479625ed0fa868f63b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
chunmao.guo a03dc779b6 FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4
(cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
2023-02-22 20:09:17 +08:00
战马 5f69f4c016 FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.

Reason for revert: update pick

Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
2023-02-22 20:09:17 +08:00
chunmao.guo 81dea77932 FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
2023-02-22 20:09:17 +08:00
chunmao.guo 3065771b2c FIX: [STUDIO-1746] transparent background for images of swtich button
Change-Id: I30012a756242816a69099d211bea444bebc4277d
(cherry picked from commit b1efb320cc4290406001994d45b0ef182d6cce30)
2023-02-22 20:09:17 +08:00
tao.jin c2eeb2522b FIX: display of Label and warning dialog
Change-Id: Ib147f28096336b07b033c2e8104a56f5c28b7d93
2023-02-22 20:09:17 +08:00
tao wang ddf8c216c6 FIX:fixed display conflict between speed popup and humidity popup
Change-Id: Ib344aa829d3172e29a5d58a7b7f3b5d2d7d6c9a1
2023-02-22 20:09:17 +08:00
tao wang 4667c7df0e FIX:fixed text of side tool displays errors in French language
Change-Id: I1160fce191c77f92c1aa616dfffc46bfb9d5034f
2023-02-22 20:09:17 +08:00
tao wang 450f3e1c77 ENH:optimized logic related to fan control
Change-Id: Ia67525bc75d4cc5be02eaf7131764fb0f9584f23
2023-02-22 20:09:17 +08:00
chunmao.guo 21a6281998 FIX: [STUDIO-1997] SpinInput messureSize
Change-Id: I5923248b4980cb7638ce683d4e32e9c271b102cd
2023-02-02 12:14:41 +08:00
tao wang e144fce341 ENH:select vams when none ams mode
Change-Id: Id47e2e89d7b6661cb2f6b147f82bd699237396c9
2023-02-01 16:24:44 +08:00
tao wang 27fc88169e FIX:Fix UI display error without AMS mode
Change-Id: Ida20f405d6c5a99ba6a8c437a7201b8ebd7fbad2
2023-02-01 16:24:44 +08:00
Stone Li b2a752110e FIX: fix display error in virtual tray
refine description for ams not connected

Change-Id: Ic4c01e69cfd9385548a497af5c5c3071614067a2
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 4158f1e06ed20fa5dd4c3ef412d4c8fab76054a8)
2023-02-01 16:24:44 +08:00
tao wang 53ed1f99ce FIX:fixed print error has wrong layout
Change-Id: I668b32caeba9c3c2256c7a85b7858f98cd97fadc
2023-02-01 16:24:44 +08:00
tao wang 86490d4cef FIX:Fixed some UI layout issues for monitor page
Change-Id: I91fc50b63ff79ef7e9b7df600325a619c6764a09
2023-02-01 16:24:44 +08:00
tao wang 23fb4dba2e ENH:select the first tray when switching AMS
Change-Id: I74487f9bda81df199685b31e6fb7f5dbcaeef607
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li 07282cc078 FIX: fix code conflict
Change-Id: Ibffa0b4fc4c72df878b469ab50f74d12748f15ed
2023-02-01 16:24:44 +08:00
tao wang 739915e6f6 ENH:Optimize the layout of AMScontrol
Change-Id: Id74c0f14cf17b5d0cbc1077bb3609d7b1c8c6c2b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
Stone Li f701b4efd5 FIX: fix check k / n logic
Change-Id: I0f9fe5c95523d79b4c6435555d10f2d641639b13
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang 8d2f3c8440 FIX:Fixed some UI layout issues for monitor page
Change-Id: Ifbb7dd7271195bed17dcd83a398bb7a65b13dca2
2023-02-01 16:24:44 +08:00
Stone Li eed072eccf NEW: add extrusion calibration
1. display factor of extrusion calibration
2. add progress to calibration extrusion
3. support ext spool

Change-Id: Ic124a0097f16e6287c09f5f133eea84eeefb4000
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-01 16:24:44 +08:00
tao wang e962bcfec9 ENH:add ams humidity tips and update new icon
Change-Id: I8f504fa911ef7a84ca8929af3c5d7c53d289761e
2023-02-01 16:24:44 +08:00
chunmao.guo a4cf284c3d ENH: adjust user preset handling
1. async fetch user presets from server (in thread)
2. always load default user presets
3. load user presets from cache immediately
4. not remove user presets cache
5. hide some loading ui

Change-Id: I1d29ed18e09606d0b2f69a69eea2eb5042c26223
2023-01-10 19:08:26 +08:00
chunmao.guo 722fde9255 FIX: [STUDIO-1873] scroll out of range in DropDown
Change-Id: Ide38f2e34f8b54380e72dc51509050c55b771f6d
2023-01-10 19:08:26 +08:00
chunmao.guo 3372313e13 FIX: [STUDIO-1969] disable mouse wheel on SpinCtrl
Change-Id: I9d568c5fe48defe88c94a476a295143c7089d960
2023-01-10 19:08:26 +08:00
tao wang 4d8d4cb69c ENH:wxStaticText set the default foreground colour
Change-Id: Ifb03554848bc869f8605fb10945e7681147204d5
2023-01-10 19:08:26 +08:00
tao wang 64a635608c ENH:set the fan gear at 10%
Change-Id: I4ccb62c0e047ccaec3b6a7ca02e03fd2ce320348
2023-01-10 19:08:26 +08:00
tao wang 5dcf49e0f4 FIX:hide the rpm for fan speed
Change-Id: I4ba972ee358cbb833a704b927260325940ca4d53
2023-01-10 19:08:26 +08:00
chunmao.guo 5066cc1736 FIX: label color
Change-Id: I1de550178601fab8844fac9aabf9728233a965bb
2023-01-10 19:08:26 +08:00
chunmao.guo d164889aa4 ENH: [STUDIO-1647] use WebView2 put_UserAgent
Change-Id: Ifae6589892353adb4b940fbe77d7d0f9521330dc
2023-01-10 19:08:26 +08:00
chunmao.guo a953442c9e ENH: update WebView2 to 1.0.1418.22
Change-Id: I76d4747f8e135368e9dae6ee9f3e980bf4ec6f81
2023-01-10 19:08:26 +08:00
tao wang c4136f7641 ENH:reset filament empty when the remain value is error
Change-Id: I1fa1923a7ef3cd61b592e5ff0874aadf5a534eaf
2023-01-10 19:08:26 +08:00
tao.jin b6ef31f7b9 ENH: refine physical printer dialog
Change-Id: I34d122f83addab3db2952a6a2b91b59921d2a981
2023-01-10 19:08:26 +08:00
chunmao.guo 1d04c35d0d FIX: StaticBox zero size bitmap
Change-Id: I33d942f771171fe1f2a61b5f3d1a66a6c7e0da05
2023-01-10 19:08:26 +08:00
tao wang 030efb339a ENH: hide some functions which are not ready on U2 version
Change-Id: I6ff7f98d55d9734938b65aaa72727320dd3c5f6e
2022-12-26 05:31:54 -05:00
tao wang 51deb70f64 FIX:fixed the side menu popup cannot be selected on macos 13
Change-Id: Ic4e9182a1a7175b89f37114b3857e813f299989d
2022-12-26 05:31:54 -05:00
Zhaofeng Li 06a06714c1 WebView: Only include the private header on Windows and macOS
The wrapper isn't used in the Linux code path. Some distributions'
wxWidgets packages don't ship the private headers.
2022-12-16 22:51:07 -05:00
Zhaofeng Li daade424cb WebView: Only include webview_edge.h when enabled 2022-12-16 22:51:07 -05:00
tao wang e9045c2f4b FIX:optimize the fan gear
Change-Id: I02361a71b56f1527d85b2085f13fb374faacdc32
2022-12-15 04:38:15 -05:00
tao wang b61da88d51 NEW:add fan control
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
2022-12-15 04:38:15 -05:00
chunmao.guo 59773eee02 FIX: [STUDIO-1725] DropDown: icon scale size on Mac
Change-Id: I8128035df0c8623d220c791225adeb4a827cbb3f
2022-12-15 04:38:15 -05:00
tao wang 0d4b8382f5 FIX:change tray id from 1,2,3,4 to A1,A2,A3,A4
Change-Id: I9da42abb50d95c7a9c41064a993c3cebb68394d9
2022-12-15 04:38:15 -05:00
tao wang 52e431170c FIX:change the humidity level icons
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
2022-12-15 04:38:15 -05:00
tao.jin 1428a6bec7 ENH:add chinese translation
Change-Id: Id2d238e3e2918229c88dd986ed41848ea932abcf
2022-12-15 04:38:15 -05:00
chunmao.guo 967909937d FIX: [STUDIO-1618] ProgressDialog: update dark before show
Change-Id: I951940d1cfa864f8abdae53ed1b151ea6bf1ea4a
2022-12-15 04:38:15 -05:00
tao wang 0db1b52b23 FIX:fixed some issue with send print and ams ui
Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d
2022-12-15 04:38:15 -05:00
chunmao.guo 588e79c76d FIX: [STUDIO-1574] not switch filament preset after wizard
Change-Id: Id830b6c8f4ffd76a0b58c51ba892a79f075c0cea
2022-12-15 04:38:15 -05:00
chunmao.guo a1fcd05baa FIX: [STUDIO-1570] wkwebview background color
Change-Id: I6b18a2dbf654b71bff88e0c14317d4479358218a
2022-12-15 04:38:15 -05:00
chunmao.guo dcb9862410 FIX: [STUDIO-1570] webview background color
Change-Id: Icdf41659f4ab18ce30c8b0f585bf702991531599
2022-12-15 04:38:15 -05:00
chunmao.guo 36efeea30b FIX: [STUDIO-1565] adjust ui style of media file buttons
Change-Id: Ia3598ca8a15e357021d8b74f645f4d34a853dd91
2022-12-15 04:38:15 -05:00
Arthur 4419703f41 ENH: do not add L prefix to empty string
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
2022-12-15 04:38:15 -05:00
tao wang eca5897a25 FIX:fixed appconfig is not saved when switching dark mode
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
2022-12-15 04:38:15 -05:00
lane.wei 27d2008037 ENH: use wxFont::AddPrivateFont to load fonts for linux
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
2022-12-15 04:38:15 -05:00
chunmao.guo ba8015e455 FIX: more web view logs
Change-Id: Ia4b2821188c3053be297b0fe0aa19fb8d939a816
(cherry picked from commit 4e76cfc6529038252a4afd8d53cf93f817d46b01)
2022-12-15 04:38:15 -05:00
tao wang a9f3f195e1 FIX:fixed ams setting button display error due to scaling
Change-Id: I810b9f75410d15b16851ec31e710d037d2fba1d6
2022-12-15 04:38:15 -05:00
chunmao.guo 2f7946333d ENH: [STUDIO-1477] indicators for that has object configs
Change-Id: I4556b049cd6aa128a05f69c00fa14d8ea5bb3f39
2022-12-15 04:38:15 -05:00
chunmao.guo ca2f05e60b ENH: [STUDIO-1478] collapse siderbar printer/filament region
Change-Id: Id0d1009f5b2c344bc2a95702d33d1d87c864b8f2
2022-12-15 04:38:15 -05:00
Tao Wang ab49516ec1 FIX:fixed popup wrong pos of the print menu on multiple displays
Change-Id: I9712244df4e0df9dcb5beedf4dd36e3a06fa9db6
2022-12-15 04:38:15 -05:00
tao wang 8216265725 NEW:add remaining capacity detection switch in ams setting
Change-Id: I8f7be78dbf881bb5e2564aea4d0e01d78f1b0433
2022-12-15 04:38:15 -05:00
chunmao.guo 3b3ad1b390 FIX: scroll offset with touch pad
Change-Id: I7dbec590f39f174c02e4179fd781ff7fd1a93374
2022-12-15 04:38:15 -05:00
chunmao.guo 9b10b1438c FIX: [STUDIO-1011] windows can not scroll in inactivate window
Change-Id: Ib09e58f4637d632625bf7bd484fd26319630cdb2
2022-12-15 04:38:15 -05:00
tao wang 6f4e80bbb6 NEW:added dark mode
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
tao wang de0b0508eb FIX:fixed the display error caused by the incorrect remain
Change-Id: I9c0bb7325d4d9ae043aa3dc868f94102e3aa24ae
2022-12-15 04:38:15 -05:00
chunmao.guo bf24a71b60 ENH: webview dark mode
Change-Id: I0b58e759268d057d5942dd8726c37d1abbdd5930
2022-12-15 04:38:15 -05:00
chunmao.guo 65ee16f676 FIX: dark mode of wxTextCtrl
Change-Id: I8a377228b79d24ffe6284acf9be7017207b5dddc
2022-12-15 04:38:15 -05:00
tao wang 3925ceb9f4 ENH:add humidity display/surplus material
Change-Id: I1a04df257c9b09fef7ff06cfa192644478a30716
2022-12-15 04:38:15 -05:00
chunmao.guo b209243b27 ENH: dark mode of StateColor
Change-Id: I5928898c50280c7f2eedbb9389032230c7e251c4
2022-12-15 04:38:15 -05:00
tao wang 01744f1759 FIX:fixed users can not click drop-down menu on mac
Change-Id: Ib9ac9e323d70f5be32a7d1bd935effba974ef006
2022-12-15 04:38:15 -05:00
chunmao.guo 5761f8c050 ENH: [STUDIO-1272] handle default filament color in presetcomboxbox
Change-Id: Id78749db063fd222915b1aa5ad6abf47fb4294ca
2022-12-15 04:33:48 -05:00
chunmao.guo d2b112d1c1 ENH: Label Wrap
Change-Id: I7492f058f731a68e441ab9b78693872364fc00ab
2022-12-15 04:33:48 -05:00
chunmao.guo 4d4fcc1780 NEW: management camera video stream in device panel
Change-Id: I39634af900071cc5c01a88100457880a513e416f
2022-12-15 04:33:48 -05:00
chunmao.guo 8d0f19fd6a FIX: test HasCapture before CaptureMouse
Change-Id: Ia18b2288b4601c1ae8769d56e5bf46b886a1264e
2022-12-15 04:33:48 -05:00
chunmao.guo a52857e95b FIX: mouse wheel direction
Change-Id: I7b9a5e300de8e7f0c5a9883a20a18856f79c2b93
2022-12-15 04:33:48 -05:00
chunmao.guo 5fc2acc235 FIX: Label hyperlink style
Change-Id: Ib0935b41080de994b0b82e4c211ff7a0b9f295bc
2022-12-15 04:33:48 -05:00