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
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
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
Ghostkeeper
33abbd4c89
Merge branch '4.0'
2019-01-25 12:03:38 +01:00
Ghostkeeper
cbed8038e9
Don't say that creating a profile needs to provide a 'new' name
...
It's weird to ask for a new name if the profile is completely new.
Made together with a change in Uranium for CURA-6086.
2019-01-23 17:35:33 +01:00
Jaime van Kessel
a51289d7ce
Merge branch 'not_activate_when_no_materials' of github.com:Ultimaker/Cura
2019-01-18 11:19:28 +01:00
Remco Burema
f057c9a7df
Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match.
2019-01-15 17:15:12 +01:00
Jaime van Kessel
578027182e
Prevent setting items from overlapping with column headers
2019-01-08 10:49:55 +01:00
Jaime van Kessel
1973397b92
Remove confusing printer preference text
...
CURA-6003
2019-01-03 15:34:41 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types
2019-01-03 10:46:49 +01:00
Jaime van Kessel
f9e76aa6c9
Merge branch 'feature_resize_settings_panel' of github.com:Ultimaker/Cura into 4.0
2018-12-31 10:09:33 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types
2018-12-28 15:51:54 +01:00
Ghostkeeper
abe684c1bd
Use Item instead of rectangle without defined colour
...
Item should be faster to render.
Contributes to issue CURA-6056.
2018-12-27 13:36:17 +01:00
Ghostkeeper
f2a32e62fc
Rename 'Protected profiles' to 'Default profiles'
...
We agreed that it looks better, especially when listed right above 'Custom profiles'.
2018-12-27 11:06:09 +01:00
Ghostkeeper
5bf260f524
Don't break binding of is_favorite upon clicking star
...
We shouldn't override it here because doing that causes the binding to break. Just remove the favourite and let the model update itself, thus removing the star.
Contributes to issue CURA-6032.
2018-12-20 14:40:37 +01:00
Ghostkeeper
f3a0b44d5e
Simplify is_favorite condition
...
No stupid ternary operators necessary.
Contributes to issue CURA-6032.
2018-12-20 14:40:29 +01:00
Diego Prado Gesto
ef2fb53790
Merge branch '4.0' into unify_font_types
2018-12-19 11:56:22 +01:00
Ghostkeeper
c0c45519a0
Change another useless rectangle into an item
...
It's more efficient to render. Also changed some code style.
Contributes to issue CURA-6032.
2018-12-18 16:49:41 +01:00
Ghostkeeper
c66257bf4d
Use item instead of transparent rectangle
...
This is faster to render.
Contributes to issue CURA-6032.
2018-12-18 16:18:01 +01:00
Ghostkeeper
279812e4ff
Round width of buttons
...
They were getting rendered a bit weird if your pixel scale was not an integer (for me it's 1.25).
2018-12-18 13:58:21 +01:00
Lipu Fei
620790ae3d
Reduce the creations of ExtrudersModels
...
CURA-6015
2018-12-13 14:12:23 +01:00
