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

4898 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
johnlewin
c231503bfa Merge pull request #692 from gregory-diaz/master 
Master
 2016-05-04 11:07:18 -07:00
Tyler Anderson
f5234eb4ff switch spaces to tabs 2016-05-04 10:33:43 -07:00
johnlewin
56d362422f Merge pull request #710 from jlewin/master 
Refactor CalibrationSettingsView, remove dead code
 2016-05-04 08:48:05 -07:00
John Lewin
b6f4acd44d Refactor CalibrationSettingsView, remove dead code 2016-05-04 08:26:20 -07:00
johnlewin
62f46bc7d6 Merge pull request #708 from jlewin/master 
Apply user overrides and fall back to settings cascade for temperature
 2016-05-04 07:33:40 -07:00
John Lewin
66bdaea7b7 Apply user overrides and fall back to settings cascade for temperature 
- Fix issue with '- default -' being stored as a material layer key
 - Fixes #704
 2016-05-04 07:16:54 -07:00
John Lewin
cd804e48be Refactor TemperatureWidgetExtruder 2016-05-04 07:16:54 -07:00
Tyler Anderson
0f1b56f136 Added R code for M190 2016-05-03 18:43:13 -07:00
Lars Brubaker
86f08b2565 use a 64 bit hash of slice settings. 2016-05-03 11:26:41 -07:00
Lars Brubaker
6ffd1736ef Put in a better hash for slice settings 2016-05-03 11:10:35 -07:00
Lars Brubaker
754ae7db2a Set the menu colors correctly. 2016-05-03 10:57:30 -07:00
johnlewin
55b9570d9d Merge pull request #705 from jlewin/master 
Revise AutoConnect behavior and startup printer selection
 2016-05-03 08:36:53 -07:00
John Lewin
2875a577c7 Remove dead code, document future behavior 2016-05-03 08:28:44 -07:00
John Lewin
e4f2dad8ae Revise AutoConnect behavior and startup printer selection 
- Store selected printer in UserSettings
 - Restore last selected printer on startup
 - AutoConnect now means "Connect" to startup printer if enabled
 - Prevent firing ActivePrinterChanged and thus ReloadAll during startup
 2016-05-03 08:08:05 -07:00
John Lewin
ad48c820e2 Restore AutoConnect functionality 
- Add AutoConnect settings UI
 - For consistency, use string int values for settings bools
 2016-05-03 08:08:05 -07:00
Lars Brubaker
778cfb8718 Took out the caching of slice settings hash code. 2016-05-02 16:34:13 -07:00
Lars Brubaker
fcbb1bb9ae Added a new COM_PORT slice setting. 2016-05-02 16:10:20 -07:00
Lars Brubaker
1ba768f9ef Fixed the colors on the pencil icon 2016-05-02 14:20:51 -07:00
Lars Brubaker
906ee5f4f8 Set the right permissions on a library protected folders 2016-05-02 13:36:48 -07:00
Lars Brubaker
7d29bee60b Made the settings check box check 'click' to only pick up user changes. 
making the OnCheckStateChanged take an EventArgs (more standard)
 2016-05-02 10:27:20 -07:00
Greg
645e734d68 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-05-02 09:46:03 -07:00
larsbrubaker
ea4c595699 latest agg 2016-05-01 21:48:24 -07:00
larsbrubaker
21b5e4c999 Got the new menu tests work for click of after click disable. 
Added new EventHandler ContainsFocusChanged
merged GotFocus and Lost Focus into FocusChanged
 2016-05-01 18:49:12 -07:00
larsbrubaker
5dc978b9a0 AddHorizontalLine to menu 2016-04-30 22:59:26 -07:00