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

5738 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
ff2f7d249e Prevent unexpected ActivePrinter changes 
- Prevent selection changes on "Add New Printer..." menu item
- Prevent ActivePrinterChanged on differing EmptyProfile instances
- Prevent calling SwitchToProfile on PrinterSelector change if already
  on instance
 2016-12-10 14:40:04 -08:00
Lars Brubaker
105d9fcab2 Merge pull request #1717 from larsbrubaker/master 
Name copy button
 2016-12-09 17:49:10 -08:00
Lars Brubaker
50261ef95a Merge remote-tracking branch 'jlewin/master' 2016-12-09 17:45:55 -08:00
John Lewin
8f7d1332f3 Update LastProfileID on create printer 2016-12-09 17:05:27 -08:00
John Lewin
a9ffae0238 Update LastProfileID on create printer 2016-12-09 16:44:58 -08:00
Lars Brubaker
5cef50db67 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-09 14:32:26 -08:00
Lars Brubaker
ef4a792ef7 Name the copy button 2016-12-09 14:32:07 -08:00
Lars Brubaker
4b921fd825 Merge pull request #1716 from larsbrubaker/master 
Get the starting color set correctly
 2016-12-09 12:14:00 -08:00
Lars Brubaker
7edb7c7dde Make change to page close children 
Set correct wizardwindow when rebuilding content
Make sure click events are running on uithread
 2016-12-09 12:09:28 -08:00
Lars Brubaker
9896346610 Get the starting color set correctly 
Made the android printer select window fix its colors on change
 2016-12-09 10:40:01 -08:00
johnlewin
71b5e30bba Merge pull request #1715 from larsbrubaker/master 
Working to reduce theme changed calls as they will reload all after.
 2016-12-08 18:08:44 -08:00
Lars Brubaker
d23a567307 Working to reduce theme changed calls as they will reload all after. 
same for on active printer changed
 2016-12-08 17:40:04 -08:00
johnlewin
9bb75473ae Merge pull request #1714 from larsbrubaker/master 
Put in the action menus and controls.
 2016-12-08 16:17:49 -08:00
Lars Brubaker
d8d3e23522 Put in the action menus and controls. 2016-12-08 15:39:23 -08:00
Lars Brubaker
a9a5a9f476 Merge pull request #1708 from larsbrubaker/master 
Fixed merge error in test
 2016-12-07 17:16:11 -08:00
Lars Brubaker
3b526cdc98 Fixed merge error in test 
Make sure we don't ref a null mesh on rebuild bed
 2016-12-07 17:04:35 -08:00
Lars Brubaker
ba8f8b08d2 Merge pull request #1706 from larsbrubaker/master 
Only close if we don't need to select a printer
 2016-12-07 16:30:03 -08:00
Lars Brubaker
f4633a582f Fixed test 
Refactored to NumberOfHotEnds
 2016-12-07 16:26:35 -08:00
Lars Brubaker
dbd2c20398 Merge branch '1.6' 
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
 2016-12-07 16:14:56 -08:00
Lars Brubaker
35c475b43a Make sure we close if multiple printers 2016-12-07 15:49:06 -08:00
Lars Brubaker
837c445e0b Fixed shared temp showing correct controls for multiple extruders. 2016-12-07 15:45:46 -08:00
Lars Brubaker
ea8f3a70a0 enable hardware as long as we are on internal machines. 2016-12-07 15:24:48 -08:00
Lars Brubaker
6d7b88b64e Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-07 15:23:33 -08:00
Lars Brubaker
38c6d488f4 Merge pull request #1705 from jlewin/master 
Add PrintLibraryItem test, suppress Process.Kill exceptions
 2016-12-07 15:23:05 -08:00
Lars Brubaker
0b88351365 Only close if we don't need to select a printer 2016-12-07 14:53:48 -08:00
John Lewin
12bfe38519 Validate PrinterConnectionAndCommunication active item matches 2016-12-07 14:34:23 -08:00
John Lewin
153686968f Add PrintLibraryItem test, suppress Process.Kill exceptions 2016-12-07 13:21:53 -08:00
johnlewin
ee7619dd77 Merge pull request #1704 from jlewin/master 
Adjust window width to ensure popout window -> Edit is targeted
 2016-12-07 12:12:08 -08:00
John Lewin
0d13eaef34 Adjust window width to ensure popout window -> Edit is targeted 2016-12-07 11:57:33 -08:00
Lars Brubaker
440c280e28 Merge pull request #1703 from larsbrubaker/master 
Fixed HasHeatedBedCheckedHidesBedTemperatureOptions
 2016-12-07 11:16:49 -08:00
Lars Brubaker
e89a1adad4 Fixed HasHeatedBedCheckedHidesBedTemperatureOptions 2016-12-07 11:10:35 -08:00
johnlewin
7435f7f3cc Merge pull request #1702 from jlewin/master 
Add 10 second timeout to WaitForReloadAll helper function
 2016-12-06 19:24:48 -08:00
John Lewin
37a9941c70 Add 10 second timeout to WaitForReloadAll helper function 2016-12-06 18:52:25 -08:00
Lars Brubaker
b0a8556a57 Merge pull request #1701 from larsbrubaker/master 
Quality settings override correctly.
 2016-12-06 18:20:47 -08:00
Lars Brubaker
5af8ce888d Merge branch 'Setting_Override_Correctly' 
# Conflicts:
#	SlicerConfiguration/SettingsControlSelectors.cs
 2016-12-06 18:17:45 -08:00
Lars Brubaker
054ba1c663 make sure we can go back to default (and test) 
change default to none
 2016-12-06 18:12:57 -08:00
Lars Brubaker
1e192d3cd0 Made a test to prove overrides persist on top of user overrides. 2016-12-06 17:54:27 -08:00
Lars Brubaker
83a3c87557 Quality settings override correctly. 2016-12-06 17:54:27 -08:00
Lars Brubaker
1bd0999352 Merge pull request #1699 from jlewin/master 
Ensure changes are persisted to disk and synced to the cloud
 2016-12-06 17:54:16 -08:00
John Lewin
b50cf8213c Ensure changes are persisted to disk and synced to the cloud 2016-12-06 16:56:37 -08:00
Lars Brubaker
c246f43f4f Quality settings override correctly. 2016-12-06 16:22:28 -08:00
johnlewin
f9fe5295de Merge pull request #1698 from larsbrubaker/master 
Fixed a bug when printing from library with new queue code
 2016-12-06 14:26:06 -08:00
Lars Brubaker
b94f9b4a2b latest agg 2016-12-06 14:16:24 -08:00
Lars Brubaker
cef4be50c2 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-06 14:15:56 -08:00
Lars Brubaker
e3d4051189 Fixed a bug when printing from library with new queue code 2016-12-06 14:15:48 -08:00
Lars Brubaker
b32b44ce12 Merge pull request #1693 from jlewin/master 
Assert UserLayer is empty in production .printer files
 2016-12-05 18:56:28 -08:00
Lars Brubaker
d743485e00 Merge branch 'master' into master 2016-12-05 18:53:47 -08:00
Lars Brubaker
f494737643 Merge pull request #1694 from larsbrubaker/master 
guard against divide by 0.
 2016-12-05 18:03:56 -08:00
Lars Brubaker
f08183dad7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-05 17:58:16 -08:00
Lars Brubaker
b5e9c77933 Merge branch 'master' into master 2016-12-05 17:58:05 -08:00