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

706 commits

Author SHA1 Message Date
Lars Brubaker
4929f834d6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	SlicerConfiguration/Settings/ProfileManager.cs
 2016-09-01 11:18:32 -07:00
Lars Brubaker
619c20aff0 Restore functionality to put default items in queue when new printer is created. 
Made default calibration files include the calibration box
 2016-09-01 10:53:10 -07:00
John Lewin
938c4c2267 Skip save operation when on the EmptyProfile 
- Fixes regression in MorePauseHandlingStreamTests
 2016-08-31 18:49:29 -07:00
Lars Brubaker
102605d535 Don't override theme color on new printer 
Either set it to default, or set it the name listed in the OEM settings
 2016-08-31 17:32:43 -07:00
John Lewin
de84fe1705 Write user profiles to a user subdirectory below Profiles 
- Issue MatterHackers/MatterControl#1339
 2016-08-31 14:57:39 -07:00
John Lewin
0a15124e4b Fix issues in ChangeID 
- New ID should be set in all cases
- Conditionally load local profile if exists
 2016-08-31 13:57:51 -07:00
John Lewin
180c559d09 Single authority for ProfilePath construction 
- Guard for null during load
 2016-08-31 13:57:50 -07:00
John Lewin
4e727def1b Code clean up 
- Remove unused SaveAs function from SlicePresetsWindow
- Remove unused LoadProfileFromMCWS()
- More consistent formatting
- Move SetValue call after adding Profile, to ensure ProfilePath works during save
 2016-08-31 13:57:49 -07:00
John Lewin
98c26d0a7c Add locking around file save operations 2016-08-31 13:57:43 -07:00
Lars Brubaker
db24db1cf2 Made the settings history be disabled when not signed in. 
MatterHackers/MCCentral#330
Settings History menu should be disabled when not signed in
 2016-08-31 13:09:06 -07:00
Lars Brubaker
b6dcacdef9 Fixed a problem with create new printer 2016-08-31 12:49:25 -07:00
Lars Brubaker
22bca53d69 Changed the theme colors to save by name 
fixed linux run bug MatterHackers/MCCentral#344

ActiveTheme does not recreate its data all the time
 2016-08-31 11:42:02 -07:00
Lars Brubaker
698426858e Made the default theme blue - light. 
Moved setting to UserrSettingsKey
 2016-08-30 17:30:31 -07:00
Lars Brubaker
cd7406d82b Created a UserSettingsKey and SystemSettingsKey 
Moved some settings into this, lots more to do
 2016-08-30 10:30:55 -07:00
Lars Brubaker
7981513b6e Adding in the ability to turn on and off thin line code 
Sorted some settings lists
Put in minimum thin line width option
Clean thin line output
 2016-08-26 12:13:39 -07:00
Lars Brubaker
98c114f79b Got the check and uncheck of reload ui settings to work 
Wrote a test
Added heat_extruder_before_homing
 2016-08-25 17:43:30 -07:00
John Lewin
4c2e366397 Disable Edit Preset button on default item 
- Use common string for default menu text
 - Localize default menu text
 - Issue MatterHackers/MatterControl#1295
 2016-08-23 09:35:22 -07:00
John Lewin
7183cbf919 Rebuild printers droplist on ProfilesListChanged event 
- Fixes list not refreshing after import
 - Issue MatterHackers/MCCentral#288
 2016-08-19 09:27:57 -07:00
Lars Brubaker
1ce37c3d31 Merge pull request #1292 from gregory-diaz/master 
On first run we effectively sign out user so that they will be forced to sign in and import printers
 2016-08-17 18:29:17 -07:00
Lars Brubaker
357a497505 Fixed a bug with pause resume gcode 
Made a new test.
added test layouts.txt and master.txt and porperties.json
added paus_gcode and resume_gcode to settingskey
 2016-08-17 14:04:03 -07:00
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
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
John Lewin
5237ef09da Assign ActiveSliceSettings.Instance on the UI thread 2016-08-12 15:59:53 -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
db86e2fe0f Fixing the drop menu to hold the pencil on the left 
issue #1279
 2016-08-11 17:18:32 -07:00
Lars Brubaker
35d9c1496f Merge branch 'master' of https://github.com/MatterHackers/MatterControl 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
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
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
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
9f9fe17843 This save was already happening. 2016-08-08 14:53:10 -07:00
Lars Brubaker
f01935a621 Merge remote-tracking branch 'lars/master' 2016-08-08 12:18:58 -07:00
Lars Brubaker
03c61aef19 Make sure we save leveling data when changed. 2016-08-08 12:14:33 -07:00
larsbrubaker
7a91b7b1aa Spelling fix 2016-08-08 08:55:30 -07:00
John Lewin
e29bf11631 Skip migrations if DocumentVersion missing 
- Disable old migrations
 -  Issue MatterHackers/MCCentral#252
 2016-08-04 08:57:14 -07:00