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

12386 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
c13b757c0c
Merge pull request #3950 from jlewin/master 
Remove conditional Markdig on Android, use Markdig NuGet
 2018-11-03 21:43:28 -07:00
John Lewin
2f1724ce89 Remove conditional Markdig on Android, use Markdig NuGet 2018-11-03 20:44:18 -07:00
johnlewin
90692ff521
Merge pull request #3949 from jlewin/master 
Update Android
 2018-11-03 20:15:44 -07:00
John Lewin
28a4dc4c78 Update Android 2018-11-03 20:04:04 -07:00
johnlewin
2827326c31
Merge pull request #3945 from larsbrubaker/master 
change loading to time based rather than length based
 2018-11-03 20:03:42 -07:00
LarsBrubaker
def9826726 add °C to temps 2018-11-03 16:27:20 -07:00
LarsBrubaker
8e8fdf8ae3 change loading to time based rather than length based 2018-11-03 12:10:59 -07:00
Lars Brubaker
ddd25c4124
Merge pull request #3943 from jlewin/master 
Revert accessibility of contentRow
 2018-11-03 12:10:14 -07:00
John Lewin
b1053b8198 Revert accessibility of contentRow 
- Add public PrinterSetupWizardPage proxy to private .contentRow
- Use PrinterSetupWizardPage.ContentRow in LoadFilamentWizard
 2018-11-03 10:12:49 -07:00
johnlewin
c79afc741a
Merge pull request #3942 from jlewin/master 
Rename theme.ActiveTabColor to theme.BackgroundColor
 2018-11-03 10:12:39 -07:00
John Lewin
7212f11871 Rename theme.ActiveTabColor to theme.BackgroundColor 
- Issue MatterHackers/MCCentral#4491
 2018-11-03 09:51:25 -07:00
johnlewin
f4a92920f5
Merge pull request #3941 from jlewin/master 
Move theme.Colors.PrimaryTextColor into theme, remove unneeded types
 2018-11-03 09:26:03 -07:00
John Lewin
8d4974dc32 Move theme.Colors.PrimaryTextColor into theme, remove unneeded types 
- Issue MatterHackers/MCCentral#4490
 2018-11-03 09:13:07 -07:00
John Lewin
c279f8a511 Fix typo 
- Issue MatterHackers/MCCentral#4485
Consider renaming recently added config setting with typo in name
 2018-11-03 08:45:17 -07:00
johnlewin
1ddca44f9b
Merge pull request #3940 from jlewin/master 
Wait for async printer load before copying part bed plate
 2018-11-03 00:36:37 -07:00
John Lewin
05966c7e56 Wait for async printer load before copying part bed plate 
- Issue MatterHackers/MCCentral#4478
When we open a printer from the select menu after clicking print
on a design tab, we don't get the part on the bed
 2018-11-03 00:21:33 -07:00
johnlewin
7c25f6aa0b
Merge pull request #3939 from jlewin/master 
Make LibraryView double click action conditional to context
 2018-11-03 00:20:23 -07:00
John Lewin
3d43ddc590 Rebuild master.txt 
- Issue MatterHackers/MCCentral#4472
update localizations
 2018-11-02 22:56:04 -07:00
John Lewin
301f72d6ab Upgrade Nuget packages 2018-11-02 22:53:19 -07:00
John Lewin
958acf97a3 Fix typos 2018-11-02 22:52:08 -07:00
John Lewin
9e8f6fac5a Make LibraryView double click action conditional to context 
- Issue MatterHackers/MCCentral#4484
Double click should conditionally open part preview or add to plate
 2018-11-02 22:02:05 -07:00
johnlewin
71ae6172ea
Merge pull request #3938 from jlewin/master 
Extract simple vertical icon view to base type from IconListView
 2018-11-02 20:17:11 -07:00
John Lewin
ee89c897af Restore previous icon spacing 2018-11-02 20:00:47 -07:00
John Lewin
2978b399c9 Fix scrollbars on favorites bar 
- Issue MatterHackers/MCCentral#4482
Scrollbars appears long before required
 2018-11-02 20:00:47 -07:00
John Lewin
e958bbebe2 Move border to parent 
- Issue MatterHackers/MCCentral#4481
Border terminates unexpectedly
 2018-11-02 20:00:47 -07:00
John Lewin
f31f3ab0a5 Extract simple vertical icon view to base type from IconListView 
- Use on favorites bar in place of IconListView
 2018-11-02 20:00:46 -07:00
