Commit Graph
100 Commits
Author SHA1 Message Date
YuSanka 1472ad9b14 To fix blurred icons under OSX there is implemented PresetBitmapComboBox, derived from wxBitmapComboBox,
which now will be used for preset choosers on sidebar a preset tabs.

+ for BitmapCache class added m_scale used for correct scaling of SVG images on Retina displays

+ some code clearing from unused functions or function's parameters
2020-01-31 16:57:45 +01:00
YuSanka 570f77cbdc Implemented DnD for objects inside ObjectList 2020-01-30 15:01:47 +01:00
YuSanka d45744b7bb Typo fix for https://github.com/prusa3d/PrusaSlicer/commit/a38735b4ae78611fe10f3422ccfd54e690ce1a88 2020-01-28 16:40:31 +01:00
YuSanka cd2973fad3 Typo fix for https://github.com/prusa3d/PrusaSlicer/commit/a38735b4ae78611fe10f3422ccfd54e690ce1a88 2020-01-28 16:23:55 +01:00
YuSanka a38735b4ae More fix of svg icons scaling under OSX (to avoid icon's blurring)
+ some code cleaning from unused text
2020-01-28 16:17:51 +01:00
YuSanka 635def1648 Fixed an icon scaling in the ObjectList under OSX 2020-01-27 16:30:09 +01:00
YuSanka cf7d7bd40f Fixed menu icons scaling under OSX 2020-01-27 14:58:11 +01:00
YuSanka d8b1d074a1 Implemented upgrade_text_entry_dialog() fuction to avoid a getting an empty string from wxTextEntryDialog (disable OK button, if TextCtrl is empty)
All mode conflicting or meaningless ticks are marked by "exclamation" icon and described in tooltip.
2020-01-27 14:36:32 +01:00
YuSanka cb3ad0a422 Updated tooltips for DoubleSlider
*partially related to #3543
2020-01-24 11:51:37 +01:00
YuSanka 5ff8ae955b Implemented editing for extruder of existing ToolChangeCode tick
+ Code refactoring: DoubleSlider is extracted from wxExtensions
2020-01-23 16:11:21 +01:00
YuSanka 1ed313ab79 Synchronized mode of color_print data to/from 3mf/amf
+ Code refactoring " CustomGCode extracted to separate namespace and file
2020-01-23 16:11:21 +01:00
YuSanka 29fa176d27 DoubleSlider: Implemented code switch between ToolChangeCode and ColorChangeCode for MultiAsSingle mode 2020-01-22 15:01:59 +01:00
YuSanka d8b5f2950d Select first printer for 3rd vendor.
+ fixed typo in output message
2020-01-21 16:34:07 +01:00
Oleksandra Yushchenko 1bbee1c5cc Merge pull request #3276 from smurfix/upstream2
Don't show a confirmation dialog when simply saving a preset
2020-01-21 15:13:12 +01:00
Oleksandra Yushchenko 749a06a092 Merge branch 'master' into upstream2 2020-01-21 15:12:32 +01:00
YuSanka 6eaf48ebd8 Implemented check of color change event respecting to mode
+ unresolved ticks are marked with error_tick icon
 + some code refactoring
2020-01-21 11:35:04 +01:00
YuSanka 2259f7b3e8 Code refactoring to mode comparison 2020-01-17 12:24:58 +01:00
YuSanka 52c590f57a Merge remote-tracking branch 'origin/ys_cp_improvements' 2020-01-16 16:06:19 +01:00
YuSanka 89fcd7f95a Added "mode" variable for custom_gcode_per_print_z 2020-01-16 16:01:19 +01:00
YuSanka 20fd874ff2 Merge remote-tracking branch 'origin/master' into ys_cp_improvements 2020-01-16 15:01:57 +01:00
YuSanka 099118d6f2 Merge remote-tracking branch 'origin/master' into ys_cp_improvements 2020-01-16 14:02:19 +01:00
YuSanka 8ef29aab78 Refactoring of DoubleSlider::add_code() 2020-01-16 10:20:36 +01:00
YuSanka 15f873dd74 DoubleSlider: Implemented code for check of used extruders for MustiAsSingle mode 2020-01-15 15:35:56 +01:00
YuSanka 1844fca780 Merge remote-tracking branch 'origin/master' into ys_cp_improvements 2020-01-15 11:40:54 +01:00
YuSanka 536514ff03 Added default filament(resin) in wizard for selected printers
Added default_materials field to "Vendor".ini
2020-01-15 09:34:21 +01:00
YuSanka 36de2c5d90 Code refactoring for context menus and current extruder color selection for tick 2020-01-13 17:03:10 +01:00
YuSanka 5fe3ddf26f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-13 08:54:56 +01:00
YuSanka c1bc06f906 Merge remote-tracking branch 'origin/ys_dark_mode_fixes' 2020-01-13 08:44:51 +01:00
YuSanka 02b2e20628 Context menus improvements. Disabling unused extruders for color_change 2020-01-10 16:49:07 +01:00
YuSanka aed277089b Updated tooltips and context menus for 3 manipulation mode of DoubleSlider
+ Some code refactoring
2020-01-09 16:38:59 +01:00
YuSanka fb65e3152f DoubleSlider modes(states) are extended and implemented mode detection from model
+ Some code refactoring
2020-01-08 16:29:37 +01:00
YuSanka 0aaa7dd076 Small fix for https://github.com/prusa3d/PrusaSlicer/commit/3e0690b37bff4af00015a3b393c39a129ab0d1cc 2020-01-08 15:44:39 +01:00
YuSanka 3d4cda8ace Fixed update of "Cost" field in "Sliced Info" box after a change of any material's options
("bottle_cost", "bottle_volume", "bottle_weight", "material_density")
2020-01-08 15:27:09 +01:00
YuSanka 07c1c3d1dc Fixed update of "Cost" field in "Sliced Info" box after a change of any material's options
("bottle_cost", "bottle_volume", "bottle_weight", "material_density")
2020-01-08 15:23:46 +01:00
YuSanka e531b0319f Code cleaning and refactoring for https://github.com/prusa3d/PrusaSlicer/commit/6a8c34dad9adfb29bf6198df289cd07f8d85065b 2020-01-07 16:17:20 +01:00
YuSanka ca950d1a00 Added check for a preset visibility in a first_compatible_idx() function
(related to #3470)
2020-01-07 15:22:47 +01:00
YuSanka bea82a4501 Fixed density calculation is wrong for resin cost calculation (#3460) 2020-01-07 08:46:11 +01:00
YuSanka 4f1f507d5a Fix of #3371 2020-01-06 12:41:27 +01:00
YuSanka 30f7a2b8e5 Fix of #3382 2020-01-03 16:09:16 +01:00
YuSanka 6a8c34dad9 Checking of icons for dark mode is removed to BitmapCache 2020-01-02 13:41:49 +01:00
YuSanka 9f529e86cc Fixed filaments/materials preset list updating from ConfigWizard
if list of printers was changed but filaments/sal_materials page wasn't activated
2020-01-02 12:18:30 +01:00
YuSanka 0802823703 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-18 15:58:24 +01:00
YuSanka 07f428fe62 Implemented function to get an icon name considering to OS color mode
For a Dark mode we start to looking of icons in folder "white"

Added missed "white" icons
2019-12-18 15:54:01 +01:00
YuSanka 7650732c61 Show context menu for a multi-object selection on 3DScene,
add "Reload from disk" item for this menu
2019-12-18 09:11:33 +01:00
YuSanka f7e06ded67 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-17 14:16:58 +01:00
YuSanka 8824468882 Added function to update of custom_gcode_per_print_z in Model from configuration
considering "colorprint_heights" option.

Changed thumb_up/down icons to better preview (feedback from #3256)

Commented some uncertain code
2019-12-17 14:16:38 +01:00
YuSanka afcc6bbb08 Code refactoring for Color change implementation 2019-12-17 08:37:50 +01:00
YuSanka 7d0d70534b Fixed "actions" buttons size under OSX 2019-12-13 17:56:04 +01:00
YuSanka 2df903640b Implemented rescaling for "Remove device" button 2019-12-13 15:13:55 +01:00
YuSanka 01f1bed060 Added missed icon 2019-12-13 13:51:46 +01:00
YuSanka c47fda39f1 Implemented "Disconnect" button 2019-12-13 13:51:45 +01:00
YuSanka 7e87d093fc Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices 2019-12-13 13:24:12 +01:00
YuSanka e5fcb587e2 Implemented rescaling for "Remove device" button 2019-12-13 13:23:55 +01:00
YuSanka 967da67d2e Fixed disabling for "Set As separated object" context menu item
+ added missed bug fix in get_freq_settings_choice (part of b9899f9496)
2019-12-12 15:54:53 +01:00
YuSanka 2eb3766e11 Deleted lines to disable dark mode when compiled against the latest OSX SDK 2019-12-12 14:43:13 +01:00
YuSanka d028f804c4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 13:49:30 +01:00
YuSanka 30f259f79c Fixed a bug (OSX specific) caused a crash on undo after Copy/Past several objects 2019-12-12 13:49:12 +01:00
YuSanka b9899f9496 Fixed a bug of settings list detection
,when we try to add settings for object/part from the 3Dscene secondary
and for this moment SettingsItem is selected in ObjectList
2019-12-12 13:42:13 +01:00
YuSanka 0e157b5b07 Updated dictionaries 2019-12-12 08:45:29 +01:00
YuSanka 43d5437e1f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 16:07:51 +01:00
YuSanka d66761e030 Fixed wrong context menu selection for instance(s). Related to #3275 2019-12-11 16:07:00 +01:00
YuSanka be09c91a1d Added missed icon 2019-12-11 11:00:23 +01:00
YuSanka bced486db3 GIT_TAG for deps-macos.cmake is changed to "v3.1.3-patched" 2019-12-11 10:32:50 +01:00
YuSanka 5872598679 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices 2019-12-10 17:31:58 +01:00
YuSanka 37b6d9e8ad Implemented "Disconnect" button 2019-12-10 17:31:27 +01:00
YuSanka 313e86ea94 Fixed show context menu for multiple selection in ObjectList 2019-12-10 17:25:30 +01:00
YuSanka cc4026cfc5 Fixed Wizard material configuration check 2019-12-10 13:47:10 +01:00
YuSanka a9b1ab0a4c Fixed localization for JA and some strings 2019-12-10 13:47:10 +01:00
YuSanka 85645a1253 Fixed crash on ConfigWizard opening after a language change
+ updated Creality.ini and PrusaResearch.ini
2019-12-09 13:02:48 +01:00
YuSanka 24bbad634a Fixed filament presets compatibility updating after switch of different vendor's printers 2019-12-06 16:22:20 +01:00
YuSanka 3acbc07caf Localization improvements 2019-12-06 16:20:59 +01:00
YuSanka 6bcfc3fe83 Updated PrusaSlicer.pot 2019-12-06 13:58:23 +01:00
YuSanka 805a6c936c Localization improvements: Text correction 2019-12-06 13:58:23 +01:00
YuSanka e2f859c3b2 Fixed filament/material sorting in the lists of ConfigWizard 2019-12-05 14:22:06 +01:00
YuSanka cac64576c5 Fixed mode icons rendering under OSX (MacOSX10.14.sdk) 2019-12-05 14:22:05 +01:00
YuSanka 26eaa8af1e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-04 16:11:35 +01:00
YuSanka fea91829eb Localization improvements:
* added wrapper to SliderFloat in imgui
 * fixed localized text in Mouse3DController
 * added take_snapshot for extruder change in object list
 * fixed text typos in AppConfig.cpp, ConfigWizard.cpp and ConfigManipulation.cpp
2019-12-04 16:11:10 +01:00
YuSanka ef29b13c5e Updated Creality.ini 2019-12-04 14:11:42 +01:00
YuSanka ee71f83939 Localization improvements:
* fixed "\n" at the end of phrases
 + updated list of files to localization
 + new PrusaSlicer.pot
 + Japanese localization
2019-12-04 11:14:13 +01:00
YuSanka 6440c8ccfd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-03 18:35:05 +01:00
YuSanka 785eed2ca0 Added context to new saved preset name 2019-12-03 18:34:46 +01:00
YuSanka 7aea0ceff3 ConfigWizard improvements - added check for printers and filaments/matelials selection 2019-12-03 18:31:07 +01:00
YuSanka a00ff7b06f Implemented new suggestion from content team:
Just HigherThumb is moved to selected position after mouse click on color band
2019-12-02 15:04:15 +01:00
YuSanka d182c35248 Focused "Next" or "Finish" button according to the selected page.
Moved update_materials function call
2019-12-02 14:19:13 +01:00
YuSanka 9f1e01b750 Fixed "Pause print" and "Custom Gcode" cancel.
It was possible to add empty code, when "Cancel" button was selected
2019-12-02 09:59:20 +01:00
YuSanka 22aa17128a Fixed function to get a profile name by alias for all preset collections 2019-11-29 11:02:58 +01:00
YuSanka 71f5ed5b9e Added new icon for "change extruder" menu.
+ some improvements for colored band
2019-11-29 11:02:58 +01:00
YuSanka 16137411c4 Fixed icon positioning and color_band scaling for DoubleSlider under OSX 2019-11-28 16:23:58 +01:00
YuSanka 0005049927 Updated icons for DoubleSlider 2019-11-28 15:40:18 +01:00
YuSanka a3ff1b4282 Added updated profiles INI files 2019-11-28 10:54:29 +01:00
YuSanka 773dace33c Merge remote-tracking branch 'origin/master' into ys_aliases 2019-11-28 10:34:05 +01:00
YuSanka dfd38c7818 Merge remote-tracking branch 'origin/master' into ys_color_print_extension 2019-11-28 09:01:14 +01:00
YuSanka c87feb9870 Code cleaning - removed unused state from DoubleSlider 2019-11-28 08:38:28 +01:00
YuSanka 322c0230c3 Code cleaning - deleted extruder selector 2019-11-27 16:03:16 +01:00
YuSanka 901a20b3b1 Code cleaning 2019-11-27 15:27:44 +01:00
YuSanka 496e09302f Implemented a message on Printer display for pause print
+ Added new icons
2019-11-27 14:44:33 +01:00
YuSanka 963969e210 Fixed RadioButton selection in ExtruderSequenceDialog under OSX 2019-11-27 09:21:28 +01:00
YuSanka 6a68002a1f Implemented use of aliases in Plater's preset comboboxes 2019-11-25 15:57:36 +01:00
YuSanka afb8483250 Merge remote-tracking branch 'origin/master' into ys_aliases 2019-11-25 10:44:58 +01:00
YuSanka 6429c3bd89 Added code for next step of a preset's aliasing 2019-11-25 10:40:36 +01:00