26315 Commits

Author SHA1 Message Date
Ghostkeeper
e4cf5568a5
Merge branch '4.11' 2021-09-03 13:07:19 +02:00
Ghostkeeper
1560ae074d
Round position of printer connection icon
It does become noticeably sharper with this. And doesn't appear out of place at all.

Contributes to issue CURA-8202.
2021-09-03 13:07:01 +02:00
Jaime van Kessel
8b5cfc9c28 Use token_hex from secrets instead of choice
CURA-8401
2021-09-03 09:57:04 +02:00
jelle Spijker
571a051041
Use SQLQueryFactory for container DB
Needed to add a Filter possibility to facilitate that
Created a Simple UserString class which can be used as:

```py
        sql_filter = SQLFilter(f"SELECT {{}} FROM table_name WHERE id = ?")
        cursor.execute(sql_filter)  # Will execute: SELECT * FROM table_name WHERE id = ?
        cursor.execute(sql_filter["id", "name"])  # Will execute: SELECT id, name FROM table_name WHERE id = ?

```

Contributes to CURA-6096
2021-09-02 16:55:24 +02:00
Ghostkeeper
e3a4b70029
Merge branch '4.11' 2021-09-02 14:32:16 +02:00
Ghostkeeper
f4508c709e
Fix links to account sign up page
This was a miscommunication.

Contributes to issue CURA-8440.
2021-09-02 14:32:06 +02:00
Jaime van Kessel
e24a844d17 Use secrets instead of random
Since we're no longer stuck on python 3.5, we can use secrets instead of random
which provides better randomness.

CURA-8401
SEC-207
2021-09-02 14:25:57 +02:00
jelle Spijker
4067d9d607
Fixed typing
Contributes to CURA-6096
2021-09-02 10:17:40 +02:00
Jaime van Kessel
3caee3f143
Merge pull request #10328 from Ultimaker/CURA-8358_Retain_last_saved_filename
Retain the last saved filename after saving a file
2021-09-02 09:54:35 +02:00
Ghostkeeper
7f1e3144bc
Remove arbitrary lower limit of 5% flow
This was not a true limitation of the mathematics. In fact, we had other flow settings (for initial layer) that already went to 0.0001%.

Discovered while working on a bug report from Reddit.
2021-09-02 09:49:30 +02:00
jelle Spijker
f80e1ec279
Updated documentation
Contributes to CURA-6096
2021-09-01 18:58:03 +02:00
Remco Burema
b97920e5b1
Only change project name when saving to project files.
CURA-8358
2021-09-01 18:11:10 +02:00
Ghostkeeper
d4751c6bc9
Merge branch '4.11' 2021-09-01 18:01:20 +02:00
Ghostkeeper
c779135112
Rename Group icon to People, and add high detail variant
The icon is called People in the UX team's icon system, and we need to stay aligned to that.
The high detail variant has an extra person in it.

Contributes to issue CURA-8530.
2021-09-01 18:01:10 +02:00
jelle Spijker
7aa08d4acd
Use a class to build to sql queries
This greatly reduced the amount of duplicate code in the DataBaseHandlers
Not sure how secure this is SQL injections. Need to check that and maybe
put in some guards. Using double underscores for now and only provide a
getter. But then again why bother with an SQL injection as
you can just as easily modify the Python code, and we still have the old
Containers to fallback to if the Database gets corrupted.

Contributes to CURA-6096
2021-09-01 16:58:48 +02:00
Remco Burema
0b114876ef
Make this run from source again on Windows. 2021-09-01 16:56:47 +02:00
Remco Burema
c2c53d51c1
Use optional last output (file) name from output-dev to set project name.
Instead of relying on the filename emitted when the workspace is changed. This is done so the user can also change the project name when saving to an output device, such as a local file, or the digital library, that supports changeing the (file)name.

CURA-8358
2021-09-01 16:04:05 +02:00
Ghostkeeper
f638809f9d
Merge branch '4.11' 2021-09-01 15:39:15 +02:00
Ghostkeeper
b7b0d25615
Add high detail versions of some icons
The group icon seems to be broken though. We'll look into it.

Contributes to issue CURA-8530.
2021-09-01 15:39:04 +02:00
Ghostkeeper
15fcad454d
Merge branch '4.11' 2021-08-31 13:35:58 +02:00
Ghostkeeper
34531656d6
Merge branch 'CURA-8520_Fix_missing_icons_in_deprecated_icons_list' into 4.11 2021-08-31 13:35:33 +02:00
Ghostkeeper
d08d5d6625
Merge branch '4.11' 2021-08-31 12:07:42 +02:00
Ghostkeeper
9ea025885a
Update links to network troubleshooting page
The new links also have campaign identifiers. Because apparently the website doesn't read the HTTP metadata information saying that it redirected from Cura, and it adds information which button it came from.
The old links will remain working via redirects, for older Cura versions.

Contributes to issue CURA-8528.
2021-08-31 12:07:11 +02:00
Ghostkeeper
751732076d
Add test to see if all deprecated theme icons still exist
This will make it easier in the future if we deprecate icons again. And it's nice for now.

