Lars Brubaker
00a894bc27
Make the movement controls more suited to always being shown.
2017-02-17 16:46:38 -08:00
johnlewin
bef4ce80eb
Merge pull request #1928 from larsbrubaker/1.7
...
Made the progress fill better
2017-02-17 14:51:08 -08:00
Lars Brubaker
8ecfd19a71
Dialogs are not modal in touchscreen mode so this needed to be refactored.
2017-02-17 14:36:09 -08:00
Lars Brubaker
f26809a825
Translate layer
2017-02-17 13:49:45 -08:00
Lars Brubaker
6fd400e326
Made the progress fill better
2017-02-17 13:25:28 -08:00
johnlewin
688b1ae729
Merge pull request #1927 from larsbrubaker/1.7
...
Make the printing screen scale well on t7
2017-02-17 12:27:26 -08:00
Lars Brubaker
96cffe5935
Make the printing screen scale well on t7
2017-02-17 12:06:11 -08:00
johnlewin
a2e7791e73
Merge pull request #1926 from larsbrubaker/1.7
...
Make sure the resume button always shows the correct state.
2017-02-17 10:48:56 -08:00
Lars Brubaker
dce35bd843
Make sure the resume button always shows the correct state.
2017-02-17 09:53:45 -08:00
johnlewin
458a4860b5
Merge pull request #1923 from larsbrubaker/1.7
...
Getting the advanced button to look right
2017-02-16 17:38:01 -08:00
Lars Brubaker
ddfb0abc55
Getting the advanced button to look right
2017-02-16 17:31:50 -08:00
Lars Brubaker
0836a034c2
Merge pull request #1922 from jlewin/1.7
...
PrintingWindow revisions
2017-02-16 16:45:56 -08:00
John Lewin
4367769bc9
Move PrintingWindow display into ApplicationController
2017-02-16 16:39:46 -08:00
John Lewin
f950e77e89
Only destroy and recreate the Advanced panel
...
- Adjust footer margin
2017-02-16 16:13:21 -08:00
John Lewin
2202db5092
Close PrintingWindow if not printing, revise Pause enabled rules
...
- Remove onClosed callback
2017-02-16 15:06:58 -08:00
John Lewin
78c04a0e37
Consolidate DisplayMode logic into IsTouchscreen setting
2017-02-16 15:02:49 -08:00
John Lewin
e129d72cc1
Move BasicBody class below PrintingWindow
...
- Assist with merge/rebase
2017-02-16 14:51:53 -08:00
johnlewin
d25fd0eb99
Merge pull request #1921 from larsbrubaker/1.7
...
Advanced button is working some.
2017-02-16 14:34:17 -08:00
Lars Brubaker
be21938236
Advanced button is working some.
2017-02-16 14:26:58 -08:00
John Lewin
6f0dbf350d
Merge pull request #1920 from larsbrubaker/1.7
...
Merge branch '1.7' of https://github.com/larsbrubaker/MatterControl i…
2017-02-16 12:58:16 -08:00
Lars Brubaker
06a10e98be
Merge branch '1.7' of https://github.com/larsbrubaker/MatterControl into 1.7
...
# Conflicts:
# CustomWidgets/PrintingWindow.cs
2017-02-16 12:55:06 -08:00
Lars Brubaker
d1cb4a87ca
Merge pull request #1916 from larsbrubaker/master
...
Made more of the printing window work
2017-02-15 17:49:48 -08:00
Lars Brubaker
d418869448
Made more of the printing window work
2017-02-15 17:43:25 -08:00
johnlewin
efb7f7cba9
Merge pull request #1915 from unlimitedbacon/master
...
Changed labels for skirt and brim
2017-02-15 16:54:40 -08:00
johnlewin
57c781e200
Merge branch 'master' into master
2017-02-15 16:49:17 -08:00
johnlewin
352c5106bc
Merge pull request #1914 from jlewin/master
...
Fix typo
2017-02-15 16:49:08 -08:00
johnlewin
39ef7b433f
Merge branch 'master' into master
2017-02-15 16:47:09 -08:00
Tyler Anderson
f6c6bbef66
Changed labels for skirt and brim
2017-02-15 15:52:01 -08:00
John Lewin
0c485fd639
Fix typo
2017-02-15 15:45:52 -08:00
johnlewin
dd0c664a81
Merge pull request #1913 from larsbrubaker/master
...
Get the right thumbnail to show for screen saver
2017-02-15 15:42:37 -08:00
Lars Brubaker
6034208e24
Turn off using ms in memory.
2017-02-15 15:32:56 -08:00
Lars Brubaker
a78fe21e7a
Fixed failing unit test.
2017-02-15 14:30:06 -08:00
Lars Brubaker
74eb21e82e
Get the right thumbnail to show for screen saver
...
colorize image
move show help into options menu
2017-02-15 14:11:37 -08:00
johnlewin
ab2173fe84
Merge pull request #1912 from larsbrubaker/master
...
Improved theme colors
2017-02-15 12:54:37 -08:00
johnlewin
81c6832e39
Merge branch 'master' into master
2017-02-15 12:50:34 -08:00
Lars Brubaker
5505258a6a
Merge pull request #1911 from jlewin/master
...
Add missing localizations
2017-02-15 12:16:58 -08:00
Lars Brubaker
77ffb2d002
Improved theme colors
...
bed temp working
2017-02-15 12:14:36 -08:00
John Lewin
17bea4cc20
Add missing localizations
2017-02-15 10:04:10 -08:00
johnlewin
d0854ba953
Merge pull request #1910 from jlewin/master
...
Refactor ActionBar/ActionRow
2017-02-15 09:40:13 -08:00
John Lewin
778439bb48
Refactor ActionBar/ActionRow
...
- Convert SlicingOutputMessage event to EventHandler<StringEventArgs>
- Remove redundant PrintStatusRow base type, use FlowLayoutWidget
- Rename DesktopPrintStatusRow to PrintStatusRow
2017-02-15 07:04:36 -08:00
John Lewin
e7a5659492
Extract class to file
2017-02-15 06:17:00 -08:00
Lars Brubaker
1c391ba9fb
Merge pull request #1909 from jlewin/master
...
Guard against null reference
2017-02-14 23:03:42 -08:00
John Lewin
3cfd40b6a0
Guard against null reference
2017-02-14 17:21:57 -08:00
John Lewin
0544ba38b8
Guard against null reference
2017-02-14 16:13:51 -08:00
johnlewin
af1fb005d6
Merge pull request #1908 from larsbrubaker/master
...
Make com port drop list look disabled when disabled.
2017-02-14 15:41:03 -08:00
Lars Brubaker
7c34c3625e
Make com port drop list look disabled when disabled.
2017-02-14 15:11:34 -08:00
Lars Brubaker
7eeb7c69ae
Merge pull request #1907 from jlewin/master
...
Move CancelPrint code for reuse in screensaver
2017-02-14 15:11:09 -08:00
John Lewin
bc3021cb3a
Move CancelPrint code for reuse in screensaver
...
- Revise screensaver styling to better match template
2017-02-14 14:34:02 -08:00
johnlewin
81c5915822
Merge pull request #1906 from larsbrubaker/master
...
Make sure we don't have the printer waiting for position before it is…
2017-02-14 14:16:53 -08:00
Lars Brubaker
a206586736
Make sure we don't have the printer waiting for position before it is connected.
2017-02-14 11:42:48 -08:00
