GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-04 07:04:18 +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
5acc3111e0 Some minor UI fixes 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
6751dc4fc8 Remove unused QML component 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
92be261178 Update the profile selector to new style for the intents 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
7d65951f43 Refactor ComboBox to use states 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
c51dfec29f Ensure that the intent category names are displayed coorectly in recommended 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
94c2211e7f Further simplify the recommended print setup 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
a9e09c6f54 Removed unused timer 
CURA-6598
 2019-08-29 11:53:25 +02:00
Jaime van Kessel
5401a4db15 Ensure that each intent gets it's own bar in recommended 
CURA-6598
 2019-08-29 11:53:19 +02:00
Jaime van Kessel
8d53ee90b4 Ensure that profile bar has no options selected if a quality_changes is active 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
9e5082a42f Cleanup the qml a bit 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
6b90975391 Replace the old settingSlider with the RadioButtonbar 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
3b93a1914a Ensure the Label bar uses the theme 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
ae406e2480 Fix the RadioCheckbar to work in Cura 2019-08-29 11:40:02 +02:00
Jaime van Kessel
a275e3de2b Add LabelBar component 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
a66c074e97 Simplify the alignment code 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
e47514d6dd Fix horizontal bar not coloring correct if last item is checkbox 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
cc4dc6a27c Fix overlap if first option is radioButton 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
abc6e5950b Fix alignment of inactiveMarker 
CURA-6598
 2019-08-29 11:40:02 +02:00
Jaime van Kessel
11c23b4fe9 Add first draft of the radiocheckbar 
CURA-6598
 2019-08-29 11:40:02 +02:00
Ghostkeeper
b3fd310d37
Move removeQualityChangesGroup to QualityManagementModel 
This is an operation specific to the quality management page, so it should be located there.

Contributes to issue CURA-6600.
 2019-08-28 15:21:33 +02:00
Ghostkeeper
21412986d3
Remove material manager from MaterialsPage 
It is no longer used now that everything relevant has been moved to a separate class for this page specifically.

Contributes to issue CURA-6600.
 2019-08-27 18:01:35 +02:00
Ghostkeeper
3952366798
Move createMaterial to MaterialManagementModel and simplify it a bit 
We can reuse our duplicateMaterial function again but in a simpler way. Also finding the preferred material is simpler with our container tree.
However there seems to be a problem with finding the preferred material; it's not finding generic_pla for UM3 and AA0.4 anyway, and then falls back on a random material. This needs to be fixed in the variant node class.

Contributes to issue CURA-6600.
 2019-08-27 17:21:22 +02:00
Ghostkeeper
1874a6453d
Move duplicateMaterial into MaterialManagementModel 
To move away from the deprecated MaterialManager class.

Contributes to issue CURA-6600.
 2019-08-27 17:21:21 +02:00
Remco Burema
c71660cc11 Fix occasional crash when entering profiles section. 
Make QualityManagementModel into a singleton.
part of CURA-6600
 2019-08-27 16:21:30 +02:00
Ghostkeeper
8346e465f6
Turn MaterialManagementModel into a singleton 
Just like MaterialManager used to be. There can be only one instance of the page then.
This prevents a crash when Qt deletes the QObject because it's no longer used in the page when you close the preferences screen. But when you open it again it doesn't construct a new one. Now there is always one instance so that's not a problem any more. Also it allows other pages to access this item.

Contributes to issue CURA-6600.
 2019-08-27 15:47:41 +02:00
Ghostkeeper
3dc7c7b61c
Move removeMaterial to MaterialManagementModel 
Moving away from the MaterialManager.

Contributes to issue CURA-6600.
 2019-08-27 15:47:40 +02:00
Ghostkeeper
99ccddefa4
Move setMaterialName to MaterialManagementModel 
No longer use the material manager which is deprecated.

Contributes to issue CURA-6600.
 2019-08-27 15:47:40 +02:00
Ghostkeeper
5b8ed91b04
Create new MaterialManagementModel and move canMaterialBeRemoved 
Just like the QualityManagementModel, this class is intended to be used as proxy for the material management page in the preferences. I'm intending to move all relevant pyqtSlots from the material manager into this one. The advantage of this switch is that the material manager had no well-bounded scope and so tended to become a big mess of all sorts of functions. This one has a clear scope: serve as a proxy for the buttons you can press in the preferences screen for materials.

