Commit graph

31424 commits

Author SHA1 Message Date
j.spijker@ultimaker.com
1c23bb56d1 No start and end characters for regex
Contributes to CURA-9365
2022-06-21 16:58:23 +02:00
j.spijker@ultimaker.com
cef1e35190 Uniform Versions
Contributes to CURA-9365
2022-06-21 16:52:32 +02:00
j.delarago
09f2a73cb1 Fix tooltip showing on hover when no tooltipText in provided.
CURA-8849
2022-06-21 16:29:41 +02:00
Ghostkeeper
5b2a482916
Add quick script to rename Cura 1 tags
Reasons are documented in the file.
2022-06-21 14:51:09 +02:00
j.spijker@ultimaker.com
d987c0190b Treat the input as a boolean not a string
Contributes to CURA-9365
2022-06-21 14:41:37 +02:00
j.spijker@ultimaker.com
117534f091 Put value between quotes
Contributes to CURA-9365
2022-06-21 14:16:14 +02:00
j.spijker@ultimaker.com
f9a3ff01c8 Always upload to Artifactory
The dependencies might have been build,
no need to rebuild them

Contributes to CURA-9365
2022-06-21 14:08:50 +02:00
j.spijker@ultimaker.com
b1a12cb70f Allow for cleaning of the cache
Handy bool if we evr downloaded an incomplete conan-package

Contributes to CURA-9365
2022-06-21 13:48:29 +02:00
j.spijker@ultimaker.com
1c0f5e8a64 Add conan-package system reqs
for Linux and Macos

Contributes to CURA-9365
2022-06-21 13:42:06 +02:00
j.spijker@ultimaker.com
4c6985b0d9 sanitized and lowercased the prerelease tag
Cura won't show the full prerelease tag in the splash screen
if there is a `-` in it. also versioning should all be
lowercase.

Contributes to CURA-9365
2022-06-21 13:19:30 +02:00
Ghostkeeper
1142768d59
Fix headers for translation files
And update their dates too.

Contributes to issue CURA-9420.
2022-06-21 13:12:21 +02:00
j.spijker@ultimaker.com
e2a3b1ad15 Remove old workflows
Contributes to CURA-9365
2022-06-21 13:06:22 +02:00
j.spijker@ultimaker.com
ff8c0414da Also run workflow when reussable workflow changes
Contributes to CURA-9365
2022-06-21 13:02:52 +02:00
Ghostkeeper
7898d8e5bf
Update translation files from updated templates
This brings the new translated strings into the files for each language.

Contributes to issue CURA-9420.
2022-06-21 12:56:04 +02:00
Ghostkeeper
de968d6c16
Update translation templates for Cura 5.1
These are the new translations for 5.1.

Contributes to issue CURA-9420.
2022-06-21 12:54:08 +02:00
j.delarago
cde897ff1e Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip.
The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear.

The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component.

CURA-8849
2022-06-21 11:59:03 +02:00
j.spijker@ultimaker.com
c7aa3c3762 run the no-response job twice a day
Contributes to CURA-9365
2022-06-21 11:38:18 +02:00
Jaime van Kessel
58651b6b97 Merge branch '5.1' of github.com:Ultimaker/Cura 2022-06-21 11:00:06 +02:00
Jaime van Kessel
52ea80f6c9 Fix the font for searchbars being styled correctly
By setting the font.italic to true, we actually reset the entire font.

Fixes #12565
2022-06-21 10:58:53 +02:00
j.spijker@ultimaker.com
c61ecfa00e Also run workflow when reussable workflow changes
Contributes to CURA-9365
2022-06-21 10:39:13 +02:00
j.spijker@ultimaker.com
c11865d1ca switched the conan-config with/out branch statement
Contributes to CURA-9365
2022-06-21 10:37:37 +02:00
j.spijker@ultimaker.com
4467491c36 Move the Conan cache step before in conan-config install
It looks like the new conan configuration isn't applied, the
ordering of the cache might influence this. At the very least
it doens't hurt to do this step at the beginning of the workflow

Contributes to CURA-9365
2022-06-21 10:23:38 +02:00
j.spijker@ultimaker.com
2f95fd2616 Remove old CI workflow
No longer relevant or needed

Contributes to CURA-9365
2022-06-21 10:19:25 +02:00
j.spijker@ultimaker.com
227b106927 Use the new JFrog Artifactory server
Only upload binaries to cura repo,
the cura-ce should contain only recipes and sources

Contributes to CURA-9365
2022-06-21 10:15:43 +02:00
Jelle Spijker
6d509e1094 Revert "Workaround for no remote atm"
This reverts commit 215f487978.
2022-06-21 09:56:15 +02:00
j.spijker@ultimaker.com
0ced137432 Also trigger workflow on changing runner pip req
Contributes to CURA-9365
2022-06-21 09:52:59 +02:00
j.spijker@ultimaker.com
57e991e214 Add runner pip requirements
Contributes to CURA-9365
2022-06-21 09:50:58 +02:00
Jelle Spijker
cd12d24584 Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main 2022-06-21 07:52:58 +02:00
j.spijker@ultimaker.com
d275ad37f8 Remove user and channel
Even though we had to patch these recipes, the user/channel
shouldn't be necesary any more because of the order in which
our remotes are defined in the conan-config repo. It will
first look into our own remotes, before going over to
conan-center-index.

Once the packages upstream are fixed for us, then we can use
the conan-center-index packages again, without changing the
code.

