nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
837 commits 1 branch 0 tags 103 MiB
Commit graph

837 commits

This branch
This branch
All branches
Author SHA1 Message Date
james jones
6d89d71e4e Fixed spelling of thumbnail 2014-07-14 17:11:45 -07:00
james jones
7cebc5cb74 Merge branch '1.1.2' into development 2014-07-14 13:50:33 -07:00
james jones
b9494b2c57 Merge remote-tracking branch 'Greg/development' into development 2014-07-14 13:50:25 -07:00
james jones
d76a2aa244 Save the position on closing rather than onclosed (no parent when in onclosed) 2014-07-14 10:40:12 -07:00
gregory-diaz
6da8b5326f Merge remote-tracking branch 'upstream/development' into development 2014-07-11 09:42:42 -07:00
gregory-diaz
6e66e2bf68 Revert "Changed Launcher output location" 
This reverts commit 83cb915520.
 2014-07-11 09:40:34 -07:00
kevinepope
8845446cd8 Stop duplicate repetier eeprom windows from opening. 2014-07-11 09:06:24 -07:00
larsbrubaker
e5d8ad2ac0 Made the state of the slice settings current tab and sub-tab save on reload view. 2014-07-08 18:22:47 -07:00
larsbrubaker
4c846f08cb Made sure the launcher gets installed (made it a reference) 2014-07-08 18:05:20 -07:00
gregory-diaz
83cb915520 Changed Launcher output location 2014-07-08 17:13:06 -07:00
Kevin Pope
70a72928c8 Merge commit 'f466f2ecbb' into development 
Conflicts:
	ApplicationView/MainApplicationWidget.cs
 2014-07-07 17:48:46 -07:00
Kevin Pope
32d8a59bfa Don't show HARDWARE_PRESENT slice settings in presets 2014-07-07 17:46:28 -07:00
larsbrubaker
f466f2ecbb Fixed problem with recreating the main window. 2014-07-07 17:37:42 -07:00
Kevin Pope
fbc4a996e5 Undo breaking change to ReloadAll behavior. 
Made solution file work with VS2010.
 2014-07-07 17:34:44 -07:00
Kevin Pope
5c3c582004 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-07-04 09:13:16 -07:00
Kevin Pope
352c009202 Remove non-required references to OpenGlGui 2014-07-04 09:12:50 -07:00
larsbrubaker
b581775524 Made change printer preserve the state. 2014-07-04 05:57:05 -07:00
larsbrubaker
fab40e17a8 Made the wide screen panel be the thing that is recreated on ReloadAll. 2014-07-03 16:39:36 -07:00
larsbrubaker
c6582a6e28 Make sure theme change stays on the correct panel. 2014-07-03 16:17:51 -07:00
larsbrubaker
109891bc5e In compact view we need the text to be a bit smaller. 2014-07-03 15:07:43 -07:00
larsbrubaker
1c0204128e Remember the state of the separator lines. 2014-07-03 14:43:56 -07:00
larsbrubaker
4bdba6d740 Got the advanced controls panel to keeps its state between the compact view and the wide screen view. 2014-07-03 14:17:58 -07:00
larsbrubaker
5589b4e737 Don't show selection control on gcode view. 2014-07-03 11:56:07 -07:00
larsbrubaker
5e119a672f Made the third panel view keep its state much better. 
We can change printers now without the third panel changing tabs.
 2014-07-03 11:50:25 -07:00
larsbrubaker
7eec6753e2 Renamed MainScreenTabView -> FirstPanelTabView 2014-07-03 10:19:45 -07:00
larsbrubaker
00e2ecda9d Making more go through PreChangePannels callback 2014-07-03 09:49:16 -07:00
larsbrubaker
6e3e09dac8 Merge remote-tracking branch 'Greg/development' into development 2014-07-03 09:38:46 -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
gregory-diaz
ea0e47050d Fixed configuration file for MendelMax 2. 2014-07-02 16:44:09 -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