Contributes to issue CURA-8520.
2021-08-31 12:00:59 +02:00
Konstantinos Karmas
b3af6f3ec5
Merge pull request #10366 from Ultimaker/CURA-8214_use_new_controlstyle_for_cluster_printer_selecter
Fix greyed out cluster printers
2021-08-31 09:45:33 +02:00
jelle Spijker
d97c4e2c94 Don't use new controls for the buttons 2021-08-31 09:34:23 +02:00
jelle Spijker
f730959f78 fixed discard or keep combobox on Mac
Use the new controls ComboBox
2021-08-30 16:15:02 +02:00
Konstantinos Karmas
de1a299e7a Add missing view_normal icon in the deprecated icons
Also remove the capitalization from the `viewMode`.

CURA-8520
2021-08-30 14:28:52 +02:00
Konstantinos Karmas
57b0287c84 Add missing Play icon
The `play` icon is readded to the theme and remapped to the `Play.svg`.

Found by @fieldOfView.

CURA-8520
2021-08-30 14:27:52 +02:00
Jelle Spijker
374fb78342
Merge pull request #10365 from Ultimaker/CURA-8498_make_setting_search_magnifier_themable
Replace the textfield with cura.Textfield
2021-08-30 14:23:40 +02:00
jelle Spijker
5ba1e8eda8 Settings search field uses italic style
Restored italic font style for the search field.
To not break look and feel with the old TextField
behaviour
2021-08-30 14:20:09 +02:00
jelle Spijker
2548fd8014 Fix greyed out cluster printers
The PrintWindow still used an old style combobox.
This resulted in a Mac user not being able to specify
which clustered printer he wanted to send a slice to.

Using the new QtQuick.Controls and specifically setting
the currentIndex fixed it for Mac.
2021-08-30 13:41:55 +02:00
Jaime van Kessel
a1378f9a06 Replace the textfield with cura.Textfield
This way we don't have to use the html in the setting item and we
dont have to re-do the whole hover logic in the search text field.

THis also makes the search magnifier themed, so it looks a lot better
in the dark theme

CURA-8498
2021-08-30 13:28:00 +02:00
Konstantinos Karmas
9504ee60d4
Merge pull request #10358 from Ultimaker/CURA-8521_Add_missing_preference_vesion_upgrade
Add the missing preference upgrade for 4.9 to 4.10
2021-08-30 13:17:08 +02:00
Jaime van Kessel
b2c6063b61 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:11:21 +02:00
Jaime van Kessel
43fd38e48e Add missing return
This caused the slicing to not be correctly aborted when the primetower was
in the wrong location

CURA-8499
2021-08-30 13:10:10 +02:00
Jaime van Kessel
f12f1ea438 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-30 13:04:48 +02:00
Konstantinos Karmas
e9e34b5448
Merge pull request #10359 from Ultimaker/CURA-8502_disable_df_save_if_name_is_invalid
Disable df save if name is invalid
2021-08-30 11:57:46 +02:00
Konstantinos Karmas
cf93f66135 Add missing Group.svg icon
CURA-8520
2021-08-30 11:42:57 +02:00
Konstantinos Karmas
b41b0e55b5 Add missing icon mappings
CURA-8520
2021-08-30 11:29:18 +02:00
Jaime van Kessel
42948c376f Add extruder to current version for version upgrade script
This should remove the Unable to upgrade file of type extruder of version 2
messages

CURA-8509
2021-08-30 11:16:49 +02:00
Jaime van Kessel
183fbfad41 Disable save to DF if the textfield is in an invalid state
CURA-8502
2021-08-30 11:09:55 +02:00
Jaime van Kessel
9bdeb82314 Add the missing preference upgrade for 4.9 to 4.10
This could break backups in certain cases

CURA-8521
2021-08-30 10:51:27 +02:00
Konstantinos Karmas
3e0b395c72 Add the Buildplate.svg to the Cura icons
The icon existed only in the UM3NetworkPrinting plugin but it was also used in the ConfigurationItem.qml in Cura, so it had to be moved to the Cura icons.

CURA-8520
2021-08-30 10:45:45 +02:00
Jaime van Kessel
3191baf5a0 Add delete to handlers
CURA-6096
2021-08-27 14:36:04 +02:00
Konstantinos Karmas
8de5e1e5b9 Account for the width of the arrow in the Extruders row
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
2021-08-26 13:31:27 +02:00
Jaime van Kessel
e5a2c612f9
Merge pull request #10338 from Ultimaker/CURA-8496_Fix_arrow_overlapping_with_material_name
CURA-8496: Account for the width of the arrow in the Extruders row
2021-08-26 13:30:33 +02:00
Konstantinos Karmas
fcbb16b70c Account for the width of the arrow in the Extruders row
Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit.

This commit fixes that by explicitly accounting for the width of the arrow in the extruders row.

**Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything.

CURA-8496
2021-08-25 17:13:43 +02:00
Jaime van Kessel
6feaecc450 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-25 17:10:09 +02:00
Jaime van Kessel
88b5c4c8be Merge branch 'CURA-8497_Image_spacing_is_misaligned_in_messages' of github.com:Ultimaker/Cura into 4.11 2021-08-25 16:57:50 +02:00