Commit graph

4898 commits

Author SHA1 Message Date
Lars Brubaker
0bb91039c1 latest agg 2016-05-12 16:13:17 -07:00
Lars Brubaker
2f4fdd5c8e Merge pull request #745 from gregory-diaz/1.5.3
Added printer profile for TAZ 6
2016-05-12 16:09:58 -07:00
Lars Brubaker
19c7e032db Merge pull request #744 from larsbrubaker/master
Make sure clicking the revert user settings button refreshes required…
2016-05-12 11:10:50 -07:00
John Lewin
6c837c4f4c Fix null reference exposed by unit tests 2016-05-12 11:05:45 -07:00
Greg
8c1572db2e Added printer profile for TAZ 6 2016-05-12 11:05:38 -07:00
Lars Brubaker
d4bf7ecd04 Make sure clicking the revert user settings button refreshes required displays
Default to min homing (more common)
Invert the colors of the gear icon

Fixes MatterHackers/MCentral#79
Fixes MatterHackers/MCentral#97
2016-05-12 10:57:41 -07:00
John Lewin
284b2d8c24 Per printer themes
- Fixes #738
2016-05-12 07:30:11 -07:00
johnlewin
9c0bbe763b Merge pull request #740 from jlewin/master
Fix icons and improve profile imports
2016-05-11 21:40:28 -07:00
John Lewin
d292e64ede Fix icons and improve profile imports
- Invert Camera image
 - Set first imported profile as active
 - Import profiles from db if missing
 - Edit presets button should do nothing on '- default -'
2016-05-11 21:31:29 -07:00
johnlewin
aee22882e6 Merge pull request #739 from jlewin/master
Rename file to match TypeName
2016-05-11 20:35:03 -07:00
John Lewin
c0d2b563f4 Rename file to match TypeName 2016-05-11 20:20:13 -07:00
Lars Brubaker
6613015ede Merge pull request #736 from larsbrubaker/1.5.3
Only send G28 when requesting all 3 axis.
2016-05-11 17:16:12 -07:00
Lars Brubaker
3af6293bb2 Merge pull request #735 from jlewin/master
Fix broken tests - ensure db is initialized before test execution
2016-05-11 17:10:41 -07:00
Lars Brubaker
e07a1a07b3 Only send G28 when requesting all 3 axis. 2016-05-11 17:04:30 -07:00
John Lewin
92774df91c Fix broken tests - ensure db is initialized before test execution 2016-05-11 16:18:54 -07:00
johnlewin
002313505a Merge pull request #734 from jlewin/master
Fix broken stream tests, use AreEqual to improve failure troubleshooting
2016-05-11 15:45:36 -07:00
John Lewin
bf744385e5 Fix broken test - ensure db is initialized before l10n 2016-05-11 14:54:32 -07:00
johnlewin
f3ab057612 Merge pull request #733 from jlewin/master
Fix broken stream tests, use AreEqual to improve failure troubleshooting
2016-05-11 13:06:09 -07:00
John Lewin
e580c886a9 Improve failure logging, move unstable test to FixNeeded 2016-05-11 12:44:04 -07:00
John Lewin
d68a5d6d07 Fix broken stream tests, use AreEqual to improve failure troubleshooting 2016-05-11 12:41:13 -07:00
Lars Brubaker
4c7c074faf Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-11 12:26:53 -07:00
Lars Brubaker
5614563530 let .net do the rounding 2016-05-11 12:26:20 -07:00
johnlewin
c9317f9000 Merge pull request #732 from jlewin/master
Move automation tests to "MatterControl.UI.Automation" category
2016-05-11 12:02:53 -07:00
John Lewin
c255e46032 Move automation tests to "MatterControl.UI.Automation" category
- Change namespaces to MatterHackers.MatterControl.Tests.Automation
 - Cleanup using statements
2016-05-11 09:16:03 -07:00
John Lewin
ca52328202 Fix "imported type conflicts with existing" warnings 2016-05-11 09:10:55 -07:00
Lars Brubaker
7f1255ace1 Latest agg 2016-05-10 16:25:14 -07:00
Lars Brubaker
4cb2d95fff Improved settings naming. 2016-05-10 15:04:43 -07:00
Lars Brubaker
6237997de5 Fixed the arrow icons to render correctly. 2016-05-10 14:53:40 -07:00
Lars Brubaker
34c2b1ced6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-10 13:31:09 -07:00
Lars Brubaker
c324a9a545 Added the printer name to slice settings ui
Reorganized settings layout a bit for printer/ fatures
Made more invert lightness extension method uses
2016-05-10 13:30:51 -07:00
johnlewin
f0599e4f36 Merge pull request #730 from jlewin/master
Fix issue preventing tests from overriding AppData in Release
2016-05-10 13:29:54 -07:00
John Lewin
d1309a9942 Fix issue preventing tests from overriding AppData in Release 2016-05-10 13:20:02 -07:00
Lars Brubaker
039314862b Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-10 12:16:09 -07:00
johnlewin
0166091276 Merge pull request #729 from jlewin/master
Create extension method for InvertLightness
2016-05-10 12:09:13 -07:00
John Lewin
6c74ca85b3 Latest Agg 2016-05-10 11:50:33 -07:00
Lars Brubaker
e4713d2715 Fixing pencil colors. 2016-05-10 11:42:40 -07:00
Lars Brubaker
10e173c6c0 Make sure we don't double scale the library icons. 2016-05-10 11:26:02 -07:00
John Lewin
8ca7fdf5b8 Create extension method for InvertLightness 2016-05-10 11:13:10 -07:00
larsbrubaker
ec4f5c180d Fixed colors for library icons. 2016-05-10 08:38:14 -07:00
Lars Brubaker
1b20092248 Made the com menu rebuild when opened.
Fixed more color setting and new icons
2016-05-09 18:07:35 -07:00
Lars Brubaker
6c321583f8 Merge remote-tracking branch 'lars/master' 2016-05-09 16:55:47 -07:00
Lars Brubaker
77439a0ef1 Merge branch '1.5.3.TG'
Conflicts:
	Submodules/MatterSlice
2016-05-09 16:55:42 -07:00
Lars Brubaker
c86829d0bc New z-hop always added to moves when set 2016-05-09 16:38:51 -07:00
johnlewin
8d1cff12fd Merge pull request #728 from jlewin/master
Add console debugging to investigate test failures
2016-05-09 16:27:35 -07:00
John Lewin
d684630a50 Add console debugging to investigate test failures 2016-05-09 16:25:32 -07:00
johnlewin
a66a1c19da Merge pull request #727 from jlewin/master
Fix Macro null reference errors
2016-05-09 16:14:47 -07:00
John Lewin
5f9899d2f7 Fix Macro null reference errors
- Make the Add->Save feature work for Macros
2016-05-09 14:20:13 -07:00
johnlewin
bb5df2b411 Merge pull request #726 from jlewin/master
Migrate Macros to new profile format
2016-05-08 16:04:34 -07:00
John Lewin
b9a24e60ca Fix mono compile issues 2016-05-08 15:32:21 -07:00
John Lewin
10f05550b5 Migrate Macros to new profile format
- Remove unused PrinterSetupStatus class
 - Fixes #683
2016-05-08 14:13:16 -07:00