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

4922 commits

This branch
This branch
All branches
Author SHA1 Message Date
Greg
1b882e8050 If first run we effectively sign out user so that they will be forced to sign in and import printers 
MatterMatterHackers/MatterControl#1207
 2016-08-16 11:22:37 -07:00
Greg
b9ffb8fbc2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-15 15:21:13 -07:00
Greg
4bffba0f68 Revert "revert this is specifically to cause a git sync fail" 
This reverts commit c5587a07df.
 2016-08-15 15:05:05 -07:00
johnlewin
9d40460eea Merge pull request #1290 from jlewin/master 
Avoid null conditional result on awaited call to workaround Mono error
 2016-08-15 14:53:13 -07:00
John Lewin
4e83bab707 Avoid null conditional result on awaited call to workaround Mono error 
- Issue MatterHackers/MCCentral#283
 2016-08-15 13:36:40 -07:00
Lars Brubaker
1ef7bd0b8c Merge pull request #1289 from jlewin/master 
Assign ActiveSliceSettings.Instance on the UI thread
 2016-08-12 16:45:12 -07:00
John Lewin
5237ef09da Assign ActiveSliceSettings.Instance on the UI thread 2016-08-12 15:59:53 -07:00
johnlewin
8a27863f11 Merge pull request #1288 from larsbrubaker/master 
Make the EULA come up faster.
 2016-08-12 15:54:28 -07:00
Lars Brubaker
c6658eaf2a Make the EULA come up faster. 2016-08-12 15:07:04 -07:00
Lars Brubaker
9ca5a376a4 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-12 15:06:08 -07:00
Lars Brubaker
47f1e6d043 Merge pull request #1286 from jlewin/master 
Revise profile recovery
 2016-08-12 14:59:33 -07:00
John Lewin
b498f80254 Fall back to dummy profile to assist Delete operations as last resort 2016-08-12 13:29:22 -07:00
John Lewin
70899bbedf Prevent unhandled exceptions when indexing into OemProfiles 
- Return null on caught exceptions
 - Issue MatterHackers/MatterControl#1285
 2016-08-12 13:29:22 -07:00
John Lewin
d4c0751505 Update ActiveSliceSettings.Instance before calling SettingChanged event 2016-08-12 13:29:22 -07:00
John Lewin
ea381ef7b1 Refactor LoadProfileAsync to reuse LoadWithoutRecovery 2016-08-12 13:29:22 -07:00
John Lewin
6079694be5 Prevent profile recovery during startup 
- Fix whitespace
 - Remove unused comportNames variable
 - Prevent assigning profile reload if already loaded
 2016-08-12 13:29:22 -07:00
John Lewin
e7b82a47e4 Improve history recovery, try up to the last 5 history items 2016-08-12 13:29:22 -07:00
John Lewin
d0ce7a5600 Move recovery orchestration into ProfileManager.LoadProfileAsync 2016-08-12 13:29:22 -07:00
John Lewin
3bc253a3fe Migrate recovery logic from PrinterSettings.LoadFile to PrinterSettings.RecoverProfile 2016-08-12 13:29:22 -07:00
John Lewin
c22916c884 Move http profile acquisition into LoadProfileAsync 2016-08-12 13:29:22 -07:00
John Lewin
72deb94de3 Better convey that ChangeID expects a deviceToken param 
- Avoid recovery - use PrinterSettings.LoadFile rather than ProfileManager.LoadProfile
 2016-08-12 13:29:22 -07:00
Lars Brubaker
97eed4a84f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-12 11:49:19 -07:00
Lars Brubaker
893b9db70e Merge pull request #1283 from tellingmachine/master 
Don't call uninitialized action.
 2016-08-12 11:47:44 -07:00
tellingmachine
b96ff64a4e Don't call uninitialized action. 
This action gets set by code that is part of CloudServices and not part of the common code.
 2016-08-12 11:27:40 -07:00
Lars Brubaker
feb54b51ea Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-11 17:32:20 -07:00
Lars Brubaker
9a8a4b0718 Merge pull request #1281 from larsbrubaker/master 
Fixing the drop menu to hold the pencil on the left
 2016-08-11 17:32:20 -07:00
Lars Brubaker
a92b41819d Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-11 17:18:42 -07:00
Lars Brubaker
db86e2fe0f Fixing the drop menu to hold the pencil on the left 
issue #1279
 2016-08-11 17:18:32 -07:00
