Enrico Turri
85b6784dcb
Merge with master
2018-05-22 15:03:40 +02:00
Vojtech Kral
360b34944d
ErrorDialog: Fix size and message encoding
2018-05-22 14:33:37 +02:00
bubnikv
306d77559e
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +02:00
bubnikv
e8247c5646
When loading a config bundle, make sure a config value is not accepted
...
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
2018-05-22 14:17:27 +02:00
Enrico Turri
ae394ca97d
Fixed remember output directory default value set to true
2018-05-22 13:57:28 +02:00
Enrico Turri
451c58d58f
3DScene's enable_picking variable moved to c++
2018-05-22 09:02:42 +02:00
Enrico Turri
59af3fb866
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
bubnikv
b694f1ac89
One day I will fix it!
2018-05-21 23:40:17 +02:00
bubnikv
512b6dfd88
Yet another fix of the previous commit.
2018-05-21 23:24:18 +02:00
bubnikv
6b4fe7975f
Fix of the previous commit: When asking the operating system to open
...
the datadir using the platform specific file explorer, enquote
and escape the path.
2018-05-21 22:10:38 +02:00
bubnikv
7b4aeef40c
Moved the "Flash firmware" menu to "Configuration",
...
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
Vojtech Kral
ee5a5df2a7
Serial port friendly name on Linux
2018-05-21 18:59:13 +02:00
bubnikv
3307dbc0fb
Another fix for linux & osx
2018-05-21 18:58:22 +02:00
bubnikv
1e8a0b69b2
Yet another fix for OSX
2018-05-21 18:58:22 +02:00
bubnikv
0a328789ef
Fixed compilation on Linux.
2018-05-21 18:58:22 +02:00
bubnikv
8917f18ef1
Fix of previous commit, fix of compilation on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
d4e939fd04
Serial port fix, get description for serial ports on OSX.
2018-05-21 18:58:22 +02:00
bubnikv
33f21422e6
Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog
2018-05-21 18:58:22 +02:00
Vojtech Kral
7f8265e2be
FirmwareDialog: Fix log clearing
2018-05-21 18:58:22 +02:00
Vojtech Kral
a43e72f696
Firmware updater: rework cancelling
2018-05-21 18:58:22 +02:00
Vojtech Kral
4723a99b15
FirmwareDialog: Fix dialog sizing
2018-05-21 18:58:22 +02:00
Vojtech Kral
e1930d57f3
Firmware updater: Disable dictionary flashing menu entry for the time being
2018-05-21 18:58:22 +02:00
Vojtech Kral
fd00ea0ca7
Firmware updater: Add cancelation
2018-05-21 18:58:22 +02:00
Vojtech Kral
98ae20c3df
Firmware updater: Perform work in a background thread
2018-05-21 18:58:22 +02:00
Vojtech Kral
a54672fb54
Firmware updater: Make the GUI less scary
2018-05-21 18:58:22 +02:00
Vojtech Kral
c5f1acfbfb
FirmwareUpdater: Disable dialog close while flashing
2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097
Firmware updater GUI
2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5
avrdude: Compilation on Windows/MSVC
2018-05-21 18:58:22 +02:00
Vojtech Kral
11a00b025f
avrdude integration basics (WIP)
2018-05-21 18:58:20 +02:00
Enrico Turri
ae53c7cb2e
Volumes rendering moved to c++
2018-05-21 15:57:03 +02:00
Enrico Turri
0f035d0bae
Background rendering moved to c++
2018-05-21 15:24:52 +02:00
Enrico Turri
bf7b9eb3e7
Legend texture moved to c++
2018-05-21 14:57:43 +02:00
Enrico Turri
3fdc5e20a7
Warning texture moved to c++
2018-05-21 14:40:09 +02:00
YuSanka
c4478ccffa
Fixed wrong updating of the options group tree
2018-05-21 14:36:09 +02:00
Enrico Turri
7cff6ef6db
Shaders loaded from files
2018-05-21 13:08:02 +02:00
Enrico Turri
3fb96ff636
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 13:06:16 +02:00
Enrico Turri
308a0b5709
Remember output directory default value set to true
2018-05-21 11:50:48 +02:00
Enrico Turri
3291cbfdad
Fix of #889
2018-05-21 11:19:03 +02:00
Enrico Turri
01b6bc1dc8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-21 08:38:05 +02:00
Enrico Turri
05dcda8ef7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-21 08:37:53 +02:00
YuSanka
deabeaaa7f
Aligned frequently changing parameters according to presets settings on the Plater tab.
...
Fixed missing adding of the Filaments preset settings(for multy material case) to the right_panel
2018-05-20 23:58:09 +02:00
Vojtech Kral
fd43e53aeb
PresetUpdater: Add some more logging
2018-05-18 14:59:24 +02:00
Enrico Turri
a7fc57a176
3DScene reset_object method moved to c++
2018-05-18 14:08:59 +02:00
Enrico Turri
5fc8fdee11
3DScene axes moved to c++
2018-05-18 13:02:47 +02:00
Enrico Turri
1e0a8de5b1
3DScene cutting plane moved to c++
2018-05-18 11:05:48 +02:00
Enrico Turri
0584990b65
Fixed z layers indices under 3D preview sliders
2018-05-18 10:14:47 +02:00
Enrico Turri
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae
Fixed a typo in AppConfig
2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 08:32:19 +02:00