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

4353 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
64b7eb37a5 Merge pull request #960 from larsbrubaker/master 
Converted more settings methods to GetValue<T>
 2016-06-16 07:15:17 -07:00
larsbrubaker
7f65698864 Converted more settings methods to GetValue<T> 2016-06-16 06:58:28 -07:00
johnlewin
f0d84b1207 Merge pull request #958 from jlewin/master 
Rename ActiveValue to GetValue, consolidate GetValue overrides
 2016-06-15 17:23:12 -07:00
John Lewin
c008234248 Rename ActiveValue to GetValue, consolidate GetValue overrides 2016-06-15 17:19:29 -07:00
johnlewin
64fef954d9 Merge pull request #956 from jlewin/master 
Move Windows driver enumeration/list from SettingsProfile to WizardPage
 2016-06-15 16:49:12 -07:00
John Lewin
463305c96c Move Windows driver enumeration/list from SettingsProfile to WizardPage 2016-06-15 16:41:10 -07:00
johnlewin
c143df3f21 Merge pull request #955 from jlewin/master 
Convert some accessors to use GetValue<T>
 2016-06-15 16:24:39 -07:00
John Lewin
814763ed72 Convert some accessors to use GetValue<T> 2016-06-15 16:15:47 -07:00
johnlewin
34cfafbada Merge pull request #954 from jlewin/master 
Revise SliceSettings nomenclature, add GetValue<T> method
 2016-06-15 15:19:09 -07:00
John Lewin
250ed87f31 Revise SliceSettings nomenclature, add GetValue<T> method 2016-06-15 15:11:23 -07:00
johnlewin
45fc170e25 Merge pull request #953 from jlewin/master 
Extract profile management to ProfileManager class
 2016-06-15 15:06:39 -07:00
John Lewin
7028673805 Revert forthcoming name changes 2016-06-15 15:01:41 -07:00
John Lewin
65c8b28239 Add missing file 2016-06-15 14:53:11 -07:00
John Lewin
4e74156521 Extract profile management to ProfileManager class 
- Use on disk profiles.json
 - Support MarkedForDelete functionality
 - Issue #930
 2016-06-15 13:09:47 -07:00
Lars Brubaker
1a84cb7a4c Merge pull request #950 from larsbrubaker/master 
Improving import wizard
 2016-06-15 11:53:00 -07:00
Lars Brubaker
2e18866da7 Merge pull request #949 from rytz/master 
Fixing incorrect help text.
 2016-06-15 11:52:15 -07:00
Lars Brubaker
5082f9d4f8 Improving import wizard 
Made a new success page for the input wizard
Made cancel file selection do the right thing
Update profile selector on add
Load from ini can handle a bad ini file now
 2016-06-15 11:49:57 -07:00
rytz
646c60cd8b Fixing incorrect help text. 2016-06-15 11:01:47 -07:00
Lars Brubaker
ff8f33a265 Merge pull request #946 from larsbrubaker/master 
Don't can OnSettingsChanged when ValueChange (only display)
 2016-06-14 17:04:04 -07:00
Lars Brubaker
0bedc17be1 Don't can OnSettingsChanged when ValueChange (only display) 2016-06-14 16:58:26 -07:00
Lars Brubaker
1d6859951c Merge pull request #943 from larsbrubaker/master 
more work on import
 2016-06-14 16:34:01 -07:00
Lars Brubaker
3350df273d Fixed the printer pause test. 2016-06-14 16:31:35 -07:00
Lars Brubaker
7548ba0203 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-14 16:20:58 -07:00
Lars Brubaker
8de6fb41cc Fixed resume printing offset (had extra relative to absolute in path) 2016-06-14 16:20:49 -07:00
johnlewin
9f5c53aaa7 Merge pull request #945 from jlewin/master 
Assign active material with preset key rather than name
 2016-06-14 15:41:29 -07:00
John Lewin
a1aaab39cc Assign active material with preset key rather than name 
- Issue #944
 2016-06-14 15:29:55 -07:00
Lars Brubaker
555dcbf2f0 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-14 12:55:42 -07:00
Lars Brubaker
b9f92280b3 more work on import 2016-06-14 12:55:19 -07:00
johnlewin
3277bc62ee Merge pull request #942 from larsbrubaker/master 
Working on settings import and export wizards
 2016-06-14 12:03:55 -07:00
johnlewin
825636f4de Merge pull request #941 from jlewin/master 
Remove ActivePrinter variable from ConnectionWizard
 2016-06-14 12:01:04 -07:00
Lars Brubaker
86a7e7c415 Working on new import and export wizard 2016-06-14 11:45:18 -07:00
John Lewin
a9f3cbf4c4 Remove ActivePrinter variable from ConnectionWizard 
- Remove excess properties from PrinterInfo
 - Remove call to Parent.Close from onPrinterStatusChanged
 2016-06-14 11:28:13 -07:00
Lars Brubaker
12bca2d0c5 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	StaticData/Translations/Master.txt
 2016-06-13 15:30:57 -07:00
Lars Brubaker
2173b43e46 Working on settings import and export wizards 2016-06-13 15:28:56 -07:00
Lars Brubaker
0ccd81d62b Merge pull request #935 from jlewin/master 
Revise Settings.json changes
 2016-06-13 14:08:26 -07:00
Lars Brubaker
28420d8b80 Merge pull request #933 from unlimitedbacon/helptext 
Help text changes
 2016-06-13 14:04:51 -07:00
John Lewin
d55aa57910 Rename OrganizerSettingsData to SliceSettingData 2016-06-13 13:44:53 -07:00
John Lewin
76dcc4a072 Revise Settings.json changes 
- Reuse SliceSettingsOrganizer.GetDefaultSettings
 - Remove SavePropertiesJson
 2016-06-13 13:40:29 -07:00
johnlewin
c6e0cca395 Merge pull request #934 from larsbrubaker/master 
Moved default settings into Properties.json and removed default confi…
 2016-06-13 13:33:14 -07:00
Lars Brubaker
85caa12dfe Moved default settings into Properties.json and removed default config.ini 
deleted some dead code
updated some error messages
 2016-06-13 12:31:17 -07:00
Tyler Anderson
9284f013a6 Help text changes 2016-06-13 11:57:22 -07:00
johnlewin
cef3a7682f Merge pull request #929 from jlewin/master 
Add EULA form, revise MenuItemAction use, ensure WizardWindows on top
 2016-06-11 17:41:21 -07:00
John Lewin
61c5208def Disable EULA prompt until more can be completed 2016-06-11 17:25:51 -07:00
John Lewin
255ddb65bf Describe named action lists as menuActions rather than menuItems 2016-06-11 17:21:59 -07:00
John Lewin
0d2432fdbe Ensure WizardWindow is always on top of main 2016-06-11 17:04:46 -07:00
John Lewin
7149f6db33 Add EULA form 2016-06-11 17:04:46 -07:00
johnlewin
4a544c9fc4 Merge pull request #928 from jlewin/master 
Fix master.txt corruption due to \r\n in loc string
 2016-06-11 17:00:38 -07:00
John Lewin
7613fb15cd Fix master.txt corruption due to \r\n in loc string 
- Issue #927
 2016-06-11 16:51:52 -07:00
johnlewin
ba989da904 Merge pull request #926 from jlewin/master 
Add ImportSettings page for new import behavior
 2016-06-11 16:28:56 -07:00
John Lewin
20bb5efdd4 Add ImportSettings page for new import behavior 
- Move ClearUserOverrides to SettingsProfile
 2016-06-11 16:24:30 -07:00