GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 22:14:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,127 Commits 289 Branches 260 Tags
Commit Graph

4529 Commits

Author SHA1 Message Date
Jaime van Kessel
50ad4e4d4e Speed up the rendering of the solid view by caching support_angle property 2019-04-19 14:55:28 +02:00
Jaime van Kessel
f86f4d184b Add a QML item that shows the FPS 2019-04-19 13:58:41 +02:00
Remco Burema
b5d4ef61f5 Add cancel-button and fix window-size (add printer). [CURA-6435] 2019-04-17 18:10:26 +02:00
Remco Burema
5c28de05e1 Workaround for ListView-cache-bug in Qt. [CURA-6435] 2019-04-17 16:40:05 +02:00
Remco Burema
d72911df84 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-17 14:00:45 +02:00
Remco Burema
4c214f5b2d
Merge pull request #5611 from Ultimaker/CURA-6449_fix_non_host_printers 
CURA-6449 Disable printers that are not host of a group
 2019-04-17 13:06:38 +02:00
Jaime van Kessel
ef92aad6bb Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine 2019-04-17 11:06:30 +02:00
Lipu Fei
44a0f00f0b Reuse welcome dialog item to show whats new upon start 
CURA-6447
 2019-04-17 09:58:07 +02:00
Lipu Fei
a49d00c60e Move some code into Component.onCompleted 
CURA-6447
 2019-04-17 09:42:42 +02:00
Lipu Fei
64cb86217e Remove non-existing icon 
CURA-6447
 2019-04-17 09:36:03 +02:00
Lipu Fei
904a8ab26c Fix theming 
CURA-6435
 2019-04-17 09:18:08 +02:00
Lipu Fei
9b603d1f4b Use Cura.MachineNameValidator 
CURA-6435
 2019-04-17 08:31:27 +02:00
Lipu Fei
96e10ee00c Add max length to machine name textbox 
CURA-6435
 2019-04-17 08:25:32 +02:00
Lipu Fei
d9018220b5
Merge branch 'master' into CURA-6449_fix_non_host_printers 2019-04-15 11:37:02 +02:00
Diego Prado Gesto
d0aee9da3f Merge branch 'master' into CURA-6447_fix_start_onboarding 2019-04-12 16:39:51 +02:00
Diego Prado Gesto
6169d1ad5c Change a label 
Contributes to CURA-6435.
 2019-04-12 16:16:10 +02:00
Diego Prado Gesto
969b5f7081 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-12 16:15:36 +02:00
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
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +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
Diego Prado Gesto
aabcd71b72 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:17:10 +02:00
Diego Prado Gesto
96301842f2 Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-11 12:47:19 +02:00
Diego Prado Gesto
a32488895b Add renderType to labels 
Otherwise it becomes unreadable on macOS.

Contributes to CURA-6435.
 2019-04-11 12:08:18 +02:00
Lipu Fei
588dd6cd78 Disable printers that are not host of a group 
CURA-6449

 - Group printers into hosts and non-hosts and of unknown type.
 - Show available/connectable printers first in the list.
 - Show sections for connectable and non-connectable printers.
 2019-04-11 11:33:01 +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
0665076018 Fix merge conflicts 2019-04-10 10:42:51 +02:00
Lipu Fei
0d437e7e96 Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 10:40:42 +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
Lipu Fei
9a33a301ab Merge remote-tracking branch 'origin/master' into CURA-6447_fix_start_onboarding 2019-04-10 09:08:05 +02:00
Lipu Fei
0e49d3dc12
Merge branch 'master' into CURA-6435_new_style_add_machine 2019-04-10 09:06:55 +02:00
Lipu Fei
b692787def Fix how onboarding flow is shown 
CURA-6447
 2019-04-10 07:16:09 +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
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
f94344263b Fix merge conflicts 2019-04-09 11:33:07 +02:00
Lipu Fei
738886b4fb Merge remote-tracking branch 'origin/CURA-6057_fix_onboarding' into CURA-6447_fix_start_onboarding 2019-04-09 11:31:42 +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
Jaime van Kessel
f5ef6aed8d Make textfield use states 
CURA-6435
 2019-04-08 17:10:36 +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