GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-29 09:37:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,424 Commits 131 Branches 318 Tags
Commit Graph

1113 Commits

Author SHA1 Message Date
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
YuSanka
07411e795c Search: Implemented SearchDialog. 
Search window on Plater: set flag SelectAll for search line
 2020-04-22 15:46:23 +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
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
cd13356b6d Code cleaning 2020-04-07 16:22:03 +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
enricoturri1966
ab1e90ec0d Fixed conflicts after merge with master 2020-04-02 12:29:30 +02:00
YuSanka
5f31d9ed41 Merge remote-tracking branch 'origin/master' into ys_search 2020-04-01 20:23:34 +02:00
tamasmeszaros
4945a0dc0e Follow-up fix for big bed arrangement 2020-04-01 12:34:50 +02:00
bubnikv
3a1bb2fece fixed missing include 2020-04-01 10:30:33 +02:00
bubnikv
22c671e593 Fixing OSX and Linux builds 2020-04-01 10:09:31 +02:00
enricoturri1966
8a03d5642d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-04-01 09:58:48 +02:00
enricoturri1966
1f3046f65d #3964 - Attempt to fix crash when closing on Linux (Debian unstable) 2020-04-01 09:58:31 +02:00
bubnikv
b843a094f6 Slic3r::format(), Slic3r::GUI::format_wxstr(): 
wrappers around boost::format using C++17 variadic templates,
replacing the ugly and verbose
	(boost::format("template") % arg1 % arg2).str()
syntax.
The wrappers also implictely convert input parameters including the template
from wxString to UTF8.

The new format wrapper has been applied at multiple places as a start,
also some double macros _(L()) with new single macro _L().
 2020-04-01 09:49:04 +02:00
tamasmeszaros
70baa0d246 Fix arrange for large beds 2020-03-30 13:26:24 +02:00
enricoturri1966
29cbfa7c9e Fixed conflicts after merge with master 2020-03-30 09:36:37 +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
7236abe473 Merge remote-tracking branch 'origin/ys_collapse_sidebar' into ys_search 2020-03-28 22:07:56 +01:00
YuSanka
14703fe561 Implemented Search on Plater, usint imGui 2020-03-28 19:39:24 +01:00
bubnikv
750e704b37 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
enricoturri1966
f12b39be25 Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
enricoturri1966
a1a4d49f15 Fixed conflicts after merge with master 2020-03-25 12:07:59 +01:00
YuSanka
45d064d4cb Merge remote-tracking branch 'origin/master' into ys_search 2020-03-25 11:20:34 +01:00
YuSanka
de06c5d659 Merge remote-tracking branch 'origin/ys_fix_cb_selection' 2020-03-25 11:12:37 +01:00
enricoturri1966
3d6c9e54e9 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
Lukas Matena
97b9de47b4 Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
YuSanka
5215b2ecb2 Fix of #3889 2020-03-23 22:47:35 +01:00
YuSanka
ebfaf7abb0 Removed SearchCombobox from the Sidebar. 
Tab->SearchCombobox works with all parameters now.
Overridden GetWindow() for PointCtrl.
 2020-03-23 10:28:28 +01:00
YuSanka
a46a225cf1 Merge remote-tracking branch 'origin/master' into ys_search 2020-03-20 14:56:05 +01:00
YuSanka
ec381c5854 Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed 2020-03-20 13:45:37 +01:00
YuSanka
e188893c28 Start to implement "Search through options" 2020-03-20 10:30:55 +01:00
enricoturri1966
2ab8a474c2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-17 07:59:10 +01:00
bubnikv
6bace46be1 Revert "#3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview" 
It is too late before 2.2.0-final.

This reverts commit 350a85cf433c7409f813d6b1cdec614af3fef950.
 2020-03-16 14:25:05 +01:00
enricoturri1966
505181ddfd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader 2020-03-16 14:19:30 +01:00
enricoturri1966
19d93b3b01 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966
350a85cf43 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00
YuSanka
ea0cb4d761 Sidebar can be hidden/shown from menu "View/Collapse sidebar" 2020-03-16 12:51:55 +01:00
bubnikv
c1e92a5759 Fix of 
"Print settings reloaded with 0.05 layer and fill percentage changed
after click on modified profile #3755"

Combo box callback was not removing the "(modified)" suffix.
 2020-03-16 09:57:20 +01:00
enricoturri1966
ac4d9ea172 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
bubnikv
dc1ffe15a8 Revert "Added "Filament spool weight" option to filament options" 
This reverts commit 3d3e36ba8d22d3654fb6adb451dae9f0eb6cf818.

The change is too risky just before the PrusaSlicer 2.2.0 final release
and the feature may need a bit of polishing before release.
 2020-03-14 09:49:12 +01:00
Lukas Matena
c731f04331 Follow-up of previous commit - check that gizmos are enabled 
To be on the safe side, reinstate one part of
the check that the previous code did.
 2020-03-14 09:46:48 +01:00
Lukas Matena
ac103f334c Actual fix of the rare crash recently mentioned in e547a0c 
The problem was in fact elsewhere. After an object is added, it is necessary to
update the gizmos. GLGizmoManager::update_data needs to be called, but regardless
of whether any gizmo is currently opened (which is what is_running returns).

To reproduce the crash that this fixes: add an object, delete it, add another one,
open SLA gizmo -> crash
 2020-03-14 09:18:49 +01:00
bubnikv
b97a12da98 Documented the previous merge. 2020-03-14 07:14:45 +01:00
bubnikv
c8b177966d Merge remote-tracking branch 'remotes/origin/ys_improvements' 2020-03-13 16:01:30 +01:00