Lars Brubaker
90b2b134b5
Merge pull request #127 from larsbrubaker/development
...
Development
2014-12-16 15:11:41 -08:00
Lars Brubaker
cf826dcdef
Make 'save' show an group and ungroup.
...
Fixed a bug with selecting a material with no selection.
2014-12-16 15:02:40 -08:00
Lars Brubaker
4ac8f2bf8d
Cleaned up the code for storing bool user settings.
...
Made the main 3d view remember what tab it is on while switching models.
2014-12-16 12:37:57 -08:00
Lars Brubaker
c3e144e3a6
Made it open in edit mode
2014-12-16 11:59:38 -08:00
Lars Brubaker
958d01c30e
Deleted some dead code
...
Change some bools to enums
2014-12-16 11:59:20 -08:00
Lars Brubaker
92e743822e
Fixed a few spelling errors.
2014-12-16 11:26:51 -08:00
Gregory Diaz
6af5dd0a92
Merge remote-tracking branch 'origin/development' into development
2014-12-16 11:08:20 -08:00
Gregory Diaz
e1f4c818dd
code that handles null organizer settings data
2014-12-16 11:07:44 -08:00
larsbrubaker
4f8b72205d
Merge remote-tracking branch 'MatterHackers_MatterControl/development' into development
2014-12-16 08:26:49 -08:00
larsbrubaker
ceb8cc6bb5
Thinking about how to edit the slice settings in place.
2014-12-16 08:26:35 -08:00
kevinepope
a19896df66
Don't show make selector if there is only one option.
2014-12-15 18:16:35 -08:00
larsbrubaker
e7a4ca2a8d
Improved connection message.
2014-12-15 17:06:37 -08:00
Lars Brubaker
84efcd9f2b
Merge pull request #125 from larsbrubaker/development
...
Made a 2 panel mode. Took out the other 3 panel mode.
2014-12-15 15:44:59 -08:00
larsbrubaker
82b529f30e
Made a 2 panel mode. Took out the other 3 panel mode.
2014-12-15 15:44:26 -08:00
Lars Brubaker
903bbab34e
Merge pull request #124 from larsbrubaker/development
...
Development
2014-12-15 14:29:26 -08:00
larsbrubaker
740d003723
Took out the simple mode stuff.
...
Put in a no connection helper message.
2014-12-15 14:17:19 -08:00
larsbrubaker
a1f7ad8588
only show interface mode in android.
2014-12-15 14:06:17 -08:00
larsbrubaker
b0f5c1105d
Made the wide screen mode switching to and from viewing the slice settings much clearer.
...
Made the visible panels settings save.
Tried to make the panel changing and the single slide more similar.
2014-12-15 14:04:27 -08:00
larsbrubaker
a6493af42a
Made the background a bit translucent.
2014-12-14 23:30:44 -08:00
larsbrubaker
2ee6902414
Draw the arrow on the end of the measuer line
2014-12-14 23:24:45 -08:00
larsbrubaker
fc24408e7e
Fixed a bug with the top left corner (0 index) getting the focus.
2014-12-14 14:25:13 -08:00
larsbrubaker
394c9393be
turn back on the new ui stuff.
2014-12-14 12:55:33 -08:00
larsbrubaker
bbb5349486
Going to work on the new ui stuff in a separate fork.
2014-12-14 12:53:19 -08:00
larsbrubaker
1e4cb18312
Made the Draw event clearer.
...
Made a DrawBefore and DrawAfter Handler and made the params clearer.
Made switching to simple mode work.
Made simple mode get the right initial state from oem settings.
2014-12-14 11:46:24 -08:00
larsbrubaker
8132713296
Draw the measurement bars when changing z.
2014-12-14 08:11:57 -08:00
larsbrubaker
099eadeb93
Fixed some visibility timing issues.
2014-12-14 07:34:50 -08:00
larsbrubaker
03085d0371
Making the height edit value be an object.
...
Starting to hook it up instead of having this code on the up arrow.
2014-12-13 23:25:08 -08:00
larsbrubaker
4c8ae06b5b
Working on improving the z edit control.
...
Adding number input
2014-12-12 21:57:05 -08:00
larsbrubaker
a35e912c58
Moved the save button a bit..
2014-12-12 20:41:01 -08:00
Lars Brubaker
cce96f03ff
Trying to clean up the interface for setting the interface mode.
2014-12-12 16:07:48 -08:00
Lars Brubaker
cb3bca22ea
Merge branch '1.1.4' into development
...
Conflicts:
PrinterControls/TerminalWindow/TextScrollWidget.cs
2014-12-12 15:14:41 -08:00
Lars Brubaker
be573de351
and make the logic correct.
2014-12-12 15:07:44 -08:00
Lars Brubaker
3e80571f70
Fixed a bug with filtering on repatier firmware.
2014-12-12 14:20:26 -08:00
Lars Brubaker
4719e71272
Fixed a bug with filtering on repatier firmware.
2014-12-12 14:19:43 -08:00
Lars Brubaker
47fed001ec
Made the save button be on the edit bar.
...
Made the up arrow cause save to show.
2014-12-12 12:57:44 -08:00
larsbrubaker
7ffdbcbba8
Put in a z height snap grid of 1. Will make a menu in the future.
2014-12-12 07:34:25 -08:00
Lars Brubaker
dcb288ddef
Merge branch '1.1.4' into development
2014-12-11 18:14:00 -08:00
Lars Brubaker
182191a464
Put in the right driver for Me3D
2014-12-11 18:07:25 -08:00
Lars Brubaker
3d8d19185a
Merge pull request #122 from gregory-diaz/1.1.4
...
New slice config files for Me3D
2014-12-11 18:04:03 -08:00
Lars Brubaker
3c41775a54
Making the Standard and Advanced ui control work and be available.
2014-12-11 17:35:57 -08:00
Gregory Diaz
d29ad1a80e
New slice config files for Me3D
2014-12-11 17:32:08 -08:00
Lars Brubaker
538bb6abdc
Fixed a bug with adding gcode to the library.
...
Made drag and drop to the library add it correctly to the library folder when needed.
2014-12-11 17:19:32 -08:00
Lars Brubaker
806fde6512
Merge pull request #121 from gregory-diaz/development
...
new slice settings, material and quality settings for Me3D
2014-12-11 15:52:18 -08:00
Gregory Diaz
d93a86c450
new slice settings, material and quality settings for Me3D
2014-12-11 15:21:24 -08:00
Lars Brubaker
9849a1871a
Faster trace data
2014-12-11 11:31:07 -08:00
Lars Brubaker
cd1a9c5833
Fixed a bug importing new slic3r ini files.
2014-12-11 09:56:03 -08:00
Lars Brubaker
46e7d6c2f1
Made bed image load through static data.
2014-12-10 12:27:24 -08:00
Lars Brubaker
834f090ea9
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
2014-12-10 12:07:16 -08:00
Lars Brubaker
ccbdde24b7
Made the replacement strings for gcode happen in macros and pause resume.
2014-12-10 12:07:06 -08:00
Lars Brubaker
58d33dd0b4
Merge pull request #119 from jlewin/ImportRefactor
...
Import project refactoring
2014-12-10 11:21:31 -08:00
