From 56fc0430a2ba6876c3e1362e004b5a650994b507 Mon Sep 17 00:00:00 2001 From: Super User Date: Fri, 8 Nov 2024 12:38:42 +0800 Subject: [PATCH] =?UTF-8?q?branding=E6=96=87=E4=BB=B6=E5=A4=B9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/branding/default/branding.desc | 40 ++++++++++++------------- src/branding/default/show.qml | 48 ++++++++++++++++-------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index 729b958e8..9f0843385 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -39,7 +39,7 @@ welcomeExpandingLogo: true # - "normal" or unset, expand as needed, use *windowSize* # - "fullscreen", start as large as possible, ignore *windowSize* # - "noexpand", don't expand automatically, use *windowSize* -windowExpanding: normal +windowExpanding: noexpand # Size of Calamares window, expressed as w,h. Both w and h # may be either pixels (suffix px) or font-units (suffix em). @@ -48,7 +48,7 @@ windowExpanding: normal # This setting is ignored if "fullscreen" is selected for # *windowExpanding*, above. If not set, use constants defined # in CalamaresUtilsGui, 800x520. -windowSize: 800px,520px +windowSize: 912px,600px # Placement of Calamares window. Either "center" or "free". # Whether "center" actually works does depend on the window @@ -123,16 +123,16 @@ navigation: widget strings: productName: "${NAME}" shortProductName: Generic - version: 2023.3 LTS - shortVersion: 2023.3 - versionedName: Fancy GNU/Linux 2023.3 LTS "Venomous Vole" - shortVersionedName: FancyGL 2023.3 - bootloaderEntryName: FancyGL - productUrl: https://calamares.io/ - supportUrl: https://github.com/calamares/calamares/wiki - knownIssuesUrl: https://github.com/calamares/calamares/issues - releaseNotesUrl: https://calamares.io/news/ - donateUrl: https://kde.org/community/donations/index.php + version: 24.09 + shortVersion: 24.09 + versionedName: openEuler-24.09 + shortVersionedName: openEuler 24.09 + bootloaderEntryName: openEuler + productUrl: https://openeuler.org/ + supportUrl: null + knownIssuesUrl: https://gitee.com/organizations/openeuler/issues + releaseNotesUrl: null + donateUrl: null # These images are loaded from the branding module directory. # @@ -163,10 +163,10 @@ strings: # These filenames can also use substitutions from os-release (see above). images: # productBanner: "banner.png" - productIcon: "squid.png" - productLogo: "squid.png" - # productWallpaper: "wallpaper.png" - productWelcome: "languages.png" + productIcon: "openEuler.png" + productLogo: "openEulerWord.png" + #productWallpaper: "welcomebg.png" + productWelcome: "Biglogo.svg" # Colors for text and background components. # @@ -180,10 +180,10 @@ images: # branding component also ships a stylesheet.qss. Then they are # the corresponding CSS attributes of #sidebarApp. style: - SidebarBackground: "#292F34" + SidebarBackground: "#0110B7" SidebarText: "#FFFFFF" SidebarTextCurrent: "#292F34" - SidebarBackgroundCurrent: "#D35400" + SidebarBackgroundCurrent: "#FFFFFF" ### SLIDESHOW # @@ -234,6 +234,6 @@ slideshowAPI: 2 # Please note that upload size may be slightly over the limit (due # to last minute logging), so provide a suitable value. uploadServer : - type : "fiche" - url : "http://termbin.com:9999" + type : "none" + url : sizeLimit : -1 diff --git a/src/branding/default/show.qml b/src/branding/default/show.qml index f4c50e629..f91d520cd 100644 --- a/src/branding/default/show.qml +++ b/src/branding/default/show.qml @@ -22,43 +22,45 @@ Presentation Timer { id: advanceTimer - interval: 1000 + interval: 5000 running: presentation.activatedInCalamares repeat: true onTriggered: nextSlide() } Slide { - + id: slide1 Image { - id: background - source: "squid.png" - width: 200; height: 200 + id: background1 + source: "Slide1.png" + width: 980; height: 980 fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } - Text { - anchors.horizontalCenter: background.horizontalCenter - anchors.top: background.bottom - text: "This is a customizable QML slideshow.
"+ - "Distributions should provide their own slideshow and list it in
"+ - "their custom branding.desc file.
"+ - "To create a Calamares presentation in QML, import calamares.slideshow,
"+ - "define a Presentation element with as many Slide elements as needed." - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center + anchors.horizontalCenter:parent.horizontalCenter + y:parent.height / 2 - height / 2 -25 } } - Slide { - centeredText: qsTr("This is a second Slide element.") + id: slide2 + Image { + id: background2 + source: "Slide2.png" + width: 980; height: 980 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter:parent.horizontalCenter + y:parent.height / 2 - height / 2 -25 + } } - Slide { - centeredText: qsTr("This is a third Slide element.") + id: slide3 + Image { + id: background3 + source: "Slide3.png" + width: 980; height: 980 + fillMode: Image.PreserveAspectFit + anchors.horizontalCenter:parent.horizontalCenter + y:parent.height / 2 - height / 2 -25 + } } - // When this slideshow is loaded as a V1 slideshow, only // activatedInCalamares is set, which starts the timer (see above). // -- 2.46.0