3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

18800 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
ac5f79ba2c
Add tab style to tabbed content 
It now gets a proper background colour, lining and radius.

Contributes to issue CURA-5876.
 2018-11-26 15:47:32 +01:00
Mark
88cedd25cf
Merge pull request #4664 from pinchies/master 
Add JGAurora Z-603S
 2018-11-26 15:47:28 +01:00
Mark
037bf8863e
Merge pull request #4666 from pinchies/add-jg-a5 
Add JGAurora A5
 2018-11-26 15:43:41 +01:00
Mark
734a8882b1
Merge pull request #4667 from pinchies/add-jg-a1 
Add JGAurora A1
 2018-11-26 15:41:30 +01:00
Diego Prado Gesto
67cba50e9b Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-26 15:41:05 +01:00
Diego Prado Gesto
d1a5d548a9
Merge pull request #4884 from Ultimaker/add_border_to_rounded_rectangle 
Add border to rounded rectangle.
 2018-11-26 15:40:02 +01:00
Mark
30c585f298
Merge pull request #4834 from mcmidget/master 
Add BIBO2 printer (dual and single extruder settings)
 2018-11-26 15:39:39 +01:00
Diego Prado Gesto
9afc5748a8 Add copyright header. 2018-11-26 15:39:34 +01:00
ChrisTerBeke
da5683c876 add typing to models 2018-11-26 15:30:30 +01:00
Jaime van Kessel
9732099250 Add border to rounded rectangle. 
It's designed so that it works in exactly the same way as rectangle.
 2018-11-26 15:14:32 +01:00
ChrisTerBeke
aaf0f69820 Fix some more relative imports 2018-11-26 15:10:36 +01:00
ChrisTerBeke
42ccabc7b6 Fix relative imports for plugin 2018-11-26 15:09:56 +01:00
Diego Prado Gesto
84f263f111 Fix style for the open file button in the prepare menu. 
Contributes to CURA-5942.
 2018-11-26 15:08:33 +01:00
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
Ghostkeeper
90a73f351d
Fix positioning of tabs in custom menu 
The label's bottom side is at its top, so we must add its height so that it gets positioned correctly.

Contributes to issue CURA-5876.
 2018-11-26 14:12:34 +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
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown 
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
	resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
 2018-11-26 13:43:20 +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