Commit graph

1483 commits

Author SHA1 Message Date
Arjen Hiemstra
7161ed63aa Use rowCount() not count for getting devicesModel's row count 2015-09-01 15:08:15 +02:00
Arjen Hiemstra
5e3d492aba Set wizard to null so we do not get complaints from QML 2015-09-01 15:07:45 +02:00
Arjen Hiemstra
f7ecc1dc40 Properly set the current index of variant/profile combo boxes 2015-09-01 15:07:13 +02:00
Tamara Hogenhout
3df4d69c37 15.10 restyling of the sidebar header
Not yet finished

Contributes to: issue CURA-60
2015-08-31 17:28:36 +02:00
Tamara Hogenhout
9fd5ea4f9f 15.10 restyling of the sidebar header
Not yet finished

Contributes to: issue CURA-60
2015-08-31 17:27:53 +02:00
Tamara Hogenhout
33aa5f596f 15.10 restyling of the sidebar
Contributes to: issue CURA-60
2015-08-31 17:26:40 +02:00
Tim Kuipers
5cbeed753c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-31 14:32:21 +02:00
Tim Kuipers
2b396814ca split magic_mesh)surface_mode into Normal, Surface, Both 2015-08-31 14:31:40 +02:00
Jaime van Kessel
dd7e450d1c Added preference to disable automatic scale
Ultimaker/Cura#142 #CURA-89
2015-08-28 16:42:11 +02:00
Jaime van Kessel
22feb03d88 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-28 11:44:28 +02:00
Jaime van Kessel
8cbe802881 Added missing ) 2015-08-28 11:44:19 +02:00
Tamara Hogenhout
bd5e85144c Merging of mine and Jaimes work 2015-08-28 10:15:17 +02:00
Tim Kuipers
75cf4c922a Merge branch 'master' of
https://github.com/Ultimaker/Cura
2015-08-28 09:20:56 +02:00
adamarumjahn
99ff043596 Update innovo-inventor.json
added manufacturer and author
2015-08-27 12:48:50 -05:00
adamarumjahn
34f474a82d Update innovo-inventor.json
added Version
2015-08-27 12:47:38 -05:00
adamarumjahn
8033f7b8e5 Update innovo-inventor.json
Updated overrides and cleaned up machine settings.
2015-08-27 12:40:33 -05:00
Jaime van Kessel
ccd95c2ecf Removed font from rectangle 2015-08-27 17:18:44 +02:00
Tim Kuipers
1b6cfc39c0 JSON: git diff! removed triangles and grid top/bottom skin options (though they are available) 2015-08-27 17:17:05 +02:00
Jaime van Kessel
74a1a5f6f1 Fixed merge issues 2015-08-27 16:09:42 +02:00
Jaime van Kessel
d195c859a2 Code style & switch to translation catalog 2015-08-27 16:04:02 +02:00
Tamara Hogenhout
3d5f4e6bd6 15.10 re-alignment of the toolbar
This is a test to be reviewed

Contributes to: issue CURA-60
2015-08-27 14:59:33 +02:00
Tamara Hogenhout
26c46eb56a 15.10 New Icons
Contributes to: issue CURA-60
2015-08-27 14:30:07 +02:00
Tamara Hogenhout
55f51a53b6 15.10 restyling of the savebutton Area
More elaborate shortdescription for especially the outputdevices still have to be implemented. And the filename textfield is not finished.

Contributes to: issue CURA-60
2015-08-27 14:29:44 +02:00
Arjen Hiemstra
712ec6acdf Fix normal profile and add a very basic High Quality profile 2015-08-27 09:36:52 +02:00
Arjen Hiemstra
5ee587a745 Options property should now be a key - value dict 2015-08-27 09:33:07 +02:00
adamarumjahn
2eb21e1d37 Create innovo-inventor.json
This is a custom machine profile for the Innovo Inventor.
2015-08-26 15:55:48 -05:00
Jaime van Kessel
4fb577b893 Fixed default button for general and view page
contributes to Ultimaker/Cura#245
2015-08-26 15:49:53 +02:00
Jaime van Kessel
87364f37a6 Fixed double ID in qml 2015-08-26 15:37:10 +02:00
Jaime van Kessel
c300b4d95a Rephrased description of cool_min_layer_time_fan_speed_max
Fixes Ultimaker/Cura#263
2015-08-26 15:27:49 +02:00
Jaime van Kessel
a49ce21fbe Adding a machine now hides if there are no more pages 2015-08-26 15:18:01 +02:00
Jaime van Kessel
97f80914c5 Fixed slice settings sender 2015-08-26 15:09:53 +02:00
Arjen Hiemstra
9a88176f6f Clean up Add Machine Wizard and use the new MachineDefintionsModel 2015-08-25 18:14:48 +02:00
Arjen Hiemstra
b9a306865e Add some data about wizard pages to ultimaker_original_plus JSON file 2015-08-25 18:13:09 +02:00
Arjen Hiemstra
cbd685596e Add metadata to dual_extrusion_printer file 2015-08-25 18:12:40 +02:00
Arjen Hiemstra
1fc4d28864 Use firstRun property for the Add machine wizard 2015-08-25 18:12:24 +02:00
Arjen Hiemstra
17d3033b9a Move new JSON files to the right location 2015-08-25 18:11:49 +02:00
Jaime van Kessel
3fddd262d5 Merge pull request #292 from bq/BQ_profiles_update
BQ profiles update
2015-08-25 17:03:20 +02:00
Tim Kuipers
4eb37a1cc9 JSON: feat: infill before walls 2015-08-25 16:18:12 +02:00
Tim Kuipers
222eabed8b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-25 14:35:59 +02:00
Tim Kuipers
c83ef32c17 changed support roof defaults (now concentric) 2015-08-25 13:30:28 +02:00
Tim Kuipers
34eb78cbaa JSON: made every fill option available for all fill types (skin, support, infill) 2015-08-25 13:10:14 +02:00
Tamara Hogenhout
534c277b00 15.10 restyling of the layerview slider
Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue

Contributes to: issue CURA-60
2015-08-25 12:20:13 +02:00
Tim Kuipers
ed60c3c929 JSON: support hammock density and pattern 2015-08-25 10:05:47 +02:00
Tim Kuipers
289f9df67e moved infill_pattern outside density ; made retraction visible by default 2015-08-25 09:19:30 +02:00
Tamara Hogenhout
96c63ef6e9 15.10 Restyling of the message stack
Contributes to: issue CURA-60
2015-08-24 17:05:24 +02:00
Nicanor Romero Venier
856ca783e4 Renamed BQ printer profiles 2015-08-24 16:10:47 +02:00
Tim Kuipers
88ae6dfac1 JSON: polygon or polygons objects should now have "type": "polygon" 2015-08-24 13:55:38 +02:00
Tim Kuipers
7f15505f01 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-24 12:05:49 +02:00
Tim Kuipers
48ea630896 JSON: new: z_seam_type; bugfix: inherit for top/bottom when 100% infill 2015-08-24 12:05:31 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00