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

10426 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
ad62450575 Remove accidental shadowing of base property 2018-05-11 18:41:50 -07:00
John Lewin
6558003511 Remove ListView instance coupling, revise to ILibraryContainer 2018-05-11 18:41:50 -07:00
Lars Brubaker
832333d2ca
Merge pull request #3312 from larsbrubaker/design_tools 
Cleaning up some bad code around small gcode data
 2018-05-11 17:57:39 -07:00
Lars Brubaker
611874275e Cleaning up some bad code around small gcode data 2018-05-11 16:59:22 -07:00
Lars Brubaker
85adfda222
Merge pull request #3310 from larsbrubaker/design_tools 
improve gcode layer display:
 2018-05-11 14:53:18 -07:00
LarsBrubaker
47335b7219 improve gcode layer display: 
issue: MatterHackers/MCCentral#3331
Index out of range exception when loading mostly empty GCode file

issue: MatterHackers/MCCentral#3332
more layer info
 2018-05-11 14:40:56 -07:00
johnlewin
e6cbac7e8e
Merge pull request #3308 from jlewin/design_tools 
Disallow model selection in GCode views
 2018-05-11 10:57:00 -07:00
John Lewin
dd6c105fd3 Switch from GCode to Model view on drag over 
- Issue MatterHackers/MatterControl#3148
After deleting obj in GCode view, model stays visually (kinda confusing?)
 2018-05-10 17:21:59 -07:00
John Lewin
664b736f66 Disallow model selection in GCode views 
- Issue MatterHackers/MatterControl#3148
After deleting obj in GCode view, model stays visually (kinda confusing?)
 2018-05-10 17:14:54 -07:00
johnlewin
d7863651e8
Merge pull request #3306 from jlewin/design_tools 
Restore Android only using statement
 2018-05-10 15:21:50 -07:00
John Lewin
b9aad1a517 Restore touch scrolling on Android 
- Issue MatterHackers/MCCentral#3352
Touch scrolling not functioning on Android
 2018-05-10 15:15:50 -07:00
John Lewin
8d763c883a Always use flat thumbnails on Android 
- Issue MatterHackers/MCCentral#3351
3D thumbnails incorrectly enabled on Android
 2018-05-10 15:15:50 -07:00
John Lewin
e0f989a52b Restore expected icons on Android 
- Issue MatterHackers/MCCentral#3350
Expected custom styling on Android missing
 2018-05-10 15:15:49 -07:00
John Lewin
741ef7a106 Restore Android only using statement 2018-05-10 15:15:49 -07:00
johnlewin
6e791e5c63
Merge pull request #3305 from larsbrubaker/design_tools 
Refactoring selection bounds to be in world space
 2018-05-10 15:15:11 -07:00
LarsBrubaker
c3ffe541be Refactoring selection bounds to be in world space 
refactoring changing signatures
 2018-05-10 10:20:39 -07:00
Lars Brubaker
ada5feb5f3
Merge pull request #3304 from jlewin/design_tools 
Fix typo
 2018-05-10 10:14:06 -07:00
John Lewin
eb355a7fb9 Extract help guides to declarative json 
- Issue MatterHackers/MCCentral#3346
GuideAssets use unlocalized string on purpose?
 2018-05-10 08:57:56 -07:00
John Lewin
95a82a3093 Cleanup 2018-05-10 08:37:55 -07:00
John Lewin
6dcbd60fc0 Remove Invalidate from OnDraw call 
- Issue MatterHackers/MCCentral#3347
Invalidate should not be invoked from Draw
 2018-05-10 08:37:55 -07:00
John Lewin
b8d5b00ad3 Compute rather than move for selection render 
- Issue MatterHackers/MCCentral#3344
Won't close if there is a selection on the bed

- Issue MatterHackers/MCCentral#3347
Invalidate should not be invoked from Draw
 2018-05-10 08:37:54 -07:00
John Lewin
cb1882c709 Fix typo 2018-05-10 07:29:44 -07:00
johnlewin
77bf89369a
Merge pull request #3302 from jlewin/design_tools 
Restore borders for hovered/selected list view items, use native borders
 2018-05-10 06:58:27 -07:00
