7d6d9e95ba
update locale
2024-05-21 00:36:45 +08:00
2776792b8e
chore(slicer): Update copyright year to 2024 ( #4428 )
...
Also remove duplicated definition for `MACOSX_BUNDLE_COPYRIGHT`.
Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com >
2024-03-13 21:20:39 +08:00
81b5586410
QoL: 3D navigator ( #4181 )
...
* Initial integration of ImGuizmo
* Fix mouse capture
* Fix frame update
* Update face color
* Show current camera rotation
* Fix coord mapping
* Update camera rotation from 3d navigator
* Use orthographic
* Render axis
* Make the axis color lighter if at back
* Show axis label
* Fix linux build
* Move to separate method
* Refine
* Add option to show/hide 3d navigator
* Add license info
* Handle dpi scaling
---------
Co-authored-by: SoftFever <softfeverever@gmail.com >
2024-02-27 21:57:31 +08:00
d4b859f099
Revert to WxWidgets 3.1.5 ( #3249 )
...
* revert to WxWidgets 3.1.5
* update nanosvg unicode path
2023-12-23 17:44:09 +08:00
ac53b7a593
Fix wx issues from upgrade ( #3032 )
...
* fix top bar resizing
* Attempt to fix bitmap bundle scaling issues
* Revert "Attempt to fix bitmap bundle scaling issues"
This reverts commit e94ba58d907b1b2da5a9e27ad552e1d7f1288c18.
* Fix AboutDialog and partially fix SwitchButton
* Fix switch button scaling on windows
* Fix dropdown icon size
* fixed sdcard/recording/timelapse icon size in device page
* Set use_legacy_bmp to true by default to it's back compatible
---------
Co-authored-by: Noisyfox <timemanager.rick@gmail.com >
Co-authored-by: SoftFever <softfeverever@gmail.com >
2023-12-21 08:27:02 +00:00
285dbed596
Update wxWidgets to v3.2.1 ( #2905 )
...
* Upgrade wxWidgets to 3.2.1
Based on prusa3d/PrusaSlicer@9a7e024
Co-authored-by: tamasmeszaros <meszaros.q@gmail.com >
* Implement BitmapCache
* update wxExtensions while keeping legacy items
* update dc.DrawBitmap calls to use get_bitmap
* Fix GetSize/Width/Height calls
* update BitmapComboBox
* fix ifndef in wxExtensions.hpp
* update my todos to OcraftyoneTODO
* Get to a compilable state
Everything seems to be working (including the plater). I am not seeing any graphical issues
* fix extruder color icons
* fix crash on opening support tab
* remove GetBmpSize method from DropDown.cpp
* Update TextInput to use bitmap bundles
* update a TODO after testing
* fix the rendering of the icons on combobox
* fix a few todos
* fix WipeTowerDialog.cpp
* Overhaul WipeTowerDialog
Removed simple version of the dialog since BBS removed the functionality but left the code.
Center the table (only seen when the table is smaller than the minimum size of the dialog)
Fix issue where editing a value causes the m_min_flush_label to change colors slightly
Fix an issue where changing a value or running an auto calc changes the disabled value from "-" to "0"
* update a few todos
* Update some todos
* Show dropdown when editing is started
* Update NanoSVG.cmake
Update NanoSVG to work with PR #2780
* Dim the icon on ComboBox when disabled
* solve ObjectDataViewModel todos
leaving colPrint and colEditing cases alone as it does not seem to impact anything
* Update names in wxExtensions
-Rename msw_rescale to sys_color_changed
-Replace GetBmpSize, GetBmpWidth, GetBmpHeight with renamed version (same name without "Bmp")
Both of these changes were also made by PrusaSlicer.
Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com >
* update BitmapCache::from_svg
disable finding bundle in the cache to match load_svg
update to match values used in load_svg
* Update ScalableButton
change the signature and remove functions/vars pertaining to a default bmp
fix TODOs in ScalableButton
Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com >
* fix up some more todos in wxExtensions
* update ScalableBitmap to use bmp bundles
use wxBitmapBundle by default
add flag to use old scaled bitmap function (specifically to solve issue with advanced toggle)
* attempt to fix macos deps build
* fix ubuntu build
* Revert "attempt to fix macos deps build"
Mistakenly made change to wrong file
This reverts commit d9c20b51216db1d409aeb0420d9d901000ad1b00.
* update wxWidgets patch
an attempt to fix macOS build
* Remove duplicate variable from OrcaSlicer.cpp
* Fix macOS build issue
* Fix blank DataViewItem being added to objects list
* Filament ComboBox editor updates
-Add show drop down feature to ObjectTable
-Call finish editing when ComboBox is closed in ObjectList
* remove Apple specific declarations missed during refactor
* delete old wxWidgets patch
* fix ubuntu seg fault
* include patch from #2926
* update patch to include wxWidgets/wxWidgets@991a74c
* fix deps not compiling on Windows
* update WipeTowerDialog
relocates the recalculate button back to its previous position
changes the wording of the tip message label
add spacing below the matrix
* finish patching wxWidgets
from prusa3d/PrusaSlicer@f8477d1 and prusa3d/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com >
* fix combobox crash
* revert outside plate changes
---------
Co-authored-by: tamasmeszaros <meszaros.q@gmail.com >
Co-authored-by: YuSanka <yusanka@gmail.com >
2023-12-04 15:21:49 +00:00
77818504f1
Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation
...
(cherry picked from commit prusa3d/PrusaSlicer@d0bff2d996 )
2023-11-04 11:41:00 +08:00
5dcc0ee8f3
clean up
2023-08-09 13:42:41 +08:00
a58eb7ad4f
tweak "Based on " string
2023-04-29 10:29:02 +08:00
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
6d25f55951
FIX: AboutDialog layout
...
Change-Id: I693f489ba92f3d4ac60abb4344063b88fb201c29
2023-04-17 15:39:02 +08:00
05c2d6c267
update about
2023-03-17 22:25:38 +08:00
a8d3e161b4
Change Application name to OrcaSlicer
2023-03-12 10:05:22 +08:00
38d5ccb29f
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
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
466f5b34a1
ENH: copyright: change the copyrights to lunkuo
...
Change-Id: Ie2804275a422a1314a5f948fc35cfc5bb7a31e29
2023-01-10 19:08:26 +08:00
b0210d7312
NEW: add build time in about dialog
...
Change-Id: Ibb27223568f19f39ec57c01af23376c325d3972b
Signed-off-by: Stone Li <stone.li@bambulab.com >
2023-01-10 19:08:26 +08:00
a0c86307fe
fix color in dark mode
2023-01-05 19:44:33 +08:00
ab1d613f42
change app color
2023-01-03 22:05: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
fa809a1894
FIX: version info and img in About Bambu Studio
...
Change-Id: I7c3ed0b13f09d6e97fdbb11b24cdeddc8439df88
2022-12-26 05:31:54 -05:00
e43a3ad097
update version to beta3
2022-12-17 11:57:31 +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
4591a3f975
FIX:fixed appconfig is not saved when switching dark mode
...
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
2022-12-15 04:38:15 -05:00
a461654b38
NEW:added dark mode
...
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
e3c6d4531e
ENH: remove placeholder '0' in version display
...
Change-Id: I6c0ffdd229a630a48a676c12a8f124f7a6e39f09
2022-12-15 04:33:48 -05:00
aafe7c7954
update SF version
2022-10-21 16:50:34 +08:00
51efb72163
update SoftFever version number
2022-10-21 00:43:21 +08:00
7ae4893c56
NEW: support to display internal Version
...
Change-Id: If074529312fe3f5e32f061280b8c8914fdcaf7e0
Signed-off-by: Stone Li <stone.li@bambulab.com >
2022-10-20 19:34:37 +08:00
d030762f41
FIX:use scalablebitmap replace wxbitmap
...
Change-Id: I4ca885051f309be4a7d9a6e08de097fe75847257
2022-08-05 16:11:42 +08:00
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
f8756e6c89
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