Greg
c5587a07df revert this is specifically to cause a git sync fail 2016-08-11 17:14:44 -07:00
Lars Brubaker
dd09f3dd25 Merge pull request #1277 from larsbrubaker/master 
Defaulted resume failed print to off
 2016-08-11 16:38:45 -07:00
Lars Brubaker
35d9c1496f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-11 16:15:30 -07:00
Lars Brubaker
592a3c4959 Merge pull request #1276 from mmoening/master 
Fixed import to not rely on layer_height validation
 2016-08-11 16:15:30 -07:00
Lars Brubaker
0511859f83 merge 2016-08-11 16:12:39 -07:00
Lars Brubaker
261b613689 Made resume failed print able to be turned on and off 
Made show if set have an & operator
Made a new test for parsing the show if set parameter
 2016-08-11 16:09:45 -07:00
Matt Moening
5b42eac301 Fixed import to not rely on layer_height validation 
- Import preset no longer checks for slicer and will validate import on weather or not any settigns were valid
 - calling Import from MenuOptionFIle will cause the same error message as importing a printer form the settings import page
 - Import to new printer now attempts to load values and validates success on importing a valid setting
 2016-08-11 14:59:33 -07:00
johnlewin
89f12946a4 Merge pull request #1273 from mmoening/master 
Importing a printer/settings from a file will now  notify the user if the file contains no valid user settings
 2016-08-11 13:21:53 -07:00
Matt Moening
5b8ff5cd29 Changed TryGetValue to ContainsKey for clarity 2016-08-11 13:01:34 -07:00
Matt Moening
bdf3e8f2a5 Importing a printer/settings from a file will now notify the user if the file contains no valid user settings 
- ImportFomEisting now returns a bool of whether or not it succeeded
 - PrinterSettings now has a Contains method
 - merging or importing quality/material settings check to make sure at least one setting was importable and notifies user if not
 2016-08-10 16:39:08 -07:00
Lars Brubaker
c78be029c6 Merge pull request #1271 from larsbrubaker/master 
Made a common static load of the mono spaced font
 2016-08-10 15:45:26 -07:00
Lars Brubaker
ef0f2be119 Made a common static load of the mono spaced font 2016-08-10 15:40:09 -07:00
Lars Brubaker
0d2e60a1dc Merge pull request #1270 from unlimitedbacon/master 
Switched custom GCode boxes to monospace font
 2016-08-10 15:35:28 -07:00
Tyler Anderson
0b4bc4cbbc Switched custom GCode boxes to monospace font 2016-08-10 15:18:03 -07:00
johnlewin
1542ee12a1 Merge pull request #1269 from larsbrubaker/master 
Made settings names save when empty
 2016-08-10 14:47:37 -07:00
Lars Brubaker
e4a10442c2 Made the drop list name update interactively. 2016-08-10 14:20:52 -07:00
Lars Brubaker
b18f8fc889 Made the name save in settings editor 
changed layername to a settings key
 2016-08-10 14:04:33 -07:00
Lars Brubaker
10b1835775 Merge pull request #1266 from larsbrubaker/master 
Making less calls to reload all
 2016-08-08 17:28:12 -07:00
Lars Brubaker
0f2b715935 Making less calls to reload all 
New function ReloadLibraryUI
Called when updating purchased and shared folder
 2016-08-08 17:17:59 -07:00
Lars Brubaker
f6ac22c308 Merge pull request #1265 from mmoening/master 
Fixed OemProfile Tests
 2016-08-08 17:09:49 -07:00
Matt Moening
a8e72662df Fixed OemProfile Tests 
- Broke up Altair and Poetry Infinity printers into separate printers based on nozzle diameter
 - fixed simple, simple metal, and MendalMax to have Layer heights less than their Nozzle Diameter on coarse settings
 - fixed printer config's oem property to be the name of its directory rather than its parents (was always profiles)
 - changed minimumLayerHight to maximumLayeHeight to reflect what the value actually represented
 - removed fix needed categories
 2016-08-08 15:59:09 -07:00
Lars Brubaker
41becdb0f1 Merge pull request #1264 from larsbrubaker/master 
Moved other to the bottom of the list.
 2016-08-08 15:52:58 -07:00