Lars Brubaker
|
84afaf8292
|
Update to framework 4.6.1
|
2017-03-15 14:45:14 -07:00 |
|
Lars Brubaker
|
d6ccdd8047
|
Merge pull request #1990 from larsbrubaker/master
Merge 1.7
|
2017-03-14 15:38:45 -07:00 |
|
Lars Brubaker
|
8988ae6884
|
Latest agg & ms
|
2017-03-14 14:20:48 -07:00 |
|
Lars Brubaker
|
0b6c4e94f1
|
Merge branch '1.7'
# Conflicts:
# StaticData/SliceSettings/Properties.json
|
2017-03-14 14:18:57 -07:00 |
|
Lars Brubaker
|
1748649a8c
|
Merge pull request #1988 from larsbrubaker/1.7
Updating connect button
|
2017-03-10 17:36:08 -08:00 |
|
Lars Brubaker
|
5875d0b17d
|
Updating connect button
|
2017-03-10 16:16:47 -08:00 |
|
johnlewin
|
4824c913ff
|
Merge pull request #1987 from jlewin/1.7
Wait up to 1 second for SettingsAndControls to appear
|
2017-03-09 14:42:21 -08:00 |
|
John Lewin
|
458f0649e6
|
Wait up to 1 second for SettingsAndControls to appear
|
2017-03-09 14:25:20 -08:00 |
|
johnlewin
|
ef10258ae4
|
Merge pull request #1986 from jlewin/1.7
Tuning adjustments default to 1.0 on application restart
|
2017-03-09 12:55:20 -08:00 |
|
John Lewin
|
7fc5a4bcdb
|
Reduce flicker/disappearance of activePrintLabel control
|
2017-03-09 12:46:06 -08:00 |
|
John Lewin
|
ab8cb11d92
|
Tuning adjustments default to 1.0 on application restart
|
2017-03-09 12:46:06 -08:00 |
|
johnlewin
|
165c4ff6f3
|
Merge pull request #1985 from larsbrubaker/1.7
Updating translations
|
2017-03-09 12:43:00 -08:00 |
|
Lars Brubaker
|
93d3af2ad8
|
Updating translations
|
2017-03-09 12:26:38 -08:00 |
|
Lars Brubaker
|
510be7b17d
|
Merge pull request #1984 from larsbrubaker/1.7
1.7
|
2017-03-09 11:21:20 -08:00 |
|
Lars Brubaker
|
c65e4b4e14
|
Merge and update agg
|
2017-03-09 11:16:59 -08:00 |
|
Lars Brubaker
|
a871dd08e8
|
Merge branch '1.7' of https://github.com/MatterHackers/MatterControl into 1.7
|
2017-03-09 11:16:19 -08:00 |
|
Lars Brubaker
|
bb14c83cc5
|
Merge pull request #1983 from jlewin/1.7
Revise ButtonFactory disabled icon defaults, PrintingWindow.Show, touchScreenConnectButton name
|
2017-03-09 11:16:00 -08:00 |
|
Lars Brubaker
|
9cfe610f84
|
Make sure we don't try to reference the hotKeyButton if not created.
|
2017-03-09 10:31:01 -08:00 |
|
John Lewin
|
19f348d878
|
Explicitly filter M105 from sent lines
|
2017-03-09 10:10:07 -08:00 |
|
John Lewin
|
074a759b2b
|
Remove custom DisabledImage, use default ButtonFactory behavior
|
2017-03-09 06:47:04 -08:00 |
|
John Lewin
|
28eb683e48
|
Modify ButtonFactory to correctly adjust DisabledImage if not specified
|
2017-03-09 06:27:15 -08:00 |
|
John Lewin
|
8a7376b871
|
Attempt to restore PrintingWindow if instance already exists
|
2017-03-08 16:40:03 -08:00 |
|
John Lewin
|
ed9d4b65c3
|
Rename button to clarify its use
|
2017-03-08 16:39:25 -08:00 |
|
Lars Brubaker
|
8c1c999818
|
Merge pull request #1981 from larsbrubaker/1.7
Cleaned up the code logic to make tests pass.
|
2017-03-08 10:29:53 -08:00 |
|
Lars Brubaker
|
748676fa8c
|
Cleaned up the code logic to make tests pass.
|
2017-03-08 10:25:36 -08:00 |
|
Lars Brubaker
|
2c738c5bf8
|
Merge pull request #1979 from larsbrubaker/1.7
Fixed regression where we turned off sd card printing temps.
|
2017-03-07 17:57:03 -08:00 |
|
Lars Brubaker
|
5218a82783
|
Fixed regression where we turned off sd card printing temps.
Wrote regression test for cancel print code
Made the emulator able to simulate sd card files
|
2017-03-07 17:52:44 -08:00 |
|
johnlewin
|
8c490d7f78
|
Merge pull request #1978 from larsbrubaker/1.7
Fixing the export button to work correctly.
|
2017-03-07 14:45:34 -08:00 |
|
Lars Brubaker
|
def442958b
|
Wrote a new test that ensures we can export library items.
|
2017-03-07 14:13:35 -08:00 |
|
Lars Brubaker
|
9200ef1a9f
|
compile and continue
|
2017-03-06 17:41:06 -08:00 |
|
Lars Brubaker
|
c39baaa606
|
latest 1.7
|
2017-03-06 17:36:55 -08:00 |
|
Lars Brubaker
|
3d89a6d071
|
Fixing the export button to work correctly.
|
2017-03-06 17:32:46 -08:00 |
|
Lars Brubaker
|
63d9459d74
|
call correct t7x function
|
2017-03-06 14:35:36 -08:00 |
|
Lars Brubaker
|
3dc0381d46
|
Working on power button for Android device.
|
2017-03-03 16:31:25 -08:00 |
|
Lars Brubaker
|
8be2e81d6e
|
Merge pull request #1975 from larsbrubaker/1.7
Improving printing screen layout
|
2017-03-03 09:36:17 -08:00 |
|
Lars Brubaker
|
236880445a
|
getting the changed code (compile and continue error)
|
2017-03-03 09:28:22 -08:00 |
|
Lars Brubaker
|
528add3680
|
Latest ms
|
2017-03-03 09:23:59 -08:00 |
|
Lars Brubaker
|
1d3861e554
|
Made the text clip.
|
2017-03-03 09:15:34 -08:00 |
|
Lars Brubaker
|
50cb270103
|
Improving layout
|
2017-03-02 18:06:49 -08:00 |
|
Lars Brubaker
|
245f47e37e
|
Merge pull request #1974 from larsbrubaker/1.7
Fixed reporting of completion on streamed gcode files
|
2017-03-02 17:43:52 -08:00 |
|
Lars Brubaker
|
965ad1c588
|
Fixed reporting of completion on streamed gcode files
Fixed theme on printing window vertical lines
|
2017-03-02 17:33:28 -08:00 |
|
johnlewin
|
792b26b2c7
|
Merge pull request #1973 from jlewin/1.7
Only render settings overrides if the currentValues differs from base
|
2017-03-02 13:53:32 -08:00 |
|
John Lewin
|
62840ba71a
|
Only render settings overrides if the currentValues differs from base
|
2017-03-02 13:45:03 -08:00 |
|
johnlewin
|
16e1c79aa3
|
Merge pull request #1972 from jlewin/1.7
Ensure that dependant properties are updated on .ClearValue
|
2017-03-02 13:34:59 -08:00 |
|
johnlewin
|
129a1519ea
|
Merge branch '1.7' into 1.7
|
2017-03-02 13:29:56 -08:00 |
|
johnlewin
|
35001b3f32
|
Merge pull request #1971 from larsbrubaker/1.7
Latest agg and ms
|
2017-03-02 13:29:06 -08:00 |
|
John Lewin
|
b74883b467
|
Remove create/close calls, reuse portFactory instance
|
2017-03-02 10:32:18 -08:00 |
|
John Lewin
|
6043aefa30
|
Fix typo
|
2017-03-02 10:32:17 -08:00 |
|
John Lewin
|
5d58a37e5c
|
Ensure that dependant properties are updated on .ClearValue
|
2017-03-02 10:32:16 -08:00 |
|
Lars Brubaker
|
688a5014b9
|
Latest agg and ms
|
2017-03-02 09:46:35 -08:00 |
|