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

4071 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
4cb2d95fff Improved settings naming. 2016-05-10 15:04:43 -07:00
Lars Brubaker
6237997de5 Fixed the arrow icons to render correctly. 2016-05-10 14:53:40 -07:00
Lars Brubaker
34c2b1ced6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-10 13:31:09 -07:00
Lars Brubaker
c324a9a545 Added the printer name to slice settings ui 
Reorganized settings layout a bit for printer/ fatures
Made more invert lightness extension method uses
 2016-05-10 13:30:51 -07:00
johnlewin
f0599e4f36 Merge pull request #730 from jlewin/master 
Fix issue preventing tests from overriding AppData in Release
 2016-05-10 13:29:54 -07:00
John Lewin
d1309a9942 Fix issue preventing tests from overriding AppData in Release 2016-05-10 13:20:02 -07:00
Lars Brubaker
039314862b Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-10 12:16:09 -07:00
johnlewin
0166091276 Merge pull request #729 from jlewin/master 
Create extension method for InvertLightness
 2016-05-10 12:09:13 -07:00
John Lewin
6c74ca85b3 Latest Agg 2016-05-10 11:50:33 -07:00
Lars Brubaker
e4713d2715 Fixing pencil colors. 2016-05-10 11:42:40 -07:00
Lars Brubaker
10e173c6c0 Make sure we don't double scale the library icons. 2016-05-10 11:26:02 -07:00
John Lewin
8ca7fdf5b8 Create extension method for InvertLightness 2016-05-10 11:13:10 -07:00
larsbrubaker
ec4f5c180d Fixed colors for library icons. 2016-05-10 08:38:14 -07:00
Lars Brubaker
1b20092248 Made the com menu rebuild when opened. 
Fixed more color setting and new icons
 2016-05-09 18:07:35 -07:00
Lars Brubaker
6c321583f8 Merge remote-tracking branch 'lars/master' 2016-05-09 16:55:47 -07:00
Lars Brubaker
77439a0ef1 Merge branch '1.5.3.TG' 
Conflicts:
	Submodules/MatterSlice
 2016-05-09 16:55:42 -07:00
Lars Brubaker
c86829d0bc New z-hop always added to moves when set 2016-05-09 16:38:51 -07:00
johnlewin
8d1cff12fd Merge pull request #728 from jlewin/master 
Add console debugging to investigate test failures
 2016-05-09 16:27:35 -07:00
John Lewin
d684630a50 Add console debugging to investigate test failures 2016-05-09 16:25:32 -07:00
johnlewin
a66a1c19da Merge pull request #727 from jlewin/master 
Fix Macro null reference errors
 2016-05-09 16:14:47 -07:00
John Lewin
5f9899d2f7 Fix Macro null reference errors 
- Make the Add->Save feature work for Macros
 2016-05-09 14:20:13 -07:00
johnlewin
bb5df2b411 Merge pull request #726 from jlewin/master 
Migrate Macros to new profile format
 2016-05-08 16:04:34 -07:00
John Lewin
b9a24e60ca Fix mono compile issues 2016-05-08 15:32:21 -07:00
John Lewin
10f05550b5 Migrate Macros to new profile format 
- Remove unused PrinterSetupStatus class
 - Fixes #683
 2016-05-08 14:13:16 -07:00
Lars Brubaker
0d1a8edba7 Merge pull request #724 from jlewin/master 
Force AdvancedControlsReload when closing presets window
 2016-05-08 13:00:21 -07:00
John Lewin
0e997955c6 Force AdvancedControlsReload when closing presets window 
- Fixes #723 - Changes made to presets not recognized until refreshed
 2016-05-07 21:07:14 -07:00
John Lewin
17c5e07ce6 Rename settingsRow2 to settingsRow 2016-05-07 21:05:53 -07:00
John Lewin
c01f56ca22 Refactor CompactTabView to better convey use 
- Rename CompactTabView to TouchscreenTabView
 - Consolidate Reload functions into LoadAdvancedControls parent method
 - Rename LoadAdvancedControls to ReloadAdvancedControls
 2016-05-07 20:49:46 -07:00
larsbrubaker
85771ced2a Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
# Conflicts:
#	SlicerConfiguration/SettingsControlSelectors.cs
 2016-05-07 20:30:25 -07:00
