3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-06-26 09:25:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'main' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2022-09-08 13:01:19 +02:00
commit c1b13c4eb5
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/conan-recipe-version.yml vendored
View file

@ -155,12 +155,15 @@ jobs:
channel_metadata = f"{no_commits}"
else:
channel_metadata = f"{channel}_{no_commits}"
# FIXME: for when we create a new release branch
if latest_branch_version.prerelease == "":
if latest_branch_version.prerelease == "":
if is_release_branch:
bump_up_patch = int(latest_branch_version.patch) + 1
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}"
else:
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}"
bump_up_minor = int(latest_branch_version.minor) + 1
actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}"
else:
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}"
else:
# FIXME: for external PR's
actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}"

21
resources/qml/Preferences/GeneralPage.qml
View file

@ -73,6 +73,9 @@ UM.PreferencesPage
var defaultTheme = UM.Preferences.getValue("general/theme")
setDefaultTheme(defaultTheme)
UM.Preferences.resetPreference("general/use_tray_icon")
trayIconCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/use_tray_icon"))
UM.Preferences.resetPreference("cura/single_instance")
singleInstanceCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/single_instance"))
UM.Preferences.resetPreference("cura/single_instance_clear_before_load")
@ -329,6 +332,23 @@ UM.PreferencesPage
}
}
UM.TooltipArea
{
width: childrenRect.width;
height: childrenRect.height;
text: catalog.i18nc("@info:tooltip", "Show an icon and notifications in the system notification area.")
UM.CheckBox
{
id: trayIconCheckbox
checked: boolCheck(UM.Preferences.getValue("general/use_tray_icon"))
onClicked: UM.Preferences.setValue("general/use_tray_icon", checked)
text: catalog.i18nc("@option:check", "Add icon to system tray *");
}
}
UM.Label
{
id: languageCaption
@ -337,6 +357,7 @@ UM.PreferencesPage
text: catalog.i18nc("@label", "*You will need to restart the application for these changes to have effect.")
wrapMode: Text.WordWrap
font.italic: true
}
Item