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

4617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
cc871edcb0 Merge pull request #1115 from gregory-diaz/master 
Added notification that lets users know that the profile they are try…
 2016-07-18 14:42:16 -07:00
Greg
c89a6ae8d5 Added notification that lets users know that the profile they are trying to load is corrupt and that we have loaded a usable public profile instead. 2016-07-18 13:48:08 -07:00
johnlewin
8ad0ace437 Merge pull request #1114 from jlewin/master 
Replace OemProfile with PrinterSettings type
 2016-07-18 12:54:26 -07:00
John Lewin
5e23e55987 Update unloaded test project for OemProfile removal 2016-07-18 12:11:43 -07:00
John Lewin
fe07d0b5c1 Replace OemProfile with PrinterSettings type 
- Issue #1112
 2016-07-18 11:58:54 -07:00
Lars Brubaker
fa021a0bd1 Merge pull request #1111 from larsbrubaker/master 
Check in new settings rebuild gcode rules.
 2016-07-18 11:37:07 -07:00
johnlewin
346b794601 Merge pull request #1109 from jlewin/master 
Move event registration and overrides into EditPrinterSettingsPage type
 2016-07-18 11:31:01 -07:00
Lars Brubaker
c36918e480 Check in new settings rebuild gcode rules. 2016-07-18 11:17:57 -07:00
Lars Brubaker
b8bacca44d Merge pull request #1110 from larsbrubaker/master 
Made the cost and mass fields update
 2016-07-18 11:14:36 -07:00
John Lewin
c5e4597f7f Ensure .Close runs on UI thread 2016-07-18 10:55:29 -07:00
Lars Brubaker
a95fbdf109 Made the cost and mass fields update as settings are changed 
Made only settings that require gcode to be rebuilt cause the hash code to change
 2016-07-18 10:52:36 -07:00
John Lewin
3a5073a8fc Move event registration and overrides into EditPrinterSettingsPage type 
- Remove unused GetSystemWindow helper function
 - Remove used member, resolve compiler warning
 - Rename runningAttentions variable
 2016-07-18 10:50:38 -07:00
Lars Brubaker
48b5c4b05d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-16 20:22:41 -07:00
Lars Brubaker
636df059ec Merge pull request #1105 from gregory-diaz/master 
Added ability to recover a usable public profile in the event that we attempt to load a corrupt one.
 2016-07-15 22:15:15 -07:00
Lars Brubaker
040da9da1e Making matter slice and cure layer changes both be detected. 2016-07-15 18:06:51 -07:00
Lars Brubaker
c584814e56 First go at new m109 replace rules. 2016-07-15 17:56:42 -07:00
Lars Brubaker
88f96c3489 Merge pull request #1104 from larsbrubaker/master 
Parse temp on contains T: rather than starts with T:
 2016-07-15 17:25:36 -07:00
Greg
b1b88c01de Added ability to recover a usable public profile in the event that we attempt to load a corrupt one. 2016-07-15 17:25:27 -07:00
Greg
73f396544c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-15 17:23:21 -07:00
Lars Brubaker
1f26141399 Switch to first model if there is only one when changing to new list. 2016-07-15 17:15:25 -07:00
Lars Brubaker
a58b6964f9 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-15 17:14:10 -07:00
Lars Brubaker
557ad616ba Merge pull request #1103 from rytz/master 
fixing minor superfluous command in Rostock profile
 2016-07-15 17:10:32 -07:00
Lars Brubaker
626727d781 Parse temp on contains T: rather than starts with T: 
Move parts to bed on scale.
 2016-07-15 17:07:45 -07:00
rytz
a499cb0af3 fixing minor superfluous command in Rostock profile 2016-07-15 16:34:51 -07:00
Lars Brubaker
30f5bfb446 Merge pull request #1100 from jlewin/master 
Ensure the in memory instance ID changes when the profile ID changes
 2016-07-15 13:38:02 -07:00
Lars Brubaker
cca81dd3e7 Merge pull request #1099 from larsbrubaker/master 
Updating the help menu
 2016-07-15 13:36:25 -07:00
John Lewin
a6a8f65ebc Ensure the in memory instance ID changes when the profile ID changes 2016-07-15 13:32:49 -07:00
Lars Brubaker
1b7f64922c Updating the help menu 2016-07-15 12:43:46 -07:00
Lars Brubaker
86a14e3b59 Merge pull request #1098 from larsbrubaker/master 
Made it so we add the delete and update info for a printer as a new c…
 2016-07-15 12:39:42 -07:00
Lars Brubaker
760110f8b2 Correct padding. 2016-07-15 12:16:51 -07:00
Lars Brubaker
b90b62528d Made it so we add the delete and update info for a printer as a new component 
left aligned printer list (took out icon space)
 2016-07-15 11:52:06 -07:00
Lars Brubaker
07645c1683 Merge pull request #1095 from larsbrubaker/master 
Try to connect to printers that have auto connect enabled when they connect
 2016-07-14 17:15:36 -07:00
Lars Brubaker
cec9a85435 Try to connect to printers that have auto connect enabled when they are selected 
removed dead code
 2016-07-14 17:07:04 -07:00
Greg
1115f05da0 Added Make and Model properties to PrinterInfo class and made sure that when we add a new printer, the Make and Model are written to {user}.json 2016-07-14 16:48:18 -07:00
Lars Brubaker
b9eb54a4e1 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-14 15:05:58 -07:00
Lars Brubaker
bebd7b2287 Merge pull request #1090 from mmoening/master 
Sync on start up
 2016-07-14 14:38:12 -07:00
Matt Moening
8ab8435b40 Reload in memory state after sync so that we will know that there are active profiles 2016-07-14 13:47:33 -07:00
Matt Moening
f8e00ca879 Made sure profiles use proper profile extension and are looked for accordingly 
Fixed bug where we would show upload profile dialog without any profiles to upload
 2016-07-14 13:46:33 -07:00
Matt Moening
26269a64d5 Created task to call sync printer profiles on Cloud services that when finished will launch create printer window if none are synced 2016-07-14 12:48:34 -07:00
johnlewin
f5ce76e868 Merge pull request #1089 from larsbrubaker/master 
Revised text for upload profiles window
 2016-07-14 12:20:30 -07:00
Lars Brubaker
a99bcae207 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-14 11:47:41 -07:00
johnlewin
13894e3e6e Merge pull request #1088 from jlewin/master 
Change printer profile extensions to '.printer'
 2016-07-14 11:47:15 -07:00
Lars Brubaker
c15922b58a Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-14 11:45:41 -07:00
johnlewin
149e306f6a Merge pull request #1087 from gregory-diaz/master 
Added Create Account functionality to SetupWizard
 2016-07-14 11:45:08 -07:00
Lars Brubaker
32de0942ca Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	DataStorage/Classic/ClassicSqlitePrinterProfiles.cs
 2016-07-14 11:39:19 -07:00
John Lewin
dba57b3e0a Change printer profile extensions to '.printer' 
- Convert string literals to shared const
 2016-07-14 11:37:04 -07:00
John Lewin
73f0afb66d Prevent null reference exception on missing guest db 2016-07-14 11:37:04 -07:00
Greg
bac3148d9c Added Create Account functionality to SetupWizard 2016-07-14 11:29:46 -07:00
Lars Brubaker
d681a01cf6 Merge 2016-07-14 11:19:13 -07:00
Lars Brubaker
9b7fdb2834 Merge pull request #1085 from jlewin/master 
Set imported ComPort to machine specific name
 2016-07-14 09:11:01 -07:00