larsbrubaker
4e7b68e1c0 Made all the icons black rather than white on transparent. 2016-05-07 20:06:43 -07:00
johnlewin
b5c2466ae1 Merge pull request #722 from jlewin/master 
Presets Window updates
 2016-05-07 18:58:15 -07:00
John Lewin
30ef1363a4 Fix initial layout issues 2016-05-07 18:51:44 -07:00
John Lewin
b8348fffdd Consolidate SlicePresetDetailWidget into SlicePresetsWindow 2016-05-07 18:23:40 -07:00
John Lewin
e623d76448 Cleanup dead code and refactor Presets window 2016-05-07 17:51:05 -07:00
John Lewin
f314731449 Better integrate new Presets editor 
- Fixes #718 - Presets editor is hard-coded to show Material presets
 - Fixes #719 - Name field in presets editor is incorrect
 - Fixes #721 - Wire up "Add Preset"
 2016-05-07 17:51:04 -07:00
larsbrubaker
371561a6f7 Working to make the icons scale better on high res screens. 2016-05-07 17:18:05 -07:00
Lars Brubaker
64584ba88b Merge pull request #717 from jlewin/master 
Machine specific ComPort settings
 2016-05-07 13:49:30 -07:00
John Lewin
6c6f16d334 Machine specific ComPort settings 
- Fixes #709
 2016-05-06 18:53:03 -07:00
Lars Brubaker
b51b38b249 Moved TextWidget.GlobalPointSizeScaleRatio -> GuiWidget.DeviceScale 
Significantly improved the layout consistency when enlarging the device scale.
Created a DeviceMargin and DevicePadding on GuiWidget
Deleted dead code
Made many images have default larger disk sizes and scale in memory.
Made the menus have horizontal spacers rather than dashed lines
 2016-05-06 17:56:27 -07:00
larsbrubaker
a225e69513 Fixed the font size in touch screen mode 2016-05-06 07:54:46 -07:00
johnlewin
192efc2074 Merge pull request #716 from jlewin/master 
Get updated profiles compiling on Android
 2016-05-05 13:55:41 -07:00
John Lewin
5db7c79d00 Get updated profiles compiling on Android 
- Remove unused properties from ApplicationView
 - Rename CompactApplicationView to TouchscreenView
 - Rename ResponsiveApplicationView to DesktopView
 - Move abstract ToggleTopContainer() specific to TouchscreenView
 - Remove unused HideTopContainer implementations
 - Conditionally compile invocation/assignment of ApplicationMenuRow
 - Migrate single setting from PrinterSettings "PublishBedImage" to SliceSettings
 - Remove PrinterSettings class
 - Import "PublishBedImage" during ImportPrinters
 - Remove code that doubles the size of the splitter bar when collapsed
 - Fix incorrect path to "config.ini"
 2016-05-05 12:33:39 -07:00
larsbrubaker
a333961029 Made the row items not open their slide menus unless they represent the top widget under the mouse. 
removed dead code.
 2016-05-04 21:57:33 -07:00
Lars Brubaker
8f47fd3efd Merge branch '1.5.3' 
Conflicts:
	StaticData/PrinterSettings/JumpStart/V1/config.ini
 2016-05-04 14:28:29 -07:00
Lars Brubaker
efb180b9a7 latest ms 2016-05-04 14:27:09 -07:00
Lars Brubaker
1402ed6961 slow down the jump start defaults 2016-05-04 14:25:14 -07:00
Lars Brubaker
f3968c36b7 Merge remote-tracking branch 'origin/1.5.3' 2016-05-04 12:14:53 -07:00
Lars Brubaker
cdd9af3920 Fixes #707 Double press pause button causes fail 
Working on a new interface to allow moving items in the library.
 2016-05-04 12:14:10 -07:00
Lars Brubaker
d414c5ff04 Merge pull request #711 from unlimitedbacon/master 
Add R code for M190
 2016-05-04 12:08:15 -07:00
johnlewin
617eb61861 Merge pull request #696 from gregory-diaz/1.5.3 
Updated printer profiles for IRA3D
 2016-05-04 11:07:33 -07:00