Commit graph

3676 commits

Author SHA1 Message Date
Lipu Fei
784598d4a2 Remake: sign in page
CURA-6132
2019-01-30 15:37:25 +01:00
Lipu Fei
6aebdade73 Remake: Change to "sign in" button
CURA-6132
2019-01-30 15:37:20 +01:00
Jaime van Kessel
969ed6409c Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-01-30 13:37:34 +01:00
Jaime van Kessel
9ae08b4aec Moved the old logo back again
It looks way better, so lets hope it's here to stay!
2019-01-30 13:36:55 +01:00
Ghostkeeper
a6688b9609
Merge branch '4.0' 2019-01-30 12:59:39 +01:00
Ghostkeeper
430be551d3
Fix link to properties of row
This fixes a QML warning and probably fixes the visibility of these elements.
2019-01-30 12:59:27 +01:00
Ghostkeeper
a36aa3f17b
Merge branch '4.0' 2019-01-30 12:53:18 +01:00
Jaime van Kessel
805b4dbe4c Fixed height for action message buttons
CURA-6115
2019-01-29 13:28:32 +01:00
Jaime van Kessel
4151050127 Setting the height of an action button now actually changes it's size
CURA-6115
2019-01-29 12:57:05 +01:00
Lipu Fei
e2e856a5cd Add adhesion warning message back
CURA-6070
2019-01-28 14:41:57 +01:00
Lipu Fei
87bdd10dab Merge remote-tracking branch 'origin/4.0' 2019-01-28 14:03:51 +01:00
Lipu Fei
1f21eed14f Add Text.NativeRendering for Labels
CURA-6141
2019-01-28 09:05:43 +01:00
Lipu Fei
c6ff8149f6 Remove colon according to design
CURA-6141
2019-01-28 09:04:08 +01:00
Lipu Fei
71b2787d0d Use Label
CURA-6141
2019-01-28 08:48:02 +01:00
Remco Burema
3d413ceb2c MaterialInfo: Tweak text-alignment/layout. [CURA-6141] 2019-01-26 11:43:15 +01:00
Remco Burema
e7ff70870f MaterialInfo: Also replace HTML-text with QML-elements for 'by line-type'. [CURA-6141] 2019-01-26 11:25:38 +01:00
Ghostkeeper
33abbd4c89
Merge branch '4.0' 2019-01-25 12:03:38 +01:00
Jaime van Kessel
8f8b13f7c4 Let Cura define how the message actions look like
CURA-6115
2019-01-25 11:07:37 +01:00
Remco Burema
7fdbb11f49 MaterialInfo: Put height and fonts by QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 21:56:57 +01:00
Remco Burema
654cd8e645 MaterialInfo: Begin replace HTML-text with QML-elements for 'by material-type'. [CURA-6141] 2019-01-24 18:08:02 +01:00
Ghostkeeper
cbed8038e9
Don't say that creating a profile needs to provide a 'new' name
It's weird to ask for a new name if the profile is completely new.

Made together with a change in Uranium for CURA-6086.
2019-01-23 17:35:33 +01:00
Diego Prado Gesto
551111bd60 Close the configuration panel when the user syncs with a configuration 2019-01-23 11:24:28 +01:00
Jaime van Kessel
aac82a0852 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-23 11:18:27 +01:00
Ghostkeeper
9a0a084339
Code style 2019-01-23 11:11:40 +01:00
Jaime van Kessel
0942bebaf8 Move troubleshoot link to help menu 2019-01-22 16:19:29 +01:00
Lipu Fei
9bc748ffa1 Fix scrolling with configurations
CURA-6125
2019-01-22 11:48:41 +01:00
Diego Prado Gesto
5e3dedf62b Merge branch '4.0' 2019-01-20 21:25:19 +01:00
Jaime van Kessel
a51289d7ce Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura 2019-01-18 11:19:28 +01:00
Remco Burema
e7ba543fec
Merge pull request #5172 from Ultimaker/resize_bar_ui_changes
Change the style of the resize bar
2019-01-17 16:59:18 +01:00
Ghostkeeper
a01063b7d8
Merge branch '4.0' 2019-01-17 16:32:18 +01:00
Ghostkeeper
13c1a70677
Fix margin
The theme entry didn't exist.

Discovered during work on CURA-6086, but for the rest unrelated.
2019-01-17 16:31:50 +01:00
Remco Burema
98ce0caaef
Merge pull request #5158 from Ultimaker/marketplace_use_busy_indicator
Remove loading gif
2019-01-17 16:17:00 +01:00
Jaime van Kessel
94cf61ca18 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 14:28:35 +01:00
Jaime van Kessel
aff2ffc67a Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:23:06 +01:00
Jaime van Kessel
12a120f044 Slightly modify the variant label to match more with the monitor tab
CURA-6100
2019-01-17 14:21:11 +01:00
Jaime van Kessel
0ce0228f76 Merge branch 'feature_configuration_menu_variant' of https://github.com/fieldOfView/Cura into 4.0 2019-01-17 14:03:43 +01:00
Jaime van Kessel
15563a756f Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 13:42:58 +01:00
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs
CURA-6117
2019-01-17 11:20:21 +01:00
Jaime van Kessel
2f43339434 Merge branch 'CURA-6118_add_experimental_tag_on_stage_panel' of github.com:Ultimaker/Cura 2019-01-17 09:32:29 +01:00
Jaime van Kessel
24fbb1007d Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-16 17:39:43 +01:00
Remco Burema
a0dd3f06e6 Add 'Experimental' tag for quality profiles in the header.
When an experimental quality profile is active, the stage panel does not show that it is experimental.
It is however shown on the quality drop-down menu in Custom mode.

This commit also fixes the untranslated (hardcoded) 'Experimental' string in the dropdown in Custom.

Fixes the issue reported in CURA-6118.
2019-01-16 15:50:40 +01:00
Diego Prado Gesto
86b0ac320b Increase the padding with the button
Add more padding when the draggable area is visible
2019-01-16 08:47:01 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
Diego Prado Gesto
2435b97ef7 Change the style of the resize bar at the bottom of the print setup panel
Make it wider and more visible to the user.
Change icon.
Keep margins according to the other panels.
2019-01-15 12:12:47 +01:00
Jaime van Kessel
090fdbf598 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-14 14:17:40 +01:00
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00
Jaime van Kessel
b1b61fa466 Add missing return 2019-01-14 14:14:47 +01:00
Jaime van Kessel
5ae05acd2c Merge branch 'fix_non_connect_networkprinters' of https://github.com/fieldOfView/Cura into 4.0 2019-01-14 14:12:36 +01:00
Lipu Fei
71036abd87 Add troubleshooting link for recommended
CURA-6114
2019-01-14 12:11:45 +01:00
Lipu Fei
6876935359 Merge remote-tracking branch 'origin/4.0' 2019-01-14 11:21:28 +01:00