Commit Graph

83 Commits

Author SHA1 Message Date
Vojtech Kral
5624b8afd2 Add a new error dialog 2018-04-30 14:34:47 +02:00
Vojtech Kral
62d67d35ec Merge branch 'profile_changes_reset' into updating 2018-04-24 18:15:23 +02:00
Vojtech Kral
fea5603409 PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario 2018-04-24 18:06:42 +02:00
YuSanka
48bbd2d22a Added new files to MackList 2018-04-20 15:02:54 +02:00
Vojtech Kral
214ad2925b Merge branch 'master' into updating 2018-04-16 17:32:58 +02:00
bubnikv
b79692c35e Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-04-13 16:43:35 +02:00
bubnikv
4275b15dcd Merge remote-tracking branch 'origin/updating' into config_snapshots 2018-04-10 16:46:15 +02:00
bubnikv
0694fad016 Initial implementation of the config snapshot dialog. 2018-04-10 16:27:42 +02:00
bubnikv
32c4cddb91 Ported the AboutDialog to C++, thanks @alexrj for the work.
New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 17:03:37 +02:00
bubnikv
601185f113 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-04-06 16:49:59 +02:00
bubnikv
670061ac33 Initial implementation of configuration snapshotting. 2018-04-06 16:49:33 +02:00
Vojtech Kral
57e47a3296 AppConfig: Support for vendor / model / variant enable state 2018-04-06 13:24:02 +02:00
Vojtech Kral
3fcf194e39 ConfigWizard: Basic structure / WIP 2018-04-06 13:23:49 +02:00
Lukas Matena
7253028d79 Merge branch 'master' into wipe_tower_improvements 2018-04-06 12:33:12 +02:00
bubnikv
e37cbdfcfc Merge remote-tracking branch 'remotes/origin/profile_changes_reset' 2018-04-05 19:53:53 +02:00
Vojtech Kral
2b8da333ef Semver: Semantic version parsing and arithmetics 2018-04-05 14:22:11 +02:00
YuSanka
08a8fe84a4 Merge remote-tracking branch 'origin/master' into profile_changes_reset 2018-03-22 14:18:48 +01:00
Lukas Matena
e30405d672 Merge branch 'master' into wipe_tower_improvements 2018-03-21 11:33:37 +01:00
bubnikv
0bd9918643 Implements SPE-159 "substitute accented letters with non-accented ones" 2018-03-16 18:20:47 +01:00
Lukas Matena
3d6f6530c0 Merge branch 'master' into wipe_tower_improvements 2018-03-16 14:06:23 +01:00
Vojtech Kral
c88d2780ce Octoprint (#796)
* Octoprint: GUI for CA file, improvements

* Octoprint: Add GUI for Bonjour lookup, bugfixes

* Octoprint: Bonjour browser: Cleanup Perl interaction

* Octoprint: Bonjour: Perform several broadcast, UI fixes

* Octoprint: Add files to localization list

* Http: Disable CA File setting on SSL backends that don't support it
2018-03-15 18:06:26 +01:00
Lukas Matena
e864238609 Merge branch 'project_specific_config' into wipe_tower_improvements 2018-03-15 14:05:45 +01:00
YuSanka
a41e55a773 Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset 2018-03-14 16:34:51 +01:00
Vojtech Kral
bd61c233a5 CMake target to generate the main pot file (#786) 2018-03-12 20:38:47 +01:00
bubnikv
30c859ac7f Added a lock icon to the list of filaments, added some
helper methods to PresetBundle.
2018-03-12 16:04:32 +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
Lukas Matena
1c6fa6660e Merge branch 'master' into wipe_tower_improvements 2018-03-09 15:10:15 +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
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
ed7c02d578 Disabled the CMake BOOST debugging. 2018-03-02 23:11:57 +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
Lukas Matena
a62ad3323f First naive implementation of wipe tower settings dialog 2018-02-28 16:04:56 +01:00
bubnikv
2edb96062e Removed the Perl Preferences dialog,
fixed the CMake after the GUI merge.
2018-02-23 15:53:16 +01:00
Merill
d59bb027eb Gyroid infill type (#733)
Gyroid infill type.
2018-02-22 09:56:05 +01:00
bubnikv
f1840a52db Merged the C++ port of the GUI Tabs / OptionGroup / Option classes
by @YuSanka, thanks @lordofhyphens for the initial port
of the OptionGroup / Option.
2018-02-15 18:13:37 +01:00
bubnikv
b695089bc4 Merge remote-tracking branch 'remotes/origin/3mf_io' 2018-02-15 17:02:47 +01:00
bubnikv
3a6436f6f0 Split the GCodePreviewData from the GCodeAnalyzer,
as in the next step the GCodePreviewData will be exported to Perl.
2018-02-14 18:42:09 +01:00
Enrico Turri
f20beeab7a 3mf Importer - fixed Linux build (makefile) 2018-02-02 15:03:06 +01:00
Enrico Turri
787a5f1715 GCode Preview - New Layout 2018-02-02 12:38:35 +01:00
Enrico Turri
475f892413 3mf Importer - 1st installment 2018-01-30 09:27:10 +01:00
Enrico Turri
893201d3d9 3mf Importer - Added miniz library 2018-01-30 08:48:58 +01:00
YuSanka
f0b035059a Merge with bibnikv.
Added some functions to TabIface.
Added BedShapeDialog & Bed2D classes.
Added new_scale to Polygon.
In class Field: Point renamed to PointCtrl and added set_value for PointCtrl, extended get_value for Choice.
2018-01-25 13:46:04 +01:00
bubnikv
a1705c093b Renamed Tab.h to Tab.hpp 2018-01-23 11:42:04 +01:00