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

4216 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lars Brubaker
c7a9df3f06 Make MC not be at a bad size when loading. 2016-06-03 17:07:29 -07:00
Lars Brubaker
77d3df1d01 Merge pull request #848 from jlewin/master 
Rename SetupConnectionWigetBase to ConnectionWizardPanel
 2016-06-03 12:21:19 -07:00
John Lewin
2ba410f52d Rename SetupConnectionWigetBase to ConnectionWizardPanel 2016-06-03 11:36:25 -07:00
johnlewin
6d6d921cc7 Merge pull request #847 from jlewin/master 
Remove duplication in SetupConnectionWidgetBase
 2016-06-02 18:43:34 -07:00
John Lewin
8456924b9e Remove duplication in SetupConnectionWidgetBase 
- Issue #846
 - Move ActivePrinter to SetupConnectionWigetBase
 - Remove local theme variables
 - Allow subclass to set widget factory defaults
 2016-06-02 17:46:49 -07:00
johnlewin
50593fe399 Merge pull request #845 from jlewin/master 
Collapse ConnectionWidgetBase out of hierarchy
 2016-06-02 16:35:35 -07:00
John Lewin
44c6a23037 Collapse ConnectionWidgetBase out of hierarchy 
- Fixes #843
 - Remove ConnectionWidgetBase class
 - Migrate most functionality into SetupStepComPortManual
 - Derive SetupConnectionWidgetBase from WizardPanel instead of CWB
 2016-06-02 16:21:48 -07:00
johnlewin
98a5440725 Merge pull request #844 from jlewin/master 
Pull make/model data from http endpoint
 2016-06-02 16:16:34 -07:00
John Lewin
eb7455f47c Ensure cache directory exists before use 2016-06-02 16:07:12 -07:00
John Lewin
e82dfc8ebb Pull make/model data from http endpoint 
- Fixes #842
 2016-06-02 14:46:51 -07:00
johnlewin
34fd35217c Merge pull request #840 from gregory-diaz/master 
Add conditional user auth panel before ChangeToAddPrinter
 2016-06-02 13:41:45 -07:00
Greg
196590f259 Add conditional user auth panel before ChangeToAddPrinter 
- Completed first pass at completing User is prompted to login in printer setup wizard if they are not signed in
 - Invoke delegate and show login prompt based on whether or not they are currently signed in.
 - Fixes #825
 2016-06-02 11:31:49 -07:00
Lars Brubaker
e3e16a75a9 Merge pull request #838 from rytz/master 
adding colon to estimated print time, removing extra 'BCN' in model name
 2016-06-02 08:02:07 -07:00
Lars Brubaker
8a15085d7e Merge pull request #839 from larsbrubaker/master 
Unified the android and desktop setup wizard classes
 2016-06-02 07:59:06 -07:00
Lars Brubaker
b54e6a14ad Unified the android and desktop setup wizard classes 2016-06-01 18:17:11 -07:00
rytz
b95d416228 adding colon to estimated print time, removing extra 'BCN' in model name 2016-06-01 15:21:42 -07:00
Lars Brubaker
6acbe7f2d3 Merge pull request #837 from jlewin/master 
Decouple make/model droplists
 2016-06-01 15:11:19 -07:00
John Lewin
a04f0ac88b Decouple make/model droplists 
- Fixes #833
 2016-06-01 14:00:47 -07:00
Lars Brubaker
95fc57e555 Merge pull request #836 from larsbrubaker/master 
Made sure Attention getter is done done
 2016-06-01 07:16:40 -07:00
larsbrubaker
47a63bf966 Made sure Attention getter is done done 
Only one run navigation at a time
only allow one highlight per widget at a time.
 2016-06-01 07:07:36 -07:00
johnlewin
d991e65361 Merge pull request #835 from jlewin/master 
Remove invalid settings from slic3r config files
 2016-05-31 18:14:59 -07:00
John Lewin
2e59506d06 Remove invalid settings from slic3r config files 
- Second attempt to fix #784
 2016-05-31 18:02:00 -07:00
johnlewin
e3da9196a5 Merge pull request #834 from jlewin/master 
Resolve outstanding config.ini issues
 2016-05-31 15:26:08 -07:00
John Lewin
b1f87eb3a9 Adjust config.ini layer height values 
- Fixes #831
 2016-05-31 15:18:16 -07:00
John Lewin
0a9a5e2121 Adjust config.ini first layer height values 2016-05-31 15:11:29 -07:00
johnlewin
b165bc287f Merge pull request #830 from jlewin/master 
Latest Agg
 2016-05-31 14:33:24 -07:00
John Lewin
38a0beaf4f Latest Agg 2016-05-31 14:13:38 -07:00
Lars Brubaker
65aca87cf3 Merge pull request #820 from larsbrubaker/master 
Made some help when connecting to a printer without a com port set
 2016-05-29 09:30:52 -07:00
larsbrubaker
85c0b66840 Made some help when connecting to a printer without a com port set 
Common ui navigation functions
Improved highlight utility
Made Edit Fields have names that can be discovered
Refactoring
 2016-05-29 09:19:46 -07:00
Lars Brubaker
ea5a7b9ee4 Merge pull request #806 from rytz/master 
UI Label change
 2016-05-26 18:26:21 -07:00
rytz
5ad28cf793 UI Label change 2016-05-26 11:55:16 -07:00
johnlewin
2e8d94ca2d Merge pull request #801 from jlewin/master 
Revise config.ini tests
 2016-05-25 11:19:09 -07:00