Styling adjustments

calamares/branding/tileos-sway/branding.desc

@@ -13,17 +13,17 @@ strings:
     bootloaderEntryName: TileOS
 
 images:
-    productLogo:         "debian-logo.png"
-    productIcon:         "debian-logo.png"
+    productLogo:         "tileos-logo.png"
+    productIcon:         "tileos-logo.png"
     productWelcome:      "welcome.png"
     # productWallpaper:  "wallpaper.png"
 
 slideshow:               "show.qml"
 
 style:
-   sidebarBackground:    "#2c3133"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#4d7079"
-   sidebarTextSelect:    "#292F34"
+   sidebarBackground:    "#1e2030"
+   sidebarText:          "#cad3f5"
+   sidebarTextSelect:    "#24273a"
+   sidebarTextSelect:    "#24273a"
 
 slideshowAPI: 2

calamares/branding/tileos-sway/stylesheet.qss

@@ -0,0 +1,46 @@
+/*
+
+A branding component can ship a stylesheet (like this one)
+which is applied to parts of the Calamares user-interface.
+In principle, all parts can be styled through CSS.
+Missing parts should be filed as issues.
+
+The IDs are based on the object names in the C++ code.
+
+Documentation for styling Qt Widgets through a stylesheet
+can be found at
+    https://doc.qt.io/qt-5/stylesheet-examples.html
+In Calamares, styling widget classes is supported (e.g.
+using `QComboBox` as a selector). You can also use specific
+object names (ids), which you can find through debugging tools.
+
+*/
+
+/* Main application window. */
+
+#mainApp {
+}
+
+/*-----QPushButton-----*/
+
+QPushButton::flat {
+    background-color: transparent;
+    border: none;
+    color: #cad3f5;
+}
+
+/* Partitioning module.
+
+#bootInfoIcon { }
+#bootInfoLable { }
+#deviceInfoIcon { }
+#defineInfoLabel { }
+#scrollAreaWidgetContents { }
+#partitionBarView { }
+*/
+
+/* Licensing module.
+
+#licenseItem {  }
+#licenseItemFullText {  }
+*/

calamares/modules/welcome.conf

@@ -6,6 +6,8 @@ showReleaseNotesUrl:    true
 requirements:
     requiredStorage:    20
     requiredRam:        1.0
+    internetCheckUrl:	https://google.com/
+
     check:
         - storage
         - ram

calamares/settings.conf

@@ -31,6 +31,14 @@ disable-cancel: false
 # YAML: boolean.
 disable-cancel-during-exec: false
 
+# If this is set to true, the "Next" and "Back" button will be hidden once
+# you start the 'Installation'.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+hide-back-and-next-during-exec: false
+
 # If this is set to true, then once the end of the sequence has
 # been reached, the quit (done) button is clicked automatically
 # and Calamares will close. Default is false: the user will see

debian/install

@@ -3,4 +3,3 @@ calamares-modules/* usr/lib/calamares/modules
 scripts/* usr/sbin
 *.desktop usr/share/applications
 install-tileos usr/bin
-artwork/install-debian.png usr/share/pixmaps

install-tileos

@@ -1,15 +1,4 @@
 #!/bin/sh
-###
-# Wrapper for running calamares on Debian live media
-###
 
-# Stale file left behind by live-build that messes with partitioning
-sudo mv /etc/fstab /etc/fstab.orig.calamares
-
-# Access control to run calamares as root for xwayland
-xhost +si:localuser:root
-pkexec calamares -d -style Fusion
-xhost -si:localuser:root
-
-# Restore stale fstab, for what it's worth
-sudo mv /etc/fstab.orig.calamares /etc/fstab
+# Set GTK2 Qt plugin for Calamares. This fixes styling issues with dark Qt theme
+QT_QPA_PLATFORMTHEME=gtk2 sudo -E calamares -d

install-tileos.desktop

@@ -6,7 +6,7 @@ GenericName=Calamares Installer
 Exec=install-tileos
 Comment=Calamares — Installer for TileOS
 Keywords=calamares;system;install;debian;installer
-Icon=install-debian
+Icon=calamares
 Terminal=false
 Categories=Qt;System;
 StartupWMClass=calamares