Commit Graph

186 Commits

Author SHA1 Message Date
4600f6c867 Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
46fb4a9d8f working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
54ad58bff8 Almost working c++ status bar
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
33c5ecd6f6 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
a19d658cd3 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
8c066dddcd Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
38f2cdb9ec Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	xs/CMakeLists.txt
2018-08-09 10:53:27 +02:00
e303be8470 Correct preset/tabs updating according to the technology
+ some code refactoring
2018-08-08 16:22:56 +02:00
78311dfdb1 Correct show_preset_comboboxes 2018-08-08 11:17:56 +02:00
3e8eb68179 Correct switching between printer_technologies (show/hide according tabs) 2018-08-06 17:01:41 +02:00
97a957d05c Deregister the update callback on end of the application.
This fixes a crash on exit.
2018-08-05 23:36:25 +02:00
f6d9f40ec1 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
2343c99d08 Added callback for 3dScene updating after extruder changing 2018-07-26 10:59:03 +02:00
6b21e5bd3c Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
ad83b61032 First right-panel reorganization:
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
2018-07-04 09:03:43 +02:00
75befce576 Stop the ongoing slicing process when attempting to export. 2018-07-03 13:12:15 +02:00
58c329c05b Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-03 11:40:35 +02:00
c11c469d75 fix for progressindicator not being destroyed after export to png 2018-07-03 11:40:02 +02:00
3af0614d7c Fix crash on Linux when arranging 2018-07-02 11:22:47 +02:00
9269876856 AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
f11dd98cc4 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
2018-06-28 18:50:39 +02:00
f0b44f95e2 AppController integration 2018-06-28 18:47:18 +02:00
5607c9340b Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +02:00
369e9496cc Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
996791ca7c Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
935bd252e2 Slicing in C++ with progress indication. 2018-06-20 14:50:18 +02:00
e51c13841b AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00
062c3c2bde Set correct man/max value for movers 2018-06-16 03:04:59 +02:00
9c3a0196fc Partial perl code cleanup 2018-06-14 16:09:36 +02:00
98752cc84f Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now 2018-06-14 15:33:42 +02:00
f440c086bd Prepared callback from c++ to Perl to inform about a change of object settings 2018-06-12 19:15:03 +02:00
c88b6cc436 Overrided OnStateChange() function to CollapsiblePane 2018-06-08 12:43:39 +02:00
1f721e231c Added MessageBoxes for experimenting on OSX 2018-06-07 15:52:35 +02:00
a92290a236 ListView doesn't used now.
(Whole logic of the object list manipulation is on c++ side)
Remove experimental add/del buttons
2018-06-07 11:12:09 +02:00
0376a0e516 CallBack from C++ to Perl to manipulations with object list 2018-06-07 00:55:09 +02:00
83debeef66 Removed DestroyGL method from 3DScene 2018-06-06 14:19:28 +02:00
3afe769053 Making some meaningful progress feedback. 2018-05-25 16:55:55 +02:00
6122adbda9 Output directory selection changed to zip file selection with file dialog. 2018-05-23 16:28:18 +02:00
b53b368a6e Merge with latest master 2018-05-23 12:27:07 +02:00
e870e4859f Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-05-22 09:05:34 +02:00
dbeeab3859 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
316714a635 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
38b8ae7cef Firmware updater GUI 2018-05-21 18:58:22 +02:00
6bb92926ee Update of the view mode works correctly 2018-05-21 14:49:31 +02:00
9f0f5a20d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 14:43:18 +02:00
5086d2aafa Fix in File menu 2018-05-17 12:56:14 +02:00
b0ea9bb16a Basic svg export ported from perl to the point where actual svg is assembled. Empty PNG files are genereted for each sliced layer. 2018-05-15 18:01:47 +02:00
e1bb65f64e OpenGL to c++ 1st installment - WIP 2018-05-09 10:47:04 +02:00
62d67d35ec Merge branch 'profile_changes_reset' into updating 2018-04-24 18:15:23 +02:00