GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 08:05:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,135 Commits 295 Branches 268 Tags
Commit Graph

17135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisTerBeke
a9fedb4f66 Restore NetworkedPrinterOutputDevice for now 2018-11-26 15:05:53 +01:00
ChrisTerBeke
39f92ced90 Comment out test 2018-11-26 15:02:52 +01:00
ChrisTerBeke
269d596f5d Fix typing for cluster list 2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7 Cleanup plugin imports 2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982 Use BaseModel for CloudCluster, some fixes 2018-11-26 14:51:24 +01:00
Marijn Deé
579522857a Fix the code-style test 2018-11-26 14:42:50 +01:00
Diego Prado Gesto
0a1c0e18d1 Reuse the component SecondaryButton in the printer selector. 
Contributes to CURA-5942.
 2018-11-26 14:38:43 +01:00
Diego Prado Gesto
52b916d45c Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 14:33:41 +01:00
Diego Prado Gesto
9c240bdfe3
Merge pull request #4882 from Ultimaker/CURA-5959-action-panel-ui-fixes 
Cura-5959 action panel ui fixes
 2018-11-26 14:31:01 +01:00
ChrisTerBeke
7654f1c71c Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 14:30:50 +01:00
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +01:00
Diego Prado Gesto
12f78fa21a Remove border of the popup selector for the output devices. 
Contributes to CURA-5959.
 2018-11-26 14:29:42 +01:00
ChrisTerBeke
89e88a73bb Temporary patch for when printer has one or more materials not installed 2018-11-26 14:11:20 +01:00
ChrisTerBeke
45159f7a80 Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 14:09:13 +01:00
ChrisTerBeke
68a90ec510 Use simple models instead of namedtuples 
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
 2018-11-26 14:08:21 +01:00
Diego Prado Gesto
b63c4f7a74 Add header in new files. Remove unused imports. 
Contributes to CURA-5959.
 2018-11-26 14:06:34 +01:00
Jaime van Kessel
a654499752 Re-enable hover for marketplace button 
CURA-5959
 2018-11-26 13:47:22 +01:00
ChrisTerBeke
014b1d6e4e test 2018-11-26 13:45:37 +01:00
Diego Prado Gesto
ebae4347a8 Fix unit tests that were failing after adding the getAbbreviatedMachineName to the machine manager. 
Contributes to CURA-5942.
 2018-11-26 13:44:32 +01:00
Mark
8bae9fa667 Merge branch 'master' into ui_rework_4_0 2018-11-26 13:41:25 +01:00
Jaime van Kessel
3c86c0ae6c Fix spacing 
CURA-5959
 2018-11-26 13:36:45 +01:00
Jaime van Kessel
1fe6501358 Removed unused entries from theme 2018-11-26 13:35:41 +01:00
Jaime van Kessel
098714254d Remove unused code 
CURA-5959
 2018-11-26 13:35:02 +01:00
ChrisTerBeke
21c81603b4 Use application singleton instead of locally cached application 2018-11-26 13:33:14 +01:00
Jaime van Kessel
eea6490e75 Hover of output device now spans the popup 
CURA-5959
 2018-11-26 13:27:26 +01:00
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml 
CURA-5943
 2018-11-26 13:21:55 +01:00
Lipu Fei
d6614941dc Update QtQuick import versions in styles.qml 
CURA-5943
 2018-11-26 13:15:25 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml 
CURA-5943
 2018-11-26 13:14:26 +01:00
Lipu Fei
845b320981 Fix adjustable monitor component width 
CURA-5943

 - Add rounding
 - If there's no sidebar, use full width
 2018-11-26 13:08:33 +01:00
Diego Prado Gesto
5397cda2b4 Add a label to the action panel when auto slice is ON, indicating that the process runs automatically. 
Contributes to CURA-5942.
 2018-11-26 12:00:06 +01:00
ChrisTerBeke
620ba8f21d Merge branch 'master' into cloud-output-device 2018-11-26 11:17:39 +01:00
Diego Prado Gesto
72d972c8b4 Remove PrinterStatusIcon that is not used anymore. 
Contributes to CURA-5942.
 2018-11-26 11:03:58 +01:00
Diego Prado Gesto
21bfa6e4c2 Fix code style. Add brackets in new line. 
Contributes to CURA-5942.
 2018-11-26 10:58:38 +01:00
Diego Prado Gesto
4d6d0ed70c Merge branch 'CURA-5942_printer_selector' of github.com:Ultimaker/Cura into CURA-5942_printer_selector 2018-11-26 10:56:16 +01:00
Jaime van Kessel
4990f20566
Use QStringList instead of QVariantList since the return value is a list of strings. 
Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-26 10:55:32 +01:00
Diego Prado Gesto
fa1ef5c45c Rename function name to be more clear to what it does. 
Contributes to CURA-5942.
 2018-11-26 10:51:08 +01:00
Diego Prado Gesto
63fab9f038 Use theme sizes. 
Contributes to CURA-5942.
 2018-11-26 10:49:43 +01:00
Marijn Deé
908628e2aa Added a model to represent a cluster 2018-11-26 10:47:53 +01:00
Diego Prado Gesto
5b940b5242 Use thick margin and change some anchors. 
Contributes to CURA-5942.
 2018-11-26 10:28:36 +01:00
Jaime van Kessel
c8e065d7a7
Fix code-style 
Contributes to CURA-5942.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-11-26 10:21:15 +01:00
Marijn Deé
d8232caec0 Merge branch 'tests-for-um3networkplugin' into cloud-output-device 2018-11-26 10:14:34 +01:00
Marijn Deé
59510487fa Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin 2018-11-26 09:50:40 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist 
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
 2018-11-26 09:40:14 +01:00
Jaime van Kessel
09af7a9435 Slice button will now be disabled on error 
CURA-5959
 2018-11-26 09:34:27 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location 
This crashes Cura on start-up for some people.
 2018-11-26 09:32:59 +01:00
Ghostkeeper
8f9d6bee62
Document dependency on fdm_materials 
Without it, Cura simply won't start if you had a printer loaded with material profiles.

Fixes #4460.
 2018-11-26 08:30:24 +01:00
Diego Prado Gesto
c5d0ed2651 Define the look and feel of the view selector button. Adjust the sizes. 2018-11-25 20:13:56 +01:00
Diego Prado Gesto
68c96a2577 Modify the header item of the view selector. 2018-11-25 19:42:00 +01:00
Diego Prado Gesto
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00
Diego Prado Gesto
9e92542eee Fix the height of the IconLabel to avoid getting binding loops. 
Contributes to CURA-5942.
 2018-11-25 18:14:01 +01:00