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

6222 commits

This branch
This branch
All branches
Author SHA1 Message Date
johnlewin
ce97fc420e Merge pull request #1970 from jlewin/1.7 
1.7
 2017-03-02 06:59:16 -08:00
John Lewin
f7bd0fcda2 Display connection failure on PrintActionRow 2017-03-02 06:45:34 -08:00
John Lewin
9e5ea69471 Remove orphaned control, remove unused printActionRow variable 2017-03-01 17:36:16 -08:00
Lars Brubaker
e7cd5dddd4 Merge pull request #1968 from larsbrubaker/1.7 
Moved all the easy static localized strings to non-static strings
 2017-03-01 17:29:19 -08:00
Lars Brubaker
b88416163c Fixing tests 2017-03-01 17:05:48 -08:00
Lars Brubaker
dde57d537f Fixed test 2017-03-01 16:02:23 -08:00
Lars Brubaker
db1cdfacea Merge branch '1.7' of https://github.com/MatterHackers/MatterControl into 1.7 2017-03-01 13:50:16 -08:00
Lars Brubaker
4d96a26cd0 Moved all the easy static localized strings to non-static strings 2017-03-01 13:48:49 -08:00
Lars Brubaker
9904c22cd8 Merge pull request #1967 from larsbrubaker/1.7 
Make sure we never try to queue a command before the queue is initialized
 2017-03-01 11:58:34 -08:00
Lars Brubaker
9bd15f936f Merge branch '1.7' of https://github.com/MatterHackers/MatterControl into 1.7 2017-03-01 11:24:22 -08:00
Lars Brubaker
4ea92ac839 Merge pull request #1966 from jlewin/1.7 
Display make/model in settings
 2017-03-01 11:24:10 -08:00
Lars Brubaker
958780d4a6 Make sure we never try to queue a command before the queue is initialized. 2017-03-01 11:22:47 -08:00
John Lewin
3d562081a5 Add note about missing tabs 2017-03-01 10:51:26 -08:00
John Lewin
b8fc35de92 Display make/model in settings 2017-02-28 15:56:10 -08:00
Lars Brubaker
e98d4b32a7 Merge pull request #1963 from jlewin/1.7 
Adjust border and image colors of disabled Connect button
 2017-02-28 13:24:59 -08:00
John Lewin
0b17d4272a Adjust border and image colors of disabled Connect button 2017-02-28 07:12:19 -08:00
johnlewin
c5675a1fa5 Merge pull request #1961 from larsbrubaker/1.7 
Fixed the e controls to disable correctly.
 2017-02-27 13:43:49 -08:00
johnlewin
d34b1e0f0b Merge branch '1.7' into 1.7 2017-02-27 13:31:22 -08:00
Lars Brubaker
7916d883dc Fixed the e controls to disable correctly. 
Make sure we always set the enabled level correctly when parent changed
 2017-02-27 13:26:33 -08:00
johnlewin
66dcac015d Merge pull request #1959 from larsbrubaker/1.7 
Make the reset button fit in t7
 2017-02-27 12:57:22 -08:00
Lars Brubaker
9994f9b3b9 Make sure we calculate the outside perimeter width correctly. 2017-02-27 10:23:11 -08:00
Lars Brubaker
5aba1bdedb Make the reset button fit in t7 2017-02-27 10:03:06 -08:00
Lars Brubaker
2bb37dc66c Merge pull request #1954 from mmoening/master 
BaudRate is Visible when network Printing is enabled
 2017-02-24 15:36:11 -08:00
Matt Moening
596c9e64b2 BaudRate is Visible when network Printing is enabled 2017-02-24 15:21:01 -08:00
johnlewin
ab020ee8d6 Merge pull request #1953 from larsbrubaker/1.7 
Only show whole numbers on printing screen
 2017-02-24 14:18:51 -08:00
Lars Brubaker
067527035b Better understanding of padleft 2017-02-24 14:10:12 -08:00
Lars Brubaker
382d8cd690 Made the numbers padded with a FIGURE SPACE. 2017-02-24 13:30:01 -08:00
Lars Brubaker
19b5938c76 Only show whole numbers on printing screen 2017-02-24 12:32:28 -08:00
johnlewin
b1dac1b91d Merge pull request #1952 from jlewin/1.7 
Skip USB port validation when TCP/IP printing
 2017-02-24 12:07:25 -08:00
John Lewin
410d526345 Skip USB port validation when TCP/IP printing 2017-02-24 12:01:46 -08:00
johnlewin
825295c4b4 Merge pull request #1951 from larsbrubaker/1.7 
Made the tuning controls layout correctly (hack)
 2017-02-24 11:48:48 -08:00
Lars Brubaker
f67e6883b7 latest ms 2017-02-24 11:39:42 -08:00
Lars Brubaker
6ff4755f51 Made the tuning controls layout correctly (hack) 
Fixed tab background color on part preview window
Change the background color back for controls
 2017-02-24 10:17:34 -08:00
johnlewin
c50a14863b Merge pull request #1950 from jlewin/1.7 
Guard for null reference
 2017-02-24 09:31:53 -08:00
John Lewin
e501b3770c Remove "Printing Window..." menu item from Release 2017-02-24 09:24:34 -08:00
John Lewin
c5000990f6 Guard for null reference 2017-02-24 09:02:50 -08:00
johnlewin
69e43a0283 Merge pull request #1949 from jlewin/1.7 
Fix path to ScrollableWidget, remove dead code
 2017-02-24 08:58:13 -08:00
John Lewin
6bdcc19dd2 Fix path to ScrollableWidget, remove dead code 2017-02-24 08:52:08 -08:00
johnlewin
476a81479c Merge pull request #1948 from larsbrubaker/1.7 
updated translation
 2017-02-24 06:16:30 -08:00
Lars Brubaker
0d02cc6536 updated translation 2017-02-23 17:28:28 -08:00
johnlewin
ce3da961f0 Merge pull request #1947 from jlewin/1.7 
Remove excess RunOnIdle, format block as block
 2017-02-23 17:15:25 -08:00
John Lewin
8eec6725b4 Remove excess RunOnIdle, format block as block 2017-02-23 17:10:08 -08:00
johnlewin
064c6c6dff Merge pull request #1946 from larsbrubaker/1.7 
Better positioning of movement controls
 2017-02-23 17:05:15 -08:00
Lars Brubaker
ac8a4808b3 Show reset if enabled 
show hover effect
code for making temp in right place
 2017-02-23 16:59:13 -08:00
Lars Brubaker
b3530b64a8 Better positioning of movement controls 
Guard against null
 2017-02-23 16:30:21 -08:00
johnlewin
13a15c02f6 Merge pull request #1945 from larsbrubaker/1.7 
Adding initializing text to printer warm up
 2017-02-23 16:16:49 -08:00
Lars Brubaker
559a652b0b spelling 2017-02-23 16:02:03 -08:00
Lars Brubaker
8f36d5d25b Adding initializing text to printer warm up 
more aggressive closing of printing window.
 2017-02-23 16:01:41 -08:00
johnlewin
efd76ce488 Merge pull request #1944 from jlewin/1.7 
Skip PowerControls on TouchScreen
 2017-02-23 15:32:01 -08:00
John Lewin
109720dfac Skip PowerControls on TouchScreen 2017-02-23 15:24:27 -08:00