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

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Moening
0b919be893 Printer file commit 2016-07-19 13:19:44 -07:00
Lars Brubaker
eb416594a7 Merge pull request #1128 from mmoening/master 
Printer Settings defaults DocumentVersion to the lastest
 2016-07-19 13:13:25 -07:00
Matt Moening
8789c4681e Printer Settings defaults DocumentVersion to the lastest 
Serializing Printer setting now Ignores Helpers and PrinterSelected
 2016-07-19 12:50:04 -07:00
Lars Brubaker
08c39086b5 Merge pull request #1127 from larsbrubaker/master 
Making sure we only select MatterSlice when it is the only engine.
 2016-07-19 11:39:37 -07:00
Lars Brubaker
445f1560b0 Making sure we only select MatterSlice when it is the only engine. 
Keeping android building.
 2016-07-19 11:31:36 -07:00
Lars Brubaker
e9ae8f6e02 Merge pull request #1126 from unlimitedbacon/profiles 
Minor changes to M3D profile
 2016-07-19 11:04:08 -07:00
Tyler Anderson
f3095a7e53 Minor changes to M3D profile 2016-07-19 10:58:28 -07:00
Lars Brubaker
cb3dadd8da Merge pull request #1124 from larsbrubaker/master 
Updated the layout of the Filament tab
 2016-07-19 09:52:26 -07:00
Lars Brubaker
2bfba91d1d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-07-19 09:45:18 -07:00
Lars Brubaker
1458980214 Updated the layout of the Filament tab 2016-07-19 09:45:10 -07:00
johnlewin
95786ca86d Merge pull request #1121 from jlewin/master 
Consolidate SettingsProfile and PrinterSettings types
 2016-07-18 18:27:48 -07:00
johnlewin
7b56fc017c Merge pull request #1123 from mmoening/master 
On log in after syncing set printer to active if it is the only printer
 2016-07-18 18:25:53 -07:00
John Lewin
215a27f79c Revert back to lazy loaded KnownSettings 2016-07-18 18:24:01 -07:00
Matt Moening
2bf948e383 On log in after syncing set printer to active if it is the only printer 2016-07-18 18:00:14 -07:00
John Lewin
80dab6c9e8 Make PrintLevelingChange event static 
- Cleanup namespaces
 - Guard for null reference with null conditional invoke
 2016-07-18 16:58:25 -07:00
John Lewin
85b2ddefc3 Rename PrintLevelingEnabled event 2016-07-18 16:58:25 -07:00
John Lewin
4ed3ac7c76 Update variable naming to match new type names 2016-07-18 16:58:25 -07:00
John Lewin
54d165d15f Consolidate member names 2016-07-18 16:58:25 -07:00
John Lewin
42f133aa70 Consolidate SettingsProfile and PrinterSettings types 2016-07-18 16:58:25 -07:00
John Lewin
f304e9f3d6 Migrate SettingsProfile functionality to new SettingsHelpers type 
- Add as child property of settings scope, ready for merge of types
 - Progress on Issue #1113
 2016-07-18 16:58:25 -07:00
Lars Brubaker
5012556dbc Merge pull request #1120 from larsbrubaker/master 
Added the ability to run the trouble shooting wizard if can't connect
 2016-07-18 16:27:20 -07:00
Lars Brubaker
c5bbda9c25 Added the ability to run the trouble shooting wizard if can't connect 
When the connect button is clicked and we don't find a usb port we run the
trouble shooting wizard and can find the board.
 2016-07-18 16:11:33 -07:00
Lars Brubaker
76cf0f038b Merge pull request #1118 from larsbrubaker/master 
spelling and localization of the update string
 2016-07-18 15:28:27 -07:00
Lars Brubaker
e39ad85d87 Make sure the profiles directory exists 2016-07-18 15:18:17 -07:00
Lars Brubaker
1dac8be6a8 Protect against null history time. 2016-07-18 14:59:14 -07:00
Lars Brubaker
9a01b2052c spelling and localization of the update string 2016-07-18 14:49:06 -07:00
Lars Brubaker
ad0ba023b7 Merge pull request #1117 from larsbrubaker/master 
Make sure we clean the cache folder again but have specific folders t…
 2016-07-18 14:43:25 -07:00
Lars Brubaker
60d3d6717e Merge pull request #1116 from mmoening/master 
Created Wizard Page to Sync Profiles after log in.
 2016-07-18 14:42:22 -07:00
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
Lars Brubaker
bde140b3cc localize "g-code" 2016-07-18 14:40:42 -07:00
Lars Brubaker
41b44cdb0d Make sure we clean the cache folder again but have specific folders that we will not remove. 2016-07-18 14:06:35 -07:00
Matt Moening
bc3f95d80c Created Wizard Page to Sync Profiles after log in. 
Prompt to log in now Properly launched if no user is logged in and sync only called if user is logged in
Removed comments from PrinterProfileHistoryPage that were meant to outline process
 2016-07-18 14:03:45 -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