Contributes to issue CURA-6600.
 2019-08-27 15:47:40 +02:00
Jaime van Kessel
d1a8ce54a1 Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-08-27 14:18:41 +02:00
Jaime van Kessel
1d9d411732 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-08-27 14:17:57 +02:00
Jaime van Kessel
867a881de9 Ensure bool and enum settings get control highlighted on hover 2019-08-27 13:38:55 +02:00
Jaime van Kessel
e7609fadf4 Deprecated the allActiveMaterialIds and replaced the single location where it was used 
CURA-6600
 2019-08-21 17:08:35 +02:00
Jaime van Kessel
7979fcd633 Fix warnings in the settings menu 
CURA-6600
 2019-08-21 17:07:58 +02:00
Ghostkeeper
9122d0cca4
Remove misleading text that says you could enter hostnames 
We don't resolve the hostnames ever. You can only enter IP addresses.
 2019-08-21 09:56:32 +02:00
Jaime van Kessel
8759aae73e Fix crash when materialManager could not be converted to QObject 
No idea why this was causing issues, but this should also be a bit faster.

CURA-6600
 2019-08-19 12:47:07 +02:00
Ghostkeeper
20201c65e6
Merge branch 'master' into feature_intent 
Conflicts:
	resources/bundled_packages/cura.json -> 4.1 to 4.2 upgrade package added simultaneously
	tests/TestMachineManager.py -> Due to changes in conftest.py
	tests/conftest.py -> Simultaneously expanding the magic mocks to have some correct properties
 2019-08-13 14:43:28 +02:00
Jaime van Kessel
7a3f9d621a Add save shortcut to save 
No idea why it wasn't there in the first place.
 2019-08-07 10:46:51 +02:00
Jaime van Kessel
3f8a65d926 Fix the settings menu not reacting to onTriggered signals 2019-08-01 11:51:58 +02:00
Ghostkeeper
846cbe79a3
Rename Orthogonal to Orthographic everywhere 2019-07-30 17:35:40 +02:00
Lipu Fei
2ce567ccfe Fix material current item reset 
CURA-6679
 2019-07-30 15:16:50 +02:00
Lipu Fei
0c66fd82d4 Merge remote-tracking branch 'origin/4.2' 2019-07-30 15:16:18 +02:00
Ghostkeeper
ec9a5fce09
Disable Polish language from the UI 
The translation files have not been updated this release, so they are incomplete.

Contributes to issue CURA-6663.
 2019-07-30 12:06:00 +02:00
Jaime van Kessel
fe2412f3a7 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-30 11:41:51 +02:00
Jaime van Kessel
914d2e98e9 Fix the disabling of the material setting fields. 
This was caused by using 2 different modelsItems.
 2019-07-30 11:29:49 +02:00
Ghostkeeper
00589e9144
Merge branch 'mb-expandable-popup-qt-5.13-fix' of https://github.com/smartavionics/Cura into smartavionics-mb-expandable-popup-qt-5.13-fix 2019-07-29 14:31:57 +02:00
Jaime van Kessel
d1f6076eb2 Fix the enable & disable extruder for the settings menu 
This fixes #6069
 2019-07-29 11:01:31 +02:00
Mark Burton
d10d3070b9 Qt 5.13 compatibility - fix size of ExpandablePopup background. 
Without this, the view selector dropdown has no background.

Tested with Qt 5.13 on Linux and Qt 5.10 on Windows.
 2019-07-28 08:03:36 +01:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
Ghostkeeper
d353776fe8
Fix showing extruder names in USB printing monitor 
It was using a deprecated function. Apparently deprectated pyqtSlots don't work because it breaks the PyQt binding for some reason. That has to be fixed. But for now I'll make this use the non-deprecated function.
 2019-07-25 15:17:13 +02:00
Mark Burton
cfea12ab25 Fix dimensions of print job information popup when using Qt 5.13. 
Remains compatible with Qt 5.10.
 2019-07-24 20:35:39 +01:00