GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 19:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,731 Commits 290 Branches 260 Tags
Commit Graph

5336 Commits

Author SHA1 Message Date
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
ChrisTerBeke
e4d8fb36ab Add more typing as per request from @sedwards2009 2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876 add typing to models 2018-11-26 15:30:30 +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
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
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +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
Jaime van Kessel
a654499752 Re-enable hover for marketplace button 
CURA-5959
 2018-11-26 13:47:22 +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
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
f3bf20ca1b Separate the view selector into a different file. 2018-11-25 18:24:21 +01:00
Diego Prado Gesto
a3bcdaf3b6 Make the popup in the printer selector resizable depending on the 
contents. Also there is a maximum height that will fit 9 printers.

Contributes to CURA-5942.
 2018-11-23 16:58:57 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added 
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
 2018-11-23 10:50:16 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Ian Paschal
9f1ce72b9e Add Cura 4.0 printer cards 
Contributes to CL-1150
 2018-11-23 10:03:08 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Lipu Fei
1c4f7c7fb7 Merge branch 'ui_rework_4_0', remote-tracking branch 'origin' into CURA-5943_ui_usb_printing 2018-11-23 08:06:43 +01:00
Diego Prado Gesto
2b08857331 Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector 2018-11-22 16:11:34 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles 
CL-1148 Re-styling monitor queue tiles
 2018-11-22 15:08:42 +01:00
Lipu Fei
2d2f24251d Fix MonitorMainView for USB printing 
CURA-5943
 2018-11-22 15:07:49 +01:00
Ian Paschal
963b8aa974 Fix QML warnings 
Contributes to CL-1148
 2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations 
Contributes to CL-1148
 2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop 
Contributes to CL-1148
 2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else" 
Contributes to CL-1148
 2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state 
Contributes to CL-1148
 2018-11-22 13:11:59 +01:00
Aleksei S
088b2f6f28 Added an extra import module, did not pass coding style test 
CURA-5936
 2018-11-22 11:36:32 +01:00
Aleksei S
c765615f1a Merge branch 'master' into fix_version_upgrade_returning_none 2018-11-22 11:17:44 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link 
Contributes to CL-1148
 2018-11-22 11:09:35 +01:00
Jaime van Kessel
bf8a04fa40 Fix some minor display issues for simulation view 
CURA-5785
 2018-11-22 11:08:46 +01:00
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Jaime van Kessel
a9f0402f63 Made size of viewselector themable 
CURA-5785
 2018-11-22 09:37:36 +01:00
Diego Prado Gesto
fe7d1825d4 Add styling to the buttons in the printer list. 
Contributes to CURA-5942.
 2018-11-21 16:54:57 +01:00
Diego Prado Gesto
7c9cd75cf9 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 13:19:23 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review 
CURA-5785
 2018-11-21 13:17:36 +01:00
Diego Prado Gesto
4772972145 Merge branch 'CURA-5785-Restyle_stage_menu' into CURA-5942_printer_selector 2018-11-21 12:18:51 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property 
This makes it a whole lot easier to read what is being set.

CURA-5785
 2018-11-21 11:50:39 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent 
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
 2018-11-21 11:37:58 +01:00
Diego Prado Gesto
8e47d04756 Adjust sizes and alignments to the print selector panel. 
Contributes to CURA-5942.
 2018-11-21 11:12:59 +01:00
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because 
NamedTuple is a Python3.6 feature
 2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints 2018-11-21 10:12:53 +01:00
Jaime van Kessel
d74393498b Fixed view selector header not updating correctly 
CURA-5785
 2018-11-21 09:35:35 +01:00
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292 Made the tests work with the named tuples 
Tests only use the _onGetRemoteMaterial
 2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f Fixed some bugs and added the color_code field to the named tuple 2018-11-20 16:33:52 +01:00