Commit graph

532 commits

Author SHA1 Message Date
Kevin Pope
4458478d55 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-05-02 18:47:47 -07:00
Kevin Pope
1b3b07d352 Added credit card logo 2014-05-02 18:46:27 -07:00
larsbrubaker
8048df02ec more translation 2014-05-02 12:41:41 -07:00
larsbrubaker
0e0dfbb2f5 don't show the add button if there is no part showing. 2014-05-02 12:07:27 -07:00
larsbrubaker
b66d0058b7 Fixed a bug with remove. 2014-05-01 17:52:45 -07:00
Kevin Pope
e0023d6e9c Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-05-01 15:30:39 -07:00
Kevin Pope
3914c9dee6 Change shop button text. 2014-05-01 14:52:54 -07:00
larsbrubaker
6e60cce574 Put support 'line' support in for CuraEngine 2014-05-01 11:00:54 -07:00
larsbrubaker
45e92a61c6 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-30 18:06:39 -07:00
larsbrubaker
b8dda573c2 Moved slider creation into shared base class. 2014-04-30 18:05:45 -07:00
kevinepope
aea7216664 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-30 12:48:03 -07:00
kevinepope
01c4139d56 Move close function to Ui thread. Add default error code for failed web requests. 2014-04-30 12:47:43 -07:00
larsbrubaker
6f3e4d6966 Cleaned up some state storing and restoring. 2014-04-30 11:21:06 -07:00
larsbrubaker
2cdc7c2c8f Merge remote-tracking branch 'origin/development' into development 2014-04-29 16:04:20 -07:00
larsbrubaker
7dd9028dd1 More translation stuff. 2014-04-29 16:03:46 -07:00
Kevin Pope
dc95cf0fd9 Fix padding on printer selection button. 2014-04-29 14:56:15 -07:00
larsbrubaker
f1acf28253 Updated all the settings to have materials rather than multiple profiles. 2014-04-29 08:06:17 -07:00
larsbrubaker
a95e13fe90 Turned off outlines for 1.1. 2014-04-28 18:46:32 -07:00
larsbrubaker
c78af4a41a The update dot is now working (mostly) 2014-04-28 18:17:51 -07:00
larsbrubaker
d07bfe57d4 Set the correct visibility. 2014-04-28 17:48:31 -07:00
larsbrubaker
5e24089aef Working to make the update button show correctly. 2014-04-28 17:34:54 -07:00
larsbrubaker
9a5a3c56c2 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-28 16:09:50 -07:00
larsbrubaker
873d1322e7 Made running matter slice in processes work better. 2014-04-28 16:09:33 -07:00
Kevin Pope
bd4d8961fd Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-28 15:23:22 -07:00
Kevin Pope
7e7b3b91f7 Added error handling for PrintItemWrapper invalid folder location. 2014-04-28 15:20:58 -07:00
Kevin Pope
75fea3eb21 Add handling for incorrectly stored initial position. 2014-04-28 15:19:41 -07:00
larsbrubaker
457ff83d7a Merge remote-tracking branch 'origin/development' into development 2014-04-28 15:04:03 -07:00
larsbrubaker
74d40a99bf Refactoring a bunch of shared code into the base class of PartPreview3DWidget 2014-04-28 15:03:25 -07:00
Kevin Pope
b8db1068a2 Preheat button no longer visible on temperature widgets unless printer is connected and not printing. 2014-04-28 11:27:05 -07:00
larsbrubaker
401d054c71 Merge remote-tracking branch 'origin/development' into development
Conflicts:
	MatterControl.sln
2014-04-28 08:10:24 -07:00
larsbrubaker
9ec0b8920d Removing dead code. 2014-04-27 21:02:47 -07:00
kevinepope
2611bf262f Added help links. 2014-04-27 21:00:07 -07:00
kevinepope
d4b924e5e5 Visual adjustments 2014-04-27 20:49:29 -07:00
kevinepope
02cc3cf563 Hooked up functionality for file menu options. 2014-04-27 20:40:22 -07:00
kevinepope
2952b99242 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2014-04-27 20:25:09 -07:00
kevinepope
cc44b0ef04 Added menu bar. 2014-04-27 20:24:58 -07:00
larsbrubaker
dcd53ccd35 need to test but put in a quick fix for update state on release change. 2014-04-27 17:26:42 -07:00
larsbrubaker
367b87dd01 spelling of Panel (fixed)
Got the left and right border buttons to be fast.
2014-04-27 17:19:06 -07:00
larsbrubaker
9c142bdbf8 Fixed more bugs with refreshing (made advanced controls fast again) 2014-04-27 16:46:00 -07:00
larsbrubaker
74cc020414 Lots more work getting the wide screen panel to recreate correctly.
Got the thumbnails to be a bit faster and have better anti-aliasing.
2014-04-27 16:16:47 -07:00
larsbrubaker
0f9dd2427f Save and load the thumbnail widgets as tgas as the mac png save seems to have issues with 32 bit alpha. 2014-04-25 18:16:36 -07:00
larsbrubaker
ea5544172e help text has left margin.
Release settings drop down works.
2014-04-25 16:57:57 -07:00
larsbrubaker
8be43369b2 Made the RoBo 3D settings conform to the new material settings data format. 2014-04-25 09:27:40 -07:00
kevinepope
4192e79230 Added preheat button to temperature indicators. Added temp direction indicator arrow to bed temp indicator. 2014-04-24 21:45:33 -07:00
kevinepope
d5b052cc25 Consolidated and rearranged the Configuration tab. 2014-04-24 20:54:05 -07:00
larsbrubaker
2955fdbb8a Fixed the help text margin. 2014-04-24 12:57:03 -07:00
larsbrubaker
d7388d8fb3 Made the compact view also remember the state of the main screen tab. 2014-04-24 12:51:01 -07:00
larsbrubaker
978d7ddcfa Making the OEMSettings a single JSon file. 2014-04-23 17:44:49 -07:00
larsbrubaker
bc011a33a6 New about page from html is working. 2014-04-23 14:33:44 -07:00
larsbrubaker
157b68545e The about page now renders most of its content 2014-04-23 13:32:05 -07:00