1824 Commits

Author	SHA1	Message	Date
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
fieldOfView	6656cd0c36	Hide adhesion & support options if they are disabled for the current printer	2017-08-23 13:26:47 +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
Ghostkeeper	d94956dd23	Give time estimate a different text colour ... Apparently it needs to be highlit a bit more than the rest. Contributes to issue CURA-4148.	2017-08-21 13:51:36 +02:00
Ghostkeeper	4b8152d6fe	Allow fallthrough of switch statement ... Makes it easier to modify. Contributes to issue CURA-4148.	2017-08-21 13:21:33 +02:00
Ghostkeeper	42b8e87d00	Make opacity of print monitor themeable ... The new dark design specifies a colour for the print monitor overlay that is darker than what would be attainable with the default 75% opacity. So I'm making it 100% opacity (but still with a fade, so we need the opacity) and let the theme specify what opacity it wants. Contributes to issue CURA-4148.	2017-08-21 10:50:36 +02:00
Lipu Fei	662e3b9cd1	Fix coding style ... CURA-4147	2017-08-18 13:38:16 +02:00
Ghostkeeper	64753f8c8b	Merge branch '2.7'	2017-08-18 10:42:14 +02:00
alekseisasin	7978b0efe9	Move quality profile, material and print core to it's new location ... CURA-4147	2017-08-18 09:15:17 +02:00
Lipu Fei	16cfb768d2	Move dont show again checkbox above the buttons ... CURA-4113 The Don't show again checkbox is on the same row with the buttons. In some translations, the text for the checkbox is very long, which overlaps with the button.	2017-08-16 16:07:02 +02:00
Lipu Fei	3a22d1916f	Go back to "Recommended/Custom" tabs ... CURA-4146	2017-08-15 17:42:34 +02:00
alekseisasin	3116ff829c	Merge pull request #2200 from fieldOfView/fix_monitoritem_size ... Adapt camera image to available space	2017-08-15 15:04:18 +02:00
alekseisasin	7ad7fb0a3c	Merge pull request #2200 from fieldOfView/fix_monitoritem_size ... Adapt camera image to available space	2017-08-15 14:45:34 +02:00
alekseisasin	e88f74fe5a	Merge branch 'master' of github.com:Ultimaker/cura	2017-08-14 15:07:59 +02:00
Ghostkeeper	7ab6a551c1	Clarify that XML material tags don't get translated ... Some of the translators got this wrong last time. Let's see how good they read this next time... Contributes to issue CURA-4113.	2017-08-14 13:54:11 +02:00
alekseisasin	a4ddd28e8f	Removed gap between material length and it's measuring unit ... feature_move_printing_time	2017-08-14 13:09:31 +02:00
Ghostkeeper	5866b759a8	Move material estimate properties to sidebar as well ... That's where they are used after all. Contributes to issue CURA-4149.	2017-08-14 12:06:03 +02:00
Ghostkeeper	6a4329c1a0	Align progress bar and save button better ... So that they don't overlap with the now larger fonts and such. Contributes to issue CURA-4149.	2017-08-14 10:36:39 +02:00
Ghostkeeper	addf6429e5	Adjust font sizes of time/material estimates ... Emphasize the time estimate. Contributes to issue CURA-4149.	2017-08-14 09:45:12 +02:00
Ghostkeeper	bff00d41d0	Add description for print time ... It looks a bit weird right below the print time but we'll discuss that later. Contributes to issue CURA-4149.	2017-08-14 09:42:46 +02:00
Ghostkeeper	454293f926	Remove superfluous rectangles ... There's only one item in there. It makes no sense to group them by rows and that only makes the bindings more complicated. Contributes to issue CURA-4149.	2017-08-14 09:38:40 +02:00
Ghostkeeper	e514a9f474	Fix some binding loops ... Contributes to issue CURA-4149.	2017-08-14 09:34:52 +02:00
Ghostkeeper	c4305c7b1e	Rearrange and align time/material estimates ... They look correct now but the log says there is a binding loop in here. We'll fix that next. Contributes to issue CURA-4149.	2017-08-14 09:23:56 +02:00
Ghostkeeper	fb3a0b701c	Remove superfluous item ... This item was just transparently being the same size as its parent, no ID or nothing. We can just remove it. Contributes to issue CURA-4149.	2017-08-14 09:12:21 +02:00
Ghostkeeper	0430a274d9	Make slicing status text smaller ... Makes more room for the time/material estimates. Contributes to issue CURA-4149.	2017-08-14 09:10:35 +02:00
Ghostkeeper	067449192a	Move time/material estimates code to sidebar ... It sort of works but is aligned all wrong right now. Contributes to issue CURA-4149.	2017-08-14 09:04:26 +02:00
Ghostkeeper	5f057f46ea	Add Pirate language only on Talk Like a Pirate Day ... Let's see who finds this.	2017-08-10 20:26:35 +02:00
fieldOfView	0630559472	Fix setting variant of non-active extruder through menu	2017-08-08 11:41:15 +02:00
fieldOfView	8d72ba5fe7	Fix setting material of non-active extruder through menu	2017-08-08 11:32:34 +02:00
Lipu Fei	3bc7e9012d	Use the right stack to retrieve infill values in Recommended mode ... CURA-3932	2017-08-07 10:53:19 +02:00
Lipu Fei	b274f63df0	Use the right stack to retrieve infill values in Recommended mode ... CURA-3932	2017-08-04 14:19:14 +02:00
alekseisasin	b984b99c30	Translated text overlaps GUI ... CURA-3799	2017-08-03 13:05:53 +02:00