3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 18:57:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28446 commits 302 branches 270 tags 773 MiB
Commit graph

12848 commits

Author SHA1 Message Date
Arjen Hiemstra
39b6f81bdf Use machine manager to get the platform width/depth 2015-09-02 12:23:51 +02:00
Arjen Hiemstra
de60fb47bf Remove superfluous log and unneeded hide 2015-09-02 12:23:14 +02:00
Arjen Hiemstra
8833e11cdb Fix machine selection drop down 
Not sure if this was a merge issue or just not properly renamed
 2015-09-02 12:22:37 +02:00
Arjen Hiemstra
5a3e780ef6 Replace all active_if with enabled functions 2015-09-02 12:21:37 +02:00
Arjen Hiemstra
82c7dd8d0a Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings 
* 'master' of github.com:ultimaker/Cura:
  15.10 restyling of the sidebar header
 2015-09-01 18:04:06 +02:00
Arjen Hiemstra
c9f62a4eab Remove duplicate i18n catalog 2015-09-01 17:29:37 +02:00
Arjen Hiemstra
f6dbc73d6d Use the right property for active machine instance name 2015-09-01 17:29:25 +02:00
Arjen Hiemstra
0cda05ae92 Change "active_if" to "enabled" for all Wireframe settings 2015-09-01 17:28:58 +02:00
Tamara Hogenhout
3088579aad 15.10 restyling of the sidebar header 
Contributes to: issue CURA-60
 2015-09-01 17:26:35 +02:00
Arjen Hiemstra
90a7368fce Fix options that were added to master to be dictionaries rather than arrays 2015-09-01 17:25:37 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings 
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
 2015-09-01 15:44:19 +02:00
Arjen Hiemstra
6306bb8901 Add toggle fullscreen action to view menu 2015-09-01 15:19:40 +02:00
Arjen Hiemstra
2d92bd660f Set enabled property to false instead of visible for material settings in UM2 2015-09-01 15:19:20 +02:00
Arjen Hiemstra
251ce2f73d Change active_if to enabled functions 2015-09-01 15:18:44 +02:00
Arjen Hiemstra
516c0cd516 Change all min/max/warning values in fdmprinter to functions 2015-09-01 15:18:26 +02:00
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