GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 287 Branches 260 Tags
Commit Graph

4298 Commits

Author SHA1 Message Date
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
Ghostkeeper
18d1148c78
Don't reset selected material upon container changed 
The onActiveMaterialChanged signal is triggered upon loading a material for the first time. This is hard to fix without breaking stuff, so we will revert this part.

This re-introduces a bug where if you change a material diameter such that the material disappears from the list, it is still selected and you can change its properties in the details panel.

Contributes to issue CURA-6679.
 2019-07-24 17:01:37 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager 
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
 2019-07-24 16:04:40 +02:00
Jaime van Kessel
822181f214 Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-22 16:15:01 +02:00
Jaime van Kessel
678621469f Fix weird update jitter in objectSelector after multiplying models 2019-07-22 10:31:21 +02:00
Jaime van Kessel
91651a34d4 Fix model binding for objectSelector 2019-07-22 10:24:04 +02:00
Ghostkeeper
7aec564848
Attempt at fixing saving of load location on Linux 
Hope this also works on the Qt version used by our build system...
 2019-07-19 12:38:07 +02:00
Ghostkeeper
4b8274d7cb
Add ID to stage selection buttons 
Necessary to switch stages in the Squish tests.

Contributes to issue CURA-6276.
 2019-07-19 12:38:07 +02:00
Ghostkeeper
483e343b38
Specify both Ultimaker B.V. and Custom as preferred categories 
This requires commit 91c6abfc56162aedc887098744533dfcd8f1cdd5 on Ultimaker/Cura.

Contributes to issue CURA-6640.
 2019-07-11 09:58:40 +02:00
Ghostkeeper
bb49acbb7f
Use correct font for material estimates 
Otherwise it uses the system defaults.
 2019-07-10 14:42:26 +02:00
Lipu Fei
3d410cceb9 Fix change material diameter binding 
CURA-6590
 2019-07-08 13:40:08 +02:00
Lipu Fei
b36d040ba9 Use rejected instead of visibility hack 
CURA-6590
 2019-07-08 13:01:42 +02:00
Ghostkeeper
9aeea22c73
Disable intent category headers 
Makes 'em look like headers.

Contributes to issue CURA-6597.
 2019-07-05 12:05:44 +02:00
Ghostkeeper
32c5118ae4
Add intents per category to the intent menu 
They are in the wrong order currently. The section headers all appear at the end and they are not greyed out. This must be fixed. The order might prove difficult... We'll see, but I want this locked in now because it works.

Contributes to issue CURA-6597.
 2019-07-05 11:45:01 +02:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately. 
part of CURA-6590
 2019-07-03 16:14:08 +02:00
Ghostkeeper
0678d47dad
Make 'Ultimaker B.V.' preferred manufacturer rather than 'Ultimaker' 
Ultimaker was the category. Ultimaker B.V. is the manufacturer, which is now used as the section property.

Contributes to issue CURA-6635.
 2019-07-03 11:12:41 +02:00
Ghostkeeper
e6f25884f8
Categorise printers by manufacturer 
This should make it easier to find the printer you want.

Contributes to issue CURA-6635.
 2019-07-03 10:56:19 +02:00
Ghostkeeper
365d725e42
Add escape as hotkey to exit full screen 
Should be easier to discover.

Fixes #5956.
 2019-07-03 10:32:00 +02:00
Jaime van Kessel
2cd6b73d12 Ensure that the material selection gets reset when diameter is changed 
CURA-6590
 2019-07-02 17:59:27 +02:00
Jaime van Kessel
e182459dba Fix the updating of material diameter. 
This was a weeeird bug. It worked if you changed the value and selected another field.
Pressing enter however (aka; The behavior that 80%+ of the users have) would change it
but it would switch back in half a second. It seems to have been caused by mutliple onEditingFinished
signals being emitted in sequence.
As I can't be bothered to go through the bowels of QML and figure out why exactly this is doing what it's doing,
I just tied the enter to losing the focus, which ensures that the right behavior happens (Field is no longer selected,
and the onEditingFinished is emitted)

Contributes to CURA-6590
 2019-07-02 15:16:41 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
pkuiper-ultimaker
67191c4040
Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time 
Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]
 2019-06-25 17:44:51 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
Ghostkeeper
487673e780
Always uncheck zoom to mouse if preference is disabled 2019-06-18 11:19:41 +02:00
Ghostkeeper
7f559987a0
Disable move to mouse position preference in orthogonal view 2019-06-18 11:16:21 +02:00
Ghostkeeper
0190247c5a
Don't show tooltip if it shows the same text as the button 
It's only useful if the text on the button gets elided.
 2019-06-14 14:17:10 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Lipu Fei
960a20652a Add warning state for prime blob and CheckBox 
CURA-6414
 2019-06-06 12:30:27 +02:00
Lipu Fei
0e55b25e0b
Merge pull request #5768 from Ultimaker/CURA-5395-orthographic-view 
Support for orthographic view
 2019-06-06 11:49:25 +02:00
Jaime van Kessel
499e02579e Fix hiding settings that were not visible by default 
CURA-6556
 2019-06-05 16:36:30 +02:00
Remco Burema
7aa17da536
Merge pull request #5791 from Ultimaker/CURA-6490_fix_ppa_attempt2 
CURA-6490 Fix settings attempt 2
 2019-06-05 13:07:47 +02:00