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
Arjen Hiemstra
5aa95f1258
Use the active machine instance for Build Volume
2015-09-01 15:06:03 +02:00
Arjen Hiemstra
510f5978f0
Remove most of the PrintInformation code and fix the material amount to use profile
2015-09-01 15:05:31 +02:00
Arjen Hiemstra
1f82e83093
Use SettingOverrideDecorator::getAllSettingValues to get per-object settings
2015-09-01 15:04:55 +02:00
Arjen Hiemstra
f618b54d69
Connect to MachineManager's addMachineRequested so we can show the add printer dialog
2015-09-01 15:03:59 +02:00
Arjen Hiemstra
47e96a9e2a
Fix ConvexHull{Decorator,Job} to work with the new profile structure
2015-09-01 15:03:29 +02:00
fieldOfView
b3cb24f76a
Fix crash when a profile cannot be loaded, which caused the width & height of the buildvolume to be set to None
2015-09-01 15:03:22 +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
709ec79918
Removed unused import
2015-08-28 16:31:47 +02:00
Jaime van Kessel
ff9a222097
Added changeLog plugin
2015-08-28 16:24:38 +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
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
Jaime van Kessel
f17cc811c4
Added message asking about sending data to server
2015-08-27 13:24:37 +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
e6e563cf09
Use the profile for getting setting values, not the machine instance
2015-08-27 09:36:09 +02:00
Arjen Hiemstra
4d4192d6d6
Ignore some active machine changes since we need to port code
2015-08-27 09:35:05 +02:00
Arjen Hiemstra
5637c9ad94
Remove active machine preference from CuraApplication, it is now handled by MachineManager
2015-08-27 09:34:22 +02:00
Arjen Hiemstra
5ee587a745
Options property should now be a key - value dict
2015-08-27 09:33:07 +02:00
Jaime van Kessel
af18019ce0
Added exception handling for checking overlap.
...
Fixes Ultimaker/Cura#297
2015-08-26 16:08:00 +02: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
fdd8a7bb6c
Removed unused import
2015-08-26 15:30:26 +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
a8afb9045f
Disabled bounding box intersection for physics
...
Fixes Ultimaker/Cura#294
2015-08-26 15:24:10 +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
Jaime van Kessel
0b6a0f7bd1
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-08-26 12:24:34 +02:00
