GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-01 22:35:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,312 Commits 295 Branches 267 Tags
Commit Graph

3880 Commits

Author SHA1 Message Date
Diego Prado Gesto
06a044b40f Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-12 16:10:15 +02:00
Diego Prado Gesto
82b7817fc6
Merge pull request #5616 from Ultimaker/CURA-6057_fix_onboarding 
Latest commits to onboarding
 2019-04-12 16:00:11 +02:00
Diego Prado Gesto
3bfe7df044 Fix the alignment of the MachineSelectorButton 
Sometimes it was creating a button with width zero. Now it expands to the width of the container.

Also fixing a small issue with the buttons and the link not being correctly aligned to the vertical center.

Contributes to CURA-6057.
 2019-04-12 15:45:10 +02:00
Diego Prado Gesto
1d9d10c909 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-12 13:54:45 +02:00
Remco Burema
55dcf31e3c Fix QML binding loop warnings for CustomConfiguration. 2019-04-11 16:24:51 +02:00
Remco Burema
db71a40acc Handle undefined extruder-color on start in RecommendedSupportSelector. 2019-04-11 16:23:36 +02:00
Diego Prado Gesto
13be1eb9aa Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 14:20:39 +02:00
Diego Prado Gesto
a428bf49f4 Use the 'busy' property of the ActionButton 
Instead of creating a new BusyIndicator, use the existing one.

Contributes to CURA-6435.
 2019-04-11 14:20:17 +02:00
Jaime van Kessel
767ccad970 Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-11 10:52:19 +02:00
Jaime van Kessel
c9a4f0c8b1 Fixed some minor qml issues with userOperations popup 2019-04-11 10:51:57 +02:00
Lipu Fei
70e97304d1 Fix add-by-ip page layout 
CURA-6057
 2019-04-10 10:33:11 +02:00
Lipu Fei
4bd3088b58 Fix ScrollableTextArea 
CURA-6447
 2019-04-10 09:50:39 +02:00
Jaime van Kessel
c2b901ae47 Merge branch 'CURA-6057_fix_onboarding' of github.com:Ultimaker/Cura 2019-04-09 16:34:36 +02:00
Diego Prado Gesto
74fe1c5aa8 Set the alignWhenCentered to false 
so the radio button is perfectly centered instead of shifted

Contributes to CURA-6057.
 2019-04-09 11:14:52 +02:00
Diego Prado Gesto
bf47bfc4ea Merge branch 'master' of github.com:Ultimaker/Cura 2019-04-08 16:26:43 +02:00
Diego Prado Gesto
7bf25a3be5 Also allow upper case CURAPACKAGE filenames 2019-04-08 16:26:14 +02:00
Lipu Fei
a0a9f20454 Fix disagree user agreement 
CURA-6057
 2019-04-08 15:06:40 +02:00
Lipu Fei
3bf8a1f257 New style more info dialog for SliceInfo 
CURA-6057
 2019-04-08 14:34:35 +02:00
Lipu Fei
ac1b1a9902 Use ScrollableTextArea in whats new page 
CURA-6057
 2019-04-08 14:11:28 +02:00
Lipu Fei
4f1282df04 Add ScrollableTextArea 
CURA-6057
 2019-04-08 14:10:18 +02:00
Jaime van Kessel
0bad57259c Increased the font size of notification icon to make it more readable 
CURA-6151
 2019-04-08 13:27:30 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page 
CURA-6057
 2019-04-08 13:06:30 +02:00
Lipu Fei
0bac3e8111 Fix button text 
CURA-6057
 2019-04-08 12:39:21 +02:00
Lipu Fei
5cce4cd4cd Fix add by ip page styling 
CURA-6057
 2019-04-08 12:27:32 +02:00
Lipu Fei
b1fe110f9f Add Cura.TextField 
CURA-6435
CURA-6057
 2019-04-08 12:27:32 +02:00
