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

15456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Pope
ee41f407c5 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-12 12:35:54 -07:00
Kevin Pope
86e2a5c736 Change language on Printer connection setup alternative options 2014-04-12 12:35:16 -07:00
Kevin Pope
3efc899d2f Make slice presets preload during setup. 2014-04-12 12:34:27 -07:00
larsbrubaker
cfeb381b9c Moved clipboard stuff into its own file. 2014-04-12 12:20:04 -07:00
larsbrubaker
bb2c02224a Merge remote-tracking branch 'origin/development' into development 2014-04-12 11:54:16 -07:00
larsbrubaker
0808bef956 Made the desktop position happen before visible so it does not move after being opened. 2014-04-12 11:54:05 -07:00
Kevin Pope
a98655f79c Adding some material presets. 2014-04-11 19:12:17 -07:00
Kevin Pope
60eb17f908 Restored theme indexes so that previous installs will maintain their present theme on update. Fixed theme selector to support same. 2014-04-11 18:17:16 -07:00
Kevin Pope
7156733a44 Added arrow indicator to column separators. 2014-04-11 13:41:34 -07:00
larsbrubaker
bacab154fd Don't show % downloaded if only 0. 2014-04-11 10:08:20 -07:00
larsbrubaker
b3a6493867 more strings 2014-04-11 08:08:54 -07:00
larsbrubaker
0aa7429761 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 
Conflicts:
	StaticData/Translations/Master.txt
 2014-04-11 08:06:56 -07:00
larsbrubaker
e19520f52c Put in a download progress % 2014-04-11 08:06:11 -07:00
Kevin Pope
86bb40903e Started work on improving panel separators. 2014-04-10 19:08:02 -07:00
Kevin Pope
84b531915b Order slice presets alphabetically. 2014-04-10 18:32:43 -07:00
Kevin Pope
caecb3586a Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-10 16:43:00 -07:00
Kevin Pope
ca734fe7b5 Update PLA default settings for AW HD 2014-04-10 16:42:28 -07:00
Kevin Pope
8aa4b7bca0 Fixed button text color. 2014-04-10 16:42:06 -07:00
Kevin Pope
321a3fd4d5 Added 'copy', 'import', and 'export' function to slice presets. 2014-04-10 16:41:48 -07:00
larsbrubaker
2c88fdc1fc Got the 'connect' button to do a connect after selecting a printer if a printer was not selected. 2014-04-10 16:38:22 -07:00
Kevin Pope
96ea37f86f Changed slice config extension (for export) to ".slice" 2014-04-10 16:38:18 -07:00
Kevin Pope
141c51b520 Made slice presets tie to PrinterProfile 2014-04-10 16:37:39 -07:00
larsbrubaker
84654d5e68 Restore the main window position. 
Always show the 'show terminal' button.
 2014-04-10 15:56:15 -07:00
larsbrubaker
fbb673117b more localizations 2014-04-10 14:51:06 -07:00
larsbrubaker
771280f6df Fixed many all upper case words to be Title case instead. 2014-04-10 14:07:25 -07:00
larsbrubaker
a749bdc6c2 Fixed some strings to not be all caps. 
Put in a project guid.
 2014-04-10 11:00:26 -07:00
larsbrubaker
50ead93c1e Made the language restart actually restart the app. 2014-04-10 10:36:59 -07:00
larsbrubaker
2c391b8780 Don't show close box on wide screen view of 3d view and gcode view 2014-04-09 21:47:00 -07:00
Kevin Pope
7b76f45f44 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 18:46:12 -07:00
Kevin Pope
0a57376804 Added lockout overlay to overridden slice settings. Added ability to open specific slice preset detail editor directly. 2014-04-09 18:45:29 -07:00
larsbrubaker
7629750e02 Fixed a stupid problem with adding instructions to the queue. 2014-04-09 16:53:08 -07:00
larsbrubaker
0bde3b14e4 Set the background color before we ShowAsSystemWindow so that it doesn't start out as a black window. 2014-04-09 14:11:00 -07:00
gregory-diaz
2e6f21c3cb Merge remote-tracking branch 'upstream/development' 2014-04-09 13:13:02 -07:00
gregory-diaz
9ee954b28e Changed theme on export library/queue item windows also added functional 'cancel' buttons. 2014-04-09 13:11:59 -07:00
larsbrubaker
1afc7feefc Cleaning up theme related stuff. 
Made save and save as fit better.
 2014-04-09 12:33:43 -07:00
larsbrubaker
8965a2d679 Merge remote-tracking branch 'Greg/master' into development 2014-04-09 11:17:49 -07:00
larsbrubaker
a1d5ae0ed1 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 11:15:56 -07:00
larsbrubaker
3a4060186b Making it a bit clearer. 
Reversed the queue <-> library default locations
 2014-04-09 11:15:02 -07:00
gregory-diaz
ce9e3ec3ff Merge remote-tracking branch 'upstream/development' 
Conflicts:
	PrintQueue/PartsSheet.cs
 2014-04-09 10:22:16 -07:00
gregory-diaz
c9b66d0d32 commit to merge 2014-04-09 10:21:22 -07:00
Kevin Pope
7309ce8fd9 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-09 10:13:33 -07:00
Kevin Pope
8f906c04b7 Fixed bug wherein new slice presets weren't saving their settings. 2014-04-09 10:12:25 -07:00
Kevin Pope
dda7632d9b Added validation and error handling around material/quality preset selections. 2014-04-09 10:11:55 -07:00
kevinepope
c57052ad38 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-08 21:53:57 -07:00
kevinepope
c6dd720200 Visual adjustments - slice presets editor 2014-04-08 21:04:58 -07:00
kevinepope
14c92d2314 Enable Quality slice presets. 2014-04-08 21:04:28 -07:00
kevinepope
1c71840941 Visual adjustments to print history. 2014-04-08 21:04:05 -07:00
larsbrubaker
74373014e4 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-08 20:57:10 -07:00
larsbrubaker
743bfb0194 Made modifications of the queue save the changes when they make them 
made 'save as' work in editing.
 2014-04-08 20:57:00 -07:00
kevinepope
bdc0cc4ad9 Visual adjustment to tuning controls. 2014-04-08 20:47:48 -07:00