GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-02 16:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,469 Commits 291 Branches 260 Tags
Commit Graph

19469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
8c41a05183
Merge branch 'maukcc-master' 2019-04-01 11:09:07 +02:00
Jaime van Kessel
64523c7baf Add some extra info to the tooltip if a setting is not used due to the value of it's children 
The behavior might make sense to us, but that's probably because we know what the behavior is. The
extra info in the tooltip should make it easier to understand

Fixes #5525
 2019-04-01 10:41:35 +02:00
Lipu Fei
3f9b98bd0c Round size numbers 
CURA-6151
 2019-04-01 10:38:43 +02:00
Remco Burema
e14d836c4f Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-29 16:23:32 +01:00
Remco Burema
dc8524b90d Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057] 2019-03-29 16:23:16 +01:00
Diego Prado Gesto
3d86499069 Don't round the radius of the RadioButton 
Otherwise it looks like a weird circle.

Contributes to CURA-6057.
 2019-03-29 15:41:20 +01:00
maukcc
7f2fcb16a8 Adding platform to HMS434 2019-03-29 14:26:42 +01:00
Ghostkeeper
d8f89d8330
Fix sorting printers by name 
Because DiscoveredPrinter.name contains the MAC addresses of the printers. NetworkedPrinterOutputDevice.name contains the discovered name as communicated by ZeroConf. We already use that property from QML to display in the list.

Contributes to issue CURA-6057.
 2019-03-29 13:41:46 +01:00
Ghostkeeper
5028290e0d
Remove welcome_pages_default_margin theme entry 
Use the wide margin instead. It's practically the same, nobody is going to notice. It still looks spacey and nice, and it's more consistent with the rest of the interface.
We had previously agreed that we will not make any new widget-specific theme entries any more.

Contributes to issue CURA-6057.
 2019-03-29 13:41:45 +01:00
Ghostkeeper
129c1ab3d4
Fix welcome page buttons text not fitting 
On some operating systems the text would not fit due to different font rendering. Also, after translation, it probably wouldn't fit either.
Usually we have the button size adjusting to the text inside it. The design didn't do this, either because it was too difficult to do in Zeplin, because the designer was lazy, or because the designer didn't know that this was the normal style in the rest of Cura. And the programmer took that over literally.

Contributes to issue CURA-6057.
 2019-03-29 13:41:45 +01:00
Jaime van Kessel
83361405a4 Add test for num instances in machine manager 2019-03-29 13:34:41 +01:00
Remco Burema
3ca8ba421a Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
Remco Burema
39f6eafe3c Remove wrong qml in WhatsNewContent. 2019-03-29 13:04:11 +01:00
Ian Paschal
58f1c05564 Actually fix tests 
Contributes to CL-1266
 2019-03-29 12:27:58 +01:00
Jaime van Kessel
91a886793b Hide welcome dialog instead of close cura if you complete it 
CURA-6057
 2019-03-29 12:04:00 +01:00
Jaime van Kessel
2f34bdc650 Fix shadow of the first run screen 
CURA-6057
 2019-03-29 11:51:57 +01:00
Diego Prado Gesto
0ffcfe041a Exclude HIPS and PETG for UM3 as it use to be in 4.0 2019-03-29 11:49:06 +01:00
Jaime van Kessel
69935115f3 Fix some layout issues with the addNetworkedOrLocalPrinter screen 
CURA-6057
 2019-03-29 11:44:09 +01:00
Jaime van Kessel
f92ed4cd02 Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 11:35:42 +01:00
Jaime van Kessel
894a09b654 The welcome dialog is now a rectangle instead of a dialog 
The whole window approach was just causing to much cross platform issues, so
I converted it into a rectangle and put a mouseArea that eats all the events in the
greyOut background

CURA-6057
 2019-03-29 11:33:49 +01:00
