127 Commits

Author SHA1 Message Date
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
Lukas Matena
5bf04d7964 Merge branch 'master_250' 2022-09-07 15:19:21 +02:00
YuSanka
f00a750362 Localization: Next phrases improvements 2022-09-05 15:46:07 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	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/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
2022-08-31 15:22:10 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
Lukas Matena
620b89d1c6 Add STEP into menu label, enable drag and drop 2022-08-11 16:49:13 +02:00
YuSanka
066b567714 Using of wxWidgets 3.1.6 WIP:
* Create Cache of wxBitmapBundles instead of wxBitmaps
* Use wxBitmapBundles instead of wxBitmap for most of Widgets
* Use empty bitmabundles instead of wxNullBitmap for wxBitmapComboBoxes.
* Updated wxWidgets.cmake
* OSX specific: Discard BitmapComboBox overrides
+ some code cleaning
2022-07-29 11:21:54 +02:00
YuSanka
e21921f2eb Fixes to support wxWidgets 3.1.6(7), 3.2.0
+Updated URL and URL HASH for wxWidgets v3.2.0-patched
2022-07-29 11:21:54 +02:00
enricoturri1966
f45711e7e5 Removed tech ENABLE_RENDER_PICKING_PASS 2022-06-15 14:29:29 +02: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
Filip Sykala
b5a075ce4a Merge branch 'master' into fs_emboss 2021-10-26 18:58:38 +02:00
enricoturri1966
fe6b288743 Fixed conflicts after merge with master 2021-10-25 12:44:59 +02:00
Vojtech Bubnik
9651ff19ef Fix of [prusa3d/PrusaSlicer] Typo in Keyboard Shortcuts (Issue #7161) 2021-10-24 11:12:15 +02:00
Filip Sykala
6c8f754186 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/slic3r/GUI/3DScene.cpp
2021-10-19 13:40:19 +02:00
enricoturri1966
0d922b04af Tech ENABLE_PREVIEW_LAYOUT - Added menu item View/Show legend 2021-10-14 11:30:27 +02:00
YuSanka
68fd37b300 Added SVG-file for G-CodeViewer logo 2021-10-07 11:53:19 +02:00
Filip Sykala
7f5c6b0513 Fix copy of text
Fix store/load of volume type
Fix grayed out of Menu item
Change short curt from q to t
2021-09-17 14:04:50 +02:00
Lukas Matena
2be10569e2 Add painting gizmos shortcuts into keyboard shortcuts dialog 2021-08-12 13:38:53 +02:00
enricoturri1966
7817105abe Tech ENABLE_GCODE_WINDOW set as default 2021-07-22 09:37:02 +02:00
Oleksandra Yushchenko
4652733201
MSW specific: Implementation of the own notebook control
* MSW specific: First implementation of the Notebook control to support Dark/Light color modes

* MSW specific: Set mode sizer to the Notebook control.

* MSW specific: Added icons to the Notepad control
 + There is no need to restart application after the changing of the color mode

* Fixed non-MSW build

* Updated color for SavePresetDialog
+ Added wrapper to wxMessageBox for mom-MSW platforms
2021-06-29 16:23:45 +02:00
Oleksandra Yushchenko
fd071421cb
DarkMode for MSW (#6632)
* MSW specific: Dark Mode: First implementation

* Use menu instead of NoteBook

* Implemented MessageDialog
+ Fixed DarkMode for all dialogs and ColorPicker

* MSW DarkMode: Added missed updates for the switching between modes

* MSW DarkMode: Updated all existed context menus after switching of the mode
+ Added markers for the menu item witch is related to the selected tab

* Used wxFrame instead of wxDialog for SettingsDialog
(this change allow us to use menu bar in SettingsDialog)

+ fix for #6548 - Prusa Slicer 2.3.1 not activating non-modal settings window if settings window is minimized

* Implemented "Always use Dark mode colors" preference option

* Fixes for non_MSW build

* Next fixes for non-MSW builds

* Preferences: Fixed selection of the Settings Layout for non-MSW platforms
+ Updated DarkMode for colorpickers

* Windows DarkMode next fixes

* MSWDarkMode: Suppress to use system color to the PrusaSlicer
Select "Preferences -> Use Dark color mode (experimental)" to allow dark mode for the application

* Fixed MSW build

* MSWDarkMode: Upadteed color mode for ExtruderSequenceDialog and for dialogs related to the DoubleSlider

* Implemented Auto recreation of the PrusaSlicer when color mode is changed.

* Preferences: Added option "Set settings tabs as menu items (experimental)"
2021-06-18 19:46:04 +02:00
YuSanka
82da1f8fc1 Code cleaning: Delete workaround code 2021-05-12 11:43:36 +02:00
Oleksandra Yushchenko
ab886e037b
Implementation for #6216
* Implementation for #6216 - Make number keys select extruder when object treeview has focus
+ deleted unused extruder_selection()
+ Fixed notification after splitting of the solid object

* Follow up 85a10268b9 - OSX implementation
+ Added shortcuts description to the "Keyboard Shortcuts" dialog

* Workaround to use "+/-" and numbers shortcuts on Linux
+ Fixed build on Linux

* OSX specific: fixed a work of keyboard accelerators from numbers on NumPad keyboard

* KBShortcutsDialog: fixed shortcuts for "Preferences" and "Show/Hide 3Dconnexion devices settings dialog, if enabled" under osx
and "Set Printable/Unprintable" and "Set extruder" under Linux
 + OSX specific: Added minimize of the application on "Cmd+M"

* Hot-fix for 6efeb9d6b4

* Removed Linux specific workaround
2021-05-11 11:02:12 +02:00
enricoturri1966
da7d7ae11b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_window 2021-03-03 09:07:28 +01:00
enricoturri1966
2c8f385c7f 1st installment of g-code window in preview 2021-03-02 10:01:06 +01:00
enricoturri1966
a3b60c09bc Tech ENABLE_CTRL_M_ON_WINDOWS set as default 2021-02-25 15:22:12 +01:00
enricoturri1966
7c3e3272aa Tech ENABLE_ARROW_KEYS_WITH_SLIDERS set as default 2021-02-17 17:21:06 +01:00
Vojtech Bubnik
0884f4fbf5 Slight rewording of the keyboard shortcuts dialog. 2020-12-12 09:11:10 +01:00
enricoturri1966
5470af3938 Fixes and tweaks in keyboard shortcuts dialog 2020-12-09 14:03:30 +01:00
Vojtěch Bubník
d4c949dab6
Merge pull request #4734 from wavexx/fix_new_instance_shortcut
Use Ctrl+Shift+I to open a new instance instead of Ctrl+I
2020-12-07 11:28:03 +01:00
enricoturri1966
10be5d1361 Replace F5 with Ctrl+Shift+R as shortcut key for reload from disk commands on MAC 2020-12-07 08:39:43 +01:00
YuSanka
e610d2d2f6 Localization: Fixed some phrases. Updated POT and NL dictionary. 2020-12-04 13:08:48 +01:00
enricoturri1966
430648471a Follow-up of 6ae1a1061491eb73ec4637a45b63c61c24d8aa4c - Fixed typo 2020-12-01 10:17:35 +01:00
enricoturri1966
6ae1a10614 #5333 - Reworked navigation of preview's sliders using the keyboard 2020-12-01 08:33:06 +01:00
YuSanka
7f22ce63f6 Refactoring:
1. Use C++ style cast instead of C style
2. Deleted unused code from Search
2020-11-26 14:34:54 +01:00
enricoturri1966
10fb75edf0 Enabled tech ENABLE_CTRL_M_ON_WINDOWS -> Added customizable support for legacy CTRL+M settings dialog on Windows in preference dialog 2020-11-26 11:00:24 +01:00
enricoturri1966
87e1875822 ENABLE_GCODE_VIEWER set as default in:
SysInfoDialog.cpp

Selection hpp/cpp

Preferences.cpp

GUI_Utils.hpp

KBShortcutsDialog.cpp
2020-11-18 13:04:34 +01:00
YuSanka
1492bc9cd5 Localization : Next phrases corrections and update for PrusaSlicer.pot 2020-11-06 12:14:19 +01:00
YuSanka
ed2f03ec79 Localization:
Some phrases are corrected in the code
The POT-file is updated
2020-11-05 22:17:49 +01:00
YuSanka
f0a339758b Fixed a Dialog position under OSX
Always set parent for the Dialog, if we want to see the Dialog in the same display as a parent.
Dialog will be shown in the primary monitor otherwise.

+ fixed a draw of the canvas legend when we move application between Retina and non-Retina displays
2020-11-05 11:53:16 -08:00
enricoturri1966
30481e1ea8 Tech ENABLE_CTRL_M_ON_WINDOWS [Experimental] to re-enable imgui dialog for settings of 3DConnexion devices (CTRL+M) on Windows 2020-11-03 08:41:04 +01:00
enricoturri1966
a830b7ea83 Setting dialog for 3DConnexion device (CTRL+M) enabled on MAC 2020-10-26 11:35:53 +01:00
enricoturri1966
844ec8447d ENABLE_PAN_ROTATE_SCENE_IN_GIZMOS set as default 2020-10-22 11:01:30 +02:00
enricoturri1966
0e04c84879 Follow-up of 68a7e5ce41217a123758996bc145350339922473 -> Updated keyboard shortcuts dialog 2020-10-22 10:08:16 +02:00
enricoturri1966
a5961ef981 New icons for standalone gcode viewer 2020-10-21 13:49:39 +02:00
Yuri D'Elia
1fd54938ef Use Ctrl+Shift+I to open a new instance instead of Ctrl+I
"Open new instance" overrider the "import" shortcut.

Use Ctrl+Shift+I for new instance, which is definitely less important
than importing new models.

Also document the shortcut in the Keyboard shortcuts dialog.

Fixes #4711
2020-10-14 20:51:21 +02:00
enricoturri1966
e3e74f4ae0 #4864 - Fixed collapse sidebar using Shift+Tab 2020-10-13 11:31:12 +02:00
Yuri D'Elia
a875b4f1c0 Document Shift+Tab in menus and shortcuts dialog 2020-10-12 09:16:08 +02:00
Yuri D'Elia
0bcfa06b09 Document "Tab" in the keyboard shortcuts dialog 2020-10-12 09:16:08 +02:00
enricoturri1966
0f44caa99c ENABLE_SLOPE_RENDERING set as default
Slope rendering active only when using Gizmo FDM supports
2020-10-02 15:43:39 +02:00