Commit Graph

27 Commits

Author SHA1 Message Date
SoftFever
91a4cfb422 Merge remote-tracking branch 'remote/master' into feature/merge_upstream
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	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/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
2023-04-19 08:48:07 +08:00
zorro.zhang
12e2c7b682 ENH: Optimize Dialog Positon Again 2
Change-Id: I3f2af3ee696415d07fc926596e110d5874dc579c
(cherry picked from commit 73baa282ab7a98df9cde95703da096c6a02eac61)
2023-04-17 15:39:02 +08:00
zorro.zhang
f812a60f7f ENH: Optimize Dialog Position
Change-Id: I6795d6d0f979ff379b8c4f1f010eeaba6aa339b1
(cherry picked from commit 2ce1e9a9f3141bc2149a4d1f62656f1a3d57b26e)
2023-04-17 15:39:02 +08:00
SoftFever
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
be404a19a9 change BambuStudio to OrcaSlicer 2023-03-10 19:26:01 +08:00
chunmao.guo
75284231bf FIX: [STUDIO-1770] webview white background
Change-Id: Ie828f53139978b0f7745355e7c65c7f6067dd4d3
2023-01-10 19:08:26 +08:00
chunmao.guo
bfa6a6248d FIX: [STUDIO-1575] end dialog with wxID_ABORT on user end session
Change-Id: Ie509b5780a5d11572eadd6dee2fd93903c128c17
2023-01-10 19:08:26 +08:00
lane.wei
56a9616a67 FIX: fix the crash issue when network plugin installing on mac
Change-Id: I766d186fa116986ce4805e71dc5f1899f5901294
2022-12-15 04:38:15 -05:00
zorro.zhang
7b501e17c3 ENH: Support Child Folder of Filaments in Profiles
Change-Id: Id89281d76efe42e7e8c407cce337fee1485e2cf0
(cherry picked from commit 634159a3ce43f3aaf9223b412e993d3355cb1682)
2022-12-15 04:38:15 -05:00
chunmao.guo
22213c6374 FIX: [STUDIO-1574] not switch filament preset after wizard
Change-Id: Id830b6c8f4ffd76a0b58c51ba892a79f075c0cea
2022-12-15 04:38:15 -05:00
Arthur
b59ff34578 ENH: do not add L prefix to empty string
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
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
chunmao.guo
a6d3bcfb1f NEW: management camera video stream in device panel
Change-Id: I39634af900071cc5c01a88100457880a513e416f
2022-12-15 04:33:48 -05:00
lane.wei
d2a5f6ffb2 ENH: add logic to load default filaments of newly added model
1. fix the prefer_model issue
2. when a printer is visible and no filament is selected, just set its default materials to visible
3. add some log for shutdown debug

Change-Id: I599dbd9c8b180c944ff4086c7638267ff002f94a
2022-10-20 19:34:37 +08:00
lane.wei
496d2d18d1 FIX: fix the vendor disappear issue after de-select the printers in newbie_guide
after the vendor profile is deselected
the system files are deleted from userdata dir
we should always load the other vendor's profiles from resource instead of userdata dir

Change-Id: I29220d30d203ea318092430c02cfa662caf0f388
2022-10-20 19:34:37 +08:00
lane.wei
2c6d380dca ENH: refine the printer select logic after newbie_guide
1. when printer are newly added, switch to the first printer newly added
2. when printer not added, filaments are added, switch to the first filament newly added
3. when the current filament/print are not compatible with the printer preset newly added and selected
switch to the first visible one which is compatible with the printer preset

Change-Id: I542eda9ac6133d19690ce03ae349b8629ea233f9
2022-10-20 19:34:37 +08:00
chunmao.guo
e7505975d4 FIX: close GuideFrame on exit to fix crash on MacOS
Change-Id: Ia9c6103961ce13c3f88f898ed449a3f8f299858d
2022-10-09 10:37:45 +08:00
liz.li
8eedf4e8b7 ENH:close dialog by pressing esc key
Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c
2022-09-02 12:52:18 +08:00
chunmao.guo
159c168d7c FIX: utf8 convert error in WebGuideDialog
Change-Id: Ie575117615b2a3dc3b11bc9c91e773ec104f7a61
2022-09-02 12:52:18 +08:00
zorro.zhang
812f8fbcd7 ENH: filament just show bundle machine
Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670)
2022-08-26 09:25:59 +08:00
zorro.zhang
c5e66ee25d ENH: Login button add Largen UI-Action
Change-Id: I40f668364730205c6cc1b916ef486fce836c08d8
2022-08-05 16:11:42 +08:00
zorro.zhang
83685085d8 ENH: support 3rd printer model
Change-Id: Ib8c2c846f73a6ac14339e1d0222204d7440de014
2022-08-05 16:11:42 +08:00
lane.wei
254edc801d add more logs for debugging
Change-Id: I420e6e60901a32cc378c09ed57fba2ee1ac688df
2022-08-05 16:11:42 +08:00
chunmao.guo
5a04bbb7b4 FIX: web view log
Change-Id: I8e28d7b8f5cfbc95428a3768b32f312a591e41c1
(cherry picked from commit fe623cb52a449ff7dffb10c9de8d7af9c7651f1e)
2022-08-05 16:11:42 +08:00
chunmao.guo
c3214f5c13 FIX: load url in guide web dialog
Change-Id: Ie723d8994dddcaeb21299837a0e34d8c15b698ed
(cherry picked from commit 05d3a1c20a6f4a817dd098c2b121539863257a66)
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