amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
2432 commits 1 branch 0 tags 820 MiB
Commit graph

107 commits

Author SHA1 Message Date
SoftFever
099ed10144 Fix Windows icon res 2023-04-12 17:05:23 +08:00
SoftFever
3975e6c7c1 improve taskbar icon, added a white circle background and transparency. 2023-03-19 18:14:16 +08:00
SoftFever
e54239fdbe update about 2023-03-17 22:25:38 +08:00
SoftFever
158e6b33fb more logo fix 2023-03-17 21:05:54 +08:00
SoftFever
4fab4ebea0 logo change 2023-03-17 19:16:36 +08:00
SoftFever
2f994207b1 fix linux build 2023-03-15 00:00:13 +08:00
SoftFever
3470460931 fix colors 2023-03-09 01:05:51 +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
tao.jin
39f87ca39e ENH: change sdcard icon 
Change-Id: I9f52213395672b591f9a4928071503d1817eaa85
 2023-02-24 17:44:15 +08:00
liz.li
6f8557861b ENH:replace a svg 
Change-Id: I6a5f13bf45d959a14f39bebbded425be8ab52d35
 2023-02-24 09:23:57 +08:00
tao.jin
2fc699be6a ENH: change video icons 
Change-Id: Ib8baf01eae1edae4f30872e4d8d6e06dc817fba1
 2023-02-22 20:09:17 +08:00
tao wang
94e097cd05 FIX:optimize the size of amsmapping item 
Change-Id: I791d897c327b51991b203a58fab957cbe74b1b44
 2023-02-22 20:09:17 +08:00
liz.li
6114a415cf NEW:add statistics of all plates in preview 
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
 2023-02-22 20:09:17 +08:00
tao wang
bb5c614b71 NEW:update the new ui layout of ams mapping window 
Change-Id: I3a5efbba2400481b5edfcf9e22aab142bf30a4f8
 2023-02-22 20:09:17 +08:00
tao.jin
688084c475 NEW: add print sequence setting to plate 
Change-Id: Ic4acb68743442a49dee04702e7a8073b6641bc39
 2023-02-22 20:09:17 +08:00
tao wang
afb8f47111 FIX:Fixed that AMS icon is not clear in dark mode 
Change-Id: I22136d4d3b3730871131cacd8a9c1deb8965bd73
 2023-02-22 20:09:17 +08:00
liz.li
78b6e75955 ENH:add a search box for text toolbar 
Change-Id: If8a43671916e56d6cb52b9fbd21dd8b8f9539083
 2023-02-22 20:09:17 +08:00
tao wang
94e6734cc0 ENH:update ui layout for ip address dialog 
Change-Id: I0095928e8c3951597d14783e1d4ef904946da993
 2023-02-01 16:24:44 +08:00
tao wang
9a8f832498 ENH:Update IP address input process 
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2023-02-01 16:24:44 +08:00
liz.li
8a3b39345e ENH: adjust ExtrusionCalibration image related 
Change-Id: Icca866dc5a164dee7da420f2fc04976bcfb42d04
 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
SoftFever
5ea57c1406 Merge branch 'SoftFever' into feature/merge_upstream 2023-01-21 23:41:20 +08:00
Heiko Liebscher
7f8c2ab267
fix 256px icon to big (#198) 2023-01-21 11:20:41 +08:00
SoftFever
2492e5d39c merge upstream changes 
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
 2023-01-21 00:37:10 +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
chunmao.guo
3ee83cd3db FIX: [STUDIO-1752] remove background of tips_arrow 
Change-Id: I5634e33ea320fc8e5fe9cc9d2b641e4598ce133d
 2023-01-10 19:08:26 +08:00
SoftFever
2ae6e90fd1 change icon color 2023-01-06 21:31:23 +08:00
Heiko Liebscher
964f2163cb
fix_color_to_#009688 and hover btn (#125) 
* fix_color_to_#009688 and hover btn

* fix_color_main_menu

* fix double ##

* tooltip_color

* fix bitmapcache.cpp
 2023-01-06 21:22:20 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever 
# 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/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	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/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
 2022-12-31 15:15:58 +08:00
Arthur
854eb0af95 ENH: change base pattern "None" to "Hollow" 
1. change base pattern "None" to "Hollow", and add an icon image
2. fix a bug of not initializing m_highest_overhang_layer
3. fix a bug where normal(auto) with Tree* styles won't generate any
   supports.
4. add popup message when selecting support material for interface.
5. draw connected loops when wall count is larger than 1

Change-Id: I7ea211d2971b25c65724bb10d0f6cf6e0b68c6a1
(cherry picked from commit 4c1ae7f937239fc3e1397ec2cb3b290d886bb0f0)
 2022-12-26 05:31:54 -05:00
tao.jin
efb7106ecc FIX: version info and img in About Bambu Studio 
Change-Id: I7c3ed0b13f09d6e97fdbb11b24cdeddc8439df88
 2022-12-26 05:31:54 -05:00
SoftFever
1df89650e9 pa works 2022-12-22 22:41:45 +08:00
SoftFever
bf8a9fee1f 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
b61da88d51 NEW:add fan control 
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
 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
Stone Li
3fae63e8cf ENH: refine render logo to save memory 
Change-Id: I8dbc999d7c1adb966f0258dafe8ab267f33d4e30
Signed-off-by: Stone Li <stone.li@bambulab.com>
 2022-12-15 04:38:15 -05:00
Stone Li
58dab90e53 ENH: refine camera status and settings 
Change-Id: I2a8c23ca119ff5d38272dad46347704bf457dee0
Signed-off-by: Stone Li <stone.li@bambulab.com>
 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
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
chunmao.guo
78dbefd9ba FIX: [STUDIO-1641] svg dark color 
Change-Id: I88a6f0e04cba193e9ce80150743b4e90cdf683c5
 2022-12-15 04:38:15 -05:00
chunmao.guo
4132711f4c ENH: [STUDIO-1528] support list value icons for param field 
Change-Id: I44f14fde20fe4d9859c019ead09d1d565af23ba4
 2022-12-15 04:38:15 -05:00
tao.jin
29e6f71402 ENH: refine details of camera setting 
Change-Id: Icb8365007f96b7dde372e7b121ec4f6e2ae96d7a
 2022-12-15 04:38:15 -05:00
tao.jin
6133ceac20 NEW: refresh task thumbnail with brokenimg 
Change-Id: I39393a43c681ba954f9d3975b35df4551b314ef2
 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
liz.li
882e06bd9b FIX:add some missing darkmode svgs 
Change-Id: I0a5a47e9733b534e45c65cb79ecd5b1cd2da7303
 2022-12-15 04:38:15 -05:00
tao.jin
e217baad50 ENH: refine display of camera state and add setting 
Change-Id: I85f02565e1581fde9a6c161f4fbed0283fda208f
 2022-12-15 04:38:15 -05:00
tao wang
63ea4179e4 FIX:fixed ams mapping instructions img not clear 
Change-Id: I21d4d024078ad2b2a983b54938efb13015382a10
 2022-12-15 04:38:15 -05:00
liz.li
df260dd724 ENH:dark mode of imgui part 
Change-Id: I42975f9004be1a348db83f1a5790490dbc444c9d
 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