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

12376 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lars Brubaker
19757dde50 compile and continue 2018-11-01 16:49:43 -07:00
Lars Brubaker
1fc34163ae Cleaning up the tree rebuild and invalidate 2018-11-01 16:43:59 -07:00
Lars Brubaker
96af54535b
Merge pull request #3931 from larsbrubaker/master 
set selection on design history right click
 2018-11-01 16:32:35 -07:00
Lars Brubaker
9379b5c7c2 set selection on design history right click 
cleans up errors with right clicking on an object different than the one selected in the scene
cleans up errors with multiple selected objects not being shown in tree view
update treenode outside of draw recursion
 2018-11-01 16:13:29 -07:00
Lars Brubaker
2c77b70944
Merge pull request #3930 from larsbrubaker/master 
make sure we check mesh for null before using
 2018-11-01 15:27:47 -07:00
Lars Brubaker
b94d0fce10 make sure we check mesh for null before using 
issue: MatterHackers/MCCentral#4447
Null reference exception in MeshWrapperObject3D when descendant has null Mesh
 2018-11-01 15:02:57 -07:00
Lars Brubaker
79eb5425c1
Merge pull request #3929 from larsbrubaker/master 
Improving setup connection wizard
 2018-11-01 14:33:43 -07:00
Lars Brubaker
8c1c0bcff4 Improving setup connection wizard 
issue: MatterHackers/MCCentral#4453
Add images to connection wizard
 2018-11-01 14:16:25 -07:00
johnlewin
837f3310ee
Merge pull request #3928 from jlewin/master 
Leave implementation details to selectedObjectPanel.SetActiveItem
 2018-11-01 10:19:21 -07:00
John Lewin
14967368a4 Replace RunOnIdle use with alternative for startup initialization 
- Issue MatterHackers/MCCentral#4438
RunOnIdle should not be used to queue work post application load
 2018-11-01 09:36:58 -07:00