diff --git a/etc/calamares/branding/netrunner-core/branding.desc b/etc/calamares/branding/netrunner-core/branding.desc
index 67bd089..4d98f94 100644
--- a/etc/calamares/branding/netrunner-core/branding.desc
+++ b/etc/calamares/branding/netrunner-core/branding.desc
@@ -3,21 +3,21 @@ componentName: netrunner-core
strings:
productName: Netrunner Core
- shortProductName: Netrunner Core
- version: 1.0.0
+ shortProductName: Core
+ version: 1.0.0-dev
shortVersion: 1.0
versionedName: Netrunner Core
shortVersionedName: Netrunner Core 1.0
bootloaderEntryName: Netrunner Core
images:
- productLogo: "netrunner-debian-logo.png"
- productIcon: "netrunner-debian-icon.png"
+ productLogo: "netrunner-core-logo.png"
+ productIcon: "netrunner-core-icon.png"
productWelcome: "welcome.png"
slideshow: "show.qml"
style:
- sidebarBackground: "#292F34"
- sidebarText: "#FFFFFF"
- sidebarTextSelect: "#8497A7"
+ sidebarBackground: "#0C0C0C"
+ sidebarText: "#5A5A5A"
+ sidebarTextSelect: "#FFFFFF"
diff --git a/etc/calamares/branding/netrunner-core/netrunner-core-icon.png b/etc/calamares/branding/netrunner-core/netrunner-core-icon.png
new file mode 100644
index 0000000..8de41c7
Binary files /dev/null and b/etc/calamares/branding/netrunner-core/netrunner-core-icon.png differ
diff --git a/etc/calamares/branding/netrunner-core/netrunner-core-logo.png b/etc/calamares/branding/netrunner-core/netrunner-core-logo.png
new file mode 100644
index 0000000..8de41c7
Binary files /dev/null and b/etc/calamares/branding/netrunner-core/netrunner-core-logo.png differ
diff --git a/etc/calamares/branding/netrunner-core/netrunner-debian-icon.png b/etc/calamares/branding/netrunner-core/netrunner-debian-icon.png
deleted file mode 100644
index d5ce6c4..0000000
Binary files a/etc/calamares/branding/netrunner-core/netrunner-debian-icon.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/netrunner-debian-logo.png b/etc/calamares/branding/netrunner-core/netrunner-debian-logo.png
deleted file mode 100644
index bd2e341..0000000
Binary files a/etc/calamares/branding/netrunner-core/netrunner-debian-logo.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/show.qml b/etc/calamares/branding/netrunner-core/show.qml
index 7c837d3..cc69c34 100644
--- a/etc/calamares/branding/netrunner-core/show.qml
+++ b/etc/calamares/branding/netrunner-core/show.qml
@@ -16,6 +16,11 @@
* along with Calamares. If not, see .
*/
+/*
+ * Change slides width and height from 800x480px to 810x486px to remove side lines
+ * Slides images dimensions are 1600x960px.
+ */
+
import QtQuick 2.0;
import calamares.slideshow 1.0;
@@ -35,15 +40,14 @@ Presentation
Image {
id: background1
source: "slide1.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background1.horizontalCenter
anchors.top: background1.bottom
- text: "Welcome to Netrunner Debian.
"+
- "During the installation, this slideshow will give you a quick introduction."
+ text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
@@ -55,16 +59,14 @@ Presentation
Image {
id: background2
source: "slide2.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background2.horizontalCenter
anchors.top: background2.bottom
- text: "Netrunner is made of free software.
"+
- "The new KDE Plasma 5 desktop is chosen for its easy of use.
"+
- "It offers many options to customize in the simplified System Settings."
+ text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
@@ -76,16 +78,14 @@ Presentation
Image {
id: background3
source: "slide3.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background3.horizontalCenter
anchors.top: background3.bottom
- text: "There are many applications on board for a great web-experience:
"+
- "Browse the internet with Firefox and send emails with Thunderbird.
"+
- "Use Skype or Telepathy to connect with friends and family."
+ text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
@@ -97,16 +97,14 @@ Presentation
Image {
id: background4
source: "slide4.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background4.horizontalCenter
anchors.top: background4.bottom
- text: "Netrunner covers your creativity with many applications such as LibreOffice, CalligraFlow and Gimp.
"+
- "There's Karbon for vector-based pictures and Krita for the pixel-artist in you.
"+
- "Use Gwenview to organize your photos and Kdenlive for creating your own videos."
+ text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
@@ -118,16 +116,14 @@ Presentation
Image {
id: background5
source: "slide5.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background5.horizontalCenter
anchors.top: background5.bottom
- text: "Netrunner can play most video and sound formats out-of-the-box.
"+
- "There is VLC media player to watch movies and handbrake to convert them into a different format.
"+
- "Use Gmusicbrowser to listen to your local collection and radiotray for your internet music."
+ text: ""
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
@@ -139,59 +135,14 @@ Presentation
Image {
id: background6
source: "slide6.png"
- width: 553; height: 332
+ width: 810; height: 486
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background6.horizontalCenter
anchors.top: background6.bottom
- text: "We want you to enjoy your computing!
"+
- "For commercial titles, Steam is supported.
"+
- "Or have fun with the classics installed."
- wrapMode: Text.WordWrap
- width: 600
- horizontalAlignment: Text.Center
- }
- }
-
- Slide {
-
- Image {
- id: background7
- source: "slide7.png"
- width: 553; height: 332
- fillMode: Image.PreserveAspectFit
- anchors.centerIn: parent
- }
- Text {
- anchors.horizontalCenter: background7.horizontalCenter
- anchors.top: background7.bottom
- text: "In the FOSS Community, you always find a helping hand.
"+
- "If you have a question, take a look at our forums.
"+
- "Netrunner Forums You're very much welcome!"
- wrapMode: Text.WordWrap
- width: 600
- horizontalAlignment: Text.Center
- }
- }
-
- Slide {
-
- Image {
- id: background8
- source: "slide8.png"
- width: 553; height: 332
- fillMode: Image.PreserveAspectFit
- anchors.centerIn: parent
- }
- Text {
- anchors.horizontalCenter: background8.horizontalCenter
- anchors.top: background8.bottom
- text: "Netrunner stands on the shoulders of Giants.
"+
- "The continuous work of thousands of people make it a reality.
"+
- "We like to say THANK YOU to everyone involved!"
- wrapMode: Text.WordWrap
+ text: ""
width: 600
horizontalAlignment: Text.Center
}
diff --git a/etc/calamares/branding/netrunner-core/slide-6.png b/etc/calamares/branding/netrunner-core/slide-6.png
new file mode 100644
index 0000000..f8079cd
Binary files /dev/null and b/etc/calamares/branding/netrunner-core/slide-6.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide1.png b/etc/calamares/branding/netrunner-core/slide1.png
index d111212..f5fb526 100644
Binary files a/etc/calamares/branding/netrunner-core/slide1.png and b/etc/calamares/branding/netrunner-core/slide1.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide2.png b/etc/calamares/branding/netrunner-core/slide2.png
index 55991e0..360b685 100644
Binary files a/etc/calamares/branding/netrunner-core/slide2.png and b/etc/calamares/branding/netrunner-core/slide2.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide3.png b/etc/calamares/branding/netrunner-core/slide3.png
index 7a33aab..5215f34 100644
Binary files a/etc/calamares/branding/netrunner-core/slide3.png and b/etc/calamares/branding/netrunner-core/slide3.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide4.png b/etc/calamares/branding/netrunner-core/slide4.png
index f6a0faa..5db1a94 100644
Binary files a/etc/calamares/branding/netrunner-core/slide4.png and b/etc/calamares/branding/netrunner-core/slide4.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide5.png b/etc/calamares/branding/netrunner-core/slide5.png
index 3000215..cb9def8 100644
Binary files a/etc/calamares/branding/netrunner-core/slide5.png and b/etc/calamares/branding/netrunner-core/slide5.png differ
diff --git a/etc/calamares/branding/netrunner-core/slide6.png b/etc/calamares/branding/netrunner-core/slide6.png
deleted file mode 100644
index 7e12cd4..0000000
Binary files a/etc/calamares/branding/netrunner-core/slide6.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/slide7.png b/etc/calamares/branding/netrunner-core/slide7.png
deleted file mode 100644
index f72c6f2..0000000
Binary files a/etc/calamares/branding/netrunner-core/slide7.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/slide8.png b/etc/calamares/branding/netrunner-core/slide8.png
deleted file mode 100644
index cf98958..0000000
Binary files a/etc/calamares/branding/netrunner-core/slide8.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/squid.png b/etc/calamares/branding/netrunner-core/squid.png
index 8e7be23..452e445 100644
Binary files a/etc/calamares/branding/netrunner-core/squid.png and b/etc/calamares/branding/netrunner-core/squid.png differ
diff --git a/etc/calamares/branding/netrunner-core/welcome.png b/etc/calamares/branding/netrunner-core/welcome.png
index 2d8e480..1304eee 100644
Binary files a/etc/calamares/branding/netrunner-core/welcome.png and b/etc/calamares/branding/netrunner-core/welcome.png differ