Commit Graph

294 Commits

Author SHA1 Message Date
YuSanka
033af199a3 Implemented palettes for mode markers 2022-12-20 15:50:13 +01:00
David Kocik
b9b4edb129 Upload changes
PrusaLink: Use PUT or POST based on information read during test connection (upload-by-put). If put - do additional GET for storage_list and let user to choose where to upload or show name if only 1 is possible. Allow PrusaLink for MK2.5 and MK2.5S.
PrusaConnect: New host type PrusaConnect inherited from PrusaLink class with filled host address, disabled http diggest. After upload read header information - status message and pass it to notification and Printhost upload dialog via events, this message can be shown as warning notification and is recieved in localized lang. Pass accept-language shortcut in upload header. 3 option to upload. (upload, to queue, to print)
Upload Notification: Showing status text, changes in text, not showing close button, Completed state on special call (not 100%) and other design changes.
Right panel: Open URL button.
2022-12-19 14:17:48 +01:00
YuSanka
4da322d527 CutGizmo: Some beautification/reorganization 2022-12-16 10:57:36 +01:00
YuSanka
7edc2acfc0 Cut: Connectors mode: Implemented forward/downward view to the cut plane
+ updated cut ikons
2022-12-09 11:15:48 +01:00
Filip Sykala - NTB T15p
c77f8373bd Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Selection.hpp
2022-11-07 15:44:33 +01:00
enricoturri1966
2c9d047520 Fixed conflicts after merge with master 2022-10-31 14:59:41 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
enricoturri1966
b821f1a33e New icon for Measure Gizmo 2022-10-12 09:10:51 +02:00
Lukas Matena
bd63320a00 Measuring: separated another gizmo 2022-10-12 09:10:50 +02:00
YuSanka
0201a5055a Cut WIP:
* Suppress to split cut objects
* ObjectList:
  * Use another icons to mark the cut objects and connectors 
  * For the cut object show parts, which are not connectors
* Set different colors for the Plugs and Dowels
* CutGizmo:
  * Invalidate CutGizmo after changes in ObjectList or perform a cut
  * CupPlane in Connectors mode: Unselect selection, when click on empty space
  * Connectors mode: Fixed performance issue
2022-09-27 16:17:09 +02:00
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
2022-09-14 11:28:36 +02:00
YuSanka
484eae7a1c Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-08 13:32:14 +02:00
YuSanka
130f0dff84 Follow-up 3b1f1d9444 - added missed icon 2022-09-05 11:32:41 +02:00
YuSanka
2ac3861b2a Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-08-08 10:57:38 +02:00
YuSanka
27f7a8da0f Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog
+ Added processing for the Ctrl+A ("Select All connectors")
2022-07-27 13:53:54 +02:00
Filip Sykala - NTB T15p
79a7f588b9 Merge branch 'et_world_coordinates' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Selection.cpp
#	src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
YuSanka
8da37f568d Updated splashscreen for GCodePreview 2022-06-22 17:18:23 +02:00
YuSanka
2688a29b08 SplashScreen: New image
+ PressureEqualizer" fixed warning
2022-06-17 17:14:14 +02:00
Filip Sykala
36bc4b2cd6 Emboss icons version 3 2022-04-26 22:33:14 +02:00
Filip Sykala
a1d7040902 WIP: cut surface of model
update emboss icons to not be soo huge - pixel preccisse
2022-04-26 17:43:38 +02:00
Filip Sykala
ec2a562d2a clean up svg icons 2022-04-14 09:59:22 +02:00
Filip Sykala
af663a81e1 new icons 2022-04-14 08:51:39 +02:00
YuSanka
e785a66a01 Cut: Added possibility to delete a selected connector
+ Save connector position in object's local coordinates
+ Added missed cut_.svg
2022-03-17 17:41:36 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +01:00
enricoturri1966
f4726f738c Follow-up of 005fef7bf6 - Fixed highlight arrows for gizmos bar and toolbars 2022-03-07 15:06:45 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
enricoturri1966
92aa6540f5 Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity 2022-02-08 12:57:56 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
Lukas Matena
5c616c5931 Sync to 2.4.1-beta1 2022-02-01 14:16:13 +01:00
Lukas Matena
ebb9041041 Merge branch 'master' into stable - no conflicts fixed 2022-02-01 14:15:18 +01:00
Filip Sykala
c2608ce2fa Improove icons 2022-01-21 20:49:42 +01:00
Filip Sykala
770a5c5501 Redesign GUI of emboss 2022-01-20 16:09:48 +01:00
enricoturri1966
b45d56b5b8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-12-08 08:15:51 +01:00
Filip Sykala
581aab2dd7 Merge branch 'master' into fs_emboss 2021-12-03 11:53:18 +01:00
YuSanka
71a9ded1c0 ObjectList: Fixed update of the icons for InfoItems, when color mode was changed
Sidebar:ObjectInfo: Fixed update of the icon, when color mode was changed
+ Added new icons for "Sinking" and "ShapeGallery"
2021-12-02 16:11:52 +01:00
enricoturri1966
8bc442cd32 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - 2nd click on edit button exits editing state in slider 2021-11-29 11:46:28 +01:00
enricoturri1966
7861554645 New icons for legend toolbar 2021-11-23 10:59:52 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
2021-11-23 09:09:09 +01:00
enricoturri1966
b9c99ab27b New icon for legend toolbar 2021-11-23 08:32:55 +01:00
enricoturri1966
6d89b22a5a Tech ENABLE_LEGEND_TOOLBAR_ICONS - New icons for legend toolbar 2021-11-15 08:45:13 +01:00
enricoturri1966
a08f8305b3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-11-12 14:04:52 +01:00
enricoturri1966
a326c5b320 Tech ENABLE_LEGEND_TOOLBAR_ICONS - Toolbar items in legend using svn icons 2021-11-12 14:04:37 +01:00
YuSanka
8ef03718d0 Linux specific: Using a pop-up menu on the "cog" wheel for changing of an extruder color.(related to #6759)
+ some code refactoring
+ change a little bit gray color in colorchange_del icons to avoid collision in Dark mode
2021-11-12 14:02:18 +01:00
YuSanka
e8be7b2ecd Implemented possibility to show resin colors from the Plater (Bottles with resin are colored now in preset combobox)
+ Added nsvgParseFromFileWithReplace() to replace some colors before parsing from SVG file
+ Thumbnails are saved with selected resin color in SL1 or SL1S files
+ "white" folder is deleted from "icons" now. THere is no needed anymore.
2021-11-09 17:01:50 +01:00
enricoturri1966
869276aedb Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Changed background color of additional button and its icon 2021-11-08 13:43:53 +01:00
enricoturri1966
9752fb5810 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Additional button, added to imgui float slider, using svg icon 2021-11-08 08:29:19 +01:00
YuSanka
176df52f64 ObjectList: Added different icons for text volumes 2021-10-21 13:51:56 +02:00
YuSanka
68fd37b300 Added SVG-file for G-CodeViewer logo 2021-10-07 11:53:19 +02:00
YuSanka
1b828ca7f5 Deleted unused PNG-files. Added mirroring_transparent.svg (thanks for @AkiraNorthstar) 2021-10-07 10:14:55 +02:00