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

5016 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lars Brubaker
eb30c8de33 latest agg 2016-09-02 15:29:18 -07:00
Lars Brubaker
98b3294f58 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-02 15:28:29 -07:00
Lars Brubaker
dbf5fd9eeb Spelling 2016-09-02 15:28:19 -07:00
Lars Brubaker
44c8e0c034 Merge pull request #1349 from larsbrubaker/master 
Make sure we show the no settings page window printer is selected on …
 2016-09-02 14:59:43 -07:00
Lars Brubaker
411a3bb32e Make sure we show the no settings page window printer is selected on touchscreen. 2016-09-02 14:30:23 -07:00
Lars Brubaker
19b6cefca4 Merge pull request #1345 from larsbrubaker/master 
MatterControl now defaults to larger window size
 2016-09-01 17:09:26 -07:00
Lars Brubaker
4724bdd311 latest agg 2016-09-01 16:56:14 -07:00
Lars Brubaker
71ccfa4996 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-01 16:55:31 -07:00
Lars Brubaker
bdaaacdf6a MatterControl now defaults to larger window size 2016-09-01 16:55:23 -07:00
Lars Brubaker
938a8a0a96 Merge pull request #1344 from larsbrubaker/master 
default to render thumbnails in perspective 3D  …
 2016-09-01 16:36:27 -07:00
Lars Brubaker
8a8b655245 Merge pull request #1343 from mmoening/development 
Loadcacheable properly loads profiles from static data
 2016-09-01 15:11:46 -07:00
Lars Brubaker
d0ea36c269 default to render thumbnails in perspective 3D 
Made only a default constructor for ray tracer
Put back in the code the guarantees we always have an item in the queue, even before we select a printer.
Added thumbnail render mode to the user settings key
 2016-09-01 13:50:11 -07:00
Matt Moening
fd76f828ed Loadcacheable properly loads profiles from static data 
- Fixed a bug in downloading profiles from web would write "null" to file if it failed to get a proper file
 2016-09-01 12:12:11 -07:00
Lars Brubaker
78a91d9b2e Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-01 11:23:15 -07:00
Lars Brubaker
d7666e0924 Merge pull request #1342 from larsbrubaker/master 
Always add at least one item to the queue.
 2016-09-01 11:22:07 -07:00
Lars Brubaker
181fb9edd7 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-09-01 11:21:47 -07:00
Lars Brubaker
3fab4b135d Merge pull request #1341 from mmoening/master 
Add Wanhao 4S and Prusa Research i3 MK2 to StaticData
 2016-09-01 11:19:39 -07:00
Lars Brubaker
4929f834d6 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 
Conflicts:
	SlicerConfiguration/Settings/ProfileManager.cs
 2016-09-01 11:18:32 -07:00
Lars Brubaker
37b12f645d Merge pull request #1340 from jlewin/master 
Use short printer ID for local features and DeviceToken for remote
 2016-09-01 11:06:54 -07:00
Lars Brubaker
619c20aff0 Restore functionality to put default items in queue when new printer is created. 
Made default calibration files include the calibration box
 2016-09-01 10:53:10 -07:00
John Lewin
938c4c2267 Skip save operation when on the EmptyProfile 
- Fixes regression in MorePauseHandlingStreamTests
 2016-08-31 18:49:29 -07:00
Lars Brubaker
8d03b045ac Always at least one item to the queue. 2016-08-31 17:51:08 -07:00
Lars Brubaker
102605d535 Don't override theme color on new printer 
Either set it to default, or set it the name listed in the OEM settings
 2016-08-31 17:32:43 -07:00
Matt Moening
1bcab829d4 Add Wanhao 4S and Prusa Research i3 MK2 to StaticData 
- Also uploaded to test server
 2016-08-31 15:38:52 -07:00
Lars Brubaker
2e96441480 Merge pull request #1338 from larsbrubaker/master 
Disable connect button when no printer selected
 2016-08-31 15:15:01 -07:00
