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
johnlewin
4ff2617096 Merge pull request #882 from jlewin/master 
WizardPanel updates
 2016-06-08 09:36:28 -07:00
Lars Brubaker
f60d57f226 Don't show connection settings in presets 
Don't show user override info on connection settings
 2016-06-08 09:25:20 -07:00
John Lewin
0b4b7d2155 Rename SetupWizardConnect to AndroidConnectDevicePanel 2016-06-08 08:56:22 -07:00
John Lewin
63adf6f2a3 Refactor SetupWizardConnect panel 
- Use initializer syntax
 - Add OnClosed override and ensure unregister events is called
 - Remove 'new EventHandler' wrappers
 - Remove LocalizedString.Get calls
 2016-06-08 08:46:04 -07:00
John Lewin
a3f12005f8 Remove unused WizardPanel 2016-06-08 08:13:32 -07:00
johnlewin
925d720095 Merge pull request #881 from jlewin/master 
Use common button factory, fix null reference error
 2016-06-08 08:12:25 -07:00
John Lewin
af892107f3 Use common button factory, fix null reference error 2016-06-07 19:00:38 -07:00
johnlewin
5e31eecebc Merge pull request #876 from jlewin/master 
Continue merge of Android and Desktop panels
 2016-06-07 18:59:26 -07:00
John Lewin
16b874073c Fix merge conflict with printerSelectorAndEditButton 2016-06-07 17:51:55 -07:00
John Lewin
ba94d285fe Add missing L10N strings 2016-06-07 17:50:41 -07:00
John Lewin
be33adcff2 Fix merge issues with active Theme state 2016-06-07 17:50:41 -07:00
John Lewin
3352c63635 Remove named methods from WizardWindow, switch to ChangeToPanel<T> 2016-06-07 17:50:41 -07:00
John Lewin
6d827a238a Continue merge of Android and Desktop panels 
- Add ChangeToPanel implementation that takes panel type param
 - Remove WizardPanel constructors that take WizardWindow params
 - Use initializer syntax
 - Remove dead code
 - Remove problematic ReloadAll calls
 2016-06-07 17:50:41 -07:00
Lars Brubaker
12c26bd453 Merge pull request #877 from larsbrubaker/master 
Don't set new printer name to current printer
 2016-06-07 17:44:33 -07:00
Lars Brubaker
e81f8f0ab5 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-07 17:39:31 -07:00
Lars Brubaker
6cc61c53d0 Don't set new printer name to current printer 
If no white list is set than do not filter
Make default MC white list be none
 2016-06-07 17:39:17 -07:00
Lars Brubaker
18ba02b7a3 Merge pull request #874 from larsbrubaker/master 
Made edit printer available and work on Android
 2016-06-07 16:25:14 -07:00
Lars Brubaker
cfb0d4c055 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-07 16:19:41 -07:00
Lars Brubaker
6d14dcbbfc Made edit printer available and work on Android 2016-06-07 16:19:26 -07:00
Lars Brubaker
5766a90ec5 Merge pull request #873 from larsbrubaker/master 
Got the new printer setup wizards back to working.
 2016-06-07 15:06:06 -07:00
Lars Brubaker
15ce8ccf31 Merge pull request #872 from jlewin/master 
Use initializer syntax, remove ThemeChanged -> Invalidate
 2016-06-07 15:03:31 -07:00
Lars Brubaker
275b320425 Got the new printer setup wizards back to working. 2016-06-07 14:27:37 -07:00
John Lewin
9fe0b1fa5b Use initializer syntax, remove ThemeChanged -> Invalidate 2016-06-07 13:48:11 -07:00
johnlewin
6f0397d197 Merge pull request #869 from jlewin/master 
Move panel styling into base class, make conditional on Touchscreen
 2016-06-07 13:25:02 -07:00
John Lewin
85002c1231 Move panel styling into base class, make conditional on Touchscreen 2016-06-07 12:52:32 -07:00
johnlewin
639b31c8a4 Merge pull request #866 from jlewin/master 
Run validation tests on slice presets
 2016-06-07 11:49:41 -07:00
John Lewin
e0c4bbd011 Add required layer cascade to slice preset tests 2016-06-07 11:22:53 -07:00
John Lewin
b064b9db64 Printer center & bed size are not required in slice files 2016-06-07 09:51:05 -07:00
John Lewin
c264fbb074 Test error messages should report affected file path 2016-06-07 09:45:49 -07:00
John Lewin
20a3cd7668 Run validation tests on slice presets 
- Issue #800
 2016-06-07 09:41:12 -07:00
johnlewin
cee7366879 Merge pull request #865 from larsbrubaker/master 
Put in unretract extra on tool change.
 2016-06-06 16:26:22 -07:00
Lars Brubaker
2c17944ab1 Put in unretract extra on tool change. 
Moved tool change to a separate section
 2016-06-06 16:20:48 -07:00
Lars Brubaker
2ca8a04411 Merge branch 'temp' 2016-06-06 15:19:26 -07:00
Lars Brubaker
7dc3f9608e Make sure we maintain relative moves that happen during printing. 2016-06-06 15:18:27 -07:00
Lars Brubaker
fa27b8be6f Merge pull request #863 from larsbrubaker/master 
Getting the printer setup wizard to run on desktop when required.
 2016-06-06 12:47:14 -07:00
Lars Brubaker
1ffcd02209 Getting the printer setup wizard to run on desktop when required. 2016-06-06 12:43:05 -07:00
Lars Brubaker
431bc3373c Merge pull request #862 from larsbrubaker/master 
Don't render the com port control on android.
 2016-06-06 12:17:39 -07:00
Lars Brubaker
30ea64c64e Merge pull request #860 from jlewin/master 
Revert breaking changes in b78dadd25c (UI label updates)
 2016-06-06 12:08:17 -07:00
Lars Brubaker
c595e05cc2 Don't render the com port control on android. 2016-06-06 12:06:08 -07:00
John Lewin
9d8c4e2e80 Revert breaking changes in b78dadd25c (UI label updates) 
- Settings delimiter must be lowercase 'x'
 2016-06-06 11:30:11 -07:00
Lars Brubaker
82177ea796 Merge pull request #858 from larsbrubaker/master 
Make MC window always be at a good size when loading.
 2016-06-06 11:26:37 -07:00
Lars Brubaker
401c206511 Latest agg and ms 2016-06-06 11:22:08 -07:00
Lars Brubaker
335d77cb63 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-06-06 09:28:32 -07:00
johnlewin
80f0e17d0a Merge pull request #853 from jlewin/master 
Migrate StyledDropDownList to Agg
 2016-06-05 16:04:29 -07:00
johnlewin
9db9992aaf Merge pull request #852 from mmoening/master 
Fixed resend Consistency
 2016-06-05 16:04:11 -07:00
John Lewin
d27db87a65 Migrate StyledDropDownList to Agg 2016-06-03 18:11:51 -07:00
John Lewin
c5dac76ff9 Prevent exception and catch with TryParse 2016-06-03 18:08:39 -07:00
Matt Moening
f316f6837d Fixed consistency error where resend would fail to send \r\n at end of line 2016-06-03 18:04:30 -07:00
johnlewin
68783c5f85 Merge pull request #850 from jlewin/master 
Migrate Theme support to Agg.UI
 2016-06-03 17:38:03 -07:00
John Lewin
e5a63b052e Migrate Theme support to Agg.UI 2016-06-03 17:22:19 -07:00