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

5767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
3e5a92d0bb Merge branch '1.6' 2016-12-15 15:32:34 -08:00
Lars Brubaker
de1b14e652 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-15 15:30:30 -08:00
Lars Brubaker
ed4f94831f Merge pull request #1731 from unlimitedbacon/guidelines 
Added contribution guidelines
 2016-12-15 14:34:41 -08:00
Tyler Anderson
551a14c57a Added contribution guidelines 2016-12-14 18:09:58 -08:00
johnlewin
923311192b Merge pull request #1730 from jlewin/1.6 
Improve startup state initialization
 2016-12-14 17:23:27 -08:00
John Lewin
a566e745f2 Fix build breaks 
- Default ActivePrinterSettings.Instance to EmptyProfile
- Clean up assignment code
- Move EmptyProfile to PrinterSettings
 2016-12-14 17:19:19 -08:00
John Lewin
836dcee8b8 Improve startup state initialization 
- Use single instance for .EmptyProfile
- Remove ActiveSliceSettings static constructor, rely on ProfileManager
- Remove SettingsKey.active_theme_name and db usage
- Revise LoadUITheme to only load oem or default color theme
- Only assign ActiveSliceSettings.Instance during ProfileManager assign
 2016-12-14 16:18:54 -08:00
Lars Brubaker
603b6c5949 Merge pull request #1729 from larsbrubaker/1.6 
1.6
 2016-12-14 16:02:02 -08:00
Lars Brubaker
bf62f92420 Fixed resend to work on smoothie 
MatterHackers/MatterControl#1700
Not sending resends to Smoothieware
 2016-12-14 15:03:37 -08:00
Lars Brubaker
c4c864a409 Rebuild ui if leveling solution changes 
MatterHackers/MCCentral#589
Changing leveling solution needs to call reload all or similar to refresh for "Finish Setup"
 2016-12-14 11:53:32 -08:00
Lars Brubaker
53e6ff3eba Added recovery count to the history data 
MatterHackers/MCCentral#914
Track the recovered count to aid diagnostics
 2016-12-14 11:26:53 -08:00
Lars Brubaker
c9bd9aae0c Merge pull request #1728 from larsbrubaker/1.6 
1.6
 2016-12-14 10:43:32 -08:00
Lars Brubaker
29f0fac18c latest agg 2016-12-14 09:25:54 -08:00
johnlewin
6c4a2eeb7d Merge pull request #1726 from jlewin/master 
Support configuration based TimeToMoveMouse
 2016-12-13 10:34:04 -08:00
John Lewin
caa2d6ae4f Support configuration based TimeToMoveMouse 2016-12-13 10:26:49 -08:00
johnlewin
a5a89aef89 Merge pull request #1724 from larsbrubaker/master 
Interactive user prompts should confirm the action requested
 2016-12-13 10:23:23 -08:00
johnlewin
69c3e89297 Merge branch 'master' into master 2016-12-12 17:50:55 -08:00
Lars Brubaker
ecaf2d3cdf Interactive user prompts should confirm the action requested 2016-12-12 17:42:22 -08:00
johnlewin
ce61d298eb Merge pull request #1723 from jlewin/master 
Reduce hard-coded test wait times, use initial dialog to add printers
 2016-12-12 17:40:21 -08:00
John Lewin
b49b4b8c7e Reduce hard-coded test wait times, use initial dialog to add printers 2016-12-12 17:33:02 -08:00
Lars Brubaker
11c8447c8b Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-12-12 17:23:39 -08:00
Lars Brubaker
49ea8df3fd Refactoring menus for consistency. 2016-12-12 14:35:34 -08:00
johnlewin
03fa2c7632 Merge pull request #1721 from jlewin/master 
Rename Com port to Serial port
 2016-12-12 14:35:19 -08:00
John Lewin
d72503a9c4 Rename Com port to Serial port 2016-12-12 14:18:17 -08:00
Lars Brubaker
0e6deec42a Merge pull request #1720 from larsbrubaker/master 
Moving keyboard offset to common base class
 2016-12-12 13:40:43 -08:00
Lars Brubaker
03e1fee901 Moving keyboard offset to common base class 2016-12-12 13:32:40 -08:00
Lars Brubaker
52fcf0e720 Merge pull request #1719 from larsbrubaker/master 
Refactored network printing settings to match the other printer settings
 2016-12-12 12:20:48 -08:00
Lars Brubaker
8c72bf1168 Refactored network printing settings to match the other printer settings 
Took out the automatic changes to other settings
 2016-12-12 12:14:30 -08:00
johnlewin
af0b47455d Merge pull request #1718 from jlewin/master 
Prevent unexpected ActivePrinter changes
 2016-12-10 14:46:33 -08:00
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