Lars Brubaker
9e2b76ee11 Disable the select printer drop menu when printing. 2016-08-31 15:10:41 -07:00
John Lewin
de84fe1705 Write user profiles to a user subdirectory below Profiles 
- Issue MatterHackers/MatterControl#1339
 2016-08-31 14:57:39 -07:00
Lars Brubaker
9ec9b2f554 Disable connect button when no printer selected 
MatterHackers/MCCentral#335
Disable connect button when no printer selected
 2016-08-31 14:44:41 -07:00
John Lewin
0a15124e4b Fix issues in ChangeID 
- New ID should be set in all cases
- Conditionally load local profile if exists
 2016-08-31 13:57:51 -07:00
John Lewin
180c559d09 Single authority for ProfilePath construction 
- Guard for null during load
 2016-08-31 13:57:50 -07:00
John Lewin
4e727def1b Code clean up 
- Remove unused SaveAs function from SlicePresetsWindow
- Remove unused LoadProfileFromMCWS()
- More consistent formatting
- Move SetValue call after adding Profile, to ensure ProfilePath works during save
 2016-08-31 13:57:49 -07:00
John Lewin
98c26d0a7c Add locking around file save operations 2016-08-31 13:57:43 -07:00
Lars Brubaker
faf97d9659 Merge pull request #1337 from larsbrubaker/master 
Made the settings history be disabled when not signed in.
 2016-08-31 13:19:23 -07:00
Lars Brubaker
db24db1cf2 Made the settings history be disabled when not signed in. 
MatterHackers/MCCentral#330
Settings History menu should be disabled when not signed in
 2016-08-31 13:09:06 -07:00
Lars Brubaker
f32395813e Merge pull request #1336 from larsbrubaker/master 
Fixed a problem with create new printer
 2016-08-31 12:53:29 -07:00
Lars Brubaker
b6dcacdef9 Fixed a problem with create new printer 2016-08-31 12:49:25 -07:00
Lars Brubaker
3cabfb3985 Merge pull request #1335 from larsbrubaker/master 
Made the default theme blue - light.
 2016-08-31 12:43:23 -07:00
Lars Brubaker
22bca53d69 Changed the theme colors to save by name 
fixed linux run bug MatterHackers/MCCentral#344

ActiveTheme does not recreate its data all the time
 2016-08-31 11:42:02 -07:00
Lars Brubaker
698426858e Made the default theme blue - light. 
Moved setting to UserrSettingsKey
 2016-08-30 17:30:31 -07:00
Lars Brubaker
cd5f3dec26 Merge pull request #1334 from larsbrubaker/master 
Created a UserSettingsKey and SystemSettingsKey
 2016-08-30 11:22:57 -07:00
Lars Brubaker
cd7406d82b Created a UserSettingsKey and SystemSettingsKey 
Moved some settings into this, lots more to do
 2016-08-30 10:30:55 -07:00
Lars Brubaker
8f8afc5681 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-30 10:06:13 -07:00
Lars Brubaker
bbd0117d85 Merge pull request #1333 from larsbrubaker/master 
added  "Don't  ask me again" to ShowAuthPanel.
 2016-08-29 22:12:52 -07:00
larsbrubaker
eebb8b212a added "Don't ask me again" to ShowAuthPanel. 2016-08-29 22:04:09 -07:00
Lars Brubaker
e8572e56a2 Merge pull request #1332 from larsbrubaker/master 
Changed Login -> Sign in & Logout -> Sign Out
 2016-08-29 17:25:31 -07:00
Lars Brubaker
3c7e63c744 Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-08-29 17:15:37 -07:00
Lars Brubaker
2dadb72271 Changed Login -> Sign in & Logout -> Sign Out 2016-08-29 17:13:45 -07:00
Lars Brubaker
8cf3521218 Merge pull request #1331 from larsbrubaker/master 
Each unique version of MC requires a separate login
 2016-08-29 17:13:27 -07:00
Lars Brubaker
a9718fa28a Fixed json. 2016-08-29 16:40:00 -07:00
Lars Brubaker
f62d384be9 Make sure we have the right preloaded files. 2016-08-29 16:20:28 -07:00