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

6410 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
4d54f7153d Fix build error 2017-05-25 18:57:04 -07:00
John Lewin
42898a6f91 Fix Layer3D view in design_tools, sync part/layer views on enter 
- Revert to 1.7/ViewGcodeBasic code and make functional
 2017-05-25 18:17:09 -07:00
johnlewin
e1421fb779 Merge pull request #2088 from jlewin/design_tools 
Working toward shared ViewControls3D and functional slicing
 2017-05-25 10:13:58 -07:00
John Lewin
08d2a6ab1a Working toward shared ViewControls3D and functional slicing 
- More missing functionality restored in action bars/slicing views
 2017-05-25 01:15:00 -07:00
johnlewin
44e9cbc09c Merge pull request #2087 from larsbrubaker/design_tools 
sync 3d views transform
 2017-05-25 00:58:51 -07:00
Lars Brubaker
04ce0a2380 fixed vector3 2017-05-24 17:26:48 -07:00
Lars Brubaker
77c3b78eb1 Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 
# Conflicts:
#	PartPreviewWindow/PartPreviewContent.cs
 2017-05-24 15:07:06 -07:00
Lars Brubaker
912101fe32 sync 3d views transform 2017-05-24 14:48:00 -07:00
Lars Brubaker
b9d8880ddc Merge pull request #2086 from jlewin/design_tools 
Sync tab styling
 2017-05-24 14:45:01 -07:00
John Lewin
4559073237 Move more widgets to printer action bar 
- Extract elements in PrinterConnectAndSelectControl to components
- Use new components in printer action bar
- Extract more factories to shared components
- Move shared color to ThemeConfig
- Add support for widget generation during ShowPopup
 2017-05-24 14:19:02 -07:00
Lars Brubaker
ac157577bd Merge branch 'design_tools' of https://github.com/MatterHackers/MatterControl into design_tools 
# Conflicts:
#	Submodules/agg-sharp
 2017-05-24 08:15:00 -07:00
John Lewin
de20dea82d Latest agg-sharp 2017-05-23 23:24:38 -07:00
John Lewin
459dd3d304 Sync tab styling 
- Fix temperature widget flow orientation for toolbar
- Create reusable constructor function for tabcontrols
- Conditional printer tab title of "Printer" or [PrinterName]
 2017-05-23 21:29:03 -07:00
johnlewin
3ed6072625 Merge pull request #2085 from jlewin/design_tools 
Continue migrating features to new layout
 2017-05-23 20:36:08 -07:00
John Lewin
95f6624f5d Prior agg-sharp 2017-05-23 20:30:53 -07:00
John Lewin
69e83b3dd9 Continue migrating features to new layout 
- Create toolbar for printer
- Migrate ActionBarPlus code to new toolbar
- Migrate printer specific actions from Options to new toolbar
- Consolidate and reuse theme factory instances
- Restore F1 reporting of unnamed widgets, useful for finding types
 2017-05-23 19:07:57 -07:00
johnlewin
88ff455851 Merge pull request #2084 from jlewin/design_tools 
Migrate View3D>Edit>Display options to ViewControls3D overflow menu
 2017-05-23 15:36:27 -07:00
John Lewin
1e643617c5 Adjust tab styling 
- Pass separator bars to tabs, disable drawn borders
- Remove ActionBar from leftnav
- Remove PrintProgressBar from leftnav
- Revise BreadCrumb button attributes
- Revise UpFolder icon
- Revise overflow/pancake menu icon
- Create OverflowButton to encapsulate common menu item
- Use horizontal/VerticalLine for consistent color/weight separators
- Reduce visual clutter
  - Minimize regions created by color and line separators
  - Reduce the contrast of separator lines
  - Reduce the contrast of region backgrounds
  - Use consistent background colors across sibling tab pages
 2017-05-23 14:54:36 -07:00
John Lewin
f9c769998d Migrate View3D>Edit>Display options to ViewControls3D overflow menu 2017-05-22 18:17:35 -07:00
Lars Brubaker
f9784738e9 Adding obj loading support 2017-05-22 17:52:08 -07:00
Lars Brubaker
a3c66d8a77 Updated address 2017-05-22 16:00:31 -07:00
johnlewin
72a8a5c2fc Merge pull request #2082 from jlewin/design_tools 
Revise IconView layout
 2017-05-22 12:03:59 -07:00
John Lewin
8dad331afd Revise IconView layout 2017-05-21 23:22:28 -07:00
johnlewin
e088f40bb6 Merge pull request #2081 from jlewin/design_tools 
Fix tests, convert Debug.Break to throw
 2017-05-21 22:44:32 -07:00
John Lewin
4d84844f96 Throw exceptions for missing functionality rather than Debug.Break 
- Fix unexpected abort in NUnit testruns
- Tests should fail rather than crash, highlighting areas needing focus
 2017-05-21 22:37:30 -07:00
John Lewin
9f6821305c Fix ClickingShowTerminalButtonOpensTerminal test 
- Remove test navigation to SettingsAndControls
 2017-05-21 22:11:27 -07:00
