Jack Ha
132addf7b8
Merge branch 'master' of github.com:Ultimaker/Cura
2016-12-08 14:49:00 +01:00
Jack Ha
a32615fb12
Added 50ms fade in on hover machine selection. CURA-2763
2016-12-08 14:48:50 +01:00
Simon Edwards
4d3e8592af
CURA-2653 Searching in English while other language set
2016-12-08 14:48:29 +01:00
Jaime van Kessel
72112159d6
It's no longer possible to set materials for machines that dont support them
...
CURA-3042
2016-12-08 14:43:28 +01:00
Jaime van Kessel
19ca4ec964
Save dialog also shows num of setting visibility items saved
...
CURA-1261
2016-12-08 14:16:51 +01:00
Jaime van Kessel
0f910ae7a2
Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog
2016-12-08 12:37:40 +01:00
Jaime van Kessel
36d743384c
Initial work for adding a save dialog for project saving
...
CURA-1263
2016-12-08 11:56:42 +01:00
Jack Ha
0d023a196e
Code layout. CURA-2763
2016-12-08 11:21:30 +01:00
Jack Ha
054e73383d
Added hover color for machine selection. CURA-2763
2016-12-08 11:12:48 +01:00
fieldOfView
ace4bfba10
Fix QML error about use of anchors in a row
2016-12-07 22:30:31 +01:00
fieldOfView
d67395b42b
Codestyle & documentation update
2016-12-07 22:23:06 +01:00
fieldOfView
18fb379fbe
Add tooltips for Setup/Monitor and Recommended/Custom tabs
2016-12-07 19:40:33 +01:00
fieldOfView
e642b4ebe9
Tweak 2.4 sidebar changes
...
* Make extruder-tabs more clear on badly calibrated displays
* Make infill selection same width as other "Recommended" controls
* Move printer selection to the top bar
* Add animation to support extruder selection combobox
2016-12-07 17:41:04 +01:00
Jack Ha
7694b8f128
Cannot do it simpler. CURA-2763
2016-12-07 15:40:25 +01:00
Jack Ha
4ecd1a0fe3
Simplifying layout by removing unneeded elements. CURA-2763
2016-12-07 15:16:47 +01:00
Jack Ha
67f1afb9ce
Revert "Show extruder tabs only in custom mode. CURA-2763"
...
This reverts commit f916c9b4cfc47e8fa99c7a9888b0d12f118503af.
2016-12-07 14:32:40 +01:00
Jack Ha
f916c9b4cf
Show extruder tabs only in custom mode. CURA-2763
2016-12-06 16:32:34 +01:00
Jack Ha
3efc5d63ef
Improved layout, removed material name from extruder name. CURA-2763
2016-12-06 16:11:08 +01:00
Jack Ha
30a74fb2c1
Layout changes, extruders are now displayed as extruder tabs. CURA-2763
2016-12-06 15:49:34 +01:00
Jack Ha
a65a81e60b
colours
2016-12-06 14:14:24 +01:00
Jack Ha
64c0cbd0a4
Fix clean config cura, recommended mode support extruder update. CURA-3033
2016-12-06 11:48:49 +01:00
Jaime van Kessel
adb1cc7933
Merge branch 'recommended_sidebar' of github.com:Ultimaker/Cura
2016-12-05 14:02:51 +01:00
Jaime van Kessel
8f023524d2
Small textual changes for project handling
...
CURA-1263
2016-12-05 11:44:42 +01:00
Jaime van Kessel
c50d0172cc
Moved open project to below open recent
...
CURA-1263
2016-12-02 13:33:13 +01:00
Jaime van Kessel
5119ee9a93
Use correct descriptor for project open
...
CURA-1263
2016-12-02 11:13:21 +01:00
Jaime van Kessel
4cf454757f
Change import & export back to save & open
...
CURA-1263
2016-12-02 10:43:02 +01:00
Jack Ha
8c5d97f6a0
Removed log. CURA-2767
2016-12-01 14:52:40 +01:00
Jack Ha
8ff233871f
Fixed typo. CURA-2767
2016-12-01 14:51:41 +01:00
Jack Ha
14701d89d0
Finally got edge cases regarding recommended mode support extruder color working. CURA-2767
2016-12-01 14:50:40 +01:00
Jack Ha
23f7a91b40
Merge branch 'master' into recommended_sidebar
2016-12-01 14:10:06 +01:00
Jack Ha
2924d2bf71
Fix color update in extruder comboboxes. CURA-3033
2016-12-01 14:06:17 +01:00
Jack Ha
4cd940cc5e
Merge branch 'master' into recommended_sidebar
2016-12-01 11:34:41 +01:00
Jack Ha
ef6e90283e
Added color to recommended view support extruder by adding combobox_color style. CURA-2767
2016-12-01 11:34:37 +01:00
Jaime van Kessel
d08c1b73bf
Fixed export profile derp
...
CURA-1263
2016-11-30 13:13:47 +01:00
Jaime van Kessel
86019c2df0
Renamed load&save workspace to import&export project
...
CURA-1263
2016-11-30 12:59:09 +01:00
Jack Ha
c27219b1c4
Merge branch 'master' into recommended_sidebar
2016-11-30 12:36:46 +01:00
fieldOfView
9c604bb674
Fixes two minor issues introduced in the feature_find_settings merge
2016-11-26 22:46:21 +01:00
Jaime van Kessel
6d66ea51ad
Setting the support extruder in recommended mode now correctly updates them in custom
...
CURA-3033
2016-11-25 11:28:38 +01:00
jack
84759e5808
Merge pull request #1176 from Ultimaker/rework_file_handler
...
Rework file handler CURA-1263
2016-11-24 14:56:05 +01:00
Jaime van Kessel
9a81a24512
Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura
2016-11-24 14:47:02 +01:00
Jack Ha
b88ed76b7c
Solve merge conflict PrinterOutputDevice. CURA-1263
2016-11-24 13:55:22 +01:00
fieldOfView
d045738dc8
Simplify button width logic
2016-11-24 11:51:35 +01:00
fieldOfView
9dd8a88602
Fix review issues
2016-11-24 10:12:11 +01:00
Jack Ha
c3320bb1a4
Change settings to settings/overrides in selected messages. CURA-2898
2016-11-23 13:33:12 +01:00
Jaime van Kessel
716ffe94ff
Don't show inheritance icon for resovled values
...
CURA-2860
2016-11-23 12:41:53 +01:00
Jaime van Kessel
75e067cab7
No longer select last_entry that isn't in the list
...
CURA-2860
2016-11-22 15:24:01 +01:00
fieldOfView
933ed5177f
Toggle visibility of filter field when pressing the "search" icon
2016-11-22 13:44:41 +01:00
fieldOfView
7e4f1dce7b
Add button for toggling the find settings textbox
...
The toggle is only shown when advanced mode is selected.
2016-11-21 23:29:18 +01:00
Jaime van Kessel
aca8110edd
Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler
2016-11-21 13:45:04 +01:00
Jaime van Kessel
d09c2d2fa5
No longer cast ObjectId to int
...
Fixes CURA-148
2016-11-21 13:42:08 +01:00
