diff --git a/debian/changelog b/debian/changelog index bd3d770..4dde507 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +calamares-settings-ubuntu (1:24.04.31) noble; urgency=medium + + * Add Kubuntu branding. (LP: #2060845) + + -- Aaron Rainbolt Tue, 16 Apr 2024 12:57:56 -0500 + calamares-settings-ubuntu (1:24.04.30) noble; urgency=medium * Don't keep lubuntu-snap-installation-monitor installed on the minimal diff --git a/kubuntu/branding/kubuntu/01_Easy_Install.png b/kubuntu/branding/kubuntu/01_Easy_Install.png new file mode 100644 index 0000000..45ac358 Binary files /dev/null and b/kubuntu/branding/kubuntu/01_Easy_Install.png differ diff --git a/kubuntu/branding/kubuntu/02_Customizable_Desktop.png b/kubuntu/branding/kubuntu/02_Customizable_Desktop.png new file mode 100644 index 0000000..40c6e37 Binary files /dev/null and b/kubuntu/branding/kubuntu/02_Customizable_Desktop.png differ diff --git a/kubuntu/branding/kubuntu/03_Built-in_Applications.png b/kubuntu/branding/kubuntu/03_Built-in_Applications.png new file mode 100644 index 0000000..1d99bd8 Binary files /dev/null and b/kubuntu/branding/kubuntu/03_Built-in_Applications.png differ diff --git a/kubuntu/branding/kubuntu/04_Performant.png b/kubuntu/branding/kubuntu/04_Performant.png new file mode 100644 index 0000000..ee81e17 Binary files /dev/null and b/kubuntu/branding/kubuntu/04_Performant.png differ diff --git a/kubuntu/branding/kubuntu/05_Secure_and_Private.png b/kubuntu/branding/kubuntu/05_Secure_and_Private.png new file mode 100644 index 0000000..c8f4d99 Binary files /dev/null and b/kubuntu/branding/kubuntu/05_Secure_and_Private.png differ diff --git a/kubuntu/branding/kubuntu/06_Community_Support.png b/kubuntu/branding/kubuntu/06_Community_Support.png new file mode 100644 index 0000000..8e0131b Binary files /dev/null and b/kubuntu/branding/kubuntu/06_Community_Support.png differ diff --git a/kubuntu/branding/kubuntu/07_Free_and_Open_Source.png b/kubuntu/branding/kubuntu/07_Free_and_Open_Source.png new file mode 100644 index 0000000..368b06e Binary files /dev/null and b/kubuntu/branding/kubuntu/07_Free_and_Open_Source.png differ diff --git a/kubuntu/branding/kubuntu/08_Software_Compatibility.png b/kubuntu/branding/kubuntu/08_Software_Compatibility.png new file mode 100644 index 0000000..8f8d64d Binary files /dev/null and b/kubuntu/branding/kubuntu/08_Software_Compatibility.png differ diff --git a/kubuntu/branding/kubuntu/09_Beautiful_Aesthetics.png b/kubuntu/branding/kubuntu/09_Beautiful_Aesthetics.png new file mode 100644 index 0000000..b282bf5 Binary files /dev/null and b/kubuntu/branding/kubuntu/09_Beautiful_Aesthetics.png differ diff --git a/kubuntu/branding/kubuntu/10_Kubuntu_Focus.png b/kubuntu/branding/kubuntu/10_Kubuntu_Focus.png new file mode 100644 index 0000000..24adf5a Binary files /dev/null and b/kubuntu/branding/kubuntu/10_Kubuntu_Focus.png differ diff --git a/kubuntu/branding/kubuntu/11_Testimonials_of_Success.png b/kubuntu/branding/kubuntu/11_Testimonials_of_Success.png new file mode 100644 index 0000000..c9aaca9 Binary files /dev/null and b/kubuntu/branding/kubuntu/11_Testimonials_of_Success.png differ diff --git a/kubuntu/branding/kubuntu/12_Get_Involved.png b/kubuntu/branding/kubuntu/12_Get_Involved.png new file mode 100644 index 0000000..82c6735 Binary files /dev/null and b/kubuntu/branding/kubuntu/12_Get_Involved.png differ diff --git a/kubuntu/branding/kubuntu/apps.png b/kubuntu/branding/kubuntu/apps.png deleted file mode 100644 index ec17151..0000000 Binary files a/kubuntu/branding/kubuntu/apps.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/branding.desc b/kubuntu/branding/kubuntu/branding.desc index 92e2ff4..bd1be9d 100644 --- a/kubuntu/branding/kubuntu/branding.desc +++ b/kubuntu/branding/kubuntu/branding.desc @@ -10,9 +10,9 @@ strings: shortVersion: noble versionedName: Kubuntu shortVersionedName: Kubuntu 24.04 LTS - bootloaderEntryName: Ubuntu - productUrl: https://lubuntu.me/ - supportUrl: https://lubuntu.me/links/ + bootloaderEntryName: Kubuntu + productUrl: https://kubuntu.org/ + supportUrl: https://kubuntu.org/contact/ images: productLogo: "logo.png" @@ -24,6 +24,6 @@ slideshow: "show.qml" slideshowAPI: 1 style: - SidebarBackground: "#74808C" + SidebarBackground: "#6C7B93" SidebarText: "#FFFFFF" SidebarTextCurrent: "#0068C8" diff --git a/kubuntu/branding/kubuntu/desktop.png b/kubuntu/branding/kubuntu/desktop.png deleted file mode 100644 index 519c2a6..0000000 Binary files a/kubuntu/branding/kubuntu/desktop.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/enjoy.png b/kubuntu/branding/kubuntu/enjoy.png deleted file mode 100644 index 499b17a..0000000 Binary files a/kubuntu/branding/kubuntu/enjoy.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/icon.png b/kubuntu/branding/kubuntu/icon.png index 5605bb7..68f938b 100644 Binary files a/kubuntu/branding/kubuntu/icon.png and b/kubuntu/branding/kubuntu/icon.png differ diff --git a/kubuntu/branding/kubuntu/lightweight.png b/kubuntu/branding/kubuntu/lightweight.png deleted file mode 100644 index 39a03e8..0000000 Binary files a/kubuntu/branding/kubuntu/lightweight.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/logo.png b/kubuntu/branding/kubuntu/logo.png index 38d6751..ea60c7c 100644 Binary files a/kubuntu/branding/kubuntu/logo.png and b/kubuntu/branding/kubuntu/logo.png differ diff --git a/kubuntu/branding/kubuntu/show.qml b/kubuntu/branding/kubuntu/show.qml index 4b465c3..db057b0 100644 --- a/kubuntu/branding/kubuntu/show.qml +++ b/kubuntu/branding/kubuntu/show.qml @@ -21,7 +21,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "lightweight.png" + source: "01_Easy_Install.png" } } Slide { @@ -34,7 +34,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "apps.png" + source: "02_Customizable_Desktop.png" } } Slide { @@ -47,7 +47,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "store.png" + source: "03_Built-in_Applications.png" } } Slide { @@ -60,7 +60,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "desktop.png" + source: "04_Performant.png" } } Slide { @@ -73,7 +73,7 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "support.png" + source: "05_Secure_and_Private.png" } } Slide { @@ -86,7 +86,91 @@ Presentation height: 485 fillMode: Image.PreserveAspectFit smooth: true - source: "enjoy.png" + source: "06_Community_Support.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image7 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "07_Free_and_Open_Source.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image8 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "08_Software_Compatibility.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image9 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "09_Beautiful_Aesthetics.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image10 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "10_Kubuntu_Focus.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image11 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "11_Testimonials_of_Success.png" + } + + } + Slide { + Image { + anchors.centerIn: parent + id: image12 + x: 0 + y: 0 + width: 810 + height: 485 + fillMode: Image.PreserveAspectFit + smooth: true + source: "12_Get_Involved.png" } } diff --git a/kubuntu/branding/kubuntu/store.png b/kubuntu/branding/kubuntu/store.png deleted file mode 100644 index c48450c..0000000 Binary files a/kubuntu/branding/kubuntu/store.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/support.png b/kubuntu/branding/kubuntu/support.png deleted file mode 100644 index 696de3f..0000000 Binary files a/kubuntu/branding/kubuntu/support.png and /dev/null differ diff --git a/kubuntu/branding/kubuntu/welcome-oem.png b/kubuntu/branding/kubuntu/welcome-oem.png index 5e29775..51d716d 100644 Binary files a/kubuntu/branding/kubuntu/welcome-oem.png and b/kubuntu/branding/kubuntu/welcome-oem.png differ diff --git a/kubuntu/branding/kubuntu/welcome.png b/kubuntu/branding/kubuntu/welcome.png index 460e2e5..55756cc 100644 Binary files a/kubuntu/branding/kubuntu/welcome.png and b/kubuntu/branding/kubuntu/welcome.png differ