[branding] update manjaro branding

src/branding/manjaro-kde/branding.desc

@@ -1,23 +0,0 @@
----
-componentName:  manjaro-kde
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             17.0
-    shortVersion:        17.0
-    versionedName:       Manjaro Linux 17.0 "Gellivara"
-    shortVersionedName:  Manjaro 17.0
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "squid.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"

src/branding/manjaro-kde/show.qml

@@ -1,137 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Timer {
-        interval: 20000
-        running: true
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-    
-    Slide {
-
-        Image {
-            id: background1
-            source: "slide1.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background1.horizontalCenter
-            anchors.top: background1.bottom
-            text: "Welcome to Manjaro.<br/>"+
-                  "Manjaro is driven by a hardworking and dedicated community.<br/>"+
-                  "During the installation, this slideshow will provide a quick introduction."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background2
-            source: "slide2.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background2.horizontalCenter
-            anchors.top: background2.bottom
-            text: "All of Manjaro's versions are completely customizable<br/>"+
-                  "to exactly how you want it. From theming, to the very<br/>"+
-                  "kernel itself, it can be changed."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background3
-            source: "slide3.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background3.horizontalCenter
-            anchors.top: background3.bottom
-            text: "Manjaro has three different officially supported editions.<br/>"+
-                  "Additionally, there are a multitude of community editions<br/>"+
-                  "to choose from, built by the community, for the community."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background4
-            source: "slide4.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background4.horizontalCenter
-            anchors.top: background4.bottom
-            text: "Manjaro has three different options for managing<br/>"+
-                  "packages. The original command line option, Pacman<br/>"+
-                  "and two different GUI options: Octopi or Pamac."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background5
-            source: "slide5.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background5.horizontalCenter
-            anchors.top: background5.bottom
-            text: "We appreciate you choosing Manjaro, and hope you enjoy<br/>"+
-                  "it as much as we do making it! If you have any questions<br/>"+
-                  "or feedback, please feel free to visit the forum, IRC, or wiki."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-}

src/branding/manjaro-xfce/branding.desc

@@ -1,23 +0,0 @@
----
-componentName:  manjaro-xfce
-
-strings:
-    productName:         Manjaro Linux
-    shortProductName:    Manjaro
-    version:             17.0
-    shortVersion:        17.0
-    versionedName:       Manjaro Linux 17.0 "Gellivara"
-    shortVersionedName:  Manjaro 17.0
-    bootloaderEntryName: Manjaro
-
-images:
-    productLogo:         "squid.png"
-    productIcon:         "logo.png"
-    productWelcome:      "languages.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#292F34"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#292F34"

src/branding/manjaro-xfce/show.qml

@@ -1,137 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Timer {
-        interval: 20000
-        running: true
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-    
-    Slide {
-
-        Image {
-            id: background1
-            source: "slide1.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background1.horizontalCenter
-            anchors.top: background1.bottom
-            text: "Welcome to Manjaro.<br/>"+
-                  "Manjaro is driven by a hardworking and dedicated community.<br/>"+
-                  "During the installation, this slideshow will provide a quick introduction."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background2
-            source: "slide2.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background2.horizontalCenter
-            anchors.top: background2.bottom
-            text: "All of Manjaro's versions are completely customizable<br/>"+
-                  "to exactly how you want it. From theming, to the very<br/>"+
-                  "kernel itself, it can be changed."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background3
-            source: "slide3.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background3.horizontalCenter
-            anchors.top: background3.bottom
-            text: "Manjaro has three different officially supported editions.<br/>"+
-                  "Additionally, there are a multitude of community editions<br/>"+
-                  "to choose from, built by the community, for the community."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background4
-            source: "slide4.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background4.horizontalCenter
-            anchors.top: background4.bottom
-            text: "Manjaro has three different options for managing<br/>"+
-                  "packages. The original command line option, Pacman<br/>"+
-                  "and two different GUI options: Octopi or Pamac."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-    Slide {
-
-        Image {
-            id: background5
-            source: "slide5.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background5.horizontalCenter
-            anchors.top: background5.bottom
-            text: "We appreciate you choosing Manjaro, and hope you enjoy<br/>"+
-                  "it as much as we do making it! If you have any questions<br/>"+
-                  "or feedback, please feel free to visit the forum, IRC, or wiki."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-}

src/branding/manjaro/show.qml

@@ -16,6 +16,11 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Change slides width and height from 800x480px to 810x486px to remove side lines
+ * Slides images dimensions are 1200x720px.
+ */
+
 import QtQuick 2.0;
 import calamares.slideshow 1.0;
 
@@ -34,17 +39,15 @@ Presentation
 
         Image {
             id: background1
-            source: "slide.png"
-            width: 500; height: 275
+            source: "slide1.png"
+            width: 810; height: 486
             fillMode: Image.PreserveAspectFit
             anchors.centerIn: parent
         }
         Text {
             anchors.horizontalCenter: background1.horizontalCenter
             anchors.top: background1.bottom
-            text: "Welcome to Manjaro.<br/>"+
-                  "Manjaro is driven by a hardworking and dedicated community.<br/>"+
-                  "During the installation, this slideshow will provide a quick introduction."
+            text: ""
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center
@@ -56,16 +59,14 @@ Presentation
         Image {
             id: background2
             source: "slide2.png"
-            width: 500; height: 275
+            width: 810; height: 486
             fillMode: Image.PreserveAspectFit
             anchors.centerIn: parent
         }
         Text {
             anchors.horizontalCenter: background2.horizontalCenter
             anchors.top: background2.bottom
-            text: "All of Manjaro's versions are completely customizable<br/>"+
-                  "to exactly how you want it. From theming, to the very<br/>"+
-                  "kernel itself, it can be changed."
+            text: ""
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center
@@ -77,16 +78,14 @@ Presentation
         Image {
             id: background3
             source: "slide3.png"
-            width: 500; height: 275
+            width: 810; height: 486
             fillMode: Image.PreserveAspectFit
             anchors.centerIn: parent
         }
         Text {
             anchors.horizontalCenter: background3.horizontalCenter
             anchors.top: background3.bottom
-            text: "Manjaro has three different officially supported editions.<br/>"+
-                  "Additionally, there are a multitude of community editions<br/>"+
-                  "to choose from, built by the community, for the community."
+            text: ""
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center
@@ -98,16 +97,14 @@ Presentation
         Image {
             id: background4
             source: "slide4.png"
-            width: 500; height: 275
+            width: 810; height: 486
             fillMode: Image.PreserveAspectFit
             anchors.centerIn: parent
         }
         Text {
             anchors.horizontalCenter: background4.horizontalCenter
             anchors.top: background4.bottom
-            text: "Manjaro has three different options for managing<br/>"+
-                  "packages. The original command line option, Pacman<br/>"+
-                  "and two different GUI options: Octopi or Pamac."
+            text: ""
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center
@@ -119,16 +116,14 @@ Presentation
         Image {
             id: background5
             source: "slide5.png"
-            width: 500; height: 275
+            width: 810; height: 486
             fillMode: Image.PreserveAspectFit
             anchors.centerIn: parent
         }
         Text {
             anchors.horizontalCenter: background5.horizontalCenter
             anchors.top: background5.bottom
-            text: "We appreciate you choosing Manjaro, and hope you enjoy<br/>"+
-                  "it as much as we do making it! If you have any questions<br/>"+
-                  "or feedback, please feel free to visit the forum, IRC, or wiki."
+            text: ""
             wrapMode: Text.WordWrap
             width: 600
             horizontalAlignment: Text.Center