Commit Graph
41 Commits
Author SHA1 Message Date
Ocraftyone 2b9cb53676 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>
2023-11-22 05:43:35 -05:00
Ocraftyone 3a3301b051 update BitmapCache::from_svg
disable finding bundle in the cache to match load_svg
update to match values used in load_svg
2023-11-22 05:35:00 -05:00
Ocraftyone 01398dd848 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>
2023-11-22 04:12:26 -05:00
Ocraftyone 3b5c571b1c Merge branch 'main' into enh-update-wxwidgets 2023-11-22 00:52:43 -05:00
Ocraftyone 51622326bf solve ObjectDataViewModel todos
leaving colPrint and colEditing cases alone as it does not seem to impact anything
2023-11-22 00:36:16 -05:00
Ocraftyone bc21ab61f5 Dim the icon on ComboBox when disabled 2023-11-21 07:38:40 -05:00
Ocraftyone 53bc949580 Merge branch 'main' into enh-update-wxwidgets
# Conflicts:
#	src/nanosvg/README.txt
#	src/nanosvg/nanosvg.h
#	src/nanosvg/nanosvgrast.h
#	src/slic3r/GUI/BitmapCache.cpp
#	src/slic3r/GUI/BitmapCache.hpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
2023-11-19 19:34:50 -05:00
Ocraftyone 7b1f49f921 Update NanoSVG.cmake
Update NanoSVG to work with PR #2780
2023-11-19 03:56:50 -05:00
Ocraftyone 6e7dfc54e4 Show dropdown when editing is started 2023-11-19 02:10:15 -05:00
Ocraftyone 3f0083c5a7 Update some todos 2023-11-19 02:04:29 -05:00
OcraftyoneandSoftFever cbb7c3381c Rework Github Build Actions (#2566)
update workflows from dev branch

Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-11-18 15:30:06 +08:00
Ocraftyone c0386d786c Fix macOS deps build issues (#2541)
update deps/CMakeLists.txt and MPFR.cmake
2023-11-17 21:59:18 +08:00
Ocraftyone cbbeb55989 update a few todos 2023-11-13 13:54:13 -05:00
Ocraftyone 62d689b03e Merge branch 'main' into enh-update-wxwidgets 2023-11-13 00:58:46 -05:00
Ocraftyone 553f72a2ac 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"
2023-11-13 00:56:25 -05:00
Ocraftyone c9284ccf09 fix WipeTowerDialog.cpp 2023-11-11 14:04:45 -05:00
Ocraftyoneandsupermerill 120a3576a0 SS port - Change extrusion role gcode (#2459)
implement custom gcode for when the extrusion role is changed

Co-authored-by: supermerill <merill@free.fr>
2023-11-09 22:30:30 +08:00
Ocraftyone 506e1f4508 fix a few todos 2023-11-09 09:01:07 -05:00
Ocraftyone 413e8751c0 fix the rendering of the icons on combobox 2023-11-08 12:26:23 -05:00
Ocraftyone 6d149e0698 update a TODO after testing 2023-11-08 12:25:11 -05:00
Ocraftyone 510a4a02ab Update TextInput to use bitmap bundles 2023-11-08 11:42:31 -05:00
Ocraftyone 7cfa854981 remove GetBmpSize method from DropDown.cpp 2023-11-08 11:08:38 -05:00
Ocraftyone 92c9a537d8 fix crash on opening support tab 2023-11-08 10:20:53 -05:00
Ocraftyone 7acae72219 fix extruder color icons 2023-11-08 07:50:37 -05:00
Ocraftyone 03754b5213 Get to a compilable state
Everything seems to be working (including the plater). I am not seeing any graphical issues
2023-11-08 06:33:32 -05:00
Ocraftyone dc062f1a1a update my todos to OcraftyoneTODO 2023-11-07 06:03:55 -05:00
Ocraftyone d4676ee9cb fix ifndef in wxExtensions.hpp 2023-11-07 05:54:31 -05:00
Ocraftyone eba3fe207f update BitmapComboBox 2023-11-07 05:44:17 -05:00
Ocraftyone 77a143a8ff Fix GetSize/Width/Height calls 2023-11-07 05:15:44 -05:00
Ocraftyone cdff9ba9fa update dc.DrawBitmap calls to use get_bitmap 2023-11-07 05:15:09 -05:00
Ocraftyone e114881ed5 update wxExtensions while keeping legacy items 2023-11-07 05:03:27 -05:00
Ocraftyone a977c69a81 Implement BitmapCache 2023-11-07 03:47:39 -05:00
Ocraftyone 961629b766 Merge branch 'main' into enh-update-wxwidgets 2023-11-05 04:11:05 -05:00
Ocraftyoneandtamasmeszaros 23022456b8 Upgrade wxWidgets to 3.2.1
Based on prusa3d/PrusaSlicer@9a7e024

Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>
2023-11-05 03:45:42 -05:00
Ocraftyone d574816aef Add default page selection (#2569)
Add option to change default page
2023-11-02 18:28:13 +08:00
Ocraftyone 06f966e43a Add splash screen toggle (#2568)
Add preferences option to toggle splash screen
2023-11-01 16:47:14 +08:00
f84e94faf7 Add "Manual filament change" option and logic (#2379)
* Add "Manual filament change" option and logic

* make suggested changes

* make suggested changes

* change tag from "CHANGE_TOOL" to "MANUAL_TOOL_CHANGE"

* some tweaks

* More fixes

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
Co-authored-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-10-22 19:31:09 +08:00
OcraftyoneandSoftFever 4d14ee15ce Thumbnail Formats Option Ported from PrusaSlicer and add BIQU/BTT format (#2405)
* Add needed src files and update CMake files

* Implementation of GCodeThumbnailsFormat for PNG, JPG, and QOI complete

* Implement BIQU (Big Tree Tech) Thumbnail Format

* have GCodeProcessor.post_process pass through original line end characters

* fix biqu thumbnail output
use \r\n for new lines in the biqu thumbnail portion. the firmware requires these end characters to function properly.
update names of variables and add comments to be more descriptive
replace modified Qt pixel algorithm with much simpler algorithm from BTT TFT firmware

* rename BiQU to BTT_TFT for better clarity

* remove underscore from GUI option

---------

Co-authored-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-10-17 20:00:38 +08:00
Ocraftyone ee9f651511 Fix M141 S0 at end of gcode (#2328)
* remove hardcoded set chamber temp gcode

* Revert "remove hardcoded set chamber temp gcode"

This reverts commit 8fc1f4a38113087a8fb11901981ca8c9cfdf7777.

* disable heated chamber only if chamber is used/defined
2023-10-05 22:02:15 +08:00
Ocraftyone 709504a2d1 toggle visibility of ironing_pattern on selection of ironing type (#2321)
* toggle visibility of ironing_pattern on selection of ironing type

* add a tooltip to ironing_pattern
2023-10-05 20:14:53 +08:00
Ocraftyone a523979ac3 add ironing angle (#2320) 2023-10-04 22:48:35 +08:00