Commit Graph

1705 Commits

Author SHA1 Message Date
bubnikv
5f28b89ae0 Added a project specific config to the PresetBundle class.
This project specific config will be stored into the config.ini,
into .3mf and .amf and .gcode,
and recover it from the same files.
2018-03-14 11:54:11 +01:00
Vojtech Kral
bd61c233a5 CMake target to generate the main pot file (#786) 2018-03-12 20:38:47 +01:00
Vojtech Kral
58788ef43a MSVC: Fix run and debug project settings (#771)
* MSVC: Fix run and debug project settings

* MSVC: Fix CMake infinite loop
2018-03-12 09:39:32 +01:00
bubnikv
f0fde26295 Implemented inheritance of profiles inside a config bundle.
Updated the Prusa's presets to match the initial flat config bundle.
2018-03-07 16:48:28 +01:00
bubnikv
4a90ab1f6a Merge branch 'octoprint' 2018-03-06 11:39:44 +01:00
bubnikv
e26ccfc247 Fixed compilation on Windows,
removed debugging menu and debugging output.
2018-03-06 11:39:24 +01:00
bubnikv
51da42734a Merge remote-tracking branch 'origin/http+build' 2018-03-06 10:15:17 +01:00
Vojtech Kral
ca0f6131a1 WIP: Bonjour: TXT + improvements 2018-03-05 18:33:15 +01:00
Vojtech Kral
fc05eb898d WIP: Bonjour 2018-03-05 18:33:15 +01:00
Vojtech Kral
7cfc5204c8 WIP: OctoPrint 2018-03-05 18:33:15 +01:00
Vojtech Kral
79ee7c9a36 Fix #608 Credit: Dylan "smellyfis" Thies 2018-03-05 18:32:09 +01:00
bubnikv
b897209e0d Removed -DCURL_STATIC on OSX,
added dynamic linking of OpenSSL on Linux, even if libcurl is linked
statically.
2018-03-05 18:02:47 +01:00
Vojtech Kral
751e86cd4d libcurl linking and cmake usage improvements 2018-03-05 16:31:24 +01:00
Vojtech Kral
14929e9d15 Http client via libcurl 2018-03-05 15:52:17 +01:00
bubnikv
3c64eb9215 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-03-05 15:31:32 +01:00
bubnikv
5ea584280c Merge remote-tracking branch 'remotes/origin/gui_improvements' 2018-03-05 12:12:40 +01:00
bubnikv
91b5853aa3 Merge remote-tracking branch 'remotes/origin/gui_change_extruders_color' 2018-03-05 11:47:13 +01:00
Enrico Turri
802579ad20 Fixed crash while exporting to .amf and .gcode files (#753) - (improves previous fix: d4f1ed0036) 2018-03-05 10:53:18 +01:00
YuSanka
f750abb9db Refactor load_config() function 2018-03-04 15:21:01 +01:00
bubnikv
ed7c02d578 Disabled the CMake BOOST debugging. 2018-03-02 23:11:57 +01:00
bubnikv
15dbeff0c9 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-03-02 18:15:15 +01:00
bubnikv
777bcf5865 Enabled Boost_DEBUG in CMake to get some debug info when something
goes wrong.
2018-03-02 18:14:19 +01:00
YuSanka
2a378f6590 Fixed problem with changing extruders color 2018-03-02 13:41:37 +01:00
YuSanka
751c97c503 Localize the Plater tab
* Marking and translation of Plater tab are complited
* GUI.pm is marked to l10n
* Fix small bug with Extruder adding at Printer Settings tab
2018-02-28 15:41:35 +01:00
Enrico Turri
0ec68eb35b Fix for issue #661 (ExPolygons generation) 2018-02-28 11:41:04 +01:00
YuSanka
0596660dda Fix bug with not displaying flags for incompatible presets 2018-02-27 09:51:14 +01:00
YuSanka
7047f4365a Update localization:
* 2D.pm, 3DPreview.pm, PreviewData.cpp are marked by L()
* use translating function in 3DScene.cpp
2018-02-26 16:23:44 +01:00
YuSanka
e05493bd90 Fixed wrong printing of recommended_thin_wall_thickness_description_line 2018-02-26 13:57:36 +01:00
YuSanka
f3f78ebc5a Fix #742 2018-02-26 09:57:08 +01:00
bubnikv
edb756c084 Refactored the gyroid infill. 2018-02-23 18:32:35 +01:00
bubnikv
2edb96062e Removed the Perl Preferences dialog,
fixed the CMake after the GUI merge.
2018-02-23 15:53:16 +01:00
bubnikv
69fc99edbb Merge remote-tracking branch 'remotes/origin/gui_translate_to_cpp' 2018-02-23 15:32:13 +01:00
YuSanka
d61295eb10 Added Preferences files 2018-02-23 14:55:27 +01:00
bubnikv
68c51be130 Merge remote-tracking branch 'remotes/origin/mesh_repair' 2018-02-23 14:38:37 +01:00
bubnikv
d0df673c82 Merge remote-tracking branch 'remotes/origin/time_estimate' 2018-02-23 14:34:01 +01:00
bubnikv
8fb443522b Merge remote-tracking branch 'remotes/origin/gcode_preview' 2018-02-23 14:33:16 +01:00
YuSanka
baa5726532 All project is ready to localization.
* Macro _LC is changed to _CHB. [to put translated string into std::string correctly]
* Macro _LS is changed to L.    [to mark string to translation]
* Standard wxWidgets macro _() is used for translation now.
* Updated POfile for EN
2018-02-23 14:25:49 +01:00
bubnikv
c3d7be5994 Merge remote-tracking branch 'remotes/origin/3mf_io' 2018-02-22 18:57:07 +01:00
Enrico Turri
52eb6f6bcf Remove .zip from file extension on import to avoid having it added again and again when exporting 2018-02-22 15:27:32 +01:00
YuSanka
bc97184c63 Fixed #735 & PresetHints.cpp is marked to localization
* Macro _LC is created to put translated string into std::string correctly.
* Macro _LU8 is changed to function L_str.
* Created function from_u8
2018-02-22 14:19:41 +01:00
Lukas Matena
d17229efd5 Gyroid infill - minor correction for standard-conforming compilers 2018-02-22 12:00:24 +01:00
YuSanka
3d805a0f43 PreferencesDialog moved to C++ part 2018-02-22 11:12:29 +01:00
Merill
d59bb027eb Gyroid infill type (#733)
Gyroid infill type.
2018-02-22 09:56:05 +01:00
Enrico Turri
81eff20ad1 GCode Preview - Added Custom extrusion role + extended layers range for GCode preview 2018-02-22 08:59:47 +01:00
Enrico Turri
36601723a2 4th attempt to fix JIRA SPE-26 (Feature types on MAC) 2018-02-20 15:22:30 +01:00
Enrico Turri
23b1c8f1d2 3rd attempt to fix JIRA SPE-26 (Feature types on MAC) 2018-02-20 14:44:00 +01:00
Enrico Turri
26409cbade 2nd attempt to fix JIRA SPE-26 (Feature types on MAC) 2018-02-20 14:25:40 +01:00
YuSanka
23f96e30c3 Fixed wrong saving of "percent or millimeters" parameters 2018-02-20 12:30:13 +01:00
Enrico Turri
a569de44b6 1st attempt to fix JIRA SPE-26 (Feature types on MAC) 2018-02-20 11:40:15 +01:00
YuSanka
6ad38f80fb Language configuration is saved now in AppConfig instead of wxConfig. 2018-02-20 08:58:46 +01:00