Commit Graph

89 Commits

Author SHA1 Message Date
Lukas Matena
edcaab8b0a Includes cleanup:
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
enricoturri1966
af9b363e41 ENABLE_CANVAS_TOOLTIP_USING_IMGUI set as default 2020-05-15 13:40:45 +02:00
enricoturri1966
c36271de2d Fixed toolbar items reacting when disabled 2020-05-13 12:30:09 +02:00
YuSanka
41a696032e Auto scale of the toolbars in respect to the canvas size 2020-05-12 23:07:35 +02:00
YuSanka
14357d0f56 Merge remote-tracking branch 'origin/ys_layouts' 2020-05-06 14:44:30 +02:00
enricoturri1966
8bba1d96dc Tech ENABLE_NON_STATIC_CANVAS_MANAGER set as default 2020-05-06 12:19:34 +02:00
YuSanka
3e3698ebae 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
YuSanka
51fd24168d 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
enricoturri1966
2fe5dbc5bb Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966
78a0893d6a Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
enricoturri1966
c5ed253b1b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966
92a815b06f ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:52:57 +01:00
Lukas Matena
ac501bdf8b Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
enricoturri1966
c8bffb7f2a Refactoring of toolbars' tooltip generation 2020-03-24 12:26:30 +01:00
bubnikv
2ba86fcc2b Fixing spurious deselection of objects when switching from 3d path
preview to plater using the bottom tool bar & left mouse click.
This is result of the recent commits refactoring the mouse focus
over toolbars handling. 739d8131ab
2020-03-19 12:39:25 +01:00
enricoturri1966
cf53ca27cb Modified mouse events handling for toolbar
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
Lukas Matena
35b59a3e13 Include cleanup in Plater, GLCanvas3D and GLGizmosManager 2020-03-03 15:53:26 +01:00
Enrico Turri
f61f6a98a5 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
Enrico Turri
184c4b96e7 ENABLE_MODIFIED_TOOLBAR_TEXTURES set as default 2020-02-13 09:50:06 +01:00
Enrico Turri
0dd7bc26d7 3Dconnexion devices translation linearly dependent on zoom 2020-01-16 10:17:07 +01:00
Enrico Turri
55549220eb Fixed artifacts on toolbar and gizmobar icons showing up when changing screen or toolbar scale factors 2020-01-07 12:40:03 +01:00
Enrico Turri
918e73fb50 Follow-up of c370bb7141 -> Do not force even size of toolbars icon textures 2019-12-05 14:43:18 +01:00
Enrico Turri
a76b7e0a97 Forces even size and disable compression for toolbar icon texture to try to solve artifacts on OsX Catalina 2019-12-05 12:22:24 +01:00
YuSanka
857c71582f 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
Lukas Matena
5b5f0b925a Fixed many warnings in following files:
src/slic3r/Config/Snapshot.cpp
src/slic3r/GUI/Field.cpp
src/slic3r/GUI/GLToolbar.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectList.hpp
src/slic3r/GUI/Plater.cpp
src/slic3r/GUI/Plater.hpp
src/slic3r/GUI/PresetBundle.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/wxExtensions.cpp
2019-09-10 12:08:43 +02:00
Enrico Turri
f61fe06794 Removed a bunch of compile warnings 2019-09-04 09:47:00 +02:00
Enrico Turri
9f742ddaa3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 08:21:40 +02:00
enricoturri1966
10212a1042 Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
enricoturri1966
3924f14452 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
Enrico Turri
53dc2efea5 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
Enrico Turri
d7a4560100 Refactoring in GLTexture 2019-07-19 11:18:19 +02:00
bubnikv
e8e35579dd Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Enrico Turri
2f43e228f3 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri
cbf50ccdca Follow-up of 4c6c608342 -> refactoring 2019-07-12 09:26:19 +02:00
Enrico Turri
9c184f5112 GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
747900c308 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
Enrico Turri
0b5725b5cb Disable remaining toolbar items when one of them is toggable and pressed 2019-07-10 11:59:25 +02:00
Enrico Turri
1c68eb1fa3 Modified toolbar to call RenderCallback only when the item is toggable and pressed 2019-07-10 10:52:12 +02:00
YuSanka
0af1af0ae2 Next improvements of an undo/redo from a toolbar 2019-07-09 19:39:36 +02:00
YuSanka
8cfe03033f Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
Enrico Turri
e9909eb95e Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
Enrico Turri
9d732e318d Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
Enrico Turri
0af66cfe82 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
Enrico Turri
eff108c58b More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
Enrico Turri
9877945e2a Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00
Enrico Turri
4ab6ee114c Texture compression set as an option 2019-05-28 12:53:16 +02:00
YuSanka
32cbe5c7b1 Implemented a possibility to set a custom toolbars icon size (related to #2247 and same others) 2019-05-22 13:51:02 +02:00
Enrico Turri
61ef36805f Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
0f657b772b Camera refactoring
1) All camera related OpenGL calls moved into class

2) The Camera class now stores the view matrix, the projection matrix and the viewport

3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport

4) All the code operating on the camera or requiring camera data has been modified to use the new methods
2019-04-01 10:00:10 +02:00
Enrico Turri
910605864a Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00