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 |
|
chunmao.guo
|
60dbf71cd6
|
FIX: [STUDIO-2331] gtk resize popup window
Change-Id: I3ad2c26c5c1fcc94964fa838ce2596b727712195
|
2023-02-24 17:44:15 +08:00 |
|
chunmao.guo
|
a03dc779b6
|
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4
(cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
|
2023-02-22 20:09:17 +08:00 |
|
战马
|
5f69f4c016
|
FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.
Reason for revert: update pick
Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
|
2023-02-22 20:09:17 +08:00 |
|
chunmao.guo
|
81dea77932
|
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf3
|
2023-02-22 20:09:17 +08:00 |
|
chunmao.guo
|
722fde9255
|
FIX: [STUDIO-1873] scroll out of range in DropDown
Change-Id: Ide38f2e34f8b54380e72dc51509050c55b771f6d
|
2023-01-10 19:08:26 +08:00 |
|
SoftFever
|
9c1a7bbf8b
|
change app color
|
2023-01-03 22:05:20 +08:00 |
|
chunmao.guo
|
59773eee02
|
FIX: [STUDIO-1725] DropDown: icon scale size on Mac
Change-Id: I8128035df0c8623d220c791225adeb4a827cbb3f
|
2022-12-15 04:38:15 -05:00 |
|
chunmao.guo
|
3b3ad1b390
|
FIX: scroll offset with touch pad
Change-Id: I7dbec590f39f174c02e4179fd781ff7fd1a93374
|
2022-12-15 04:38:15 -05:00 |
|
chunmao.guo
|
9b10b1438c
|
FIX: [STUDIO-1011] windows can not scroll in inactivate window
Change-Id: Ib09e58f4637d632625bf7bd484fd26319630cdb2
|
2022-12-15 04:38:15 -05:00 |
|
chunmao.guo
|
b209243b27
|
ENH: dark mode of StateColor
Change-Id: I5928898c50280c7f2eedbb9389032230c7e251c4
|
2022-12-15 04:38:15 -05:00 |
|
chunmao.guo
|
3d7d2badf7
|
FIX: handle mouseCaptureLost in common ctrls
Change-Id: Ifde2406911a628fa61acf41c0e7a5120612d73bf
|
2022-10-20 19:34:37 +08:00 |
|
chunmao.guo
|
a64fc3918a
|
FIX: scroll direction of DropDown
Change-Id: Id5abf74e099586810ac9a5ec2b43e6050381a3c3
|
2022-09-08 21:49:36 +08:00 |
|
chunmao.guo
|
af54a34567
|
FIX: wxDisplay crash on wxNOT_FOUND
Change-Id: If7b936d361873e20fb71b7fc35c9d270cd39a763
|
2022-08-26 09:25:59 +08:00 |
|
chunmao.guo
|
646934953c
|
FIX: Intercept IDLE event in DropDown to fix various problems on MacOS
Change-Id: Ia9aa96c90f1b7c3f6c33b7325dc28a4f780969c3
|
2022-08-08 22:19:42 +08:00 |
|
chunmao.guo
|
8300c386e0
|
FIX: call DismissAndNotify to manual close popup
Change-Id: I395708a98dda390f81d52151c9c52ba367de5a3d
|
2022-08-05 16:11:42 +08:00 |
|
chunmao.guo
|
93cbd5173f
|
FIX: support key event in ComboBox
Change-Id: Iac5f114ff45123f0a6b1bc24ef289a6112475183
|
2022-08-05 16:11:42 +08:00 |
|
chunmao.guo
|
00ba515783
|
FIX: use scaled icon in MacOS
Change-Id: Ic7e89a3ff1dd92818adfcec410cc0bdcacfc0398
|
2022-08-05 16:11:42 +08:00 |
|
lane.wei
|
1555904bef
|
Add the full source of BambuStudio
using version 1.0.10
|
2022-07-15 23:42:08 +08:00 |
|