johnlewin
8233fca2d3 Merge pull request #2080 from jlewin/design_tools 
Update more PrintQueue tests
 2017-05-21 20:18:50 -07:00
John Lewin
1e286f14bf Remove library tests from PrintQueueTests, extract non-applicable tests 
- See PrintQueueUncertain.cs and LibraryActionTests.cs
 2017-05-21 18:02:53 -07:00
John Lewin
88ce05b5fd Fix QueueAddButtonAddsSTL test 
- Rename to AddStlFile
- Update to new format
- Remove testToRun variable, pass lambda directly
- Issue MatterHackers/MCCentral#1504
 2017-05-21 17:37:37 -07:00
John Lewin
a1e49bb1e7 Fix QueueAddButtonAddsGcodeFile test 
- Rename to AddGCodeFile
- Update to new format
- Remove testToRun variable, pass lambda directly
- Issue MatterHackers/MCCentral#1504
 2017-05-21 17:36:09 -07:00
John Lewin
addd88986a Fix QueueAddButtonAddsAMF test 
- Rename to AddAmfFile
- Update to new format
- Remove testToRun variable, pass lambda directly
- Issue MatterHackers/MCCentral#1504
 2017-05-21 17:27:06 -07:00
John Lewin
51abfc527a Fix AddSingleItemToQueue test 
- Issue MatterHackers/MCCentral#1504
 2017-05-21 17:10:30 -07:00
John Lewin
bbbcb62123 Fix AddMultipleItemsToQueue test 
- Use new library widget name format
- Fix blocking issues in PrintQueueContainer
  - Perform actual container reload via .ReloadContainer
  - Allow ReloadContainer to execute on the current thread
  - Wrap original invocation of ReloadContainer in ctor with Task.Run()
- Issue MatterHackers/MCCentral#1504
 2017-05-21 16:55:33 -07:00
John Lewin
2654151649 Call Container.Add(IEnumerable<T>) 
- Add ChangeToQueueContainer helper method
- Cast to IWritableContainer and invoke Add(IEnumerable<T>)
- Issue MatterHackers/MCCentral#1503
 2017-05-21 16:29:00 -07:00
johnlewin
57c416fa76 Merge pull request #2079 from jlewin/design_tools 
Constrain window height to desktop bounds
 2017-05-21 13:11:49 -07:00
John Lewin
aa8786a795 Constrain window height to desktop bounds 2017-05-21 10:11:48 -07:00
johnlewin
3c996e5b8c Merge pull request #2078 from jlewin/design_tools 
Only switch to container if not null
 2017-05-21 00:07:27 -07:00
John Lewin
1787c377eb Only switch to container if not null 2017-05-21 00:02:30 -07:00
johnlewin
ab161a949e Merge pull request #2077 from jlewin/design_tools 
Fix list item names, use DoubleClickByName to automate library items
 2017-05-20 17:56:24 -07:00
John Lewin
c24480e4ed Fix list item names, use DoubleClickByName to automate library items 
- Remove unused 'up folder' list view item code
 2017-05-20 17:47:36 -07:00
johnlewin
355ced781f Merge pull request #2076 from jlewin/design_tools 
Move to new library model and view
 2017-05-20 15:56:26 -07:00
John Lewin
e882f925ed Fix failing MatterControlRuns test 
- Switch control to validate from 'SettingsAndControls' to 'Library Tab'
 2017-05-20 15:50:17 -07:00
John Lewin
8c926db5d3 Add missing project to public solution file 2017-05-20 15:13:28 -07:00
John Lewin
b67a29d32d Latest agg-sharp 2017-05-20 08:37:20 -07:00
John Lewin
03a593f1b5 Move to new library model and view 
- Add new listview control for library content
- Migrate library providers to containers
  - Cloud, Sqlite, Directories, Queue, History
- Migrate SideBar components to containers
  - Primatives, Text, Braille, ImageConverter
- Create new library container types
  - Zip files, Calibration parts, Printer SDCards
- Reduce leftnav to Library, Settings, Controls, Options
- Add DragDrop support for image content
 2017-05-20 00:41:02 -07:00
Lars Brubaker
b0b249e0c3 Merge pull request #2075 from larsbrubaker/design_tools 
Fixed CancelingNormalPrintTurnsHeatAndFanOff
 2017-05-19 17:26:50 -07:00
Lars Brubaker
8ef9da90b9 Fixed CancelingNormalPrintTurnsHeatAndFanOff 2017-05-19 17:18:21 -07:00
johnlewin
4aa73a5933 Merge pull request #2074 from larsbrubaker/design_tools 
merge 1.7.1
 2017-05-19 15:57:26 -07:00
Lars Brubaker
9f3f1d9303 first run after commit 2017-05-19 15:14:59 -07:00
Lars Brubaker
352eb792f1 Merge branch 'smash_1.7.1' into design_tools 
# Conflicts:
#	PartPreviewWindow/View3D/View3DWidget.cs
#	SlicerConfiguration/SliceSettingsWidget.cs
#	SlicerConfiguration/SlicingQueue.cs
#	StaticData/SliceSettings/Properties.json
 2017-05-19 14:57:04 -07:00