5807d82c94
Merge branch 'SoftFever' into feature/merge_upstream
2023-01-21 23:41:20 +08:00
9cf21a2293
fix 256px icon to big ( #198 )
2023-01-21 11:20:41 +08:00
9f91a8450b
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com >
2023-01-21 00:37:10 +08:00
e745ac980e
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
e119121f1b
change icon color
2023-01-06 21:31:23 +08:00
a9f23e38f2
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
122c68321b
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
6913736f8c
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
fa809a1894
FIX: version info and img in About Bambu Studio
...
Change-Id: I7c3ed0b13f09d6e97fdbb11b24cdeddc8439df88
2022-12-26 05:31:54 -05:00
103ee3c127
pa works
2022-12-22 22:41:45 +08:00
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
1449bedfec
NEW:add fan control
...
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
2022-12-15 04:38:15 -05:00
acdcb60f35
ENH:display different thumbnails according to the printer type
...
Change-Id: I1534594923fdcafb231661a1a7fa289221277449
2022-12-15 04:38:15 -05:00
69e13a73b9
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
6e26a5c8e3
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
619769c81d
FIX:change the humidity level icons
...
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
2022-12-15 04:38:15 -05:00
689d06a9a2
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
3a0daadb52
FIX: [STUDIO-1641] svg dark color
...
Change-Id: I88a6f0e04cba193e9ce80150743b4e90cdf683c5
2022-12-15 04:38:15 -05:00
0f5202dea8
ENH: [STUDIO-1528] support list value icons for param field
...
Change-Id: I44f14fde20fe4d9859c019ead09d1d565af23ba4
2022-12-15 04:38:15 -05:00
aa00be214f
ENH: refine details of camera setting
...
Change-Id: Icb8365007f96b7dde372e7b121ec4f6e2ae96d7a
2022-12-15 04:38:15 -05:00
b29d7b44b6
NEW: refresh task thumbnail with brokenimg
...
Change-Id: I39393a43c681ba954f9d3975b35df4551b314ef2
2022-12-15 04:38:15 -05:00
4591a3f975
FIX:fixed appconfig is not saved when switching dark mode
...
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
2022-12-15 04:38:15 -05:00
90be5dfbf3
FIX:add some missing darkmode svgs
...
Change-Id: I0a5a47e9733b534e45c65cb79ecd5b1cd2da7303
2022-12-15 04:38:15 -05:00
c1b62d70ef
ENH: refine display of camera state and add setting
...
Change-Id: I85f02565e1581fde9a6c161f4fbed0283fda208f
2022-12-15 04:38:15 -05:00
373739ce05
FIX:fixed ams mapping instructions img not clear
...
Change-Id: I21d4d024078ad2b2a983b54938efb13015382a10
2022-12-15 04:38:15 -05:00
c99039a5f8
ENH:dark mode of imgui part
...
Change-Id: I42975f9004be1a348db83f1a5790490dbc444c9d
2022-12-15 04:38:15 -05:00
a461654b38
NEW:added dark mode
...
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
65431f1c5c
ENH:add humidity display/surplus material
...
Change-Id: I1a04df257c9b09fef7ff06cfa192644478a30716
2022-12-15 04:38:15 -05:00
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
9619b80a4d
ENH:add next_button in dailytips
...
1.add next button in dailytips
2.adjust menuitem position of show tip in menu bar
3.add new tip
Change-Id: Idad011b5849d7bddeb36b3a3e7d843aa596023d4
2022-12-15 04:33:48 -05:00
1f34203d53
ENH: refine set partplate bedtype dialog & button
...
Change-Id: Icf1ec314f04c6156e92f2f5a8646b97cf4c2220c
2022-12-15 04:33:48 -05:00
ca2b68e2e6
ENH:displays the publish button based on user permissions
...
Change-Id: I853506fa61f1f8cf14dfeb4601c8bb5f1a0c5914
2022-12-15 04:33:48 -05:00
b10da8ce5d
ENH: mark icon if plate bed_type differ from global
...
Change-Id: I6ae1396b8a3007b61ce85992ebb2aec6c64ec2ff
(cherry picked from commit c8dbb583838df20105c0ca4f9d1a5d711d7c0347)
2022-12-15 04:33:48 -05:00
6cee2f09b2
NEW: set bed type for partplate
...
Change-Id: I876e24fb424b16eeb674313c7e0e03a228bc4b35
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-12-15 04:33:48 -05:00
a6d3bcfb1f
NEW: management camera video stream in device panel
...
Change-Id: I39634af900071cc5c01a88100457880a513e416f
2022-12-15 04:33:48 -05:00
b17e3d3b1b
NEW:add variable layer height
...
Change-Id: Idef7f0dea32e4faaeb4d6eb188695cc7b554099c
(cherry picked from commit 4969835159eebb356e9b26dab223ad0a18882b70)
2022-12-15 04:33:48 -05:00
25c4ed40d4
ENH: set 4 status of monitor extruder icon
...
Change-Id: I2739c7079268409975a9bd6ed1efb6cf47868438
2022-12-15 04:33:48 -05:00
9758ad71a4
NEW:Fixed some mall issues
...
Change-Id: I1f9105a1a7089457f4ecb327cb5db43ca0d39f4e
(cherry picked from commit 975bdcf64f88b4f1e7c0e03abd9dfba6c32c00fe)
2022-12-15 04:33:48 -05:00
38ad3e3320
NEW:add model mall system
...
Change-Id: Iccfe460cd7bfd11d91cdd7eddf142a8590e3c5b0
2022-12-15 04:33:48 -05:00
2e9a11ad13
ENH: move raft to advanced mode
...
Signed-off-by: yifan.wu <yifan.wu@bambulab.com >
Change-Id: I805e9059405680926a5423b5aa0e23d97840a51a
2022-12-15 04:33:48 -05:00
10bffb217a
NEW: add custom printer config wizard
...
Change-Id: I48f34039635803c3f1cee4cc2c853a0ffa5b451a
Signed-off-by: Stone Li <stone.li@bambulab.com >
(cherry picked from commit 387ba2a5aac05d3b3af0923f88415188ae8cb44e)
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-12-15 04:33:48 -05:00
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
b884c4f7e0
FIX: replace print file default image
...
Change-Id: I58ff7c02b725c38b9c898fd1d4d4c92bf61c4c24
2022-10-20 19:34:37 +08:00
cf032b2d72
ENH: some improvements and fixs
...
1. create user folder if not exists
2. add a tips for binding a printer
3. fix sdcard tips
4. modify icons
5. refine layout of task options
Change-Id: Ic0529cf1e8bdde0128052bc42454f6e6aaae87ca
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-10-20 19:34:37 +08:00
38a4d2f5f2
NEW:add printer tips can link to wiki
...
Change-Id: Id6fc6afbcdfcab9ac0747d9f7228f94aba6c871e
2022-10-20 19:34:37 +08:00
95da53ef38
NEW:add ams guide wiki
...
Change-Id: I825f9dbbf3aa0a32eb5272b941179025ef2d35e2
2022-10-20 19:34:37 +08:00
0441e0304a
ENH: change extruder icon colour when loading filament
...
Change-Id: Ifd1e9c868702352790de9ddf25f256d504875785
2022-10-20 19:34:37 +08:00
8eff6e6641
Merge mainstream changes
2022-10-04 13:51:34 +08:00
ea479a76f6
FIX: optimize style of media file panel
...
Change-Id: I2e5319538adae84b9b0348874d7b468b0dbc2db1
2022-09-29 11:16:43 +08:00
e8da687e00
ENH: icon for param group
...
Change-Id: I435830615747aa850ed82621349f5fedfc29d860
2022-09-29 11:16:43 +08:00