Lipu Fei
0962481bc1 Fix printer type update in the main printer selection menu 
CURA-6057
 2019-04-08 12:27:31 +02:00
Jaime van Kessel
ed503cb6ec Removed platform check that always had the same result 
The UM.Application.platform property has been removed by someone for quite some time.
I don't know why the check was in there, but it doesn't seem needed at all as the property was always undefined
 2019-04-05 17:07:12 +02:00
Jaime van Kessel
495b24b87b Factor out the scene proxy 2019-04-05 16:41:22 +02:00
Jaime van Kessel
2dd4a30586 Prevent machines without an extruder from showing "undefined" in the workspace dialog 
This fixes #5572
 2019-04-04 20:07:27 +02:00
Jaime van Kessel
7dd54aefcd Merge branch 'remove_compatibility_chart_link' of github.com:Ultimaker/Cura 2019-04-04 15:05:43 +02:00
Diego Prado Gesto
9594545f2c Remove the link to show the compatibility chart 
Actually it only made sense for ultimaker materials. Now that we can include instruction link in every materials, a specific link for every material can be used instead.

Contributes to CURA-6423.
 2019-04-04 14:46:20 +02:00
Ghostkeeper
bd1712cb10
Spelling fix: Overriden -> Overridden 
I think some of us got the spelling of this word wrong in their heads.
 2019-04-04 14:39:01 +02:00
Lipu Fei
06f427ef46 Make GCode TextField scrollable 
CURA-6057
 2019-04-04 14:18:54 +02:00
Jaime van Kessel
29a55c2953 Added missing rendertype 2019-04-04 14:11:07 +02:00
Jaime van Kessel
2e50c19949 Added missing rendertype 2019-04-04 09:51:53 +02:00
Jaime van Kessel
75386c0b7e Change the font of the customMachineSettings window 
CURA-6057
 2019-04-03 17:08:07 +02:00
Jaime van Kessel
cf68fb9cae Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-03 17:04:16 +02:00
Jaime van Kessel
362036e064 Fix small display issue where a line was drawn between the tabs 
CURA-6057
 2019-04-03 17:03:39 +02:00
Ghostkeeper
b9efeb47ed
Don't open add printer wizard on first launch 
Oops.

Contributes to issue CURA-6057.
 2019-04-03 15:56:54 +02:00
Ghostkeeper
2ccc30b824
Only show add machine dialogue if your stack got corrupt, not whole onboarding 
We don't need to accept the EULA again or whatever. Just add the printer that got lost.

Contributes to issue CURA-6057.
 2019-04-03 15:52:07 +02:00
Lipu Fei
1207533046 Fix local printer selection update 
CURA-6057
 2019-04-03 15:14:06 +02:00
Jaime van Kessel
cf04ee98ef Fix being able to add a local machine that is not the first in the list 
CURA-6057
 2019-04-03 15:04:59 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Ghostkeeper
df32f3e263
Move Cura.ProgressBar to Uranium 
It is not specific to 3D printing.

Contributes to issue CURA-6057.
 2019-04-03 11:51:57 +02:00
Ghostkeeper
745d9e6116
Also catch middle mouse button in overlay 
Just catch all buttons. There's an entry for that in QML.

Contributes to issue CURA-6057.
 2019-04-03 11:03:55 +02:00
Ghostkeeper
453a785bee
Fix typo 
Contributes to issue CURA-6057.
 2019-04-03 10:42:07 +02:00
Jaime van Kessel
8ae0c695bd Add total cost to the output overview. 
This fixes #5529
 2019-04-02 11:09:12 +02:00
Jaime van Kessel
52589ffcad Fix incorrect margin 
CURA-6057
 2019-04-01 14:29:11 +02:00
Jaime van Kessel
7a3cd81e3f Fix font size for the titles in the welcome flow 
CURA-6057
 2019-04-01 14:10:09 +02:00
Jaime van Kessel
1b8b5415f7 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-04-01 13:46:00 +02:00