1703 Commits

Author	SHA1	Message	Date
Lipu Fei	3e3f15d33f	Larger gap between the logo and topbar buttons ... CURA-4213	2017-09-05 11:12:47 +02:00
Lipu Fei	77adfe345d	Fix merge conflicts from master ... CURA-4213	2017-09-05 08:41:44 +02:00
Mark	e3f319a644	less margin when support extruder pops up ... CURA-4148	2017-09-04 16:23:19 +02:00
Jaime van Kessel	dd7ea80b68	Also added canPreheatBed option	2017-09-04 15:33:04 +02:00
Jaime van Kessel	8683275d4f	Added canAbort & canPause feature to PrinterOutputDevice	2017-09-04 15:16:55 +02:00
Jaime van Kessel	88c74b30c2	Added missing QML properties	2017-09-04 11:48:54 +02:00
Mark	d18d9223a5	refix the alignmet of the support and adhesion chackboxes ... CURA-4148	2017-09-03 08:18:12 +02:00
alekseisasin	24c9dc9bee	Merge branch 'feature_light_colours_icons' ... CURA-4148	2017-09-01 19:25:29 +02:00
Jaime van Kessel	9ec7ef8dba	Made print spec invisible when monitoring print	2017-09-01 13:07:00 +02:00
Ghostkeeper	bec786b140	Move printer status icon outside of the monitor button ... It's positioned on the right side now above the side bar. Contributes to issue CURA-4213.	2017-08-31 17:13:56 +02:00
Ghostkeeper	c6d614156f	Move the Cura logo into the top bar ... Looks ugly there, I think, but the colours will be changed eventually so we'll see. Contributes to issue CURA-4213.	2017-08-31 16:09:16 +02:00
Ghostkeeper	062957c249	Hide the header if it would be empty ... It would be empty if the machine is single extrusion and has no materials or variants. Contributes to issue CURA-4241.	2017-08-31 15:51:51 +02:00
Ghostkeeper	0fc40d571a	Only make separator visible if the element above and below it are visible ... The behaviour should be the same, if it was implemented correctly previously. Contributes to issue CURA-4241.	2017-08-31 15:47:29 +02:00
alekseisasin	e38ec9d5e8	Renamed "Hotend" to "Extruder" ... CURA-4256	2017-08-31 14:19:01 +02:00
Ghostkeeper	ed7e204cc0	Fix colour of time estimates text ... I'd like it to be the same colour as the text underneath it, so subtext it is. Contributes to issue CURA-4148.	2017-08-31 10:21:28 +02:00
Ghostkeeper	c4910503e4	Correct height of tips text ... The contentHeight property seems to indicate the height of only one line, contrary to the documentation... Contributes to issue CURA-4148.	2017-08-31 10:18:54 +02:00
Ghostkeeper	526a42f7a0	Put sidebar contents inside a scroll view ... That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit. Contributes to issue CURA-4148.	2017-08-31 09:51:19 +02:00
Ghostkeeper	95ba4b9368	Link anchors differently ... Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes. Contributes to issue CURA-4148.	2017-08-31 09:35:27 +02:00
Ghostkeeper	6f77cfc763	Always show plain monitor icon, never with_status ... The status icons are just overlaid on top of the monitor icon. No need for any specialised icon with a background or anything. Contributes to issue CURA-4148.	2017-08-30 15:02:43 +02:00
fieldOfView	4d0c77683c	Show target hotend temperature(s)	2017-08-29 11:02:37 +02:00
Lipu Fei	0781848af5	Reduce margin size for settings in recommended and custom mode ... CURA-4148	2017-08-28 17:35:03 +02:00
Lipu Fei	0eb63637d4	Merge branch 'master' into feature_dark_colours_icons	2017-08-28 16:54:36 +02:00
Ghostkeeper	7a8956fd0e	Merge branch '2.7'	2017-08-28 16:21:40 +02:00
Jaime van Kessel	8a0f6d969e	Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7	2017-08-28 16:05:59 +02:00
Ghostkeeper	22b808afb3	Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master	2017-08-28 15:29:45 +02:00
Lipu Fei	3fbdb27e8e	Merge branch 'master' into feature_dark_colours_icons ... CURA-4148 Resolve merge conflicts.	2017-08-28 11:13:38 +02:00
Ghostkeeper	585c04dfaa	Also show warning icon when the set-up on other extruders is unsupported ... So I added a function that checks the support on all extruders and the global stack. Contributes to issue CURA-4148.	2017-08-25 14:27:45 +02:00
Ghostkeeper	165665247f	Remove unused property valueWarning ... It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same. Contributes to issue CURA-4148.	2017-08-25 14:03:54 +02:00
Ghostkeeper	78dbe8c56a	Remove offline icon ... We don't show an icon in that case any more. Contributes to issue CURA-4148.	2017-08-25 13:03:50 +02:00
Ghostkeeper	4835ffa403	Don't recolor printer status buttons ... Just leave it to the actual icons to provide colour. It may be a bit harder to modify the colours in a different theme then, but now we can have multi-colour icons (as per the new theme requires). Contributes to issue CURA-4148.	2017-08-24 21:22:13 +02:00
Lipu Fei	f85a76b4bd	Fix per-object settings qml	2017-08-24 17:38:16 +02:00
Ghostkeeper	cdf43ea6a4	Forgotten sidebar margins ... The buttons need the sidebar margins too. Contributes to issue CURA-4148.	2017-08-23 17:58:05 +02:00
Ghostkeeper	09a5cf1de2	Shift sidebar tooltips with the arrow outside of sidebar ... Because now the arrow has the same colour as the sidebar so you won't see it otherwise. Contributes to issue CURA-4148.	2017-08-23 17:53:00 +02:00
Ghostkeeper	11f8204644	Change margins in the side bar ... These are more or less all margins in the side bar. Contributes to issue CURA-4148.	2017-08-23 16:28:28 +02:00
Ghostkeeper	078b9e8b66	Fix placeholder text colour ... It should use the same colour as the normal text, for now. Contributes to issue CURA-4148.	2017-08-23 15:32:42 +02:00
Ghostkeeper	b52446ed99	Use text colour specific to text in scene for job specs ... Because the scene may have a different background colour than the rest, we need to be able to have inverted colours for that part. Contributes to issue CURA-4148.	2017-08-23 14:58:43 +02:00
Ghostkeeper	f5169f53f3	Remove text_reversed ... This theme item is broken by nature since the theme itself allows you to change the colours such that these text elements don't get inversed colours at all. Instead I'm going to use text_emphasis for these which is currently the same. If ever they need to get different colours for these items than the normal colour, the theme item will have to be split up. Contributes to issue CURA-4148.	2017-08-23 14:44:14 +02:00
Ghostkeeper	d55b8b2957	Add icon after Troubleshooting Guide text ... Sadly the colour of this icon is hard-coded into the image... I didn't find any other solution to append an inline image after a multi-line text. Contributes to issue CURA-4148.	2017-08-23 14:38:35 +02:00
Ghostkeeper	c6d1ff0823	Don't colour Check Material Compatibility text red upon incompatibility ... I would've liked it when it became yellow instead, but just keeping it white and displaying the warning icon is sufficient I suppose. Contributes to issue CURA-4148.	2017-08-23 13:33:04 +02:00
Ghostkeeper	ab444943cb	Rename setting_validation_error/warning and border ... In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items. Contributes to issue CURA-4148.	2017-08-23 13:30:25 +02:00
Ghostkeeper	2a1a41662a	Remove tab_monitor_with_status icon ... It must always be the same as tab_monitor, but we'll just draw an additional icon on top of it. Contributes to issue CURA-4148.	2017-08-23 12:53:07 +02:00
Mark	2d0a4d443d	Switch material and print core ... CURA-4147	2017-08-23 10:54:46 +02:00
alekseisasin	9363f93467	Merge pull request #2224 from fieldOfView/fix_multiextruder_menus ... Fix multiextruder menus	2017-08-23 09:08:48 +02:00
Lipu Fei	28670edf8e	Align profile dropdown box correctly ... CURA-4147	2017-08-22 16:11:15 +02:00
Lipu Fei	e17a88fe11	Merge branch '2.7'	2017-08-22 16:06:36 +02:00
Mark	64f6cd237f	Rename Print tab to Monitor ... CURA-4106	2017-08-22 13:58:01 +02:00
Jaime van Kessel	fd6ee6ee3c	Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7	2017-08-22 10:53:51 +02:00
Ghostkeeper	b2338d9c2e	Re-use action button styling now that toggle is gone ... We should keep these two types of buttons in sync, so have them share a theme. Contributes to issue CURA-4148.	2017-08-21 15:11:07 +02:00
Ghostkeeper	d73bbabda9	Change top bar text colour depending on hover and active state ... Too bad we have to introduce additional theme entries for this sort of thing. Makes it harder to modify the theme! Contributes to issue CURA-4148.	2017-08-21 14:11:16 +02:00
Ghostkeeper	5652bccc58	Change control border colour depending on validation state ... The background colour was already changing, but the border colour was only depending on the hover state. Contributes to issue CURA-4148.	2017-08-21 13:56:07 +02:00