John Lewin
090eecb8a3 Set execute flag on build script 2018-05-09 20:42:08 -07:00
John Lewin
da8b841292 Spelling 2018-05-09 20:40:33 -07:00
John Lewin
fd63b2c5fc Restore borders for hovered/selected list view items, use native borders 
- Issue MatterHackers/MCCentral#3345
Restore borders for selected items, replace owner drawn with native
 2018-05-09 20:39:53 -07:00
johnlewin
b8cce5d425
Merge pull request #3301 from larsbrubaker/design_tools 
Improving help
 2018-05-09 20:00:27 -07:00
Lars Brubaker
2e61d18dc5 Improving help 2018-05-09 17:22:31 -07:00
Lars Brubaker
1a29f81056
Merge pull request #3300 from larsbrubaker/design_tools 
Made the selection much faster and consistent
 2018-05-09 16:46:56 -07:00
Lars Brubaker
f39d2116ee Made the selection much faster and consistent 2018-05-09 16:41:45 -07:00
johnlewin
81e98c0de5
Merge pull request #3299 from jlewin/design_tools 
Add missing SerialHelper files
 2018-05-09 15:32:45 -07:00
John Lewin
7fadf07589 Change ZOffset to LayerTop 2018-05-09 15:27:31 -07:00
John Lewin
acd8842f0b Update paths for new location 2018-05-09 15:26:24 -07:00
John Lewin
5dfb7c6d4a Add missing SerialHelper files 2018-05-09 15:22:31 -07:00
Lars Brubaker
682ff24209
Merge pull request #3298 from larsbrubaker/design_tools 
Made tool tips show for most Public Properties
 2018-05-09 14:35:58 -07:00
Lars Brubaker
2d27b777c1 Made tool tips show for most Public Properties 
still need to get lists working
 2018-05-09 13:35:47 -07:00
Lars Brubaker
13eb73ed62
Merge pull request #3297 from larsbrubaker/design_tools 
Design tools
 2018-05-09 12:36:55 -07:00
Lars Brubaker
788a0cd7be Fixed ring object 2018-05-09 12:30:50 -07:00
Lars Brubaker
a360cc1112 Don't crash when we have bad data (should fix it at a higher level (rebuild from children)) 2018-05-09 12:30:50 -07:00
Lars Brubaker
9678fe7561 Don't show internals of !persistable objects 2018-05-09 12:30:49 -07:00
johnlewin
8057c5a3c6
Merge pull request #3296 from jlewin/design_tools 
Add missing field initializer
 2018-05-09 11:16:55 -07:00
John Lewin
1c3493e8a2 Add missing field initializer 2018-05-09 10:50:31 -07:00
johnlewin
db1709f356
Merge pull request #3295 from jlewin/design_tools 
Ensure drag-drop GCode is disallowed on part tabs
 2018-05-09 08:57:57 -07:00
John Lewin
f6ce9431b6 Move state from widget to model and revise persistence/init 
- Issue MatterHackers/MCCentral#3305
View style state not synced on load
 2018-05-09 08:41:29 -07:00
John Lewin
f651026b15 Add and use application viewstate type for library view mode 
- Issue MatterHackers/MCCentral#3315
ListView mode/state not synced with actual
 2018-05-09 07:52:05 -07:00
John Lewin
6441440764 Improve readability, add uncommitted change 2018-05-09 07:50:50 -07:00
John Lewin
50ec91ea2f Ensure drag-drop GCode is disallowed on part tabs 
- Issue MatterHackers/MCCentral#3318
Drag-drop GCode to part tab should not be allowed
 2018-05-09 07:35:42 -07:00
johnlewin
474823feba
Merge pull request #3294 from jlewin/design_tools 
Don't fire ReloadAll on printer change
 2018-05-08 17:36:22 -07:00
John Lewin
7731b0b4fd Revise naming for clarity 2018-05-08 17:24:14 -07:00
John Lewin
9c09297ecb Load theme earlier, use TabBarBackground color 2018-05-08 17:24:14 -07:00