From 44e0c0adffc6b891ea24593edde9500900800007 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 28 Feb 2022 13:56:01 +0100
Subject: [PATCH 1/2] Add a preference to make tray icon optional

---
 resources/qml/Preferences/GeneralPage.qml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index ccdd5efcf3..9cabdc908e 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -76,6 +76,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")
@@ -314,6 +317,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 (restart required)");
+                }
+            }
+
             Item
             {
                 //: Spacer

From 01e3823d4da4cab72878f445d1424f833afb164a Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Wed, 7 Sep 2022 17:09:59 +0200
Subject: [PATCH 2/2] Bump minor version on main

---
 .github/workflows/conan-recipe-version.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index 701efcc658..b2c690342a 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -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}"