Commit Graph

3896 Commits

Author SHA1 Message Date
enricoturri1966
2daa12d467 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-07 16:47:28 +02:00
enricoturri1966
dcb603bed5 Fix for tooltip not disappearing when loading an object using the top toolbar 'Add' command and when swithing to preview 2020-05-07 16:47:15 +02:00
YuSanka
3c996111aa Layouts:
1. Fixed crash on OSX after change of the settings layout (PreferencesDialog should be destroyed before call of recreate_GUI)
2. Fixed dialog message during GUI recreation
3. In PreferencesDialog changed radio buttons view (under OSX they were bold)
4. slDlg mode - fixed switching between main frame and settings dialog (dialog->SetFocus() doesn't work under OSX, so we just hide it and show again)
2020-05-07 15:37:18 +02:00
dakkar
34b504d50e avoid calling GetHeight() on non-IsOk() icons
probably fixes #3837
2020-05-07 09:48:44 +02:00
YuSanka
f741872361 Fixed a can_change_view() function in respect to the new settings layouts 2020-05-07 09:14:31 +02:00
YuSanka
3f958acdf9 Added missed include for the OSX build 2020-05-06 21:29:51 +02:00
YuSanka
a94c952b40 Search:
1. To the imGui Dialog added icons instead of settings type
2. Fixed a search trough the options with # symbol in opt_key
3. Deleted "Type" checkbox from the Search Windows and added "Search in English" checkbox (but without implementation for this moment)

Layouts:
1. Fixed a visibility of the "Switch to Settings" toolbar icon for the old layout mode
2020-05-06 20:51:50 +02:00
YuSanka
d7b12c6e19 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-06 15:15:31 +02:00
enricoturri1966
e28ed4997d Added missing include 2020-05-06 14:48:40 +02:00
YuSanka
b7c122096a Merge remote-tracking branch 'origin/ys_layouts' 2020-05-06 14:44:30 +02:00
enricoturri1966
6f789aaee7 GLCanvas3DManager replaced by OpenGLManager 2020-05-06 14:38:53 +02:00
enricoturri1966
0bb56736a1 Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
YuSanka
0098aee002 Fixed OSX build 2020-05-05 20:36:00 +02:00
YuSanka
181203c2c7 New layout:
1. PreferencesDialog: When "Cancel" is selected, don't close the PreferencesDialog, just revert layout mode selection
2. For the tooltip of "Switch to Settings" added information about shortcuts
3. Shortcuts for the switching between tabs work from Settings Dialog now
4. Fixed the collapse button show after preference's change
2020-05-05 17:23:58 +02:00
bubnikv
5980d46e4c Bumped up version number to 2.3.0-alpha0 2020-05-05 13:11:32 +02:00
YuSanka
43be7a51aa Fixed OSX/Linux build
Destroy Settings Dialog when close application
2020-05-05 09:37:31 +02:00
YuSanka
53516c8086 Merge remote-tracking branch 'origin/master' into ys_layouts 2020-05-05 08:54:51 +02:00
YuSanka
10d530a57e New Layouts: There 3 mode of a layout of the settings tabpanel :
1. Old mode, as it was always.
2. New mode, when Settings Tabs are hidden on the Plater. Use "cog" icon for the switching to the settings tabs
3. Dlg mode, when Settings Tabs are extracted to the Settings dialog. Use "cog" icon for Show or Focus the Settings Dialog

The "Collapse sidebar" toolbar appearance is set in the Preferences.
2020-05-04 22:31:59 +02:00
bubnikv
80b684b4b7 Fuzzy matching:
1) Handle localized and English searches as equivalent.
2) Search the whole section : group : label string, still give
   precedence to just the label.
2020-05-04 21:22:56 +02:00
bubnikv
0e87226ac9 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-05-04 16:18:32 +02:00
bubnikv
95cf8c2d30 Fuzzy matching of parameters in the search box:
Fix of https://github.com/forrestthewoods/lib_fts/issues/21 finally applied,
disabled CamelCase matching as we are not using CamelCase in Slicer parameters.
2020-05-04 16:18:20 +02:00
tamasmeszaros
568448fa7d Fix font size on windows with wx3.1.3 2020-05-04 15:00:17 +02:00
bubnikv
28c0880b24 ASCII folding applied over the matched string 2020-05-03 15:45:47 +02:00
bubnikv
e27c6c7928 fts_fuzzy_match fixes:
Recursive fix https://github.com/forrestthewoods/lib_fts/issues/21
End of string penalty fix https://github.com/forrestthewoods/lib_fts/issues/24

