diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/PageHeader.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/PageHeader.qml index 68a06a2..09aff13 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/PageHeader.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/PageHeader.qml @@ -24,6 +24,9 @@ ColumnLayout { Label { id: descriptionLabel + // A page with nothing to add under its title should not pay for an + // empty line; an invisible item is left out of the layout. + visible: text !== "" Layout.fillWidth: true color: root.descriptionColor font.pixelSize: Math.max(14, Math.round(Qt.application.font.pointSize * 1.28)) diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/TintedFrame.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/TintedFrame.qml new file mode 100644 index 0000000..7ec4de8 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/components/TintedFrame.qml @@ -0,0 +1,23 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 + +// A panel with rounded corners and a colour of its own. It is a Frame, and +// not a Rectangle holding anchored children, because a Frame takes its size +// from its content: with a Rectangle the content ends up taking its size from +// the panel instead, and the panel grows to whatever space is left. +Frame { + id: root + + property color tint: palette.base + property color line: palette.mid + property int cornerRadius: 10 + + padding: 13 + + background: Rectangle { + color: root.tint + border.width: 1 + border.color: root.line + radius: root.cornerRadius + } +} diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/i18n.js b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/i18n.js index 605e731..5ab284e 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/i18n.js +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/i18n.js @@ -8,7 +8,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Неабходная ўмова не выканана. Праглядзіце пункты ніжэй, перш чым працягнуць.", "BigLinux has been installed on your computer.": "BigLinux усталяваны на ваш камп'ютар.", "BigLinux logo surrounded by slowly moving rings": "Лагатып BigLinux у атачэнні павольна рухомых кольцаў", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Праглядзіце выбраныя параметры ніжэй. Дыскі не будуць зменены, пакуль вы не пацвердзіце ўсталяванне.", "Choose the language": "Выберыце мову", "Computer name": "Імя камп'ютара", "Create your account and choose the name used by this computer on the network.": "Стварыце ўліковы запіс і выберыце імя, пад якім гэты камп'ютар будзе бачны ў сетцы.", @@ -54,7 +53,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необходимо условие не е изпълнено. Прегледайте елементите по-долу, преди да продължите.", "BigLinux has been installed on your computer.": "BigLinux е инсталиран на вашия компютър.", "BigLinux logo surrounded by slowly moving rings": "Логото на BigLinux, заобиколено от бавно движещи се пръстени", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Прегледайте изборите по-долу. Дисковете няма да бъдат променени, докато не потвърдите инсталацията.", "Choose the language": "Изберете езика", "Computer name": "Име на компютъра", "Create your account and choose the name used by this computer on the network.": "Създайте регистрацията си и изберете името, с което този компютър ще се вижда в мрежата.", @@ -100,7 +98,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Požadovaná podmínka není splněna. Před pokračováním zkontrolujte položky níže.", "BigLinux has been installed on your computer.": "BigLinux byl nainstalován do vašeho počítače.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux obklopené pomalu se pohybujícími prstenci", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Zkontrolujte volby níže. Disky se nezmění, dokud instalaci nepotvrdíte.", "Choose the language": "Vyberte jazyk", "Computer name": "Název počítače", "Create your account and choose the name used by this computer on the network.": "Vytvořte si účet a zvolte název, pod kterým bude tento počítač vystupovat v síti.", @@ -146,7 +143,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "En påkrævet betingelse er ikke opfyldt. Gennemgå punkterne nedenfor, før du fortsætter.", "BigLinux has been installed on your computer.": "BigLinux er installeret på din computer.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omgivet af langsomt bevægende ringe", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Gennemgå valgene nedenfor. Diskene ændres ikke, før du bekræfter installationen.", "Choose the language": "Vælg sproget", "Computer name": "Computernavn", "Create your account and choose the name used by this computer on the network.": "Opret din konto, og vælg det navn denne computer bruger på netværket.", @@ -192,7 +188,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Eine erforderliche Bedingung ist nicht erfüllt. Prüfen Sie die Punkte unten, bevor Sie fortfahren.", "BigLinux has been installed on your computer.": "BigLinux wurde auf Ihrem Computer installiert.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-Logo, umgeben von langsam kreisenden Ringen", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Prüfen Sie die Auswahl unten. Die Datenträger werden erst geändert, wenn Sie die Installation bestätigen.", "Choose the language": "Sprache wählen", "Computer name": "Computername", "Create your account and choose the name used by this computer on the network.": "Erstellen Sie Ihr Konto und wählen Sie den Namen, unter dem dieser Computer im Netzwerk erscheint.", @@ -238,7 +233,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Μια απαιτούμενη προϋπόθεση δεν πληρούται. Ελέγξτε τα παρακάτω στοιχεία πριν συνεχίσετε.", "BigLinux has been installed on your computer.": "Το BigLinux εγκαταστάθηκε στον υπολογιστή σας.", "BigLinux logo surrounded by slowly moving rings": "Λογότυπο BigLinux περιτριγυρισμένο από δακτυλίους που κινούνται αργά", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Ελέγξτε τις παρακάτω επιλογές. Οι δίσκοι δεν θα αλλάξουν μέχρι να επιβεβαιώσετε την εγκατάσταση.", "Choose the language": "Επιλέξτε τη γλώσσα", "Computer name": "Όνομα υπολογιστή", "Create your account and choose the name used by this computer on the network.": "Δημιουργήστε τον λογαριασμό σας και επιλέξτε το όνομα που θα χρησιμοποιεί αυτός ο υπολογιστής στο δίκτυο.", @@ -284,7 +278,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "No se cumple una condición necesaria. Revise los elementos siguientes antes de continuar.", "BigLinux has been installed on your computer.": "BigLinux se ha instalado en su equipo.", "BigLinux logo surrounded by slowly moving rings": "Logotipo de BigLinux rodeado de anillos en movimiento lento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Revise las opciones a continuación. Los discos no se modificarán hasta que confirme la instalación.", "Choose the language": "Elija el idioma", "Computer name": "Nombre del equipo", "Create your account and choose the name used by this computer on the network.": "Cree su cuenta y elija el nombre que este equipo usará en la red.", @@ -330,7 +323,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Nõutav tingimus pole täidetud. Vaata allolevad punktid üle, enne kui jätkad.", "BigLinux has been installed on your computer.": "BigLinux on sinu arvutisse paigaldatud.", "BigLinux logo surrounded by slowly moving rings": "BigLinuxi logo aeglaselt liikuvate rõngaste ümbritsetuna", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Vaata allolevad valikud üle. Kettaid ei muudeta enne, kui kinnitad paigalduse.", "Choose the language": "Vali keel", "Computer name": "Arvuti nimi", "Create your account and choose the name used by this computer on the network.": "Loo oma konto ja vali nimi, mille all see arvuti võrgus nähtav on.", @@ -376,7 +368,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Vaadittu ehto ei täyty. Käy alla olevat kohdat läpi ennen jatkamista.", "BigLinux has been installed on your computer.": "BigLinux on asennettu tietokoneellesi.", "BigLinux logo surrounded by slowly moving rings": "BigLinuxin logo hitaasti liikkuvien renkaiden ympäröimänä", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Käy alla olevat valinnat läpi. Levyjä ei muuteta ennen kuin vahvistat asennuksen.", "Choose the language": "Valitse kieli", "Computer name": "Tietokoneen nimi", "Create your account and choose the name used by this computer on the network.": "Luo tilisi ja valitse nimi, jolla tämä tietokone näkyy verkossa.", @@ -422,7 +413,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Une condition requise n'est pas remplie. Vérifiez les éléments ci-dessous avant de continuer.", "BigLinux has been installed on your computer.": "BigLinux a été installé sur votre ordinateur.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux entouré d'anneaux en mouvement lent", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Vérifiez les choix ci-dessous. Les disques ne seront pas modifiés tant que vous n'aurez pas confirmé l'installation.", "Choose the language": "Choisissez la langue", "Computer name": "Nom de l'ordinateur", "Create your account and choose the name used by this computer on the network.": "Créez votre compte et choisissez le nom utilisé par cet ordinateur sur le réseau.", @@ -468,7 +458,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "תנאי נדרש אינו מתקיים. בדוק את הפריטים שלהלן לפני שתמשיך.", "BigLinux has been installed on your computer.": "BigLinux הותקן במחשב שלך.", "BigLinux logo surrounded by slowly moving rings": "הלוגו של BigLinux מוקף בטבעות שנעות לאט", - "Check the choices below. The disks will not be changed until you confirm the installation.": "בדוק את הבחירות שלהלן. הדיסקים לא ישונו עד שתאשר את ההתקנה.", "Choose the language": "בחר את השפה", "Computer name": "שם המחשב", "Create your account and choose the name used by this computer on the network.": "צור את החשבון שלך ובחר את השם שבו ישתמש המחשב הזה ברשת.", @@ -514,7 +503,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Potreban uvjet nije ispunjen. Pregledajte stavke u nastavku prije nego što nastavite.", "BigLinux has been installed on your computer.": "BigLinux je instaliran na vaše računalo.", "BigLinux logo surrounded by slowly moving rings": "Logotip BigLinux okružen prstenovima koji se polako kreću", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Pregledajte odabire u nastavku. Diskovi se neće mijenjati dok ne potvrdite instalaciju.", "Choose the language": "Odaberite jezik", "Computer name": "Naziv računala", "Create your account and choose the name used by this computer on the network.": "Stvorite račun i odaberite naziv pod kojim će ovo računalo biti vidljivo na mreži.", @@ -560,7 +548,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Egy szükséges feltétel nem teljesül. Tekintse át az alábbi tételeket a folytatás előtt.", "BigLinux has been installed on your computer.": "A BigLinux telepítve lett a számítógépére.", "BigLinux logo surrounded by slowly moving rings": "A BigLinux logója lassan mozgó gyűrűkkel körülvéve", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Tekintse át az alábbi választásokat. A lemezek addig nem változnak, amíg meg nem erősíti a telepítést.", "Choose the language": "Válassza ki a nyelvet", "Computer name": "Számítógép neve", "Create your account and choose the name used by this computer on the network.": "Hozza létre a fiókját, és válassza ki a nevet, amelyet ez a számítógép a hálózaton használ.", @@ -606,7 +593,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Nauðsynlegt skilyrði er ekki uppfyllt. Farðu yfir atriðin hér að neðan áður en þú heldur áfram.", "BigLinux has been installed on your computer.": "BigLinux hefur verið sett upp á tölvunni þinni.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-merki umkringt hringjum á hægri hreyfingu", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Farðu yfir valkostina hér að neðan. Diskunum verður ekki breytt fyrr en þú staðfestir uppsetninguna.", "Choose the language": "Veldu tungumálið", "Computer name": "Heiti tölvunnar", "Create your account and choose the name used by this computer on the network.": "Búðu til reikninginn þinn og veldu heitið sem þessi tölva notar á netinu.", @@ -652,7 +638,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Una condizione necessaria non è soddisfatta. Controlla gli elementi qui sotto prima di continuare.", "BigLinux has been installed on your computer.": "BigLinux è stato installato sul tuo computer.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux circondato da anelli in lento movimento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Controlla le scelte qui sotto. I dischi non verranno modificati finché non confermi l'installazione.", "Choose the language": "Scegli la lingua", "Computer name": "Nome del computer", "Create your account and choose the name used by this computer on the network.": "Crea il tuo account e scegli il nome usato da questo computer sulla rete.", @@ -698,7 +683,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "必要な条件が満たされていません。続行する前に以下の項目を確認してください。", "BigLinux has been installed on your computer.": "BigLinux がコンピューターにインストールされました。", "BigLinux logo surrounded by slowly moving rings": "ゆっくり動くリングに囲まれた BigLinux のロゴ", - "Check the choices below. The disks will not be changed until you confirm the installation.": "以下の選択内容を確認してください。インストールを確定するまでディスクは変更されません。", "Choose the language": "言語を選択", "Computer name": "コンピューター名", "Create your account and choose the name used by this computer on the network.": "アカウントを作成し、このコンピューターがネットワークで使う名前を選んでください。", @@ -744,7 +728,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "필요한 조건이 충족되지 않았습니다. 계속하기 전에 아래 항목을 확인하십시오.", "BigLinux has been installed on your computer.": "BigLinux가 컴퓨터에 설치되었습니다.", "BigLinux logo surrounded by slowly moving rings": "천천히 움직이는 고리로 둘러싸인 BigLinux 로고", - "Check the choices below. The disks will not be changed until you confirm the installation.": "아래 선택 사항을 확인하십시오. 설치를 확인하기 전까지 디스크는 변경되지 않습니다.", "Choose the language": "언어 선택", "Computer name": "컴퓨터 이름", "Create your account and choose the name used by this computer on the network.": "계정을 만들고 이 컴퓨터가 네트워크에서 사용할 이름을 선택하십시오.", @@ -790,7 +773,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Aan een vereiste voorwaarde is niet voldaan. Controleer de punten hieronder voordat u doorgaat.", "BigLinux has been installed on your computer.": "BigLinux is op uw computer geïnstalleerd.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omringd door langzaam bewegende ringen", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Controleer de keuzes hieronder. De schijven worden pas gewijzigd als u de installatie bevestigt.", "Choose the language": "Kies de taal", "Computer name": "Computernaam", "Create your account and choose the name used by this computer on the network.": "Maak uw account aan en kies de naam die deze computer op het netwerk gebruikt.", @@ -836,7 +818,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Et nødvendig vilkår er ikke oppfylt. Se gjennom punktene nedenfor før du fortsetter.", "BigLinux has been installed on your computer.": "BigLinux er installert på datamaskinen din.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omgitt av sakte bevegende ringer", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Se gjennom valgene nedenfor. Diskene endres ikke før du bekrefter installasjonen.", "Choose the language": "Velg språket", "Computer name": "Datamaskinnavn", "Create your account and choose the name used by this computer on the network.": "Opprett kontoen din og velg navnet denne datamaskinen bruker på nettverket.", @@ -882,7 +863,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Wymagany warunek nie jest spełniony. Przejrzyj poniższe pozycje przed kontynuowaniem.", "BigLinux has been installed on your computer.": "BigLinux został zainstalowany na Twoim komputerze.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux otoczone wolno poruszającymi się pierścieniami", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Przejrzyj poniższe wybory. Dyski nie zostaną zmienione, dopóki nie potwierdzisz instalacji.", "Choose the language": "Wybierz język", "Computer name": "Nazwa komputera", "Create your account and choose the name used by this computer on the network.": "Utwórz konto i wybierz nazwę, pod którą ten komputer będzie widoczny w sieci.", @@ -928,7 +908,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Uma condição obrigatória não foi atendida. Revise os itens abaixo antes de continuar.", "BigLinux has been installed on your computer.": "O BigLinux foi instalado no seu computador.", "BigLinux logo surrounded by slowly moving rings": "Logo do BigLinux cercado por anéis em movimento lento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Confira as escolhas abaixo. Os discos não serão alterados até você confirmar a instalação.", "Choose the language": "Escolha o idioma", "Computer name": "Nome do computador", "Create your account and choose the name used by this computer on the network.": "Crie sua conta e escolha o nome usado por este computador na rede.", @@ -974,7 +953,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "O condiție necesară nu este îndeplinită. Verificați elementele de mai jos înainte de a continua.", "BigLinux has been installed on your computer.": "BigLinux a fost instalat pe computerul dumneavoastră.", "BigLinux logo surrounded by slowly moving rings": "Sigla BigLinux înconjurată de inele în mișcare lentă", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Verificați opțiunile de mai jos. Discurile nu vor fi modificate până când nu confirmați instalarea.", "Choose the language": "Alegeți limba", "Computer name": "Numele computerului", "Create your account and choose the name used by this computer on the network.": "Creați-vă contul și alegeți numele folosit de acest computer în rețea.", @@ -1020,7 +998,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необходимое условие не выполнено. Проверьте пункты ниже, прежде чем продолжить.", "BigLinux has been installed on your computer.": "BigLinux установлен на ваш компьютер.", "BigLinux logo surrounded by slowly moving rings": "Логотип BigLinux в окружении медленно движущихся колец", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Проверьте выбранные параметры ниже. Диски не будут изменены, пока вы не подтвердите установку.", "Choose the language": "Выберите язык", "Computer name": "Имя компьютера", "Create your account and choose the name used by this computer on the network.": "Создайте учётную запись и выберите имя, под которым этот компьютер будет виден в сети.", @@ -1066,7 +1043,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Požadovaná podmienka nie je splnená. Pred pokračovaním skontrolujte položky nižšie.", "BigLinux has been installed on your computer.": "BigLinux bol nainštalovaný do vášho počítača.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux obklopené pomaly sa pohybujúcimi prstencami", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Skontrolujte voľby nižšie. Disky sa nezmenia, kým inštaláciu nepotvrdíte.", "Choose the language": "Vyberte jazyk", "Computer name": "Názov počítača", "Create your account and choose the name used by this computer on the network.": "Vytvorte si účet a zvoľte názov, pod ktorým bude tento počítač vystupovať v sieti.", @@ -1112,7 +1088,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Ett nödvändigt villkor är inte uppfyllt. Gå igenom punkterna nedan innan du fortsätter.", "BigLinux has been installed on your computer.": "BigLinux har installerats på din dator.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logotyp omgiven av långsamt roterande ringar", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Gå igenom valen nedan. Diskarna ändras inte förrän du bekräftar installationen.", "Choose the language": "Välj språket", "Computer name": "Datornamn", "Create your account and choose the name used by this computer on the network.": "Skapa ditt konto och välj namnet som den här datorn använder i nätverket.", @@ -1158,7 +1133,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Gerekli bir koşul sağlanmıyor. Devam etmeden önce aşağıdaki maddeleri gözden geçirin.", "BigLinux has been installed on your computer.": "BigLinux bilgisayarınıza kuruldu.", "BigLinux logo surrounded by slowly moving rings": "Yavaşça hareket eden halkalarla çevrili BigLinux logosu", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Aşağıdaki seçimleri gözden geçirin. Kurulumu onaylayana kadar diskler değiştirilmeyecek.", "Choose the language": "Dili seçin", "Computer name": "Bilgisayar adı", "Create your account and choose the name used by this computer on the network.": "Hesabınızı oluşturun ve bu bilgisayarın ağda kullanacağı adı seçin.", @@ -1204,7 +1178,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необхідну умову не виконано. Перегляньте пункти нижче, перш ніж продовжити.", "BigLinux has been installed on your computer.": "BigLinux встановлено на ваш комп'ютер.", "BigLinux logo surrounded by slowly moving rings": "Логотип BigLinux в оточенні повільно рухомих кілець", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Перегляньте вибрані параметри нижче. Диски не буде змінено, доки ви не підтвердите встановлення.", "Choose the language": "Виберіть мову", "Computer name": "Ім'я комп'ютера", "Create your account and choose the name used by this computer on the network.": "Створіть обліковий запис і виберіть ім'я, під яким цей комп'ютер буде видно в мережі.", @@ -1250,7 +1223,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "有一项必要条件未满足。继续之前请检查下面的项目。", "BigLinux has been installed on your computer.": "BigLinux 已安装到您的计算机上。", "BigLinux logo surrounded by slowly moving rings": "被缓慢转动的圆环环绕的 BigLinux 徽标", - "Check the choices below. The disks will not be changed until you confirm the installation.": "请检查下面的选择。在您确认安装之前，磁盘不会被更改。", "Choose the language": "选择语言", "Computer name": "计算机名称", "Create your account and choose the name used by this computer on the network.": "创建您的账户，并选择这台计算机在网络上使用的名称。", diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/stylesheet.qss b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/stylesheet.qss index ca461bc..87aec53 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/stylesheet.qss +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/stylesheet.qss @@ -100,3 +100,44 @@ EncryptWidget QLineEdit { EncryptWidget QLineEdit:focus { border: 1px solid palette(highlight); } + +/* Calamares builds its confirmations - cancelling the install, closing during + * it - as plain QMessageBox instances with no object name of its own, so this + * is the only handle on them. They came up cramped and with small buttons + * beside the roomy QML pages, which is what made them look out of place. + * CalamaresWindow applies this stylesheet to itself, and the dialogs are its + * children, so these rules reach them. */ +QMessageBox { + background-color: palette(window); +} + +QMessageBox QLabel { + color: palette(window-text); + background-color: transparent; + font-size: 14px; +} + +/* Qt gives its own children these names; the text one carries the message. */ +QMessageBox QLabel#qt_msgbox_label { + /* Wide enough for the longest of these messages to keep the two + * lines its own text is written as, instead of wrapping again. */ + min-width: 460px; + padding: 22px 26px 18px 14px; +} + +QMessageBox QLabel#qt_msgboxex_icon_label { + padding: 20px 4px 10px 20px; +} + +QMessageBox QPushButton { + /* Calamares puts a tick and a cross on these buttons, which repeat what + * the labels already say and are the only icon-theme artwork in the + * dialog, so they were the least consistent part of it. + * + * Nothing else is set here on purpose. Giving these buttons a size or a + * padding makes the widget style draw its default-button frame around the + * box while the button paints inside it, which showed up as a second + * rectangle around the default button. Leaving the geometry alone keeps + * them identical to every other button the style draws. */ + icon-size: 0px; +} diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/summaryq.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/summaryq.qml index ae3c174..466ad80 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/summaryq.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/summaryq.qml @@ -22,11 +22,21 @@ Page { .replace(/BigLinux/g, Branding.string(Branding.ProductName)) } - function summaryIcon(index) { - if (index === 0) return "icons/location-content.svg" - if (index === 1) return "icons/keyboard-content.svg" - if (index === 2) return "icons/partition-content.svg" - return "icons/summary-content.svg" + // One badge per step of the summary, in that step's own colour. The order + // is the show sequence of settings.conf, which is what fills the model. + function badgeIcon(index) { + if (index === 0) return "visuals/badge-location.svg" + if (index === 1) return "visuals/badge-keyboard.svg" + if (index === 2) return "visuals/badge-partition.svg" + if (index === 3) return "visuals/badge-users.svg" + return "visuals/badge-summary.svg" + } + + function badgeTint(index) { + if (index === 1) return Qt.rgba(0.55, 0.36, 0.96, 0.16) + if (index === 2) return Qt.rgba(0.13, 0.63, 0.42, 0.16) + if (index === 3) return Qt.rgba(0.91, 0.51, 0.23, 0.16) + return Qt.rgba(0.13, 0.52, 0.82, 0.16) } function escapeHtml(value) { @@ -71,46 +81,158 @@ Page { return String(message) } + + // Pulled from the installer's translation of the confirmation dialog it + // replaces; see the frame that uses it below. + readonly property string undoWarning: { + const source = "The %1 installer is about to make changes to your disk " + + "in order to install %2.
You will not be able to " + + "undo these changes." + const translated = qsTranslate( + "Calamares::ViewManager", + source, + "%1 is short product name, %2 is short product name with version") + // qsTranslate hands back the source when a language has no + // translation for it, which is exactly what the dialog itself showed + // in that case, so the warning is never dropped for want of one. + const bold = /(.*?)<\/strong>/.exec(translated) + return bold ? bold[1] : translated + } + padding: 24 background: Rectangle { color: root.palette.window } + // Every colour below is the accent at a low alpha over whatever the page + // background is, so one set of values reads on the light and on the dark + // palette; a solid panel would have to be maintained twice. + readonly property color infoTint: Qt.rgba(0.13, 0.52, 0.82, 0.12) + readonly property color infoLine: Qt.rgba(0.13, 0.52, 0.82, 0.38) + readonly property color infoMark: "#2185D0" + readonly property color warnTint: Qt.rgba(0.91, 0.51, 0.13, 0.13) + readonly property color warnLine: Qt.rgba(0.91, 0.51, 0.13, 0.42) + readonly property color warnMark: "#E8833A" + ColumnLayout { anchors.fill: parent - spacing: 12 + spacing: 10 + // Only the title. The sentence that used to sit under it repeated + // what the panel below already says, and every line the heading takes + // is a line the choices lose - they were losing enough of them to + // need a scroll bar. PageHeader { Layout.fillWidth: true title: root.tr("Review") - description: root.tr("Check the choices below. The disks will not be changed until you confirm the installation.") } - NativeFrame { + // Side by side: what is still safe, and what will not be undone. They + // used to be stacked, which pushed the choices themselves off screen. + RowLayout { Layout.fillWidth: true + spacing: 12 - RowLayout { - anchors.fill: parent - spacing: 12 + // Both panels take the taller one's height, so they line up. + // Layout.fillHeight would do it, except that in a row inside a + // column it also makes the row itself claim the space the list + // below needs, and the list ends up with none. + readonly property real panelHeight: + Math.max(safePanel.implicitHeight, undoPanel.implicitHeight) - Image { - Layout.preferredWidth: 42 - Layout.preferredHeight: 42 - source: "visuals/review-shield.svg" - fillMode: Image.PreserveAspectFit - } + TintedFrame { + id: safePanel + Layout.fillWidth: true + Layout.preferredHeight: parent.panelHeight + tint: root.infoTint + line: root.infoLine - ColumnLayout { - Layout.fillWidth: true - spacing: 2 - Label { + RowLayout { + anchors.fill: parent + spacing: 12 + + Rectangle { + Layout.preferredWidth: 34 + Layout.preferredHeight: 34 + Layout.alignment: Qt.AlignTop + radius: 17 + color: Qt.rgba(0.13, 0.52, 0.82, 0.22) + + Image { + anchors.centerIn: parent + width: 20 + height: 20 + source: "visuals/review-shield.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } + } + + ColumnLayout { Layout.fillWidth: true - text: root.tr("Nothing will be changed until you review and confirm.") - font.weight: Font.DemiBold - wrapMode: Text.WordWrap + spacing: 2 + + Label { + Layout.fillWidth: true + text: root.tr("Nothing will be changed until you review and confirm.") + font.weight: Font.DemiBold + wrapMode: Text.WordWrap + } + Label { + Layout.fillWidth: true + text: root.tr("You can still go back and adjust any choice before starting the installation.") + color: root.palette.placeholderText + wrapMode: Text.WordWrap + } + } + } + } + + // The warning that used to sit in the "Continue with Installation?" + // dialog. That dialog said what this page already says, so it is + // switched off in settings.conf and the one sentence worth keeping + // moved here, above the list that scrolls: below it, the warning + // could be scrolled out of sight. + // + // The sentence is borrowed from the installer's own catalogue + // rather than translated again: it is the bold half of the + // dialog's question, so the translation already exists in every + // language Calamares ships. + TintedFrame { + id: undoPanel + Layout.fillWidth: true + Layout.preferredHeight: parent.panelHeight + tint: root.warnTint + line: root.warnLine + + RowLayout { + anchors.fill: parent + spacing: 12 + + Rectangle { + Layout.preferredWidth: 34 + Layout.preferredHeight: 34 + Layout.alignment: Qt.AlignTop + radius: 17 + color: Qt.rgba(0.91, 0.51, 0.13, 0.22) + + Image { + anchors.centerIn: parent + width: 20 + height: 20 + source: "visuals/status-alert.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } } + Label { Layout.fillWidth: true - text: root.tr("You can still go back and adjust any choice before starting the installation.") - color: root.palette.placeholderText + Layout.alignment: Qt.AlignVCenter + text: root.undoWarning + font.weight: Font.DemiBold wrapMode: Text.WordWrap } } @@ -134,28 +256,41 @@ Page { boundsBehavior: Flickable.StopAtBounds ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded } - delegate: NativeFrame { + delegate: TintedFrame { required property int index required property string title required property string message + width: ListView.view.width + padding: 12 RowLayout { anchors.fill: parent - spacing: 12 + spacing: 14 - Image { - Layout.preferredWidth: 38 - Layout.preferredHeight: 38 + Rectangle { + Layout.preferredWidth: 40 + Layout.preferredHeight: 40 Layout.alignment: Qt.AlignTop - source: root.summaryIcon(index) - fillMode: Image.PreserveAspectFit - smooth: true + radius: 20 + color: root.badgeTint(index) + + Image { + anchors.centerIn: parent + width: 22 + height: 22 + source: root.badgeIcon(index) + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } } ColumnLayout { Layout.fillWidth: true spacing: 4 + Label { Layout.fillWidth: true text: title diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/usersq.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/usersq.qml index b22e3ac..adf9ece 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/usersq.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/usersq.qml @@ -25,12 +25,6 @@ Page { .replace(/BigLinux/g, Branding.string(Branding.ProductName)) } - function initials(name) { - var parts = String(name).trim().split(/\s+/) - if (!parts.length || parts[0] === "") return "?" - if (parts.length === 1) return parts[0].charAt(0).toUpperCase() - return (parts[0].charAt(0) + parts[parts.length - 1].charAt(0)).toUpperCase() - } padding: 20 background: Rectangle { color: root.palette.window } @@ -307,12 +301,20 @@ Page { radius: 46 color: root.palette.highlight - Label { + // The avatar stays the symbolic user glyph whatever + // the name is. It used to be the initials, falling + // back to a question mark while the field was empty, + // and that question mark read as an error rather than + // as a field still to fill. + Image { anchors.centerIn: parent - text: root.initials(config.fullName) - color: root.palette.highlightedText - font.pixelSize: 30 - font.weight: Font.DemiBold + width: 46 + height: width + source: "icons/users.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true } } diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-keyboard.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-keyboard.svg new file mode 100644 index 0000000..3b4c40b --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-keyboard.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-location.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-location.svg new file mode 100644 index 0000000..5053ee5 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-location.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-partition.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-partition.svg new file mode 100644 index 0000000..4113391 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-partition.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-summary.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-summary.svg new file mode 100644 index 0000000..5bb20c7 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-summary.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-users.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-users.svg new file mode 100644 index 0000000..971d594 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/branding/bigcommunity/visuals/badge-users.svg @@ -0,0 +1,4 @@ + + + + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/settings.conf b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/settings.conf index 3170eb2..ddf100b 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/settings.conf +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/bigcommunity/settings.conf @@ -50,7 +50,9 @@ sequence: - finishedq branding: bigcommunity -prompt-install: true +# The summary page carries the warning this prompt used to show, so the +# extra dialog only repeated what was already on screen. +prompt-install: false dont-chroot: false oem-setup: false disable-cancel: false diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/PageHeader.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/PageHeader.qml index 68a06a2..09aff13 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/PageHeader.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/PageHeader.qml @@ -24,6 +24,9 @@ ColumnLayout { Label { id: descriptionLabel + // A page with nothing to add under its title should not pay for an + // empty line; an invisible item is left out of the layout. + visible: text !== "" Layout.fillWidth: true color: root.descriptionColor font.pixelSize: Math.max(14, Math.round(Qt.application.font.pointSize * 1.28)) diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/TintedFrame.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/TintedFrame.qml new file mode 100644 index 0000000..7ec4de8 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/components/TintedFrame.qml @@ -0,0 +1,23 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 + +// A panel with rounded corners and a colour of its own. It is a Frame, and +// not a Rectangle holding anchored children, because a Frame takes its size +// from its content: with a Rectangle the content ends up taking its size from +// the panel instead, and the panel grows to whatever space is left. +Frame { + id: root + + property color tint: palette.base + property color line: palette.mid + property int cornerRadius: 10 + + padding: 13 + + background: Rectangle { + color: root.tint + border.width: 1 + border.color: root.line + radius: root.cornerRadius + } +} diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/i18n.js b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/i18n.js index 605e731..5ab284e 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/i18n.js +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/i18n.js @@ -8,7 +8,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Неабходная ўмова не выканана. Праглядзіце пункты ніжэй, перш чым працягнуць.", "BigLinux has been installed on your computer.": "BigLinux усталяваны на ваш камп'ютар.", "BigLinux logo surrounded by slowly moving rings": "Лагатып BigLinux у атачэнні павольна рухомых кольцаў", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Праглядзіце выбраныя параметры ніжэй. Дыскі не будуць зменены, пакуль вы не пацвердзіце ўсталяванне.", "Choose the language": "Выберыце мову", "Computer name": "Імя камп'ютара", "Create your account and choose the name used by this computer on the network.": "Стварыце ўліковы запіс і выберыце імя, пад якім гэты камп'ютар будзе бачны ў сетцы.", @@ -54,7 +53,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необходимо условие не е изпълнено. Прегледайте елементите по-долу, преди да продължите.", "BigLinux has been installed on your computer.": "BigLinux е инсталиран на вашия компютър.", "BigLinux logo surrounded by slowly moving rings": "Логото на BigLinux, заобиколено от бавно движещи се пръстени", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Прегледайте изборите по-долу. Дисковете няма да бъдат променени, докато не потвърдите инсталацията.", "Choose the language": "Изберете езика", "Computer name": "Име на компютъра", "Create your account and choose the name used by this computer on the network.": "Създайте регистрацията си и изберете името, с което този компютър ще се вижда в мрежата.", @@ -100,7 +98,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Požadovaná podmínka není splněna. Před pokračováním zkontrolujte položky níže.", "BigLinux has been installed on your computer.": "BigLinux byl nainstalován do vašeho počítače.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux obklopené pomalu se pohybujícími prstenci", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Zkontrolujte volby níže. Disky se nezmění, dokud instalaci nepotvrdíte.", "Choose the language": "Vyberte jazyk", "Computer name": "Název počítače", "Create your account and choose the name used by this computer on the network.": "Vytvořte si účet a zvolte název, pod kterým bude tento počítač vystupovat v síti.", @@ -146,7 +143,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "En påkrævet betingelse er ikke opfyldt. Gennemgå punkterne nedenfor, før du fortsætter.", "BigLinux has been installed on your computer.": "BigLinux er installeret på din computer.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omgivet af langsomt bevægende ringe", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Gennemgå valgene nedenfor. Diskene ændres ikke, før du bekræfter installationen.", "Choose the language": "Vælg sproget", "Computer name": "Computernavn", "Create your account and choose the name used by this computer on the network.": "Opret din konto, og vælg det navn denne computer bruger på netværket.", @@ -192,7 +188,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Eine erforderliche Bedingung ist nicht erfüllt. Prüfen Sie die Punkte unten, bevor Sie fortfahren.", "BigLinux has been installed on your computer.": "BigLinux wurde auf Ihrem Computer installiert.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-Logo, umgeben von langsam kreisenden Ringen", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Prüfen Sie die Auswahl unten. Die Datenträger werden erst geändert, wenn Sie die Installation bestätigen.", "Choose the language": "Sprache wählen", "Computer name": "Computername", "Create your account and choose the name used by this computer on the network.": "Erstellen Sie Ihr Konto und wählen Sie den Namen, unter dem dieser Computer im Netzwerk erscheint.", @@ -238,7 +233,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Μια απαιτούμενη προϋπόθεση δεν πληρούται. Ελέγξτε τα παρακάτω στοιχεία πριν συνεχίσετε.", "BigLinux has been installed on your computer.": "Το BigLinux εγκαταστάθηκε στον υπολογιστή σας.", "BigLinux logo surrounded by slowly moving rings": "Λογότυπο BigLinux περιτριγυρισμένο από δακτυλίους που κινούνται αργά", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Ελέγξτε τις παρακάτω επιλογές. Οι δίσκοι δεν θα αλλάξουν μέχρι να επιβεβαιώσετε την εγκατάσταση.", "Choose the language": "Επιλέξτε τη γλώσσα", "Computer name": "Όνομα υπολογιστή", "Create your account and choose the name used by this computer on the network.": "Δημιουργήστε τον λογαριασμό σας και επιλέξτε το όνομα που θα χρησιμοποιεί αυτός ο υπολογιστής στο δίκτυο.", @@ -284,7 +278,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "No se cumple una condición necesaria. Revise los elementos siguientes antes de continuar.", "BigLinux has been installed on your computer.": "BigLinux se ha instalado en su equipo.", "BigLinux logo surrounded by slowly moving rings": "Logotipo de BigLinux rodeado de anillos en movimiento lento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Revise las opciones a continuación. Los discos no se modificarán hasta que confirme la instalación.", "Choose the language": "Elija el idioma", "Computer name": "Nombre del equipo", "Create your account and choose the name used by this computer on the network.": "Cree su cuenta y elija el nombre que este equipo usará en la red.", @@ -330,7 +323,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Nõutav tingimus pole täidetud. Vaata allolevad punktid üle, enne kui jätkad.", "BigLinux has been installed on your computer.": "BigLinux on sinu arvutisse paigaldatud.", "BigLinux logo surrounded by slowly moving rings": "BigLinuxi logo aeglaselt liikuvate rõngaste ümbritsetuna", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Vaata allolevad valikud üle. Kettaid ei muudeta enne, kui kinnitad paigalduse.", "Choose the language": "Vali keel", "Computer name": "Arvuti nimi", "Create your account and choose the name used by this computer on the network.": "Loo oma konto ja vali nimi, mille all see arvuti võrgus nähtav on.", @@ -376,7 +368,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Vaadittu ehto ei täyty. Käy alla olevat kohdat läpi ennen jatkamista.", "BigLinux has been installed on your computer.": "BigLinux on asennettu tietokoneellesi.", "BigLinux logo surrounded by slowly moving rings": "BigLinuxin logo hitaasti liikkuvien renkaiden ympäröimänä", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Käy alla olevat valinnat läpi. Levyjä ei muuteta ennen kuin vahvistat asennuksen.", "Choose the language": "Valitse kieli", "Computer name": "Tietokoneen nimi", "Create your account and choose the name used by this computer on the network.": "Luo tilisi ja valitse nimi, jolla tämä tietokone näkyy verkossa.", @@ -422,7 +413,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Une condition requise n'est pas remplie. Vérifiez les éléments ci-dessous avant de continuer.", "BigLinux has been installed on your computer.": "BigLinux a été installé sur votre ordinateur.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux entouré d'anneaux en mouvement lent", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Vérifiez les choix ci-dessous. Les disques ne seront pas modifiés tant que vous n'aurez pas confirmé l'installation.", "Choose the language": "Choisissez la langue", "Computer name": "Nom de l'ordinateur", "Create your account and choose the name used by this computer on the network.": "Créez votre compte et choisissez le nom utilisé par cet ordinateur sur le réseau.", @@ -468,7 +458,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "תנאי נדרש אינו מתקיים. בדוק את הפריטים שלהלן לפני שתמשיך.", "BigLinux has been installed on your computer.": "BigLinux הותקן במחשב שלך.", "BigLinux logo surrounded by slowly moving rings": "הלוגו של BigLinux מוקף בטבעות שנעות לאט", - "Check the choices below. The disks will not be changed until you confirm the installation.": "בדוק את הבחירות שלהלן. הדיסקים לא ישונו עד שתאשר את ההתקנה.", "Choose the language": "בחר את השפה", "Computer name": "שם המחשב", "Create your account and choose the name used by this computer on the network.": "צור את החשבון שלך ובחר את השם שבו ישתמש המחשב הזה ברשת.", @@ -514,7 +503,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Potreban uvjet nije ispunjen. Pregledajte stavke u nastavku prije nego što nastavite.", "BigLinux has been installed on your computer.": "BigLinux je instaliran na vaše računalo.", "BigLinux logo surrounded by slowly moving rings": "Logotip BigLinux okružen prstenovima koji se polako kreću", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Pregledajte odabire u nastavku. Diskovi se neće mijenjati dok ne potvrdite instalaciju.", "Choose the language": "Odaberite jezik", "Computer name": "Naziv računala", "Create your account and choose the name used by this computer on the network.": "Stvorite račun i odaberite naziv pod kojim će ovo računalo biti vidljivo na mreži.", @@ -560,7 +548,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Egy szükséges feltétel nem teljesül. Tekintse át az alábbi tételeket a folytatás előtt.", "BigLinux has been installed on your computer.": "A BigLinux telepítve lett a számítógépére.", "BigLinux logo surrounded by slowly moving rings": "A BigLinux logója lassan mozgó gyűrűkkel körülvéve", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Tekintse át az alábbi választásokat. A lemezek addig nem változnak, amíg meg nem erősíti a telepítést.", "Choose the language": "Válassza ki a nyelvet", "Computer name": "Számítógép neve", "Create your account and choose the name used by this computer on the network.": "Hozza létre a fiókját, és válassza ki a nevet, amelyet ez a számítógép a hálózaton használ.", @@ -606,7 +593,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Nauðsynlegt skilyrði er ekki uppfyllt. Farðu yfir atriðin hér að neðan áður en þú heldur áfram.", "BigLinux has been installed on your computer.": "BigLinux hefur verið sett upp á tölvunni þinni.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-merki umkringt hringjum á hægri hreyfingu", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Farðu yfir valkostina hér að neðan. Diskunum verður ekki breytt fyrr en þú staðfestir uppsetninguna.", "Choose the language": "Veldu tungumálið", "Computer name": "Heiti tölvunnar", "Create your account and choose the name used by this computer on the network.": "Búðu til reikninginn þinn og veldu heitið sem þessi tölva notar á netinu.", @@ -652,7 +638,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Una condizione necessaria non è soddisfatta. Controlla gli elementi qui sotto prima di continuare.", "BigLinux has been installed on your computer.": "BigLinux è stato installato sul tuo computer.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux circondato da anelli in lento movimento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Controlla le scelte qui sotto. I dischi non verranno modificati finché non confermi l'installazione.", "Choose the language": "Scegli la lingua", "Computer name": "Nome del computer", "Create your account and choose the name used by this computer on the network.": "Crea il tuo account e scegli il nome usato da questo computer sulla rete.", @@ -698,7 +683,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "必要な条件が満たされていません。続行する前に以下の項目を確認してください。", "BigLinux has been installed on your computer.": "BigLinux がコンピューターにインストールされました。", "BigLinux logo surrounded by slowly moving rings": "ゆっくり動くリングに囲まれた BigLinux のロゴ", - "Check the choices below. The disks will not be changed until you confirm the installation.": "以下の選択内容を確認してください。インストールを確定するまでディスクは変更されません。", "Choose the language": "言語を選択", "Computer name": "コンピューター名", "Create your account and choose the name used by this computer on the network.": "アカウントを作成し、このコンピューターがネットワークで使う名前を選んでください。", @@ -744,7 +728,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "필요한 조건이 충족되지 않았습니다. 계속하기 전에 아래 항목을 확인하십시오.", "BigLinux has been installed on your computer.": "BigLinux가 컴퓨터에 설치되었습니다.", "BigLinux logo surrounded by slowly moving rings": "천천히 움직이는 고리로 둘러싸인 BigLinux 로고", - "Check the choices below. The disks will not be changed until you confirm the installation.": "아래 선택 사항을 확인하십시오. 설치를 확인하기 전까지 디스크는 변경되지 않습니다.", "Choose the language": "언어 선택", "Computer name": "컴퓨터 이름", "Create your account and choose the name used by this computer on the network.": "계정을 만들고 이 컴퓨터가 네트워크에서 사용할 이름을 선택하십시오.", @@ -790,7 +773,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Aan een vereiste voorwaarde is niet voldaan. Controleer de punten hieronder voordat u doorgaat.", "BigLinux has been installed on your computer.": "BigLinux is op uw computer geïnstalleerd.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omringd door langzaam bewegende ringen", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Controleer de keuzes hieronder. De schijven worden pas gewijzigd als u de installatie bevestigt.", "Choose the language": "Kies de taal", "Computer name": "Computernaam", "Create your account and choose the name used by this computer on the network.": "Maak uw account aan en kies de naam die deze computer op het netwerk gebruikt.", @@ -836,7 +818,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Et nødvendig vilkår er ikke oppfylt. Se gjennom punktene nedenfor før du fortsetter.", "BigLinux has been installed on your computer.": "BigLinux er installert på datamaskinen din.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logo omgitt av sakte bevegende ringer", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Se gjennom valgene nedenfor. Diskene endres ikke før du bekrefter installasjonen.", "Choose the language": "Velg språket", "Computer name": "Datamaskinnavn", "Create your account and choose the name used by this computer on the network.": "Opprett kontoen din og velg navnet denne datamaskinen bruker på nettverket.", @@ -882,7 +863,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Wymagany warunek nie jest spełniony. Przejrzyj poniższe pozycje przed kontynuowaniem.", "BigLinux has been installed on your computer.": "BigLinux został zainstalowany na Twoim komputerze.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux otoczone wolno poruszającymi się pierścieniami", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Przejrzyj poniższe wybory. Dyski nie zostaną zmienione, dopóki nie potwierdzisz instalacji.", "Choose the language": "Wybierz język", "Computer name": "Nazwa komputera", "Create your account and choose the name used by this computer on the network.": "Utwórz konto i wybierz nazwę, pod którą ten komputer będzie widoczny w sieci.", @@ -928,7 +908,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Uma condição obrigatória não foi atendida. Revise os itens abaixo antes de continuar.", "BigLinux has been installed on your computer.": "O BigLinux foi instalado no seu computador.", "BigLinux logo surrounded by slowly moving rings": "Logo do BigLinux cercado por anéis em movimento lento", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Confira as escolhas abaixo. Os discos não serão alterados até você confirmar a instalação.", "Choose the language": "Escolha o idioma", "Computer name": "Nome do computador", "Create your account and choose the name used by this computer on the network.": "Crie sua conta e escolha o nome usado por este computador na rede.", @@ -974,7 +953,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "O condiție necesară nu este îndeplinită. Verificați elementele de mai jos înainte de a continua.", "BigLinux has been installed on your computer.": "BigLinux a fost instalat pe computerul dumneavoastră.", "BigLinux logo surrounded by slowly moving rings": "Sigla BigLinux înconjurată de inele în mișcare lentă", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Verificați opțiunile de mai jos. Discurile nu vor fi modificate până când nu confirmați instalarea.", "Choose the language": "Alegeți limba", "Computer name": "Numele computerului", "Create your account and choose the name used by this computer on the network.": "Creați-vă contul și alegeți numele folosit de acest computer în rețea.", @@ -1020,7 +998,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необходимое условие не выполнено. Проверьте пункты ниже, прежде чем продолжить.", "BigLinux has been installed on your computer.": "BigLinux установлен на ваш компьютер.", "BigLinux logo surrounded by slowly moving rings": "Логотип BigLinux в окружении медленно движущихся колец", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Проверьте выбранные параметры ниже. Диски не будут изменены, пока вы не подтвердите установку.", "Choose the language": "Выберите язык", "Computer name": "Имя компьютера", "Create your account and choose the name used by this computer on the network.": "Создайте учётную запись и выберите имя, под которым этот компьютер будет виден в сети.", @@ -1066,7 +1043,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Požadovaná podmienka nie je splnená. Pred pokračovaním skontrolujte položky nižšie.", "BigLinux has been installed on your computer.": "BigLinux bol nainštalovaný do vášho počítača.", "BigLinux logo surrounded by slowly moving rings": "Logo BigLinux obklopené pomaly sa pohybujúcimi prstencami", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Skontrolujte voľby nižšie. Disky sa nezmenia, kým inštaláciu nepotvrdíte.", "Choose the language": "Vyberte jazyk", "Computer name": "Názov počítača", "Create your account and choose the name used by this computer on the network.": "Vytvorte si účet a zvoľte názov, pod ktorým bude tento počítač vystupovať v sieti.", @@ -1112,7 +1088,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Ett nödvändigt villkor är inte uppfyllt. Gå igenom punkterna nedan innan du fortsätter.", "BigLinux has been installed on your computer.": "BigLinux har installerats på din dator.", "BigLinux logo surrounded by slowly moving rings": "BigLinux-logotyp omgiven av långsamt roterande ringar", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Gå igenom valen nedan. Diskarna ändras inte förrän du bekräftar installationen.", "Choose the language": "Välj språket", "Computer name": "Datornamn", "Create your account and choose the name used by this computer on the network.": "Skapa ditt konto och välj namnet som den här datorn använder i nätverket.", @@ -1158,7 +1133,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Gerekli bir koşul sağlanmıyor. Devam etmeden önce aşağıdaki maddeleri gözden geçirin.", "BigLinux has been installed on your computer.": "BigLinux bilgisayarınıza kuruldu.", "BigLinux logo surrounded by slowly moving rings": "Yavaşça hareket eden halkalarla çevrili BigLinux logosu", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Aşağıdaki seçimleri gözden geçirin. Kurulumu onaylayana kadar diskler değiştirilmeyecek.", "Choose the language": "Dili seçin", "Computer name": "Bilgisayar adı", "Create your account and choose the name used by this computer on the network.": "Hesabınızı oluşturun ve bu bilgisayarın ağda kullanacağı adı seçin.", @@ -1204,7 +1178,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "Необхідну умову не виконано. Перегляньте пункти нижче, перш ніж продовжити.", "BigLinux has been installed on your computer.": "BigLinux встановлено на ваш комп'ютер.", "BigLinux logo surrounded by slowly moving rings": "Логотип BigLinux в оточенні повільно рухомих кілець", - "Check the choices below. The disks will not be changed until you confirm the installation.": "Перегляньте вибрані параметри нижче. Диски не буде змінено, доки ви не підтвердите встановлення.", "Choose the language": "Виберіть мову", "Computer name": "Ім'я комп'ютера", "Create your account and choose the name used by this computer on the network.": "Створіть обліковий запис і виберіть ім'я, під яким цей комп'ютер буде видно в мережі.", @@ -1250,7 +1223,6 @@ var byLanguage = { "A required condition is not satisfied. Review the items below before continuing.": "有一项必要条件未满足。继续之前请检查下面的项目。", "BigLinux has been installed on your computer.": "BigLinux 已安装到您的计算机上。", "BigLinux logo surrounded by slowly moving rings": "被缓慢转动的圆环环绕的 BigLinux 徽标", - "Check the choices below. The disks will not be changed until you confirm the installation.": "请检查下面的选择。在您确认安装之前，磁盘不会被更改。", "Choose the language": "选择语言", "Computer name": "计算机名称", "Create your account and choose the name used by this computer on the network.": "创建您的账户，并选择这台计算机在网络上使用的名称。", diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/stylesheet.qss b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/stylesheet.qss index ff53a1c..ec5604e 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/stylesheet.qss +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/stylesheet.qss @@ -100,3 +100,44 @@ EncryptWidget QLineEdit { EncryptWidget QLineEdit:focus { border: 1px solid palette(highlight); } + +/* Calamares builds its confirmations - cancelling the install, closing during + * it - as plain QMessageBox instances with no object name of its own, so this + * is the only handle on them. They came up cramped and with small buttons + * beside the roomy QML pages, which is what made them look out of place. + * CalamaresWindow applies this stylesheet to itself, and the dialogs are its + * children, so these rules reach them. */ +QMessageBox { + background-color: palette(window); +} + +QMessageBox QLabel { + color: palette(window-text); + background-color: transparent; + font-size: 14px; +} + +/* Qt gives its own children these names; the text one carries the message. */ +QMessageBox QLabel#qt_msgbox_label { + /* Wide enough for the longest of these messages to keep the two + * lines its own text is written as, instead of wrapping again. */ + min-width: 460px; + padding: 22px 26px 18px 14px; +} + +QMessageBox QLabel#qt_msgboxex_icon_label { + padding: 20px 4px 10px 20px; +} + +QMessageBox QPushButton { + /* Calamares puts a tick and a cross on these buttons, which repeat what + * the labels already say and are the only icon-theme artwork in the + * dialog, so they were the least consistent part of it. + * + * Nothing else is set here on purpose. Giving these buttons a size or a + * padding makes the widget style draw its default-button frame around the + * box while the button paints inside it, which showed up as a second + * rectangle around the default button. Leaving the geometry alone keeps + * them identical to every other button the style draws. */ + icon-size: 0px; +} diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/summaryq.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/summaryq.qml index ebdf5d4..d4bde80 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/summaryq.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/summaryq.qml @@ -16,11 +16,21 @@ Page { readonly property string localeKey: Qt.locale().name + "|" + qsTr("__biglinux_language_marker__") function tr(source) { return I18n.translate(source, localeKey) } - function summaryIcon(index) { - if (index === 0) return "icons/location-content.svg" - if (index === 1) return "icons/keyboard-content.svg" - if (index === 2) return "icons/partition-content.svg" - return "icons/summary-content.svg" + // One badge per step of the summary, in that step's own colour. The order + // is the show sequence of settings.conf, which is what fills the model. + function badgeIcon(index) { + if (index === 0) return "visuals/badge-location.svg" + if (index === 1) return "visuals/badge-keyboard.svg" + if (index === 2) return "visuals/badge-partition.svg" + if (index === 3) return "visuals/badge-users.svg" + return "visuals/badge-summary.svg" + } + + function badgeTint(index) { + if (index === 1) return Qt.rgba(0.55, 0.36, 0.96, 0.16) + if (index === 2) return Qt.rgba(0.13, 0.63, 0.42, 0.16) + if (index === 3) return Qt.rgba(0.91, 0.51, 0.23, 0.16) + return Qt.rgba(0.13, 0.52, 0.82, 0.16) } function escapeHtml(value) { @@ -65,46 +75,158 @@ Page { return String(message) } + + // Pulled from the installer's translation of the confirmation dialog it + // replaces; see the frame that uses it below. + readonly property string undoWarning: { + const source = "The %1 installer is about to make changes to your disk " + + "in order to install %2.
You will not be able to " + + "undo these changes." + const translated = qsTranslate( + "Calamares::ViewManager", + source, + "%1 is short product name, %2 is short product name with version") + // qsTranslate hands back the source when a language has no + // translation for it, which is exactly what the dialog itself showed + // in that case, so the warning is never dropped for want of one. + const bold = /(.*?)<\/strong>/.exec(translated) + return bold ? bold[1] : translated + } + padding: 24 background: Rectangle { color: root.palette.window } + // Every colour below is the accent at a low alpha over whatever the page + // background is, so one set of values reads on the light and on the dark + // palette; a solid panel would have to be maintained twice. + readonly property color infoTint: Qt.rgba(0.13, 0.52, 0.82, 0.12) + readonly property color infoLine: Qt.rgba(0.13, 0.52, 0.82, 0.38) + readonly property color infoMark: "#2185D0" + readonly property color warnTint: Qt.rgba(0.91, 0.51, 0.13, 0.13) + readonly property color warnLine: Qt.rgba(0.91, 0.51, 0.13, 0.42) + readonly property color warnMark: "#E8833A" + ColumnLayout { anchors.fill: parent - spacing: 12 + spacing: 10 + // Only the title. The sentence that used to sit under it repeated + // what the panel below already says, and every line the heading takes + // is a line the choices lose - they were losing enough of them to + // need a scroll bar. PageHeader { Layout.fillWidth: true title: root.tr("Review") - description: root.tr("Check the choices below. The disks will not be changed until you confirm the installation.") } - NativeFrame { + // Side by side: what is still safe, and what will not be undone. They + // used to be stacked, which pushed the choices themselves off screen. + RowLayout { Layout.fillWidth: true + spacing: 12 - RowLayout { - anchors.fill: parent - spacing: 12 + // Both panels take the taller one's height, so they line up. + // Layout.fillHeight would do it, except that in a row inside a + // column it also makes the row itself claim the space the list + // below needs, and the list ends up with none. + readonly property real panelHeight: + Math.max(safePanel.implicitHeight, undoPanel.implicitHeight) - Image { - Layout.preferredWidth: 42 - Layout.preferredHeight: 42 - source: "visuals/review-shield.svg" - fillMode: Image.PreserveAspectFit - } + TintedFrame { + id: safePanel + Layout.fillWidth: true + Layout.preferredHeight: parent.panelHeight + tint: root.infoTint + line: root.infoLine - ColumnLayout { - Layout.fillWidth: true - spacing: 2 - Label { + RowLayout { + anchors.fill: parent + spacing: 12 + + Rectangle { + Layout.preferredWidth: 34 + Layout.preferredHeight: 34 + Layout.alignment: Qt.AlignTop + radius: 17 + color: Qt.rgba(0.13, 0.52, 0.82, 0.22) + + Image { + anchors.centerIn: parent + width: 20 + height: 20 + source: "visuals/review-shield.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } + } + + ColumnLayout { Layout.fillWidth: true - text: root.tr("Nothing will be changed until you review and confirm.") - font.weight: Font.DemiBold - wrapMode: Text.WordWrap + spacing: 2 + + Label { + Layout.fillWidth: true + text: root.tr("Nothing will be changed until you review and confirm.") + font.weight: Font.DemiBold + wrapMode: Text.WordWrap + } + Label { + Layout.fillWidth: true + text: root.tr("You can still go back and adjust any choice before starting the installation.") + color: root.palette.placeholderText + wrapMode: Text.WordWrap + } + } + } + } + + // The warning that used to sit in the "Continue with Installation?" + // dialog. That dialog said what this page already says, so it is + // switched off in settings.conf and the one sentence worth keeping + // moved here, above the list that scrolls: below it, the warning + // could be scrolled out of sight. + // + // The sentence is borrowed from the installer's own catalogue + // rather than translated again: it is the bold half of the + // dialog's question, so the translation already exists in every + // language Calamares ships. + TintedFrame { + id: undoPanel + Layout.fillWidth: true + Layout.preferredHeight: parent.panelHeight + tint: root.warnTint + line: root.warnLine + + RowLayout { + anchors.fill: parent + spacing: 12 + + Rectangle { + Layout.preferredWidth: 34 + Layout.preferredHeight: 34 + Layout.alignment: Qt.AlignTop + radius: 17 + color: Qt.rgba(0.91, 0.51, 0.13, 0.22) + + Image { + anchors.centerIn: parent + width: 20 + height: 20 + source: "visuals/status-alert.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } } + Label { Layout.fillWidth: true - text: root.tr("You can still go back and adjust any choice before starting the installation.") - color: root.palette.placeholderText + Layout.alignment: Qt.AlignVCenter + text: root.undoWarning + font.weight: Font.DemiBold wrapMode: Text.WordWrap } } @@ -128,28 +250,41 @@ Page { boundsBehavior: Flickable.StopAtBounds ScrollBar.vertical: ScrollBar { policy: ScrollBar.AsNeeded } - delegate: NativeFrame { + delegate: TintedFrame { required property int index required property string title required property string message + width: ListView.view.width + padding: 12 RowLayout { anchors.fill: parent - spacing: 12 + spacing: 14 - Image { - Layout.preferredWidth: 38 - Layout.preferredHeight: 38 + Rectangle { + Layout.preferredWidth: 40 + Layout.preferredHeight: 40 Layout.alignment: Qt.AlignTop - source: root.summaryIcon(index) - fillMode: Image.PreserveAspectFit - smooth: true + radius: 20 + color: root.badgeTint(index) + + Image { + anchors.centerIn: parent + width: 22 + height: 22 + source: root.badgeIcon(index) + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true + } } ColumnLayout { Layout.fillWidth: true spacing: 4 + Label { Layout.fillWidth: true text: title diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/usersq.qml b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/usersq.qml index b27bf8e..041ab56 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/usersq.qml +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/usersq.qml @@ -19,12 +19,6 @@ Page { function tr(source) { return I18n.translate(source, localeKey) } - function initials(name) { - var parts = String(name).trim().split(/\s+/) - if (!parts.length || parts[0] === "") return "?" - if (parts.length === 1) return parts[0].charAt(0).toUpperCase() - return (parts[0].charAt(0) + parts[parts.length - 1].charAt(0)).toUpperCase() - } padding: 20 background: Rectangle { color: root.palette.window } @@ -301,12 +295,20 @@ Page { radius: 46 color: root.palette.highlight - Label { + // The avatar stays the symbolic user glyph whatever + // the name is. It used to be the initials, falling + // back to a question mark while the field was empty, + // and that question mark read as an error rather than + // as a field still to fill. + Image { anchors.centerIn: parent - text: root.initials(config.fullName) - color: root.palette.highlightedText - font.pixelSize: 30 - font.weight: Font.DemiBold + width: 46 + height: width + source: "icons/users.svg" + sourceSize.width: width + sourceSize.height: height + fillMode: Image.PreserveAspectFit + smooth: true } } diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-keyboard.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-keyboard.svg new file mode 100644 index 0000000..3b4c40b --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-keyboard.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-location.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-location.svg new file mode 100644 index 0000000..5053ee5 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-location.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-partition.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-partition.svg new file mode 100644 index 0000000..4113391 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-partition.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-summary.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-summary.svg new file mode 100644 index 0000000..5bb20c7 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-summary.svg @@ -0,0 +1 @@ + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-users.svg b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-users.svg new file mode 100644 index 0000000..971d594 --- /dev/null +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/branding/biglinux/visuals/badge-users.svg @@ -0,0 +1,4 @@ + + + + diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/settings.conf b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/settings.conf index 6035592..296f543 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/settings.conf +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/biglinux/settings.conf @@ -50,7 +50,9 @@ sequence: - finishedq branding: biglinux -prompt-install: true +# The summary page carries the warning this prompt used to show, so the +# extra dialog only repeated what was already on screen. +prompt-install: false dont-chroot: false oem-setup: false disable-cancel: false diff --git a/biglinux-livecd/usr/share/biglinux/calamares-profiles/xivastudio/branding/xivastudio/stylesheet.qss b/biglinux-livecd/usr/share/biglinux/calamares-profiles/xivastudio/branding/xivastudio/stylesheet.qss index e24ac05..ee4f340 100644 --- a/biglinux-livecd/usr/share/biglinux/calamares-profiles/xivastudio/branding/xivastudio/stylesheet.qss +++ b/biglinux-livecd/usr/share/biglinux/calamares-profiles/xivastudio/branding/xivastudio/stylesheet.qss @@ -44,3 +44,44 @@ EncryptWidget QLineEdit { EncryptWidget QLineEdit:focus { border: 1px solid palette(highlight); } + +/* Calamares builds its confirmations - cancelling the install, closing during + * it - as plain QMessageBox instances with no object name of its own, so this + * is the only handle on them. They came up cramped and with small buttons + * beside the roomy QML pages, which is what made them look out of place. + * CalamaresWindow applies this stylesheet to itself, and the dialogs are its + * children, so these rules reach them. */ +QMessageBox { + background-color: palette(window); +} + +QMessageBox QLabel { + color: palette(window-text); + background-color: transparent; + font-size: 14px; +} + +/* Qt gives its own children these names; the text one carries the message. */ +QMessageBox QLabel#qt_msgbox_label { + /* Wide enough for the longest of these messages to keep the two + * lines its own text is written as, instead of wrapping again. */ + min-width: 460px; + padding: 22px 26px 18px 14px; +} + +QMessageBox QLabel#qt_msgboxex_icon_label { + padding: 20px 4px 10px 20px; +} + +QMessageBox QPushButton { + /* Calamares puts a tick and a cross on these buttons, which repeat what + * the labels already say and are the only icon-theme artwork in the + * dialog, so they were the least consistent part of it. + * + * Nothing else is set here on purpose. Giving these buttons a size or a + * padding makes the widget style draw its default-button frame around the + * box while the button paints inside it, which showed up as a second + * rectangle around the default button. Leaving the geometry alone keeps + * them identical to every other button the style draws. */ + icon-size: 0px; +} diff --git a/tests/test_calamares_configuration.py b/tests/test_calamares_configuration.py index 36349a2..d4a173c 100644 --- a/tests/test_calamares_configuration.py +++ b/tests/test_calamares_configuration.py @@ -631,7 +631,9 @@ def test_branding_catalog_covers_every_string_and_language() -> None: ) } ) - assert len(used) >= 44 + # One fewer since the review page dropped the description under its + # title; the floor only guards against the regex matching nothing. + assert len(used) >= 43 # English is the source text; every other catalog the package ships needs # an entry for each of these.