1660 Commits

Author	SHA1	Message	Date
Ghostkeeper	9de041ade5	Remove theme font from system-themed dialogue ... See commit 36dedabd11a36bd40669fbcf3b0e1f820c47acf1.	2017-05-12 09:45:53 +02:00
fieldOfView	a727e4ffd0	Make sure all materials are shown ... Without this workaround, some materials that are listed above the generic materials do not show up untill the user scrolls the scrollview.	2017-05-11 18:17:11 +02:00
fieldOfView	6fa83a9110	Fix selecting a material when an edit field has the focus	2017-05-11 13:22:14 +02:00
fieldOfView	e45f04f391	Merge branch 'master' into fix_material_uniqueness	2017-05-11 12:23:01 +02:00
Ghostkeeper	e3236bec4d	Make wording more consistent ... Contributes to issue CURA-3732.	2017-05-11 11:22:18 +02:00
Jaime van Kessel	8e7637ae62	Merge branch 'master' of github.com:Ultimaker/Cura	2017-05-11 11:08:47 +02:00
Jaime van Kessel	e2b39e7e33	Fixed spacing of infill options ... CURA-3732	2017-05-11 11:08:23 +02:00
Ghostkeeper	00aff6d2f2	Make feature labels more accurate for support ... It's used a bit differently. Contributes to issue CURA-3773.	2017-05-11 10:29:18 +02:00
Ghostkeeper	32ea311762	Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature	2017-05-11 09:53:50 +02:00
Mark	04611b06af	Fix two spelling errors ... TRI-1450	2017-05-10 20:14:03 +02:00
Jaime van Kessel	51c08d4f53	Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura	2017-05-10 14:00:15 +02:00
fieldOfView	8f792b2504	Tweak Print Settings layout to match the rest of the UI.	2017-05-09 13:03:49 +02:00
Lipu Fei	19ee790cd7	Remove device pixel ratio from DiscardOrKeepProfileChangesDialog	2017-05-09 12:05:01 +02:00
Lipu Fei	36dedabd11	Fix DPI issue with DiscardOrKeepProfileChangesDialog	2017-05-09 11:47:55 +02:00
Jaime van Kessel	eb677f5625	Merge branch 'feature_cutting_mesh' of github.com:Ultimaker/Cura	2017-05-09 10:20:27 +02:00
Mark	1449f785f7	Fix so that sliding the switch also changes the mode	2017-05-08 15:51:38 +02:00
fieldOfView	836cf27266	Keep material selected when editing its name, brand or type ... Editing a material name, brand or type may change its position in the materials list. We now reselect the material after editing one of these values.	2017-05-08 11:37:19 +02:00
fieldOfView	b4f56d10d7	Set currentIndex to a more logical successor when deleting a material	2017-05-08 11:17:10 +02:00
fieldOfView	00f3cf409b	Select newly created material	2017-05-08 10:38:25 +02:00
Mark	e3b17579e8	Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon	2017-05-05 19:21:13 +02:00
Ghostkeeper	fc1a5e89c3	Change gradual infill upon clicking infill buttons ... It sets the gradual infill to the value stored in the listmodel. Contributes to issue CURA-3732.	2017-05-05 17:16:18 +02:00
Ghostkeeper	ad1b1e0455	Detect whether the current infill is gradual ... And highlight the correct infill button in that case. Contributes to issue CURA-3732.	2017-05-05 17:13:32 +02:00
Ghostkeeper	df0a971326	Improve tooltip wording for gradual infill button ... Contributes to issue CURA-3732.	2017-05-05 16:59:35 +02:00
14bitVoid	e9d70a8a70	Translate features for time estimates	2017-05-05 02:36:22 +02:00
14bitVoid	05f46c47f7	Dynamically fill tooltip with time estimates	2017-05-05 02:31:16 +02:00
14bitVoid	69a95e37a5	Show time estimates per feature in tooltip	2017-05-05 01:34:09 +02:00
Jack Ha	0b0011fc88	Multiply dialog now has focus on #, added shortcut Ctrl-M	2017-05-04 16:31:33 +02:00
Ghostkeeper	45a369e31b	Merge branch 'Sidebar-fix'	2017-05-04 13:00:03 +02:00
Ghostkeeper	c25e2b9b95	Revert "Include recommended/custom switch in theme" ... This reverts commit a1f32b74e5b4a30e892a87deb3f7e052e94bbf54. The fix was correct but we allow the honour for Randyxxl.	2017-05-04 12:53:05 +02:00
Mark	68f5995b19	[WIP] Add place for the extra gradual infill icon ... CURA-3732	2017-05-04 12:35:40 +02:00
Ghostkeeper	a1f32b74e5	Include recommended/custom switch in theme ... Otherwise it stays white.	2017-05-04 09:48:54 +02:00
Ghostkeeper	945486ade9	Merge branch 'cura_containerstack' ... Contributes to issue CURA-3497.	2017-05-03 17:11:55 +02:00
Mark	b590e7b86c	[WIP] Add place for the extra gradual infill icon ... CURA-3732	2017-05-03 17:05:56 +02:00
Randall Wessel	687d326fae	Changed color to transparancy and spaces instead of tabs	2017-05-03 15:34:56 +02:00
Ghostkeeper	c42d092b0f	Merge branch 'master' into cura_containerstack	2017-05-03 15:21:01 +02:00
Randall Wessel	163543b86b	Make background color of toggle button themeable ... Background of toggle button gets same color as toolbar surrounding the button.	2017-05-03 14:26:44 +02:00
Lipu Fei	ac560229a1	Fix TypeError in JobSpec.qml due to material cost being undefined	2017-05-03 10:45:39 +02:00
Jack Ha	5d15d6e792	Merge branch 'master' into feature_multiextruder_machinesettings	2017-05-02 17:26:27 +02:00
Ghostkeeper	7a9a4ae290	Revert "Change Label to Text because of ugle font rendering" ... This reverts commit 8c9eccd1f4f49a0d0584b3f56985f4fa16e48915. This element is in a modal window, where the fonts should get the system themeing.	2017-05-02 12:58:29 +02:00
Mark	0e1748b705	Small layout fix so the comboboxes are aligned	2017-05-02 12:55:37 +02:00
Jaime van Kessel	d7004d3547	Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack	2017-05-02 11:42:16 +02:00
Jaime van Kessel	2bc4355f00	Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura	2017-05-02 09:40:08 +02:00
Mark	be21cd7f7d	Fix preference category double name	2017-05-01 13:25:13 +02:00
fieldOfView	f18947681a	Disambiguate theme name	2017-04-30 23:25:14 +02:00
fieldOfView	93197cd173	Add hover effect to mode switch text labels	2017-04-30 23:21:49 +02:00
fieldOfView	0c6a5328c8	Add hover effect to mode switch control ... While simplifying theme additions	2017-04-30 22:52:54 +02:00
fieldOfView	98aca20197	Fix hover effect on "enable support" checkbox	2017-04-30 22:27:07 +02:00
fieldOfView	577a8d0a3e	Fix MaterialView layout issues ... Make scrollview look more in line with the scrollview on the profiles page	2017-04-30 10:28:03 +02:00
fieldOfView	a1d9b1a37f	Force update after unlinking material.	2017-04-29 21:19:54 +02:00
fieldOfView	67b8302d40	Add a notice to linked materials and allow "unlinking" a material.	2017-04-29 21:08:48 +02:00