Some refactoring for succintness (based on Vojtech's taste)
2020-05-03 14:14:40 +02:00
bubnikv
07ab5c31e6 WIP Fuzzy search rework.
1) fts_fuzzy_match has been extended to support wchar_t for a char
   type and uint16_t for an index type for the match indices.
2) fts_fuzzy_match has been extended to place a proper stopper character
   into the match buffer.
3) Slicer integration now uses the fuzzy match indices for highlighting.
4) Slicer integration now correctly highlights the matched word.
5) Slicer search dialog now sorts based on match AND category.

Further modifications are planned:
1) Matching in local language vs. English: Just show the English variant
   if matched in English. Don't mix the two together.
2) Matching the group or category: Continue matching the label.
3) For matches with equal match quality and category sort alphanumerically.
2020-05-01 08:57:24 +02:00
bubnikv
18d08cc5cb Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-30 12:04:03 +02:00
bubnikv
cc2d33f6a0 Search: Fixed returning of a pointer to temporary. 2020-04-30 12:03:49 +02:00
Lukas Matena
bc34928ea8 Follow-up of previous commit (Slic3r::GUI::format issues)
Another missing namespace qualification caused infinite recursion
2020-04-30 11:32:17 +02:00
bubnikv
2875bc685c Fixed spelling of "sidebar" 2020-04-29 15:58:57 +02:00
YuSanka
99d49a74d0 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-29 14:56:31 +02:00
bubnikv
8a82e3d5be Localization fixes. 2020-04-29 14:42:43 +02:00
David Kocik
d828a1e80b single slicer instance
check for other instances during startup
send message with command line arguments if found and terminate
listen for those messages and load objects from paths in messages from them
2020-04-29 10:53:48 +02:00
bubnikv
4de4d765ee Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-04-28 19:31:18 +02:00
bubnikv
b8e02a5405 Fixed handling of fill_pattern field if not all patterns are allowed
for the internal infill.
2020-04-28 18:00:42 +02:00
YuSanka
60ae7d67e9 Implemented workaround for the mouse wheel in Search Window and Undo/Redo lists on the Plater
Workaround is used because of ImGui::GetIO().MouseWheel returns zero always!
2020-04-27 16:00:54 +02:00
YuSanka
93170870e8 Fixed update(clear) of the search_line, when search dialog was opened and closed without changing 2020-04-27 11:51:17 +02:00
Lukas Matena
8afc9338de Merge branch 'lm_fdm_custom_supports_backend' 2020-04-24 15:16:33 +02:00
YuSanka
270e815eeb Fix to the last commit f9b3f2d45e 2020-04-24 11:33:00 +02:00
YuSanka
f9b3f2d45e Search: Code cleaning
+ Reverted "Plater" tab to the Settings Notepad
2020-04-24 11:01:14 +02:00
tamasmeszaros
4f622e4541 Merge branch 'tm_sl1_import_2' 2020-04-24 08:27:49 +02:00
YuSanka
3ba4a2cf3d Fixed an update of the search list after the change of the print technology 2020-04-23 21:32:12 +02:00
YuSanka
1c1a7ed712 Collapse_toolbar: fixed draw items
+ Extended toolbar
2020-04-23 21:00:00 +02:00
tamasmeszaros
83929c2984 Add ui job for SLA import 2020-04-23 19:45:55 +02:00
tamasmeszaros
217477a9ff SLA archive import with miniz, marching square bugfixes
Fix compilation on Windows


Fix array subscript out of range error in MarchingSquares


Fix normals of mesh constructed from slices


Improve performance of mesh construction from slices
2020-04-23 19:12:07 +02:00
tamasmeszaros
247fca6d55 Initial version of sl1 import with sla::Raster refactor. 2020-04-23 19:05:32 +02:00
tamasmeszaros
6eb51a1cca Move ui jobs into separate folder 2020-04-23 18:56:09 +02:00
tamasmeszaros
728d90cb33 Separate jobs from Plater, re-add big bed workaround 2020-04-23 18:47:51 +02:00
tamasmeszaros
89d376dc35 Add min_object_distance method as free function taking ConfigBase argument 2020-04-23 18:17:37 +02:00
YuSanka
fcb85dcdc3 First implementation of the separate plater from the settings tabs
+ Added collapse_toolbar
2020-04-23 17:11:49 +02:00
YuSanka
b447b45a3e Search: Fixed "Search" menu item under OSX
+ deleted search combobox
2020-04-22 20:27:42 +02:00