From 089db581f9bbf48b26af62c9af5c122c2c80a177 Mon Sep 17 00:00:00 2001 From: davedatum Date: Sun, 3 Nov 2019 20:26:03 +0000 Subject: [PATCH] # --- shared/Packages-Live | 9 +- .../calamares/branding/manjaro/branding.desc | 8 +- .../etc/calamares/branding/manjaro/show.qml | 106 ++++++++---------- tromjaro/gnome/live-overlay/etc/default/grub | 2 +- 4 files changed, 53 insertions(+), 72 deletions(-) diff --git a/shared/Packages-Live b/shared/Packages-Live index 1654b659..21b93a68 100644 --- a/shared/Packages-Live +++ b/shared/Packages-Live @@ -1,6 +1,5 @@ -#>manjaro grub-theme-live-manjaro - calamares +>manjaro grub-theme-live-manjaro gsmartcontrol manjaro-architect manjaro-live-skel @@ -11,6 +10,6 @@ squashfs-tools clonezilla #TROM -grub-theme-live-common-tromjaro -grub-theme-live-tromjaro -grub-theme-tromjaro \ No newline at end of file +#grub-theme-live-common-tromjaro +#grub-theme-live-tromjaro +#grub-theme-tromjaro \ No newline at end of file diff --git a/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/branding.desc b/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/branding.desc index 4b19fca1..b27ec92d 100644 --- a/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/branding.desc +++ b/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/branding.desc @@ -4,10 +4,10 @@ componentName: manjaro strings: productName: TROMjaro Linux shortProductName: TROMjaro - version: 18.1.1 - shortVersion: 18.1.1 - versionedName: TROMjaro Linux - shortVersionedName: TROMjaro + version: 18.1.2 + shortVersion: 18.1.2 + versionedName: TROMjaro Linux 18.1.2 "Juhraya" + shortVersionedName: TROMjaro 18.1.2 bootloaderEntryName: TROMjaro images: diff --git a/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/show.qml b/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/show.qml index fb5b55b4..dc4cea68 100644 --- a/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/show.qml +++ b/tromjaro/gnome/live-overlay/etc/calamares/branding/manjaro/show.qml @@ -28,20 +28,36 @@ Presentation id: presentation Timer { - interval: 20000 + interval: 6000 running: true repeat: true onTriggered: presentation.goToNextSlide() } Slide { + anchors.fill: parent + + Image { + id: background + source: "slide1.png" + anchors.fill: parent + } + Text { + anchors.horizontalCenter: background1.horizontalCenter + anchors.top: background1.bottom + text: "" + wrapMode: Text.WordWrap + width: 800 + horizontalAlignment: Text.Center + } + } + Slide { + anchors.fill: parent Image { id: background1 - source: "slide1.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + source: "slide2.png" + anchors.fill: parent } Text { anchors.horizontalCenter: background1.horizontalCenter @@ -53,13 +69,11 @@ Presentation } } Slide { - + anchors.fill: parent Image { id: background2 - source: "slide2.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + source: "slide3.png" + anchors.fill: parent } Text { anchors.horizontalCenter: background1.horizontalCenter @@ -71,13 +85,11 @@ Presentation } } Slide { - + anchors.fill: parent Image { id: background3 - source: "slide3.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + source: "slide4.png" + anchors.fill: parent } Text { anchors.horizontalCenter: background1.horizontalCenter @@ -89,13 +101,11 @@ Presentation } } Slide { - + anchors.fill: parent Image { id: background4 - source: "slide4.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + source: "slide5.png" + anchors.fill: parent } Text { anchors.horizontalCenter: background1.horizontalCenter @@ -107,31 +117,11 @@ Presentation } } Slide { - + anchors.fill: parent Image { id: background5 - source: "slide5.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent - } - Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: background1.bottom - text: "" - wrapMode: Text.WordWrap - width: 800 - horizontalAlignment: Text.Center - } - } - Slide { - - Image { - id: background6 source: "slide6.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + anchors.fill: parent } Text { anchors.horizontalCenter: background1.horizontalCenter @@ -144,13 +134,11 @@ Presentation } Slide { - + anchors.fill: parent Image { - id: background7 + id: background6 source: "slide7.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + anchors.fill: parent } Text { anchors.horizontalCenter: background2.horizontalCenter @@ -163,13 +151,11 @@ Presentation } Slide { - + anchors.fill: parent Image { - id: background8 + id: background7 source: "slide8.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + anchors.fill: parent } Text { anchors.horizontalCenter: background3.horizontalCenter @@ -182,13 +168,11 @@ Presentation } Slide { - + anchors.fill: parent Image { - id: background9 + id: background8 source: "slide9.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + anchors.fill: parent } Text { anchors.horizontalCenter: background4.horizontalCenter @@ -201,13 +185,11 @@ Presentation } Slide { - + anchors.fill: parent Image { - id: background10 + id: background9 source: "slide10.png" - width: 800; height: 440 - fillMode: Image.PreserveAspectFit - anchors.centerIn: parent + anchors.fill: parent } Text { anchors.horizontalCenter: background5.horizontalCenter diff --git a/tromjaro/gnome/live-overlay/etc/default/grub b/tromjaro/gnome/live-overlay/etc/default/grub index 4f78d6f2..5bf59bc4 100644 --- a/tromjaro/gnome/live-overlay/etc/default/grub +++ b/tromjaro/gnome/live-overlay/etc/default/grub @@ -43,7 +43,7 @@ GRUB_DISABLE_RECOVERY=true # Uncomment one of them for the gfx desired, a image background or a gfxtheme #GRUB_BACKGROUND="/usr/share/grub/trom-background.png" -GRUB_THEME="/boot/grub/themes/tromjaro-live/theme.txt" +#GRUB_THEME="/boot/grub/themes/tromjaro-live/theme.txt" # Uncomment to get a beep at GRUB start #GRUB_INIT_TUNE="480 440 1"