Commit graph

280 commits

Author SHA1 Message Date
larsbrubaker
3f2b93466a Made MatterSlice support ui more like the other ui. 2014-03-28 07:56:27 -07:00
larsbrubaker
5271896ada Tried to merge in Greg's changes fixing the messed up stuff. 2014-03-27 18:41:02 -07:00
Kevin Pope
199b3f7a39 Merge commit '495cef1f7a' into development 2014-03-27 18:13:30 -07:00
larsbrubaker
41a31a2645 the raft needs work so disabling it for now. 2014-03-27 10:35:12 -07:00
larsbrubaker
cdfcb94a88 Put in raft settings for MatterSlice 2014-03-27 08:12:05 -07:00
larsbrubaker
f91cac83e1 Made the total time in minutes get calculated rather than stored. 2014-03-26 17:18:04 -07:00
larsbrubaker
7252d065ec A bit of English 2014-03-26 16:54:15 -07:00
larsbrubaker
9fb452fe1f Made the z distance a layer gap rather than a measurement. 2014-03-26 13:49:40 -07:00
gregory-diaz
495cef1f7a Set Button is now visible in the "Fan Controls" group box on the manual controls window (still need to add padding and margin). 2014-03-26 11:29:48 -07:00
gregory-diaz
55791545d8 committing changes to pull 2014-03-26 10:52:58 -07:00
gregory-diaz
34dfa3cc0a committing changes to pull 2014-03-26 10:50:22 -07:00
larsbrubaker
e08d49595f Getting the new raft settings started. 2014-03-26 10:22:16 -07:00
larsbrubaker
a90d606b84 Put in WipeShield 2014-03-25 20:57:12 -07:00
larsbrubaker
b1674aaaab Get the support extruder mapping right. 2014-03-25 20:44:38 -07:00
larsbrubaker
1e220f7074 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-25 17:47:15 -07:00
larsbrubaker
44f6eb1dde more translations. 2014-03-25 17:46:52 -07:00
Kevin Pope
a86e42d72b Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-25 17:34:12 -07:00
Kevin Pope
7561b5eb90 Further work on History tab. 2014-03-25 17:33:57 -07:00
Kevin Pope
95442df81f Print actions now create and update PrintTask record 2014-03-25 17:31:57 -07:00
Kevin Pope
5e7fb2e59e Added id-based constructor to PrintItemWrapper 2014-03-25 17:31:02 -07:00
Kevin Pope
f555aea0e0 Modifications to PrintTask records 2014-03-25 17:29:45 -07:00
Kevin Pope
75cf881a01 Added some pre-made vertical and horizontal line widgets. 2014-03-25 17:29:16 -07:00
larsbrubaker
c615ed9456 Cleaned up the support generation to match our settings. 2014-03-25 15:54:26 -07:00
larsbrubaker
819098cd84 Put in more MatterSlice settings. 2014-03-25 14:37:43 -07:00
larsbrubaker
a43dcdd63f Cleaning up some settings names and organization.
Added bed size to MatterSlice settings
2014-03-25 14:10:26 -07:00
larsbrubaker
3ab9a132b9 Fixed a bug with the expanded view giving keystrokes to a gcode window when it doesn't have anything loaded. 2014-03-25 13:38:56 -07:00
larsbrubaker
70e1a1f4fc Fixing the data to work in matter slice settings. 2014-03-25 12:25:19 -07:00
larsbrubaker
7cbb33e58b fixed spelling of positive
put in more matterslice settings.
2014-03-25 12:14:03 -07:00
gregory-diaz
08f9e8e783 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-25 10:07:46 -07:00
larsbrubaker
7c53c5ce97 Pares all the command line args. 2014-03-25 07:46:14 -07:00
Kevin Pope
4ce2e97044 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-24 18:57:43 -07:00
Kevin Pope
429dfb9605 Added files for PrintHistory 2014-03-24 18:57:12 -07:00
Kevin Pope
f1ac2fe746 Prep work on slice settings layering. 2014-03-24 18:56:41 -07:00
Kevin Pope
2832653ecb Split QueueTab into its own file. 2014-03-24 18:56:08 -07:00
gregory-diaz
c860d47129 Removed Remove All button from print queue. 2014-03-24 18:31:14 -07:00
gregory-diaz
b31897ace8 Added functional "Remove All" button to "Queue Options" drop menu in the print queue. Also converted some light strings to primary text color. 2014-03-24 17:31:24 -07:00
larsbrubaker
3406ab937a More settings working in MatterSlice. 2014-03-24 17:08:37 -07:00
gregory-diaz
ef5f15c4b4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-24 14:45:00 -07:00
gregory-diaz
00910197cb Changed button and text color from white to black on print level wizard 2014-03-24 14:44:43 -07:00
larsbrubaker
8e2684f3f3 Getting more slice settings mapped for MatterSlice 2014-03-24 14:06:05 -07:00
gregory-diaz
ca0a547112 Changed text color for widgets, buttons and labels. 2014-03-24 13:57:46 -07:00
Kevin Pope
e43d2ac899 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-24 12:24:38 -07:00
larsbrubaker
98a53f312c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-03-24 12:21:47 -07:00
larsbrubaker
7152f81324 Getting MatterSlice to work. 2014-03-24 12:21:21 -07:00
Kevin Pope
81b4ede03c Updates to compact side panel view. 2014-03-24 12:06:01 -07:00
larsbrubaker
b649f3aab3 The spelling of filament corrected. 2014-03-24 07:06:07 -07:00
larsbrubaker
51740e9eb0 More translations from having an item not on disk. 2014-03-23 09:47:20 -07:00
kevinepope
868e6d7f6e More theme compliance changes. 2014-03-22 10:04:31 -07:00
kevinepope
ac6e25cc41 Moved 'Create' button to Queue widget. 2014-03-22 10:04:04 -07:00
kevinepope
8685ce5513 TextImageButtons now uses theme for default text. 2014-03-22 10:02:14 -07:00