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

2926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
359d343b3e Merge pull request #406 from gregory-diaz/1.4.0 
made hotkey controls icon change to the correct color when ActiveThem…
 2015-09-22 15:18:51 -07:00
Gregory Diaz
a63c54330a made hotkey controls icon change to the correct color when ActiveTheme is changed from light to dark 2015-09-22 14:47:33 -07:00
johnlewin
6e9a4de9ea Merge pull request #405 from jlewin/1.4.0 
Clear SelectedItems when the LibraryDataView is rebuilt
 2015-09-22 14:06:14 -07:00
John Lewin
ca97f3d0e9 Clear SelectedItems when the LibraryDataView is rebuilt 2015-09-22 14:04:30 -07:00
Lars Brubaker
3cd2c36d89 If the number edit widget resets the content then put the cursor at the end of the input 2015-09-22 13:03:37 -07:00
Lars Brubaker
494121d4c1 make sure the save as window supports the keyboard. 2015-09-22 12:37:21 -07:00
Lars Brubaker
b0f0f84984 This is not actually fatal just for checking in PC. 2015-09-22 12:29:02 -07:00
Lars Brubaker
fd860f19d2 Put a bigger icon in touch 2015-09-22 12:21:11 -07:00
Lars Brubaker
23203526ef Make sure we don't use this pointer when threaded without ensure it is not null. 2015-09-22 12:15:21 -07:00
Lars Brubaker
3b1d698f58 Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-22 11:10:54 -07:00
Lars Brubaker
4ed7d63b0e Don't show title if not given. 2015-09-22 10:41:29 -07:00
Kevin E. Pope
35569909cf Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-22 10:30:57 -07:00
Kevin E. Pope
28509f167c Adjust library item progress bar spacing. 2015-09-22 10:30:53 -07:00
Lars Brubaker
c3a4eb53f5 new localization 2015-09-21 19:14:48 -07:00
Lars Brubaker
d8a154ec50 Merge pull request #404 from mmoening/1.4.0 
Fixed Flashforge cancel reprint not starting new print
 2015-09-21 17:01:39 -07:00
Matt Moening
46b576a0eb Updated FlashForge printer profiles to send end print message to printer on cancel. 2015-09-21 16:59:35 -07:00
Lars Brubaker
fe2d63cde9 Bringing some clarity to the material selection in 3d view. 2015-09-21 16:53:40 -07:00
Lars Brubaker
ff7631c336 can load a sequence from static data 2015-09-21 16:41:56 -07:00
Lars Brubaker
712ee8fd2c Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-21 15:44:23 -07:00
Lars Brubaker
be1ee63705 Put in the new loading images 2015-09-21 15:44:13 -07:00
johnlewin
0c8451004b Merge pull request #403 from jlewin/1.4.0 
Prevent interaction with library placeholder collections
 2015-09-21 15:30:40 -07:00
John Lewin
47062356db Prevent interaction with library placeholder collections 
- Remove hard-coded place holder tokens
 - Fix extruder number comments in exported gcode
 2015-09-21 15:27:32 -07:00
Lars Brubaker
d49d2e4588 Make sure we don't corrupt the cache data (or use it while creating it) 
make sequences handle bad data better
 2015-09-21 15:08:29 -07:00
Lars Brubaker
f600e0f031 Don't crash when adding a missing file to the library. 2015-09-21 14:57:06 -07:00
Lars Brubaker
fbb5f7eabd Better NameExists code. Checks for all names in the region. 
Fixed the check box test.
 2015-09-21 12:09:19 -07:00
Lars Brubaker
e61cade31a Fixed a bug with the cm3 value in exporting 2015-09-21 11:25:47 -07:00
Lars Brubaker
5ae3cdcc07 Make the 3d views rebuild on revert. 2015-09-21 11:01:20 -07:00
Lars Brubaker
f68bd262de Put back in update notification feed on touch screen. 2015-09-21 10:34:10 -07:00
Lars Brubaker
c3c12745b7 Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-21 10:00:44 -07:00
Lars Brubaker
801cc06f2a put in share tool tip 2015-09-21 10:00:40 -07:00
johnlewin
9b36e1d228 Merge pull request #402 from jlewin/1.4.0 
Restore batch remove functionality
 2015-09-20 13:55:59 -07:00
John Lewin
e9661283ee Restore batch remove functionality 2015-09-20 13:13:52 -07:00
Kevin E. Pope
a484795de2 Fixed bug where deleting multiple folders at once caused crash. 2015-09-18 17:32:54 -07:00
Kevin E. Pope
ce98ea2328 Update loading icon/image. 2015-09-18 15:53:51 -07:00
johnlewin
74bbce1ad0 Merge pull request #401 from jlewin/1.4.0 
Restore hover border on "up" library folders
 2015-09-18 13:16:05 -07:00
John Lewin
c3dea1ac87 Restore hover border on "up" library folders 2015-09-18 13:13:14 -07:00
Kevin E. Pope
4466c2365f Update shared folder icon. 2015-09-18 11:24:46 -07:00
Lars Brubaker
4b898847f0 Don't use libraryProvider if null. 2015-09-17 19:26:18 -07:00
Kevin E. Pope
5e2ecf93d3 Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-17 19:19:20 -07:00
Kevin E. Pope
14a6834669 Add share redemption. 2015-09-17 19:19:15 -07:00
johnlewin
0f173e86af Merge pull request #400 from jlewin/1.4.0 
Remove unused widget
 2015-09-17 18:47:14 -07:00
John Lewin
657c0a810f Remove unused widget 2015-09-17 18:46:26 -07:00
Lars Brubaker
de79d40782 Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-17 18:26:17 -07:00
Lars Brubaker
95bed9d201 Fixed the test. 2015-09-17 18:26:05 -07:00
Kevin E. Pope
19eed1e124 Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-17 18:25:56 -07:00
Kevin E. Pope
d7b2dc5bc1 Adjust menu border colors. 2015-09-17 18:25:35 -07:00
Lars Brubaker
0fda08b6ee Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0 2015-09-17 18:25:05 -07:00
Lars Brubaker
2289fbfdf0 Put in database locking 
fixed a test
 2015-09-17 18:25:00 -07:00
Kevin E. Pope
bcb3b44d89 Add share button to library. 2015-09-17 18:03:02 -07:00
Lars Brubaker
20618e3835 more strings 2015-09-17 17:30:55 -07:00