Commit graph

15419 commits

Author SHA1 Message Date
Tamara Hogenhout
9f61bff08f Removes certain symbols that give problems with the extract-json script
contributes to #CURA-526
2016-01-07 11:46:54 +01:00
Jaime van Kessel
b2ef5c1afb Changed manufacturer for M180 to "other" 2016-01-05 17:20:12 +01:00
Jaime van Kessel
3523b709c4 Fixed delete selection issues.
CURA-616
2016-01-05 12:26:39 +01:00
Ghostkeeper
0e22fdab19 Add machine Malyan M180
This is a translation of the machine that Malyan made for version 15.06. The settings should be the same as what Malyan provided back then.
2016-01-05 00:57:49 +01:00
fieldOfView
c208c01528 Remove commented-out code 2015-12-30 16:36:02 +01:00
fieldOfView
fba47cac0c Fix layout of General preference page 2015-12-30 09:53:29 +01:00
fieldOfView
282a0d307d Tweak "Add Printer" dialog 2015-12-30 09:53:29 +01:00
fieldOfView
aa2563b891 Rename "Machines" to "Printers" 2015-12-30 09:53:28 +01:00
fieldOfView
30d3d90dd8 Tweak Simple Mode layout margins 2015-12-30 09:53:28 +01:00
fieldOfView
b7f413dbb7 Move Variant selection to directly below Machine selection 2015-12-30 09:53:28 +01:00
fieldOfView
5ec00b2f6d Move MessageStack back to bottom until we can relocate the messages that make it obtrusive 2015-12-30 09:53:28 +01:00
fieldOfView
ea7f47c487 Tweak modal windows size 2015-12-30 09:53:27 +01:00
fieldOfView
01b04a284e Tweak category header icon positioning 2015-12-30 09:53:27 +01:00
fieldOfView
2aa3fa3623 Tweak setting category headers 2015-12-30 09:53:27 +01:00
fieldOfView
3cf9149a0f Fix gap between SaveButton and SaveToButton on HiDPI screens 2015-12-30 09:53:26 +01:00
fieldOfView
d5af132a9a Fixed more thin borders on HiDPI screens 2015-12-30 09:53:26 +01:00
fieldOfView
1747efeff8 Fixed thin borders on HiDPI screens 2015-12-30 09:53:26 +01:00
fieldOfView
4bf4a20d44 Add small hover-effect to small buttons 2015-12-30 09:53:25 +01:00
fieldOfView
15e09efeef Fix layer slider label size and behavior 2015-12-30 09:53:25 +01:00
fieldOfView
ed0fea125c Add pencil-mark to print job name in JobSpecs area 2015-12-30 09:53:24 +01:00
Ghostkeeper
f6ccbab9dc Correct alignment of manufacturer in add printer window
I reduced the font size of the manufacturer to make it appear like a subscript a bit.
2015-12-29 16:38:10 +01:00
Kurt Loeffler
5cff8a033f Moved Nozzle Diameter into a new "Machine" category in the UI. This category needs icon art. 2015-12-23 12:04:41 +01:00
Kurt Loeffler
050bc91912 Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI.
Cherry pick from master.
Conflicts:
	resources/machines/ultimaker2.json
	resources/machines/ultimaker_original.json