Contributes to CURA-9365
2022-06-21 07:52:27 +02:00
j.delarago
4ee4a781f4 Change flashing yellow warning on resolution combobox to blue flashing lining.
Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations.

CURA-8849
2022-06-20 11:33:28 +02:00
Ghostkeeper
dffb0fc744
Merge branch '5.1' into main 2022-06-20 11:04:33 +02:00
Ghostkeeper
8970f46154
Better path to packages.json in the 3MF file
Let's put it in the Cura directory with the rest of such files, as to not muddy the 3MF file with all sorts of directories that are not known to other consumers.

Contributes to issue CURA-9413.
2022-06-20 11:04:14 +02:00
j.delarago
9c16e200e0 Update reset settings icon in print settings to match new color used in recommeded settings
CURA-8849
2022-06-20 10:56:00 +02:00
j.delarago
c6bc3a5cd7 Add tooltip to IconWithText.qml,
Use this to display tooltips for Infill, Support and Adhesion in recommended settings.

CURA-8849
2022-06-20 10:52:31 +02:00
Ghostkeeper
b3394a240c
Merge branch '5.1' into main 2022-06-20 10:48:41 +02:00
Ghostkeeper
d1747e09e1
Fix link to help page when material package is missing
In this case we don't want to link to Ultimaker's internal help pages, but to the public support pages.
2022-06-20 10:48:13 +02:00
j.spijker@ultimaker.com
a31124673b Compile libffi and mpdecimal statically on Windows
Contributes to CURA-9365
2022-06-19 19:08:24 +02:00
j.spijker@ultimaker.com
0fb8d62825 Use patched recipes for cpython, mpdecimal, tk, tcl
Once upstream recipes are fixed these can be removed again.
export the changes for now
```
# Export patched conan-center-index recipes, I will open PR's for all of those
git clone https://github.com/jellespijker/conan-center-index.git
pushd .
cd conan-center-index

git checkout fix_tcl_recipe_env_info
conan export recipes/tcl/all tcl/8.6.10@ultimaker/testing

git checkout fix_tk_recipe_env_info
conan export recipes/tk/all tk/8.6.10@ultimaker/testing

git checkout fix_mpdecimale_recipe_not_use_msys
conan export recipes/mpdecimal/2.5.x mpdecimal/2.5.1@ultimaker/testing

git checkout add_3_10_4_version_cpython
conan export recipes/cpython/all cpython/3.10.4@ultimaker/testing
```

Contributes to CURA-9365
2022-06-19 14:59:36 +02:00
j.spijker@ultimaker.com
05191af96f set mpdecimal cxx option to false on windows
the combination of compiling it shared and with cxx is invalid
on Windows. We don't use the cxx capabilities of mpdecimal

Contributes to CURA-9365
2022-06-19 14:34:26 +02:00
j.spijker@ultimaker.com
74bd183869 Use cpython 3.10.4
See branch in fork conan-center-index
https://github.com/jellespijker/conan-center-index/tree/add_3_10_4_version_cpython

Contributes to CURA-9365
2022-06-19 14:03:16 +02:00
j.spijker@ultimaker.com
23501a8fdb Update README
- Add banners
- remove old chat channels
- Mention ExtensiveSupportLogging plugin

Contributes to CURA-9365
2022-06-18 20:01:42 +02:00
j.spijker@ultimaker.com
229e548e1d Add Conan generated deps graph for documentation
Contributes to CURA-9365
2022-06-18 17:20:45 +02:00
j.spijker@ultimaker.com
bfa5c440bf Use Conan CPython
This should make things more agnostic.
although technically not needed for Uranium
and already implicitly defined as a requirement
of pyArcus. I think it is good to include this
requirement here as well. For Unit Testing etc.

Contributes to CURA-9365
2022-06-18 16:49:34 +02:00
j.spijker@ultimaker.com
ac6f939db3 Use Conan CPython package
Now all our deps are compiled with the same flags.
This should help to make it more agnostic over the
systems.

Contributes to CURA-9365
2022-06-18 16:44:07 +02:00
j.spijker@ultimaker.com
dce96a6abd Add a custom export-pkg option
Repo's such as fdm_materials and cura-binary-data don't
need to build we can just export pre-build binaries
and files with the recipe

Contributes to CURA-9365
2022-06-18 14:44:46 +02:00
j.spijker@ultimaker.com
0713960482 Fixed couple of mistakes in conandata
Contributes to CURA-9365
2022-06-18 11:51:41 +02:00
j.spijker@ultimaker.com
29ddfe1352 Make the entrypoint and icon path relative from source
Contributes to CURA-9365
2022-06-18 11:39:49 +02:00
j.spijker@ultimaker.com
dfc0f9b31f Use UMBaseConanfile for reusable functions
Added a recipe in the conan-ultimaker-index repo,
which contains a conanrecipe that can be loaded
as a python_requires.

This allows us to reuse python code over multiple
recipes, see: https://docs.conan.io/en/latest/extending/python_requires.html

Contributes to CURA-9365
2022-06-18 11:35:20 +02:00
j.spijker@ultimaker.com
4c1262d9d3 Add conan generated files to the .gitignore
Contributes to CURA-9365
2022-06-18 00:31:45 +02:00
j.spijker@ultimaker.com
eb8e119e5c Using node-semver to validate version in conandata
Still not sure if this is the best approach.

Contributes to CURA-9365
2022-06-18 00:29:15 +02:00