3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12758 commits 19 branches 69 tags 1.7 GiB
Commit graph

1014 commits

Author SHA1 Message Date
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
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
YuSanka
1c1a7ed712 Collapse_toolbar: fixed draw items 
+ Extended toolbar
 2020-04-23 21:00:00 +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
83782e59b6 Search: Implemented "Option type" checkbox for imGui window on Plater 
+ code refactoring
 2020-04-20 21:54:46 +02:00
YuSanka
3b88dc2688 Search: Implemented cursor movement inside SearchWindow on Plater 2020-04-20 17:37:03 +02:00
YuSanka
ae51f280b8 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-16 11:46:29 +02:00
YuSanka
45147d887b Implemented cursor movement inside SearchComboPopup 
+ Added checkboxes for editing of the option's name (include "Group"/"Category" or not)
+ some code refactoring
 2020-04-14 17:54:15 +02:00
YuSanka
167f7cf5de Added map for save Group and Category values for each option 
+ Some code refactoring in Tab (the translation of the titles moved to the OptionGroups) and Search
+ Fixed assert in fts_fuzzy_match
 2020-04-13 17:55:38 +02:00
YuSanka
218abacb75 Search: Set focus on search line in popup control on Plater 2020-04-08 21:03:58 +02:00
YuSanka
8ab7956c26 Search: Added shortkey Ctrl+F on Plater 2020-04-08 09:47:33 +02:00
Lukas Matena
a380053a17 Merge branch 'lm_gizmos' into lm_fdm_supports_gizmo 2020-04-07 17:16:48 +02:00
Lukas Matena
1d65ce760b Removed obsolete code 
Got rid of dummy header GLGizmos.hpp
 2020-04-07 16:47:39 +02:00
YuSanka
5ca6b9f8d0 Implemented SearchCtrl class instead of SearchComboBox 
Search string are synchronized between Plater and Tabs.

List with options and filtered list are in Sidebar.
All options list on tabs and Plater use this data from Sidebar

Note: SearchComboBox.cpp(hpp) was renamed to Search.cpp(hpp)
 2020-04-03 10:27:50 +02:00
YuSanka
5f31d9ed41 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-01 20:23:34 +02:00
YuSanka
67c55c7490 Added code for deactivating of search toolbar item 
+ invalidated its unused callbacks.

 + ImGui::Selectable function is copied to InGuiWrapper.cpp and a little beat modified to change a label text, when item is hovered
 2020-04-01 15:28:07 +02:00
enricoturri1966
f598c2d5d8 Fixed conflicts after merge with master 2020-04-01 15:06:30 +02:00
enricoturri1966
daa6dd0a25 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-31 18:05:12 +02:00
enricoturri1966
e886475fe7 Fixed build when tech ENABLE_NON_STATIC_CANVAS_MANAGER is disabled 2020-03-31 18:04:49 +02:00
Enrico Turri
081a24abf3 Follow-up of 095062e371 -> 3DConnexion settings dialog (Ctrl+M) shown only on Linux (not Mac) 2020-03-31 15:30:24 +02:00
Enrico Turri
095062e371 3DConnexion settings dialog (Ctrl+M) shown only on Mac 2020-03-31 14:16:53 +02:00
YuSanka
abad9133eb Added new icon for "collapse sidebar" 
+ The tooltip for a "Collapse" button is updated according to the collapse state
 2020-03-30 11:53:58 +02:00
YuSanka
ab02d344e4 Activated "collapsed sidebar" button 2020-03-29 20:52:14 +02:00
YuSanka
d317f0753a Merge remote-tracking branch 'origin/master' into ys_search 2020-03-29 20:21:00 +02:00
YuSanka
14703fe561 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
Lukas Matena
0054134ff8 Fix of #3916 (macOS crash when generating WarningTexture) 
Likely the same cause as #3371, hopefully the same solution as presented in 4f1f507
 2020-03-25 23:55:25 +01:00
bubnikv
750e704b37 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
dd34aef643 Follow-up of bfbcd45209 -> completed fix 2020-03-25 15:30:25 +01:00
enricoturri1966
bfbcd45209 Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966
a54d77699b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966
f12b39be25 Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
bubnikv
c27297f6cc 64bit coord_t 
Vec3i as a vertex index to TriangleMesh constructor
 2020-03-25 14:35:41 +01:00
enricoturri1966
10eb954c7e ENABLE_AUTO_CONSTRAINED_CAMERA set as default 2020-03-25 10:24:52 +01:00
enricoturri1966
3d6c9e54e9 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
enricoturri1966
fac28ea27a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966
df8def7545 Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled 2020-03-25 09:22:37 +01:00
enricoturri1966
6f1c99db34 ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:43:18 +01:00
enricoturri1966
36041ced26 ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:31:15 +01:00
Lukas Matena
97b9de47b4 Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
enricoturri1966
c6d5ad1517 Refactoring of toolbars' tooltip generation 2020-03-24 12:26:30 +01:00
enricoturri1966
c480041487 Close undo/redo windows when an item in the list is selected 2020-03-23 16:00:56 +01:00
enricoturri1966
b8c4369c4f ImGui upgraded to version 1.75 + fixes required by upgrade 2020-03-23 12:41:16 +01:00
enricoturri1966
5b24a0fb91 Fixed conflicts after merge with master 2020-03-20 10:55:37 +01:00
enricoturri1966
cd5154b8e1 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
Lukas Matena
7afe7326b6 WIP: Duplicated the SLA gizmo for the FDM, removed what was not needed 
Clipping plane and the m_model_object pointer keeping was duplicated
 2020-03-19 11:15:17 +01:00
bubnikv
a901b17d33 Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:28:54 +01:00
bubnikv
79951630ec Hiding the tooltip when the window gets deactivated and reactivated. 2020-03-18 14:28:43 +01:00
enricoturri1966
9da16aeaa9 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00