johnlewin
|
8de383227c
|
Merge pull request #1837 from larsbrubaker/master
Fixed a fix needed test
|
2017-01-19 13:06:05 -08:00 |
|
Lars Brubaker
|
07fa0ba780
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2017-01-19 12:45:16 -08:00 |
|
johnlewin
|
c4dee79155
|
Merge pull request #1836 from jlewin/master
Initial screensaver prototype
|
2017-01-19 12:39:59 -08:00 |
|
Lars Brubaker
|
676281d7e3
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2017-01-19 12:36:19 -08:00 |
|
Lars Brubaker
|
da7bc876a0
|
Fixed a fix needed test
Fixed macro progress display
|
2017-01-19 12:35:33 -08:00 |
|
John Lewin
|
ac3139c704
|
Reuse existing MoveButton objects
- Alternate format for widget factory colors
- Move fixed sizing in MoveButtonWidget to more specific scope
|
2017-01-19 12:31:53 -08:00 |
|
John Lewin
|
f296b13d67
|
Extract and reuse Z-Offset control as new ZTuningWidget
|
2017-01-19 12:31:53 -08:00 |
|
John Lewin
|
2e8c0baaab
|
Prevent null reference exception
|
2017-01-19 12:31:53 -08:00 |
|
John Lewin
|
16c2230018
|
Initial screensaver prototype
- Consolidate title casing mechanism into PrintItemWrapper.GetFriendlyName
|
2017-01-19 12:31:53 -08:00 |
|
johnlewin
|
8c465e781f
|
Merge pull request #1835 from larsbrubaker/master
Make system window control if in single os screen mode.
|
2017-01-19 12:31:34 -08:00 |
|
Lars Brubaker
|
664573c755
|
Merge branch 'master' into master
|
2017-01-19 11:45:40 -08:00 |
|
Lars Brubaker
|
7a062a2cb2
|
Make system window control if in single os screen mode.
|
2017-01-19 10:35:42 -08:00 |
|
Lars Brubaker
|
8c581d25b0
|
Merge pull request #1834 from larsbrubaker/master
Make sure we recalculate leveling when the user changes settings in t…
|
2017-01-19 10:24:06 -08:00 |
|
Lars Brubaker
|
e086f6058d
|
Make sure we recalculate leveling when the user changes settings in the editor.
|
2017-01-18 14:44:49 -08:00 |
|
Lars Brubaker
|
44f7500650
|
Merge pull request #1833 from larsbrubaker/master
Improving testing
|
2017-01-18 10:41:06 -08:00 |
|
Lars Brubaker
|
85a3edee9f
|
Improving testing
|
2017-01-18 10:18:33 -08:00 |
|
johnlewin
|
664ed1a080
|
Merge pull request #1829 from jlewin/master
Remove duplicate .Click event from ButtonBase, AddToPrintStatusRow action
|
2017-01-17 17:39:23 -08:00 |
|
John Lewin
|
2f5149f739
|
BrailleBuilder - remove duplicate .Click event from ButtonBase
|
2017-01-17 17:35:08 -08:00 |
|
John Lewin
|
c2dd24444a
|
Remove AddIconToPrintStatusRow implementation
|
2017-01-17 17:16:07 -08:00 |
|
John Lewin
|
8510ca5b3d
|
Remove duplicate .Click event from ButtonBase
|
2017-01-17 15:31:08 -08:00 |
|
Lars Brubaker
|
ca7130fa96
|
Merge pull request #1828 from larsbrubaker/master
Make sure we save baby steps any time before the 2nd layer
|
2017-01-17 15:13:15 -08:00 |
|
Lars Brubaker
|
84ed2ce1b2
|
Make sure we save baby steps any time before the 2nd layer
|
2017-01-17 15:04:42 -08:00 |
|
johnlewin
|
75598ae00a
|
Merge pull request #1827 from larsbrubaker/master
better pathing with merge lines
|
2017-01-17 13:09:45 -08:00 |
|
Lars Brubaker
|
37c0fa2248
|
better pathing with merge lines
|
2017-01-17 11:22:06 -08:00 |
|
Lars Brubaker
|
58de417d3a
|
Merge pull request #1825 from larsbrubaker/master
Moving to new pathing in MS
|
2017-01-16 10:47:40 -08:00 |
|
Lars Brubaker
|
4eef7adbcd
|
Updated the project with new libraries
|
2017-01-16 10:42:49 -08:00 |
|
Lars Brubaker
|
7f17531300
|
Latest agg and ms
|
2017-01-16 10:16:13 -08:00 |
|
Lars Brubaker
|
78f55dae26
|
New path finding code
|
2017-01-16 10:04:34 -08:00 |
|
larsbrubaker
|
153d42e628
|
Moving to new pathing in MS
|
2017-01-16 07:48:49 -08:00 |
|
Lars Brubaker
|
6ed4182f74
|
Merge pull request #1823 from larsbrubaker/master
improve reliability of test
|
2017-01-12 18:04:42 -08:00 |
|
Lars Brubaker
|
78aa824be5
|
Merge remote-tracking branch 'origin/1.6'
# Conflicts:
# Tests/MatterControl.AutomationTests/PrintingTests.cs
|
2017-01-12 17:59:24 -08:00 |
|
Lars Brubaker
|
de916a835b
|
Making test better
|
2017-01-12 17:56:55 -08:00 |
|
johnlewin
|
a3a2b16a62
|
Merge pull request #1822 from jlewin/1.6
Remove InfInstaller Agg dependencies, prevent ShellExecute on launch
|
2017-01-12 16:52:37 -08:00 |
|
John Lewin
|
353c001566
|
Remove InfInstaller Agg dependencies, prevent ShellExecute on launch
- Fixes failure to launch InfInstaller/pnputil from InnoSetup
|
2017-01-12 16:47:28 -08:00 |
|
Lars Brubaker
|
3a24c277a5
|
Trying to improve reliability of test
|
2017-01-12 14:18:04 -08:00 |
|
Lars Brubaker
|
0b52b051a1
|
Merge pull request #1820 from larsbrubaker/1.6
Waiting for done button was failing if slow computer
|
2017-01-12 07:44:06 -08:00 |
|
larsbrubaker
|
519d4f5a3f
|
Waiting for done button was failing if slow computer
|
2017-01-12 07:39:29 -08:00 |
|
johnlewin
|
ff1e5f7601
|
Merge pull request #1818 from jlewin/master
Revise user overrides
|
2017-01-12 06:35:32 -08:00 |
|
johnlewin
|
c13b846435
|
Merge branch 'master' into master
|
2017-01-12 06:28:04 -08:00 |
|
Lars Brubaker
|
97c54c930d
|
Merge pull request #1819 from larsbrubaker/master
Waiting for done button was failing if slow computer
|
2017-01-11 21:35:22 -08:00 |
|
larsbrubaker
|
502f69e519
|
Waiting for done button was failing if slow computer
|
2017-01-11 21:29:01 -08:00 |
|
Lars Brubaker
|
2d44666f26
|
Merge pull request #1817 from larsbrubaker/1.6
Make sure we work with the new marline rc8 and resend
|
2017-01-11 17:25:24 -08:00 |
|
Lars Brubaker
|
1090438cd5
|
Merge pull request #1816 from larsbrubaker/master
Make sure we work with the new marline rc8 and resend
|
2017-01-11 17:25:03 -08:00 |
|
Lars Brubaker
|
51541abfa2
|
turn off debug code
|
2017-01-11 17:18:42 -08:00 |
|
Lars Brubaker
|
642b6ad907
|
Make sure we work with the new marline rc8 and resend
|
2017-01-11 17:16:25 -08:00 |
|
Lars Brubaker
|
0cdf057cb1
|
Make sure we work with the new marline rc8 and resend
|
2017-01-11 17:08:36 -08:00 |
|
Lars Brubaker
|
0db9516b0a
|
Merge branch 'master' of https://github.com/MatterHackers/MatterControl
|
2017-01-11 16:08:06 -08:00 |
|
John Lewin
|
405c40ba76
|
Remove comment, create issue
|
2017-01-11 14:40:53 -08:00 |
|
John Lewin
|
af4bf06621
|
Preserve SettingsControlBar visibility throughout window lifetime
- Issue MatterHackers/MCCentral#1080
Preset selectors become visible on printer state changes
|
2017-01-11 14:29:29 -08:00 |
|
John Lewin
|
1eeaa5208d
|
Move user-override stashing to PrinterSettings, invoke on SetValue
- Issue MatterHackers/MCCentral#1053
Editing Preset does not stash changes
|
2017-01-11 14:29:29 -08:00 |
|