681 Commits

Author SHA1 Message Date
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
0b4a3039e5
Remove multi-buildplate option
It doesn't work any more.
2019-09-24 14:24:57 +02:00
Ghostkeeper
5ec833c15e
Remove extraenous space
This space triggers PoEdit to give a warning that the translation doesn't have the space there. That's okay, since it's a column and the space doesn't influence spacing then.
2019-09-23 11:43:24 +02:00
fieldOfView
c9e281f52e Add preference for general/restore_window_geometry
See https://github.com/Ultimaker/Uranium/pull/523
2019-09-20 14:51:37 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
2019-09-20 09:57:36 +02:00
Ghostkeeper
47e1dbe38d
Remove usage of Quality Manager
This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest.

Contributes to issue CURA-6600.
2019-09-10 14:55:32 +02:00
Ghostkeeper
0d68381e61
Code style: brackets on new line
Contributes to issue CURA-6600.
2019-09-10 14:52:51 +02:00
Ghostkeeper
b5d32a9b70
Move createQualityChanges function to QualityManagementModel
This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless).

Contributes to issue CURA-6600.
2019-09-02 17:07:18 +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
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
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
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
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
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
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
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
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
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
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
Cherubim
0ebb2a35fe
Merge branch '4.1'
Conflicts:
	resources/i18n/es_ES/cura.po -> Correction being made on master while translations were being done for 4.1.
2019-05-28 11:07:20 +02:00
Cherubim
376c5445e4
Re-enable Polish
It was disabled yesterday because it was incomplete then, but we got the translations yesterday evening.

Contributes to issue CURA-6547.
2019-05-28 10:48:58 +02:00
Lipu Fei
0bc8a67a37 Merge master 2019-05-28 10:43:51 +02:00
Diego Prado Gesto
b234485592 Merge branch '4.1' 2019-05-27 11:31:08 +02:00
Diego Prado Gesto
fa197f53a7 Hide Polish from the list of available languages in 4.1
The tranlations are incomplete so not available in 4.1

Contributes to CURA-6521.
2019-05-27 11:16:54 +02:00
Jaime van Kessel
65a8582a1e Add preference to set the camera rendering type
CURA-5395
2019-05-21 09:54:32 +02:00
Jaime van Kessel
ff0a18603b Remove a few more usages of deprecated functions 2019-05-16 15:20:38 +02:00
Jaime van Kessel
a0c705e900 Remove usage of some deprecated functions 2019-05-16 14:49:53 +02:00
Jaime van Kessel
99e6ec9509 Fix the last material qml warnings 2019-05-16 14:29:05 +02:00
Jaime van Kessel
bfe1275d46 Fix a number of QML warnings 2019-05-16 14:23:09 +02:00
Ellecross
d5de401dfa Add the ids for the menu buttons to be used in Squish. 2019-05-09 16:38:06 +02:00
Satish
f4c00c460d Added id to the profile page in preferences to identify custom profiles 2019-05-09 14:05:04 +02:00
Ghostkeeper
dfeb71992a
Remove custom text property in materials brand section
It was duplicating the sectionName property.

Contributes to issue CURA-6302.
2019-05-07 14:27:39 +02:00
Satish
3b4e253e98 Added ids to materials for squish tests
-Added a text property to MaterialsBrandSection
-Added ids to materials menu buttons
2019-05-07 12:37:42 +02:00
Diego Prado Gesto
6708d9da64 Merge branch '4.1' 2019-05-07 11:49:45 +02:00
Lipu Fei
53d595f698 Use loader for machine actions in dialog
CURA-6495
2019-05-06 13:06:23 +02:00
Jaime van Kessel
c3a373e2a2 Remove usages of deprecated activeMachineName 2019-05-03 13:38:06 +02:00
Jaime van Kessel
d42f446d70 Remove usages of deprecated function 2019-05-03 13:17:10 +02:00