Remco Burema
7ceaade26d Sort changelog correctly (newest on top). [CURA-6057] 2019-03-29 11:27:37 +01:00
Jaime van Kessel
28dc187731 Set the flag of the welcome dialog to Dialog 
We want the dialog to be modal, but if it's a window (and not a dialog) the
modality can't be set (or well, it can be set, but it's just ignored at that point)

CURA-6057
 2019-03-29 11:08:10 +01:00
Jaime van Kessel
b4134e6dbb Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-29 10:44:29 +01:00
Jaime van Kessel
f8b67be487 Fix error spam when a printer of a cluster is unreachable 
CURA-6057
 2019-03-29 10:43:47 +01:00
Remco Burema
60920c89af Remove old send slice-info confirm: part of the new onboard. [CURA-6057] 2019-03-29 09:33:41 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Ian Paschal
4581c1f138 Fix UM3NetworkPrinting test 
Contributes to CL-1266
 2019-03-28 16:20:01 +01:00
Lipu Fei
d34b3b8585 Move associate um network printer function into UM3OutputDevicePlugin 2019-03-28 15:24:42 +01:00
Lipu Fei
109631d023 Update doc for updateHasMaterialsMetadata() 2019-03-28 15:13:41 +01:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
3ad79a5888 Fix divided by 0 problem 2019-03-28 14:34:18 +01:00
Lipu Fei
82471a0e39 Add doc for MachineSettingsManager 2019-03-28 14:31:33 +01:00
Lipu Fei
397add861f Correct logging level 2019-03-28 14:29:37 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Lipu Fei
b28fdc2b0b Use camelcase for pyqtProperty names 2019-03-28 14:22:27 +01:00
Jaime van Kessel
84de34341d
Merge pull request #5470 from Ultimaker/WIP_onboarding_machine_action 
New onboarding flow - machine action
 2019-03-28 13:43:48 +01:00
Jaime van Kessel
ffd7a001fb Add notification icon to the installed tab of the toolbox 
CURA-6151
 2019-03-28 13:31:51 +01:00
Jaime van Kessel
6c26dd38ec Clean up code for the toolbox tab button 
Removed unused properies and made it use states for it's changing properties.
This makes it a lot easier to read and understand what it's actually doing

CURA-6151
 2019-03-28 13:24:25 +01:00
Lipu Fei
4f5aee6298 Merge remote-tracking branch 'origin/fix_long_button_text' 2019-03-28 11:11:49 +01:00
Diego Prado Gesto
742329a170 Document where the magic numbers come from 
For the maximumSize of a button.

Contributes to CURA-6412.
 2019-03-28 09:29:31 +01:00
Jaime van Kessel
84aa7fd007 Fix mypy type errors 
CURA-6057
 2019-03-27 17:40:33 +01:00
Jaime van Kessel
9091eaa6f8 Re-added the imports to the conftest 
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
 2019-03-27 17:32:34 +01:00
Jaime van Kessel
5c50ef41cc Merge branch 'WIP_onboarding' of github.com:Ultimaker/Cura into WIP_onboarding 2019-03-27 17:21:16 +01:00
Jaime van Kessel
804e2060ea Re-added the imports to the conftest 
These are really really needed, otherwise the tests wont run. I've added a few
more comments to further stress the importance of these.

CURA-6057
 2019-03-27 17:20:17 +01:00
Ian Paschal
49cb3de562 Merge remote-tracking branch 'origin/master' into CL-1266_cloud_association_for_manual_ips 2019-03-27 16:53:31 +01:00
Ian Paschal
637e18a841 Add default value for internal IP if not supplied 
Contributes to CL-1266
 2019-03-27 15:40:06 +01:00
Lipu Fei
58507303fa Duplicate qualities should have unique names 
CURA-6426
 2019-03-27 14:08:06 +01:00
Jaime van Kessel
56f3226ac1 Add the notification icon for the marketplace. 
This adds an icon to the top right of the marketplace button to indicate that there
are plugins with pending updates.

CURA-6151
 2019-03-27 13:21:56 +01:00
Lipu Fei
0a8a25860c Update network troubleshooting URL 2019-03-27 13:09:25 +01:00