Lars Brubaker
95349d62ee
Merge pull request #3937 from larsbrubaker/master 
clicking already loaded means we are done
 2018-11-02 18:46:06 -07:00
Lars Brubaker
677335c8a2 clicking already loaded means we are done 2018-11-02 18:38:59 -07:00
Lars Brubaker
bc0e4c5d2d
Merge pull request #3936 from larsbrubaker/master 
Re-wrote the load filament wizard as not a macro so we have more cont…
 2018-11-02 18:15:43 -07:00
Lars Brubaker
0fb4196edd fixing android 2018-11-02 18:09:55 -07:00
Lars Brubaker
915625fa25 Make sure we update the setup button at the end of loading filament 2018-11-02 18:02:01 -07:00
Lars Brubaker
be6593c32a Mark filament has been loaded correctly 
Make sure we parse markdown in load filament correctly
 2018-11-02 17:21:32 -07:00
Lars Brubaker
775f1982bd Re-wrote the load filament wizard as not a macro so we have more control over it 
Added it to the setup steps

issue: MatterHackers/MCCentral#4429
Put in a loading filament as part of initial setup process
 2018-11-02 16:14:37 -07:00
Lars Brubaker
6469cba676
Merge pull request #3935 from jlewin/master 
Fix tests
 2018-11-02 09:10:50 -07:00
John Lewin
96831c8424 Add test workaround for inconsistent extension handling 
- Allow for either naming convention
- Issue MatterHackers/MCCentral#4470
Test fails to add items to print queue
 2018-11-02 09:00:25 -07:00
John Lewin
0758361f0f Revise helper for reuse, allow caller to override target folder 
- Use IEnumerable<string> instead of params to support target folder
 2018-11-02 07:35:26 -07:00
John Lewin
b61511da81 Simplify 2018-11-02 07:33:44 -07:00
johnlewin
358f4d02ac
Merge pull request #3934 from jlewin/master 
Use MenuTheme for menu children
 2018-11-01 19:04:47 -07:00
John Lewin
a6e1b025c4 Use MenuTheme for menu children 
- Issue MatterHackers/MCCentral#4466
Wrong theme colors - use MenuTheme
 2018-11-01 18:19:09 -07:00
John Lewin
33c1b85bcf Update appsettings.json template file 2018-11-01 17:34:42 -07:00
johnlewin
8417bcd8ca
Merge pull request #3933 from jlewin/master 
Disable edit action until implemented
 2018-11-01 17:25:59 -07:00
John Lewin
d47567042d Apply theme colors to noContentFieldDescription 
- Issue MatterHackers/MCCentral#4443
Improve legibility of themed EmptyAndNotSelected text
 2018-11-01 17:15:25 -07:00
John Lewin
d95877142b Reset EditorPanel title on clear 
- Switch title to 'Properties' per feedback
- Issue MatterHackers/MCCentral#4459
Editor title should reset when cleared
 2018-11-01 17:11:24 -07:00
John Lewin
da320e739e Change listview item double click to show part view 
- Issue MatterHackers/MCCentral#4464
Library -> Part -> DoubleClick should fire Open behavior
 2018-11-01 17:04:13 -07:00
John Lewin
53cb371879 Disconnect loaded scene from newly created one 
- Issue MatterHackers/MCCentral#4463
Save seems to fails after Part -> Print button has been invoked
 2018-11-01 17:02:12 -07:00
John Lewin
d73e78c286 Remove EditContext.Content 
- Issue MatterHackers/MCCentral#4463
Save seems to fails after Part -> Print button has been invoked
 2018-11-01 17:02:12 -07:00
John Lewin
35e7e24fda Open constructed tab after creation 
- Issue MatterHackers/MCCentral#4460
Library -> MCX -> Edit should switch to constructed tab
 2018-11-01 17:02:12 -07:00
John Lewin
624e07803c Use sceneContext.SaveChanges instead of Printer.Bed.SaveChanges 
- Issue MatterHackers/MCCentral#4462
CTRL-S should not be coupled to Printer
 2018-11-01 17:02:12 -07:00
John Lewin
d225ac2dd4 Disable edit action until implemented 
- Issue MatterHackers/MCCentral#4458
Remove name edit button - restore when implemented
 2018-11-01 17:02:12 -07:00
johnlewin
e64406113c
Merge pull request #3932 from larsbrubaker/master 
Cleaning up the tree rebuild and invalidate
 2018-11-01 17:01:44 -07:00