13410 Commits

Author SHA1 Message Date
Jack Ha
4f224a4311 CURA-4525 do not show build plate view item when disabled 2018-01-04 16:12:39 +01:00
Lipu Fei
d778856025
Merge pull request #3009 from smartavionics/mb-add-infill_enable_travel_optimization
Added infill_enable_travel_optimization setting.
2018-01-04 15:09:58 +01:00
fieldOfView
9730c25ec6 Fix showing the normal set 2018-01-04 14:29:40 +01:00
fieldOfView
d3c2e0d656 Merge branch 'qtquick-controls-2.0' into feature_setting_visibility_profiles 2018-01-04 14:20:44 +01:00
Lipu Fei
d20895a055 Fix code style
CURA-4758
2018-01-04 13:51:47 +01:00
Lipu Fei
84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs
CURA-4758
2018-01-04 13:26:14 +01:00
ChrisTerBeke
4cec27b181 Fix QML warnings for combo boxes - CURA-4758 2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1 Fix icon positions - CURA-4758 2018-01-04 11:33:12 +01:00
fieldOfView
503c612509 Add (non-functional) items for changed settings (user-changes) and current profile settings 2018-01-04 11:21:44 +01:00
ChrisTerBeke
af9181287a Merge branch 'master' into qtquick-controls-2.0 2018-01-04 11:17:50 +01:00
fieldOfView
3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 2018-01-04 11:06:51 +01:00
Jack Ha
d19015e85f CURA-4523 solved merge conflict 2018-01-04 10:47:24 +01:00
Jack Ha
a5d9aac91b CURA-4525 placed view menu items in Build Plate submenu 2018-01-04 10:32:54 +01:00
Jaime van Kessel
4cb7bc03ad Sidebar tooltips are now visible again
CL-541
2018-01-04 10:30:03 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
ChrisTerBeke
46827b9295 Fix tevo blackwidow json file 2018-01-04 10:14:55 +01:00
Jaime van Kessel
b6ebb804ba OutputDevice header now shows name of active printer
CL-541
2018-01-04 10:13:55 +01:00
Jaime van Kessel
faa4af634a Show pause text even if there is nothing to pause
CL-541
2018-01-04 09:58:15 +01:00
ChrisTerBeke
0c504560fa
Merge pull request #3057 from thetobby/master
Adding printer definition for Anycubic i3 Mega & Tevo Black Widow
2018-01-04 09:57:31 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
ChrisTerBeke
4e10d6ee87
Merge pull request #3030 from TheAssassin/patch-1
Reduce amount of movements after print for Tevo Tarantula
2018-01-03 17:49:50 +01:00
Ghostkeeper
e18b3b3669
Remove duplicate setting
Some merge conflict, I think.

Contributes to issue CURA-4523.
2018-01-03 17:29:49 +01:00
Aleksei S
49ae078396 Adjust 3d view and add Camera View to the menu bar
CURA-4642
2018-01-03 16:45:26 +01:00
ChrisTerBeke
5a9e3a8efd Fix front view button rotation, cleanup view buttons onClicked 2018-01-03 16:18:31 +01:00
Lipu Fei
392be23281 Fix SettingView stakc ID binding
CURA-4708
2018-01-03 15:58:30 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
2f965cc053 CURA-4525 switch locations of build plates and objects list 2018-01-03 14:18:40 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
ChrisTerBeke
7eb507484b hide sidebar header when in monitoring mode 2018-01-03 14:12:45 +01:00
ChrisTerBeke
1686f951c9 Finish styling mode switch buttons 2018-01-03 14:02:35 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
ChrisTerBeke
4f77b2ea6d More layout and font fixes 2018-01-03 13:50:06 +01:00
ChrisTerBeke
1476e95adc Fix mode switching buttons functionality 2018-01-03 13:45:18 +01:00
ChrisTerBeke
b7aadbe3c3 Fix extruder dropdown text model 2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486 Fix text color for extruder comboboxes 2018-01-03 12:52:40 +01:00
Jack Ha
cb1484ee63 CURA-4525 update size and margins of objects list 2018-01-03 12:52:32 +01:00
ChrisTerBeke
3a2b2d3333 Also fix combobox list item heights for extruder dropdowns 2018-01-03 12:48:33 +01:00
Jack Ha
c8243a0ddd CURA-4525 fix convex hull, changed size of object list 2018-01-03 12:47:09 +01:00
ChrisTerBeke
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Lipu Fei
f6168c07f0 Fix material_diameter bindings for metarial menu and page
CURA-4708
2018-01-03 11:27:30 +01:00
ChrisTerBeke
27ca743e58 Merge branch 'master' into qtquick-controls-2.0 2018-01-03 11:03:17 +01:00
Aleksei S
43db2ee2f9 Added ElideRight for the text which is out of boundaries
CURA-4692
2018-01-03 10:34:23 +01:00
Lipu Fei
2e4ffc83b5 Add material_diameter to fdmextruder definition
CURA-4708
2018-01-02 10:50:06 +01:00
Mark Burton
f82753b766 Move optimize_wall_printing_order from experimental section to shell.
Still not enabled by default yet but perhaps in the future after it has been tested more it will be.
2018-01-02 09:39:20 +00:00
Torbjørn
5104a48bcc Added 3D model for Tevo Black Widow + small fix
Roel Versteeg (Rovex) has kindly agreed to let us use his model of the printer, https://www.thingiverse.com/thing:1933864
Since the model is a bit to detailed for our use I have spoken with Jon MC (security0051) that had already modified for better fit in editor. https://www.thingiverse.com/thing:2592417. He has also agreed to let us use his version.
2017-12-31 23:15:00 +01:00
Torbjørn
948497c9a8 Major update of Quality profiles and definitions
Removed has_materials, quality over quantity
2017-12-31 03:23:19 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
2017-12-30 19:35:46 +01:00
Torbjørn
391adbdfb3 Remove ID from definition files 2017-12-30 02:24:23 +01:00
Torbjørn
5690aef3d5 Added 3D Platform for Anycubic i3 Mega 2017-12-30 01:58:22 +01:00