GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 02:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,228 Commits 290 Branches 260 Tags
Commit Graph

3571 Commits

Author SHA1 Message Date
Jaime van Kessel
f2fbb4e989 Merge branch 'CURA-6174_fix_time_estimates_dark_theme' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:38:44 +01:00
Jaime van Kessel
91f90e7d40 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2019-02-05 13:32:14 +01:00
Jaime van Kessel
b6f5dd8f94 Fix display of long names in sync configuration menu 2019-02-05 13:31:50 +01:00
Remco Burema
5c54cb740a Fix dark-theme material-estimates-panel (and layout-issues). [CURA-6174] 2019-02-05 13:24:28 +01:00
Lipu Fei
cfdadbaffb
Merge pull request #5270 from Ultimaker/action_panel_per_stage 
Let each stage create its own action panel
 2019-02-05 11:16:00 +01:00
Jaime van Kessel
d59889a4ab Fix logo in about popup 2019-02-05 11:13:47 +01:00
Ghostkeeper
7569ed9834
Another adjustment to account creation commercial text 
The marketing team wants to make this small adjustment too.
 2019-02-04 16:18:54 +01:00
Ghostkeeper
61475a79cf
Fix font size of buildplate warning 
This was most likely copied from an old release but the font in question was deleted.
 2019-02-04 15:23:57 +01:00
Ghostkeeper
a831cfa558
Configure whether preview shortcut is visible from ActionPanelWidget property 
This way it's more dynamic: You don't need to hardcode the plug-in name in the widget to see whether or not it's visible.

Contributes to issue CURA-6086.
 2019-02-04 15:19:09 +01:00
Ghostkeeper
5992e66ed6
Move action panel into each stage 
They can then decide if it needs to be there. For instance, the monitor stage doesn't want to have this panel. Also each stage can position it where they like, and in the near future I'll make a feature to let it decide whether or not to show the preview button.

Contributes to issue CURA-6086.
 2019-02-04 15:08:59 +01:00
Ghostkeeper
7d871e5a18
Update text for pre-login screen 
This is a new text that we got from marketing.
 2019-02-04 13:06:06 +01:00
Jaime van Kessel
4aaeb8c2d5 Merge branch 'CURA-6153_wrong_name_on_disconnect' of github.com:Ultimaker/Cura into 4.0 2019-02-01 11:54:35 +01:00
Lipu Fei
60a4fb3151 Fix missing "group_name" renaming 
CURA-6153
 2019-02-01 10:23:51 +01:00
Remco Burema
954fdb20ad Rename 'connect_group_name' to 'group_name'. [CURA-6153] 2019-01-31 20:21:42 +01:00
Jaime van Kessel
e6f722b29c Move additional component loader into ActionPanelWidget 2019-01-31 17:13:32 +01:00
Lipu Fei
f0d9aa77c2 Make account button non-fixed-width 
CURA-6132
 2019-01-31 09:43:33 +01:00
Remco Burema
dcf9ce56e4
Merge pull request #5244 from Ultimaker/CURA-6115-improve-message-options 
Cura 6115 improve message options
 2019-01-30 17:54:47 +01:00
Lipu Fei
8dd0f8d329 Remake: show initial if no avatar 
CURA-6132
 2019-01-30 15:37:41 +01:00
Lipu Fei
de4db19234 Remake: account panel 
CURA-6132
 2019-01-30 15:37:34 +01:00
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
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
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
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
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
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
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
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
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
Lipu Fei
3b3baeac03 Remove hard-coded account URLs in QMLs 
CURA-6117
 2019-01-17 11:20:21 +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
ChrisTerBeke
f2922e2405 Merge branch '4.0' into STAR-322_cloud-connection 2019-01-14 14:16:35 +01:00