Commit Graph

41 Commits

Author SHA1 Message Date
SoftFever
1ec149b4e1 Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
tao wang
2bcfeb5173 FIX:optimized some ui for macos
Change-Id: I0451edc06d9dadfef3b9d1087bb863b4666bb276
2022-12-15 04:38:15 -05:00
tao wang
4591a3f975 FIX:fixed appconfig is not saved when switching dark mode
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
2022-12-15 04:38:15 -05:00
tao wang
fc8b8bcffe NEW:lan mode interaction optimization
Change-Id: I80eef918fe1ac4c8e306787bd7b9437262686e23
2022-12-15 04:38:15 -05:00
Stone Li
6101a1d2f5 FIX: fix use wrong preset folder
this happened when stop sync user preset

Change-Id: I16e17614d64a3e81adbc32fc9819cc32c6599a77
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
a461654b38 NEW:added dark mode
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
lane.wei
37b5c1531d ENH: bootup: add slow bootup mode to avoid some possible crash on seldom computers
Change-Id: Ia7a05082eee32dcc8a2ed9ca47cf13287ee2aed9
2022-12-15 04:38:15 -05:00
tao wang
51182e7ec0 NEW:add some new changes for send print job
1. change tray id like to A1, B1, C1, D1
2. can change the name of the project that is sent
3. add ams mapping instructions

Change-Id: If301f4051f640157a53d6927a0ddf2facf4961b4
2022-12-15 04:38:15 -05:00
tao wang
88d431eb18 FIX:fixed the mall system dialog not being destroyed
Change-Id: Ie453bdbb41e59da69987e24a7c2d5cc9f378aee4
2022-12-15 04:33:48 -05:00
chunmao.guo
a6d3bcfb1f NEW: management camera video stream in device panel
Change-Id: I39634af900071cc5c01a88100457880a513e416f
2022-12-15 04:33:48 -05:00
Stone Li
d8db30e1ab ENH: set timeout to 15 for get version and get plugin
when a DNS problem occurs, the UI isblocked for too long

Change-Id: I3ee1fe1ddb1bec38be9fc3c3e5c3e08931b6eb76
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
tao wang
9758ad71a4 NEW:Fixed some mall issues
Change-Id: I1f9105a1a7089457f4ecb327cb5db43ca0d39f4e
(cherry picked from commit 975bdcf64f88b4f1e7c0e03abd9dfba6c32c00fe)
2022-12-15 04:33:48 -05:00
tao wang
2498767bb9 FIX:fixed crash caused by unable to resolve file name
Change-Id: I98388cd95e8b2bc26d33cddcc4945580a1c34292
2022-12-15 04:33:48 -05:00
tao wang
38ad3e3320 NEW:add model mall system
Change-Id: Iccfe460cd7bfd11d91cdd7eddf142a8590e3c5b0
2022-12-15 04:33:48 -05:00
tao.jin
e3c6d4531e ENH: remove placeholder '0' in version display
Change-Id: I6c0ffdd229a630a48a676c12a8f124f7a6e39f09
2022-12-15 04:33:48 -05:00
SoftFever
2f94d6924c Merge branch 'master-remote' into SoftFever
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	version.inc
2022-11-28 20:46:53 +08:00
lane.wei
5a1eb6a5fe ENH: Updater: always update plugin to the newest compatible version
Change-Id: Icec343ba4913b9738add9564c78934553a33336c
2022-11-26 15:39:32 +08:00
SoftFever
0267e2f230 Merge branch 'master-remote' into feature/merge_remote_1.3
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
Stone Li
c5f1793f1b NEW: support send gcode to third-party printer
Thanks SoftForever for your works to support
sending a gcode file to third-party printer

Change-Id: I3cba43c8bd878f1f1c2fd5fae202ed4d922e8727
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
tao wang
590f4aa390 NEW:add the download path edit in the preferences
Change-Id: I8dfd3373a25bdd9d70360b61605d92f20052d478
2022-10-20 19:34:37 +08:00
SoftFever
0a702245a9 Merge branch 'master-remote' into SoftFever 2022-10-14 20:40:22 +08:00
lane.wei
cdb8509e15 Fix the random crash at the startup on Macos&&Linux
don't do the post_init when adding script handler of webview

