Commit graph

810 commits

Author SHA1 Message Date
Kevin Pope
352c009202 Remove non-required references to OpenGlGui 2014-07-04 09:12:50 -07:00
larsbrubaker
fb2d34a1bb Made the queue item index preserve (again)
Made the main screen tab preserve (again)
Made a pre and post change panels event (much cleaner, but not everything is using it yet).
2014-07-02 19:35:35 -07:00
larsbrubaker
0d38435ed7 make sure we don't ask for wrapping on - sizes. 2014-07-02 17:22:16 -07:00
larsbrubaker
c5f88756f2 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	StaticData/PrinterSettings/Printrbot/Simple Metal/config.ini
	StaticData/PrinterSettings/Printrbot/Simple Metal/setup.ini
2014-07-02 16:30:26 -07:00
larsbrubaker
15bc1d2187 make sure we don't try and change panel 3 when it's not there. 2014-07-02 16:25:20 -07:00
gregory-diaz
9851571a8d Edited strings in Taz 4 slice files. Also changed config files so that parts can be sliced in MatterSlice and CuraEngine. 2014-07-02 16:23:59 -07:00
larsbrubaker
19883085fb Fixed first layer heights for robo 2014-07-02 15:49:29 -07:00
gregory-diaz
b3e0c56fe5 edited Taz 4 config file 2014-07-02 14:15:21 -07:00
gregory-diaz
11ab998742 Added TAZ 4 Printer Profiles 2014-07-02 14:01:39 -07:00
Kevin Pope
e032c4f928 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-02 13:33:05 -07:00
Kevin Pope
f1d1fffd1f Adding some printer profiles. 2014-07-02 13:32:13 -07:00
larsbrubaker
b75ae71d24 Made 3D views editable while printing (if not the embedded view).
Made the eeprom windows have the correct tab stops.
2014-07-02 13:28:51 -07:00
larsbrubaker
264590b78d only open one copy of the eeprom window at a time. 2014-07-02 12:55:49 -07:00
larsbrubaker
9a8ac29870 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-02 12:03:04 -07:00
larsbrubaker
c4a6a9960a Making the windows understand their closed states better.
Made print history have a data and a view
2014-07-02 11:43:06 -07:00
Kevin Pope
11b9fd6a98 get/set 'sync to print' setting from datastore. 2014-07-02 10:13:40 -07:00
Kevin Pope
730fe7e853 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 19:29:49 -07:00
Kevin Pope
4726bfad86 Changed 2D/3D layer view toggle UI, setting also now saves state. 2014-07-01 19:29:13 -07:00
larsbrubaker
9679512a7b put the new file in the project. 2014-07-01 18:36:57 -07:00
larsbrubaker
4e37aaf427 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 18:35:02 -07:00
larsbrubaker
6e0865627a Making sql work on pc (: 2014-07-01 18:34:24 -07:00
Kevin Pope
0e57dd46c0 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 18:32:44 -07:00
Kevin Pope
606a361a48 Get/set gcode view settings via datastore. 2014-07-01 18:32:39 -07:00
larsbrubaker
85661efd51 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 18:19:14 -07:00
larsbrubaker
178f7acf71 Took out some dead code 2014-07-01 18:18:27 -07:00
Kevin Pope
334cc4e24e Sqlite cross-platform fixes. 2014-07-01 16:42:10 -07:00
larsbrubaker
bbfc3b61b5 Got print from sd card cancel to work. 2014-07-01 15:08:50 -07:00
larsbrubaker
1aaade2275 enabling sd card reader on Robo R1 2014-07-01 14:46:39 -07:00
larsbrubaker
222ed94f36 Make sure we remove all the children of column two before removing them.
Got rid of some dead code.
2014-07-01 14:44:27 -07:00
james jones
af9d9d7026 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 12:09:41 -07:00
james jones
bff2e01fad Trying to get things to behave nicely with the requirement that GuiWidgets clear their parent when the are closed or removed. 2014-07-01 12:09:35 -07:00
Kevin Pope
fe42dea1e3 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 11:34:25 -07:00
Kevin Pope
a8932a1a65 Don't use community.csharpsqlite in Unix 2014-07-01 11:34:20 -07:00
james jones
6ce3533668 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-01 09:36:18 -07:00
james jones
e51d8c92cd vs 2013 dependency changes. 2014-07-01 09:36:13 -07:00
larsbrubaker
bb47a4724a Added a file to the project 2014-06-30 21:45:22 -07:00
Kevin Pope
699e3b0e6e Added datastore for Printer settings. Move cloud monitor flag to use. 2014-06-30 15:35:20 -07:00
kevinepope
0f47609de0 More polish to cloud monitor. 2014-06-29 15:14:14 -07:00
james jones
4e41d10b06 Getting it working with vs 2013. 2014-06-27 18:18:00 -07:00
Kevin Pope
83640114d5 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-06-27 14:45:28 -07:00
Kevin Pope
b3a66f7557 Added link to release notes.
Added sized icon for notifications.
Added link to instructions for cloud monitor.
2014-06-27 14:45:21 -07:00
larsbrubaker
f4d7d0b5c4 Made the print leveling control its own window. 2014-06-27 12:45:14 -07:00
larsbrubaker
a43a905a1a Merge remote-tracking branch 'origin/development' into development 2014-06-27 11:44:32 -07:00
larsbrubaker
3b90168edf Made the print level wizard have the correct padding on the text. 2014-06-27 11:25:15 -07:00
Kevin Pope
1061560a5d Remove non-required imports. 2014-06-27 11:20:21 -07:00
larsbrubaker
e80c635b66 Merge remote-tracking branch 'Greg/development' into development 2014-06-27 10:57:47 -07:00
larsbrubaker
8c855efca5 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-06-27 10:57:39 -07:00
larsbrubaker
73db6d8db9 Made all the GetPortNames go through FrostedSerialPort
Cleaned up some using statements.
2014-06-27 10:57:14 -07:00
james jones
6a84783075 made the print leveling editing window open on the ui thread. 2014-06-27 10:50:17 -07:00
james jones
adbac73b9a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-06-27 10:31:48 -07:00