Commit graph

221 commits

Author SHA1 Message Date
Lukas Matena
e864238609 Merge branch 'project_specific_config' into wipe_tower_improvements 2018-03-15 14:05:45 +01:00
Lukas Matena
67009d80fd Ramming parameters reduced to one and connected to the wipe tower generator again 2018-03-15 14:04:12 +01:00
Lukas Matena
9f18b639a8 Added filament_ramming_parameters and filament_ramming_buttons into configuration layer 2018-03-14 15:48:37 +01:00
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
Lukas Matena
cf5dfb9673 Started to move ramming dialog into filament settings 2018-03-13 15:54:29 +01:00
Lukas Matena
27ab8ff4e1 Configuration layer changes (cooling_time, bridging, adhesion moved from dedicated dialog to filament/print settings) 2018-03-12 15:41:25 +01:00
Lukas Matena
1c6fa6660e Merge branch 'master' into wipe_tower_improvements 2018-03-09 15:10:15 +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
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
14929e9d15 Http client via libcurl 2018-03-05 15:52:17 +01:00
bubnikv
5ea584280c Merge remote-tracking branch 'remotes/origin/gui_improvements' 2018-03-05 12:12:40 +01:00
YuSanka
f750abb9db Refactor load_config() function 2018-03-04 15:21:01 +01:00
Lukas Matena
b3e9b82280 (Un)loading speed and time delay parameters introduced into GUI and conf. layer (not yet into wipe tower generator) 2018-03-02 15:52:16 +01:00
YuSanka
2a378f6590 Fixed problem with changing extruders color 2018-03-02 13:41:37 +01:00
Lukas Matena
d2006c8d8e Cooling tubes parameters added into GUI and configuration layer (not yet into wipe tower generator) 2018-03-01 16:15:00 +01:00
Lukas Matena
1d787a15a0 Fix for win builds 2018-03-01 09:57:51 +01:00
Lukas Matena
c76c075569 Yet another attempt to fix Win builds 2018-03-01 09:19:34 +01:00
Lukas Matena
9ea803b000 Attempts to fix OSX and Win builds 2018-02-28 19:53:32 +01:00
Lukas Matena
a62ad3323f First naive implementation of wipe tower settings dialog 2018-02-28 16:04:56 +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
YuSanka
0596660dda Fix bug with not displaying flags for incompatible presets 2018-02-27 09:51:14 +01:00
Lukas Matena
3099c32d08 GUI - reenabling rotation angle settings for the wipe tower (was disabled by the merge with master) 2018-02-27 08:56:11 +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
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
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
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
YuSanka
3d805a0f43 PreferencesDialog moved to C++ part 2018-02-22 11:12:29 +01:00
Lukas Matena
5a02bde170 Fix of merge conflict and uninitialized variables in writer class 2018-02-22 09:28:31 +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
Lukas Matena
de92f45eaf Merge with master 2018-02-21 13:22:51 +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
Enrico Turri
eeada56c1f 1st attempt to fix JIRA SPE-22 (wrong file export on MAC) 2018-02-19 15:33:01 +01:00
YuSanka
f5ae470e5e Completed translation to Ukrainian.
* Signs of degree are returned to UTF-8 in PrintConfig.
* Changed _LU8 macro. It's translated now like string explicitly specified as a string is already in UTF-8 encoding.
2018-02-19 15:32:22 +01:00
Enrico Turri
7375f6a6f5 Fixed camera shifting after generating gcode 2018-02-19 11:28:56 +01:00
YuSanka
c6ff5ccbf4 Updated TextCtrl::BUILD() 2018-02-19 09:15:15 +01:00
YuSanka
867e867cdd Merge remote-tracking branch 'origin/master' into gui_translate_to_cpp 2018-02-19 08:41:41 +01:00
YuSanka
f330eb9567 Fixed set_value() bug. Fixed Infill density.
* Got rid of try/catch at PointCtrl::set_value().
* Optimized localization: got rid of redundant macro _LU8(s).
2018-02-19 00:01:11 +01:00