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
gregory-diaz
380331af02 Merge remote-tracking branch 'upstream/development' 2014-04-17 14:52:17 -07:00
gregory-diaz
712e62a8d2 Added code on the release options styled drop menu. 2014-04-17 14:50:27 -07:00
larsbrubaker
86145a4298 Merge remote-tracking branch 'Greg/master' into development 2014-04-17 13:24:35 -07:00
larsbrubaker
52e5d1ed43 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-17 13:24:24 -07:00
larsbrubaker
4b6e44d714 Put a white background behind the text in the gcode view. 
Do a better job of resetting the windows when no widgets are in use.
 2014-04-17 13:23:44 -07:00
Kevin Pope
5223b80d22 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-17 12:22:12 -07:00
Kevin Pope
250044f84c Added some test code. 2014-04-17 12:21:51 -07:00
gregory-diaz
00f875b65b more changes to theme controls group box. 2014-04-17 12:11:34 -07:00
gregory-diaz
374aa66c4a Added gui widget to theme controls group box. Still needs tweaking... 2014-04-17 11:30:13 -07:00
larsbrubaker
1f1bc8335e Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-17 11:03:30 -07:00
larsbrubaker
60efb72fba Put in a shop button. 
Set the release back to x86.
 2014-04-17 11:02:38 -07:00
Kevin Pope
efc7aa23dc Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-17 10:45:45 -07:00
Kevin Pope
3904634810 Move updateFeedType setting to UserSettings. 2014-04-17 10:45:28 -07:00
larsbrubaker
d74ad8a444 Made the friendly message for 3d view. 2014-04-16 18:17:00 -07:00
larsbrubaker
7549ed97ab Merge remote-tracking branch 'Greg/master' into development 
Conflicts:
	ConfigurationPage/ConfigurationPage.cs
	StaticData/Translations/Master.txt
 2014-04-16 18:00:25 -07:00
gregory-diaz
b9eafe8d86 took out debugshowbounds statements from last commit 2014-04-16 17:49:56 -07:00
gregory-diaz
4b551a1e72 Fixed UI on the release options group box 2014-04-16 17:30:56 -07:00
larsbrubaker
bea60eb773 Made the notification button stay as the window gets re-created (a bit hacky). 2014-04-16 17:28:46 -07:00
larsbrubaker
9cf7025903 Merging 2014-04-16 17:08:34 -07:00
larsbrubaker
7805b270c4 Merge remote-tracking branch 'Greg/master' into development 2014-04-16 16:56:23 -07:00
larsbrubaker
18f55cab5b Merge remote-tracking branch 'origin/development' into development 2014-04-16 15:11:07 -07:00
larsbrubaker
db09079196 Refactor for clarity Done -> SlicingDone on PrintItemWrapper 
Moved a bunch of classes into their own files in ActionBar
Made the part preview be right when the window changes between wide and narrow.
 2014-04-16 15:11:01 -07:00
gregory-diaz
32a8d6aef6 Merge remote-tracking branch 'upstream/development' 
Conflicts:
	StaticData/Translations/Master.txt
 2014-04-16 14:20:17 -07:00
gregory-diaz
79dc1d6b03 Added drop down menu for release options 2014-04-16 14:18:56 -07:00
Kevin Pope
9264039aa7 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-16 14:16:04 -07:00
Kevin Pope
7a4a5f0cf1 Changed name of parameter in update request for backwards (in)compatibility. 2014-04-16 14:13:45 -07:00
Kevin Pope
6f5e062aa9 Update feed type is now determined by application setting. 2014-04-16 12:29:20 -07:00
larsbrubaker
acc846d463 Fixe a problem with text creator not having good view controls. 2014-04-16 12:26:35 -07:00
larsbrubaker
ff7a5a3916 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-16 12:01:56 -07:00
larsbrubaker
4508a25e58 Got the queue and the count tab to work. 2014-04-16 12:01:01 -07:00
gregory-diaz
f725df3f00 Merge remote-tracking branch 'upstream/development' 2014-04-16 11:27:13 -07:00
Kevin Pope
4a4e189e5f Added theming corrections to manual connection process. 2014-04-16 11:19:34 -07:00
Kevin Pope
484da4085c Added handling for error that occurred when deleting the profile of the active printer. 2014-04-16 11:18:43 -07:00
larsbrubaker
f9baaf2f35 Merge remote-tracking branch 'origin/development' into development 2014-04-16 10:52:31 -07:00
larsbrubaker
6347ff7773 Adding infill settings. 
Hooking stuff up to the new queue data.
 2014-04-16 10:52:25 -07:00
Kevin Pope
9445266477 Moved terminal button from Manual Controls to Configuration. 
Resized connection icon.
 2014-04-15 19:14:49 -07:00
larsbrubaker
a511bbddbe Merge remote-tracking branch 'origin/development' into development 2014-04-15 18:13:32 -07:00
larsbrubaker
4b6a3cfa97 Lots of work on Getting the QueueData instance to be separate form the UI queue and refs. 2014-04-15 18:13:27 -07:00
Kevin Pope
5cba5eca78 Added default message to 2D view. Changed minimum width for three-column view. 2014-04-15 12:12:40 -07:00
gregory-diaz
08a349bbae commit translations 2014-04-15 10:12:46 -07:00
larsbrubaker
49c8a045a5 fixed the spelling of label 
an acronymed some variables txt -> text lbl -> label
 2014-04-15 10:11:56 -07:00
Kevin Pope
8d07751dc7 Merge commit 'afe39e1c9d' into development 2014-04-14 18:30:33 -07:00
larsbrubaker
0dcf31bdcd make sure we don't crash if generate is pushed when no model loaded. 2014-04-14 16:45:08 -07:00
gregory-diaz
afe39e1c9d Added code so that the 'Save As' window can only be opened once when the 'Save As' button is clicked multiple times. 2014-04-14 16:22:56 -07:00
gregory-diaz
1383cdd84e Merge remote-tracking branch 'upstream/development' 2014-04-14 10:19:00 -07:00
gregory-diaz
acea4975af Merge remote-tracking branch 'upstream/development' 
Conflicts:
	StaticData/Translations/Master.txt
 2014-04-14 10:18:13 -07:00
larsbrubaker
d6ff6acd41 Changed many iterator functions to not have 'interator' in their names. 2014-04-13 21:29:18 -07:00
Kevin Pope
f8b7d5483e Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-12 13:56:36 -07:00
Kevin Pope
9cd754d2a6 Reversed priority (and coloring) of Material versus Quality slice presets. 2014-04-12 13:56:04 -07:00
larsbrubaker
a68e88c8ad You can now edit all the positions and they save and load and look good. 2014-04-12 13:19:00 -07:00