Change-Id: I2c766c46bb67347286765dee539657b5efd7f64a
2022-10-09 10:37:45 +08:00
SoftFever
8eff6e6641 Merge mainstream changes 2022-10-04 13:51:34 +08:00
tao.jin
e705bbd79f NEW: limit log files within 30 by deleting old files
Change-Id: I1bb5c827c7fb01d97b84a4a1bf3f905bb8e90448
(cherry picked from commit 065ef224357352851cbba2c0dcac131ea9acae82)
2022-09-29 11:16:43 +08:00
tao wang
eba52ac31f FIX:add the sd card removal function
Change-Id: I98592a5d3d4abcfd3a67b8c12fa4cf07e79b0e4b
2022-09-29 11:16:43 +08:00
SoftFever
a09ffa2131 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
tao.jin
2efd6f0527 ENH: support to skip current version in upgrading dialog
Change-Id: Iedcf595b146017fa26827900b446fd8782938341
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-08 21:49:36 +08:00
SoftFever
2e2263d7b7 Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
lane.wei
f94be926ad add logic to remove the plugins folder when the version changed
Change-Id: Idb0ac34376c4eed81bf37da7afe670d9d9a42457
2022-09-02 13:16:54 +08:00
zorro.zhang
be32500a52 NEW: homepage and UserManual
Change-Id: Iecdb4d0151a0cf76614548aee69e525ad7e1fe68
(cherry picked from commit 4c7403683b334e42d8676a933012e2133cd1ce7f)
2022-09-02 12:52:18 +08:00
SoftFever
b6c1f101f8 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
Stone Li
d8885cb0d0 NEW: add HMS to query hms info
display hms msg in HMS tab of Monitor

Change-Id: I4df1c63b104463ba62cdf7eb079a540a4176f8c5
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit f4635d18f3383e70177536dfbe5edf2e1370b746)
2022-08-26 09:25:59 +08:00
SoftFever
707b3085b3 Support upload g-code to third-party printers
* wip

* fix cmake warning

* add UI and config options for Moonraker connection

* wip: copy whole print host UI from PS

* add more needed options

* wip 2

* fix string issue on Mac

* wip3

* fix cmake warning

* working
need tweaks

* cleanup

* support thumbnail

* fix DNS resolving issue in Windows

* code clean up
2022-08-20 23:06:41 +08:00
SoftFever
ec43ca2e1a Revert "Support upload g-code to third-party printers (#2)"
This reverts commit dc5e0eed34.
2022-08-20 23:05:25 +08:00
SoftFever
e843afab61 Support upload g-code to third-party printers (#2)
* wip

* fix cmake warning

* add UI and config options for Moonraker connection

* wip: copy whole print host UI from PS

* add more needed options

* wip 2

* fix string issue on Mac

* wip3
2022-08-20 15:09:05 +08:00
lane.wei
d73df91a89 add the backup logic to make sure plugin install success
Change-Id: Id9da725ffe2e6d604c2771abf89cf445824793db
2022-08-08 22:19:42 +08:00
lane.wei
3c84c5ce05 Macos: add the support of file association
Change-Id: Iacd3b35423dac6f63416628d28b0502ba175f7b4
2022-08-05 16:11:42 +08:00
chunmao.guo
ab4778ab89 ENH: use system menu on mac platform
Change-Id: Ia0e0bf42232d51cd08216811fdc6633527b3eb97
Signed-off-by: chunmao.guo <chunmao.guo@bambulab.com>
2022-08-05 16:11:42 +08:00
Stone Li
7bc396ae2e FIX: shutdown GUI_App after confirm dialog
Change-Id: Ie379e9e764f43be1592a74b929bfbfc1d2d41a49
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-08-05 15:28:01 +08:00
lane.wei
af0b3ddb28 Update the codes to 01.01.00.10 for the formal release
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
   small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
lane.wei
f8756e6c89 Add the full source of BambuStudio
using version 1.0.10
2022-07-15 23:42:08 +08:00