3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
2968 commits 10 branches 72 tags 3.3 GiB
Commit graph

32 commits

Author SHA1 Message Date
SoftFever
9f598046d1 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
tao wang
bf08a0b2e2 FIX:fixed some ui issues 
Change-Id: I96f3e3ec56a07a7b5ca4723c92715df58e0baaf6
 2023-04-17 15:39:02 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5 
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
 2023-03-08 00:08:26 +08:00
Stone Li
edd5e9cbb2 ENH: display release note if description is empty 
Change-Id: Ia13b14e8e43f5c9d289fe6992bf3685b05017fbb
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-24 09:23:57 +08:00
Stone Li
6fee9bcca1 ENH: parse ack of upgrade confirm 
Change-Id: I33691749221aac4c83f71d6d76708d7b2d8d6d4d
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-22 20:09:17 +08:00
SoftFever
1bdedb1c47
Feature/fix more colors (#193) 
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
 2023-01-18 23:06:39 +08:00
Stone Li
41d08e0924 FIX: fix display error in UpgradePanel 
Change-Id: I1be4a8879baa6a43ebd8d69eeb95cc83d53bc16d
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-01-10 19:08:26 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +08:00
tao wang
5c3c2fcb1c FIX:changed top menu bar color on macos 
Change-Id: I276aab27c2c089ad322dc5cb2f6206dccb3e494d
 2022-12-15 04:38:15 -05:00
tao wang
25484bcba9 FIX:fixed 'dont show again' with wrong color in dark mode 
Change-Id: Icedd3df2f428c9d526633b908d7017c02b4cca3a
 2022-12-15 04:38:15 -05:00
tao wang
b5e38e02fe ENH:display different thumbnails according to the printer type 
Change-Id: I1534594923fdcafb231661a1a7fa289221277449
 2022-12-15 04:38:15 -05:00
liz.li
94dd1af6c6 ENH:add ext panel in upgrade 
Change-Id: I2832bec3f2b035b3c4e812d61f7bb6efb4676a37
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
tao wang
09ab775667 ENH:blocking send/send all on p1p printers 
Change-Id: If6ed8056790211d6ffa8237136318768e1a7f5d7
 2022-12-15 04:38:15 -05:00
Stone Li
e344f8b8b9 ENH: update hms panel and upgrade panel when disconnected 
Change-Id: I75d724c99ec2029190641cd2cfa22b6337d0060d
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
tao.jin
2ffa56633c ENH: rebuild warning dialog with frame 
Change-Id: Id4a8ab80ecec30b668de59556823dad6838276fe
 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.jin
e56c266edc FIX: refine Warning dialog 
Change-Id: I8169dd8bce0013a1acacd837871af2051f5cc3a5
 2022-12-15 04:33:48 -05:00
tao wang
453c005423 FIX:update chinese translation 
Change-Id: I254c0617a9ee5e43aa1388b06788f332f0094a40
 2022-12-15 04:33:48 -05:00
tao.jin
92b0f591d3 FIX: replace ConfirmHintDialog with SecondaryCheckDialog 
Change-Id: I3a712f838d7a4d8cbfe725c30f3d77813dd80b92
 2022-12-15 04:33:48 -05:00
Stone Li
8d8dcc36c5 FIX: fix a crash, set APP_MODAL for dialog 
Change-Id: I80d216df134febdcefd2fd5f3859bdb62c1b81bd
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-11-07 19:59:23 +08:00
tao wang
464957864c FIX:hide the printer status on the upgrade page 
Change-Id: Ia462b047081243c5b5c32ce035dc37afa251a84c
 2022-10-20 19:34:37 +08:00
tao.jin
c2b2c75bf2 ENH: refine firmware upgrade interaction: ams version, translation 
Change-Id: Ifc42421a4dedf8d8ef427d491cf8afc7b0e0665e
 2022-10-09 10:37:45 +08:00
tao.jin
8386b48554 ENH: add confirm dialog for cancel-print button 
Change-Id: I0a97c7a3122b1b5dd0b306212292e8c51b9acd9b
 2022-09-29 11:16:43 +08:00
tao.jin
83a9c259f7 ENH: add hint dialogs for firmware upgrade 
Change-Id: Iff34e4543d50074db05280fec8178029c4531e00
(cherry picked from commit 6f98eda25c722ecb6e0b6f4926972031c00bc366)
 2022-09-29 11:16:43 +08:00
Stone Li
d42c8f58df FIX: fix display error when only ams2 exists 
Change-Id: I6993b6681b403094d8ed242fbd3869ad19f834b9
 2022-09-02 13:16:54 +08:00
Stone Li
801b15966a ENH: modify to new upgrade protocol 
Change-Id: I8d431ec3c5e9c81e7a7438c6b1db9febf01d4706
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-09-02 13:16:54 +08:00
tao wang
1c3375bb07 FIX:add ams hub upgrade module 
Change-Id: Iba636f5a13ab3350aa61b22548535aa7ad334cc0
 2022-09-02 12:52:18 +08:00
tao wang
459fe36235 FIX:fixed amsdata not sync after changed ams 
Change-Id: If1c087c42258897fec7df5d44ff039bb0eec3b25
 2022-09-02 12:52:18 +08:00
Stone Li
2866e33304 ENH: refine new version protocol in upgrading 
Change-Id: I8c14dce6a20ca93cf42ff55b4610c397cdbf97e3
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-09-02 12:52:18 +08:00
Stone Li
816dae015b FIX: fix display error in release note 
Change-Id: I71edf47b4b48ce5ae310b8633fe351318f8f24ef
 2022-08-26 09:25:59 +08:00
chunmao.guo
66c89c62e2 FIX: wxWidgets asserts 
Change-Id: I583edbde501c2bfe8adfa8fdb525479a379a4cb8
 2022-08-26 09:25:59 +08:00
lane.wei
1555904bef Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00