Commit graph

197 commits

Author SHA1 Message Date
Gregory Diaz
00d5c89563 Fixed 'Edit' and 'Remove' button positioning in PrinterListItem 2014-11-11 10:42:03 -08:00
Kevin Pope
0b1d93e1f8 Fix styling of printer profile widgets. 2014-11-10 12:38:37 -08:00
larsbrubaker
c51d3a3d8a Merge remote-tracking branch 'origin/master' into development 2014-11-07 16:51:11 -08:00
larsbrubaker
688bc19372 Fixed theming on terminal scroll bar. 2014-11-07 16:48:04 -08:00
Gregory Diaz
cd19d8121f Centered text on Edit and Done buttons in 'ChooseConnectionWidget' 2014-11-07 16:39:24 -08:00
larsbrubaker
85976685dd Changes made during edit and continue didn't save until next compile. 2014-11-07 10:13:47 -08:00
larsbrubaker
8f2a99e63e Made the terminal store all the content and scroll and be able to save. 2014-11-07 10:12:47 -08:00
larsbrubaker
686d660876 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-11-07 09:20:38 -08:00
larsbrubaker
9299f38207 Working on terminal window loging 2014-11-06 15:19:38 -08:00
John Lewin
e02c387704 Account for null reference condition when assigning .ActivePrinter - Fixes #82157118 2014-11-05 13:38:16 -08:00
John Lewin
0ae732638f Change ordering to ensure CloseOnIdle is run last 2014-11-04 21:15:15 -08:00
John Lewin
eb8cd1fcab Update ActivePrinterProfile.Instance.ActivePrinter after edits in EditConnectionWidget 2014-11-04 21:15:13 -08:00
John Lewin
292d056cb4 Sync class and file name for EditConnectionWidget 2014-11-04 21:15:12 -08:00
Matt Moening
64628b4132 Improved auto-name feature to change on model change
Will not change name if user types value into name box
2014-10-31 09:36:30 -07:00
Lars Brubaker
cde58a3148 Merge pull request #79 from mmoening/development
Added feature to replace "Default Printer" with the Make and Model of th...
2014-10-29 18:14:51 -07:00
Matt Moening
b7957f7124 Added feature to replace "Default Printer" with the Make and Model of the printer if the name of the printer was not changed when added 2014-10-29 17:46:05 -07:00
Kevin Pope
7f06d069e0 Widened the print connection buttons a bit and made a separate part preview container widget. 2014-10-29 16:55:44 -07:00
Kevin Pope
2d3adf5098 Merge pull request #77 from gregory-diaz/development
Finished up work for Printer Connection Window and PrinterList Items.
2014-10-29 12:52:09 -07:00
Gregory Diaz
58a3d34938 Finished up work for Printer Connection Window and PrinterList Items. 2014-10-29 12:34:01 -07:00
larsbrubaker
e58e7cf049 Made ExtruderShareTemperature go through the api rather than direct query. 2014-10-29 09:51:52 -07:00
Matt Moening
d4bd2c010a Removed not longer needed function call that breaks build 2014-10-27 18:22:48 -07:00
Matt Moening
bdb13f94ee Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-27 18:14:01 -07:00
Matt Moening
61583a7220 ToggleSwitchFactory for generating toggle switchs, Added the factory to ControlWidgetBase.cs, used factory to create toggle switch in FanControl.cs 2014-10-27 17:32:35 -07:00
larsbrubaker
0d454acd9f Fixed more memory leaks. 2014-10-24 18:50:41 -07:00
larsbrubaker
08dc379472 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	PrinterControls/PrinterConnections/PrinterListItems.cs
2014-10-24 13:53:00 -07:00
larsbrubaker
222a5a46a7 Changed ButtonEventHandler to EventHandler
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
2014-10-24 13:41:13 -07:00
Gregory Diaz
5069e9f584 Added functionality to edit and remove buttons in printer connection window 2014-10-23 21:30:50 -07:00
Gregory Diaz
10233f5f2b Merge remote-tracking branch 'gregsFork/development' into development 2014-10-23 20:42:29 -07:00
Kevin Pope
7956a03718 Fixed crash error that occurred when printer profile did not include fan. 2014-10-23 17:47:59 -07:00
gregory-diaz
e0f55cc4e3 Merge remote-tracking branch 'upstream/development' into development 2014-10-23 13:55:47 -07:00
gregory-diaz
dd38b98a07 Greg bug files printer connections window. 2014-10-22 18:06:38 -07:00
Kevin Pope
19157834b4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-22 10:14:28 -07:00
Kevin Pope
6914434853 Allow OutputScroll to be used as embedded widget. 2014-10-22 10:13:22 -07:00
kevinepope
e936fe98f7 Change message confirmation dialogs from modal to async w/callback. 2014-10-21 21:20:09 -07:00
Gregory Diaz
bca9fab46f More work to UI 2014-10-21 18:58:23 -07:00
Gregory Diaz
6a8de729bb Worked on some UI stuff in printer connection window 2014-10-21 18:53:15 -07:00
Matt Moening
9969d0d641 Added Button to enable and disable fan.
Added button to output console text to file (temp hardcoded location)
2014-10-20 17:53:49 -07:00
Kevin Pope
01cf3003f3 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-17 14:12:09 -07:00
Kevin Pope
b7770b9008 Added sub header to temperature controls. 2014-10-16 12:31:20 -07:00
larsbrubaker
6590583d19 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
Conflicts:
	PrinterControls/ManualPrinterControls.cs
2014-10-15 17:11:20 -07:00
larsbrubaker
398023ba7b Put in actual extruder temp setting and reading for multi extruders.
Got rid of crash when no gcode loaded and try to clear it.
2014-10-15 17:04:14 -07:00
Kevin Pope
9faee063eb Refactoring manual controls widget. 2014-10-15 16:57:26 -07:00
Kevin Pope
db1da694b9 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-10-14 14:40:03 -07:00
Kevin Pope
9e9259bfba Adding mutli-material UI support. 2014-10-14 14:39:46 -07:00
gregory-diaz
b5484bb922 Added serial port radio buttons to scrollable widgets(did not implement right the first time) 2014-10-14 10:03:21 -07:00
gregory-diaz
a2dbd3a891 resolved conflicts to merge 2014-10-14 09:35:22 -07:00
gregory-diaz
babd2cc620 Added serial port radio buttons to scrollable widget. 2014-10-14 09:33:14 -07:00
Kevin Pope
4d9f5ce9f6 Alignment corrections. 2014-10-13 18:47:27 -07:00
Kevin Pope
e17ea72299 Added UI support for manual extrusion with multiple extruders. 2014-10-13 18:06:14 -07:00
larsbrubaker
196c3e1c76 Merge remote-tracking branch 'Greg/development' into development
Conflicts:
	PartPreviewWindow/View3DTransfromPart.cs
2014-10-13 12:27:31 -07:00