GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,182 Commits 289 Branches 260 Tags
Commit Graph

715 Commits

Author SHA1 Message Date
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
Satish
18630fa2f1 Added several ids to be used in integration tests: 
-Marketplace, printer pref, add/manage printer from main mnu, print settings
 2019-05-03 09:35:17 +02:00
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
e010220432 Fix merge conflicts 2019-03-28 14:46:19 +01:00
Ghostkeeper
294b61937a
Re-enable Polish 2019-03-21 21:14:11 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Lipu Fei
e623c807ce Rename SectionName to DiscoverySource in GlobalStacksModel 2019-03-20 10:39:23 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Lipu Fei
49233216ec Fix machine management page section 2019-03-14 13:43:24 +01:00
Lipu Fei
4f05a2ab5f WIP: Use GlobalStackModel for Machine management page 2019-03-14 11:21:09 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Jaime van Kessel
dee739db8b Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-21 20:19:30 +01:00
Jaime van Kessel
48ed9b6e20 Remove usage of plugin model 2019-02-21 17:16:59 +01:00
Jaime van Kessel
c2d783bf7a Removed unused plugins model 2019-02-21 15:05:40 +01:00
Ghostkeeper
e7d2400199
Merge branch '4.0' 2019-02-04 13:06:32 +01:00
Lipu Fei
60a4fb3151 Fix missing "group_name" renaming 
CURA-6153
 2019-02-01 10:23:51 +01:00