Contributes to issue CURA-276.
2015-12-23 12:02:42 +01:00
Kurt Loeffler
38d2bff8c6 Moved Nozzle Diameter into a new "Machine" category in the UI. This category needs icon art. 2015-12-22 22:49:13 -08:00
Tim Kuipers
788a40c656 lil fix 2015-12-17 12:45:35 +01:00
ckielstra
9bc7b6b6b7 Spelling 2015-12-17 09:21:15 +01:00
Kurt Loeffler
608bfa568b Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. 2015-12-14 11:14:55 -08:00
Kurt Loeffler
384f4fbeaf Reverting 88c8765ee2 2015-12-14 10:29:02 -08:00
Tim Kuipers
cde6e4c655 JSON: extruder trains were reversed (CURA-494) 2015-12-14 15:20:09 +01:00
Arjen Hiemstra
379ba357cf Merge branch '2.1'
* 2.1: (60 commits)
  Fix documentation of XRayView class and add a note about RenderPass ctor
  Uranium -> Cura and drop some unused code
  Update XRayView to render properly
  Render Convex Hull below 0 to avoid z fighting artifacts
  Render the grid a bit below 0, so we avoid some z fighting artifacts
  Add a working X-Ray view
  Remove commented out code
  Update with the changed default for backface culling
  Fix convex hull and layer view rendering
  Default Cura to SolidView, not MeshView
  Add SolidView plugin, which is what used to be Uranium's MeshView
  Fix ConvexHullNode so it renders
  Update BuildVolume and ConvexHullNode to use new API
  Remove setLightPosition call
  Revert "Displays settings based on whether they are global-only or not"
  Revert "Adds a global-only role to the SettingOverrideModel"
  Tweak Setting Category header size
  Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once
  Fix PerObjectSettingsPanel layout
  Remove Print Speed setting from simple mode
  ...
2015-12-14 14:05:51 +01:00
Arjen Hiemstra
c5689e6256 Add SolidView plugin, which is what used to be Uranium's MeshView 2015-12-14 13:56:32 +01:00
Arjen Hiemstra
7395f37efe Update BuildVolume and ConvexHullNode to use new API 2015-12-14 13:56:32 +01:00
Kurt Loeffler
88c8765ee2 Changed the name of the Lone Width field to Nozzle Diameter in the UI to make its use more clear. When the active machine profile is an Ultimaker 2 it will also mention the Olsson Block. 2015-12-11 12:55:28 -08:00
Tamara Hogenhout
e61d3e4f3e Merge pull request #562 from Ultimaker/feature_ux2-1
Design rework for 2.1 release
2015-12-10 11:05:19 +01:00
Tim Kuipers
99d9348c38 extruder trains can now be overridden (CURA-494) 2015-12-09 16:28:48 +01:00
Tim Kuipers
17e372820c JSON: machine_show_variants was never defined in fdmPrinter.json (CURA-494) 2015-12-09 16:28:31 +01:00
fieldOfView
f29e03f7e7 Tweak Setting Category header size 2015-12-09 15:40:57 +01:00
Tim Kuipers
ff500e4315 JSON: machine_extruder_trains array refactored to objcet with int children (CURA-494) 2015-12-09 14:15:23 +01:00
Tim Kuipers
a390aa73a8 JSON: machine_settings ==> overrides (CURA-494) 2015-12-09 14:06:33 +01:00
Tim Kuipers
11f7f521c9 Merge branch '2.1' 2015-12-08 16:15:43 +01:00
fieldOfView
6863e15e20 Remove Print Speed setting from simple mode 2015-12-08 15:03:54 +01:00
Tamara Hogenhout
9388fd9e55 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2015-12-08 13:45:28 +01:00
Tamara Hogenhout
70b221b33a Proof of concept to test the global-only functionalities
Contributes to #CURA-460458
2015-12-08 13:44:59 +01:00
Tim Kuipers
4932ef819c JSON fix: Min Volume Before Coasting doesn't include Coasting Volume anymore (CURA-528) 2015-12-08 13:30:12 +01:00
Tim Kuipers
a4e824464c JSON bugfix: coasting_min_volume had an inherit_function and the inherit property (CURA-550) 2015-12-08 10:47:09 +01:00
Tim Kuipers
71c8393f8c JSON bugfix: default brim width (CURA-550) 2015-12-08 10:13:23 +01:00
Tim Kuipers
26a7fc7bdc JSON: made brim_line_count default match brim_width_default for 0.4 nozzles (CURA-550) 2015-12-08 09:50:34 +01:00
Tim Kuipers
8a853e5b05 JSON bugfix: infill_density ==> infill_sparse_density (CURA-550) 2015-12-08 09:48:01 +01:00
Tim Kuipers
6ef68ca5c1 JSON: made coasting_min_volume depend on coasting_volume (CURA-550) 2015-12-08 09:47:20 +01:00
Tim Kuipers
67bbb5478e JSON: (bugfix) introduced brim_width (CURA-550) 2015-12-08 09:38:21 +01:00