diff --git a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h index 8e7c7b498..f75825cef 100644 --- a/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h +++ b/3rdparty/kdsingleapplicationguard/kdsingleapplicationguard.h @@ -41,7 +41,7 @@ public: explicit KDSingleApplicationGuard( Policy policy, QObject * parent=nullptr ); explicit KDSingleApplicationGuard( const QStringList & arguments, QObject * parent=nullptr ); explicit KDSingleApplicationGuard( const QStringList & arguments, Policy policy, QObject * parent=nullptr ); - ~KDSingleApplicationGuard(); + ~KDSingleApplicationGuard() override; bool isOperational() const; @@ -70,7 +70,7 @@ public Q_SLOTS: void killOtherInstances(); protected: - /*! \reimp */ bool event( QEvent * event ); + /*! \reimp */ bool event( QEvent * event ) override; private: #ifndef Q_WS_WIN diff --git a/3rdparty/waitingspinnerwidget.h b/3rdparty/waitingspinnerwidget.h index c8c6b9687..d171e9beb 100644 --- a/3rdparty/waitingspinnerwidget.h +++ b/3rdparty/waitingspinnerwidget.h @@ -85,7 +85,7 @@ private slots: void rotate(); protected: - void paintEvent(QPaintEvent *paintEvent); + void paintEvent(QPaintEvent *paintEvent) override; private: static int lineCountDistanceFromPrimary(int current, int primary, diff --git a/CHANGES b/CHANGES index 13dd3d779..ec6ad4b61 100644 --- a/CHANGES +++ b/CHANGES @@ -10,7 +10,7 @@ website will have to do for older versions. # 3.2.31 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Corentin Noël ## Core ## - No core changes yet diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts index 85a3f82e7..3c315c924 100644 --- a/lang/calamares_az.ts +++ b/lang/calamares_az.ts @@ -1955,7 +1955,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Select your preferred Region, or use the default one based on your current location. - + Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin. @@ -1967,17 +1967,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Select your preferred Zone within your Region. - + Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin. Zones - + Zonalar You can fine-tune Language and Locale settings below. - + Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz. @@ -3799,7 +3799,16 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + %3 üçün</strong><br/><br/> + Müəliff hüquqları 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt; + Müəliff hüquqları 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;8<br/> + <a href='https://calamares.io/team/'>Calamares komandasına</a> və + <a href='https://www.transifex.com/calamares/calamares/'>Calamares tərcümə komandasına</a> təşəkkürlər.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> tərtibatı <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software + tərəfindən dəstəklənir. @@ -3849,7 +3858,7 @@ Output: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin. @@ -3864,7 +3873,7 @@ Output: Keyboard Variant - + Klaviatura variantı @@ -3948,7 +3957,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin @@ -3968,12 +3977,12 @@ Output: Login Name - + Giriş Adı If more than one person will use this computer, you can create multiple accounts after installation. - + Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. @@ -3988,7 +3997,7 @@ Output: This name will be used if you make the computer visible to others on a network. - + Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. @@ -4008,27 +4017,27 @@ Output: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. Validate passwords quality - + Şifrənin keyfiyyətini yoxlamaq When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + Bu xana işarələnərsə şifrələrin etibatlılıq səviyyəsi yoxlanılacaq və siz zəif şifrədən istifadə edə bilməyəcəksiniz.. Log in automatically without asking for the password - + Şifrə soruşmadan sistemə daxil olmaq Reuse user password as root password - + İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək @@ -4038,22 +4047,22 @@ Output: Choose a root password to keep your account safe. - + Hesabınızı qorumaq üçün kök şifrəsini seçin. Root Password - + Kök Şifrəsi Repeat Root Password - + Kök Şifrəsini təkrar yazın Enter the same password twice, so that it can be checked for typing errors. - + Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts index 815ebc84b..1c0234ed5 100644 --- a/lang/calamares_az_AZ.ts +++ b/lang/calamares_az_AZ.ts @@ -6,7 +6,7 @@ The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. - Bu sistemin <strong>açılış mühiti</strong>.<br><br>Köhnə x86 sistemlər yalnız <strong>BIOS</strong> dəstəkləyir.<br>Müasir sistemlər isə adətən <strong>EFI</strong> istifadə edir, lakin açılış mühiti əgər uyğun rejimdə başladılmışsa, həmçinin BİOS istiafadə edə bilər. + Sistemin <strong>açılış mühiti</strong>.<br><br>Köhnə x86 sistemlər yalnız <strong>BIOS</strong> dəstəkləyir.<br>Müasir sistemlər isə adətən <strong>EFI</strong> istifadə edir, lakin açılış mühiti əgər uyğun rejimdə başladılmışsa, həmçinin BİOS istiafadə edə bilər. @@ -65,12 +65,12 @@ GlobalStorage - Ümumi yaddaş + ÜmumiYaddaş JobQueue - Tapşırıq sırası + TapşırıqSırası @@ -1955,7 +1955,7 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Select your preferred Region, or use the default one based on your current location. - + Üstünlük verdiyiniz bölgəni və ya cari mövqeyinizə əsaslanan standart bir bölgəni seçin. @@ -1967,17 +1967,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir. Select your preferred Zone within your Region. - + Bölgənizlə birlikdə üstünlük verdiyiniz zonanı seçin. Zones - + Zonalar You can fine-tune Language and Locale settings below. - + Dil və Yer ayarlarını aşağıda dəqiq tənzimləyə bilərsiniz. @@ -3799,7 +3799,16 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + %3 üçün</strong><br/><br/> + Müəliff hüquqları 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt; + Müəliff hüquqları 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;8<br/> + <a href='https://calamares.io/team/'>Calamares komandasına</a> və + <a href='https://www.transifex.com/calamares/calamares/'>Calamares tərcümə komandasına</a> təşəkkürlər.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> tərtibatı <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software + tərəfindən dəstəklənir. @@ -3849,7 +3858,7 @@ Output: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Yazı dili və variantını seçmək üçün üstünlük verdiyiniz klaviatura modelini seçin və ya avadanlıq tərəfindən aşkar edilən klaviaturaya əsaslanan standart birini seçin. @@ -3864,7 +3873,7 @@ Output: Keyboard Variant - + Klaviatura variantı @@ -3948,7 +3957,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + İnzibatçı tapşırıqlarını yerinə yetirmək və sistemə giriş üçün istifadəçi adını və istifadəçi hesabı məlumatlarını daxil edin @@ -3968,12 +3977,12 @@ Output: Login Name - + Giriş Adı If more than one person will use this computer, you can create multiple accounts after installation. - + Əgər bu komputeri bir neçə şəxs istifadə ediləcəksə o zaman quraşdırmadan sonra birdən çox hesab yarada bilərsiniz. @@ -3988,7 +3997,7 @@ Output: This name will be used if you make the computer visible to others on a network. - + Əgər gizlədilməzsə komputer şəbəkədə bu adla görünəcək. @@ -4008,27 +4017,27 @@ Output: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. Güclü şifrə üçün rəqəm, hərf və durğu işarələrinin qarışıöğından istifadə edin. Şifrə ən azı səkkiz simvoldan uzun olmalı və müntəzəm olaraq dəyişdirilməlidir. Validate passwords quality - + Şifrənin keyfiyyətini yoxlamaq When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + Bu xana işarələnərsə şifrələrin etibatlılıq səviyyəsi yoxlanılacaq və siz zəif şifrədən istifadə edə bilməyəcəksiniz.. Log in automatically without asking for the password - + Şifrə soruşmadan sistemə daxil olmaq Reuse user password as root password - + İstifadəçi şifrəsini kök şifrəsi kimi istifadə etmək @@ -4038,22 +4047,22 @@ Output: Choose a root password to keep your account safe. - + Hesabınızı qorumaq üçün kök şifrəsini seçin. Root Password - + Kök Şifrəsi Repeat Root Password - + Kök Şifrəsini təkrar yazın Enter the same password twice, so that it can be checked for typing errors. - + Düzgün yazılmasını yoxlamaq üçün eyni şifrəni iki dəfə daxil edin. diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts index 333d8e4f8..051279b28 100644 --- a/lang/calamares_ca.ts +++ b/lang/calamares_ca.ts @@ -2320,7 +2320,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé What name do you want to use to log in? - Quin nom voleu usar per iniciar la sessió d'usuari? + Quin nom voleu usar per iniciar la sessió? @@ -2345,13 +2345,13 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé Choose a password to keep your account safe. - Trieu una contrasenya per tal de mantenir el compte d'usuari segur. + Trieu una contrasenya per tal de mantenir el compte segur. <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> - <small>Escriviu la mateixa contrasenya dues vegades, de manera que se'n puguin comprovar els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars de temps.</small> + <small>Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya contindrà una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars.</small> @@ -2394,7 +2394,7 @@ per desplaçar-s'hi i useu els botons +/- per fer ampliar-lo o reduir-lo, o bé <small>Enter the same password twice, so that it can be checked for typing errors.</small> - <small>Escriviu la mateixa contrasenya dues vegades, per tal de poder-ne comprovar els errors de mecanografia.</small> + <small>Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia.</small> @@ -3973,7 +3973,7 @@ La configuració pot continuar, però algunes característiques podrien estar in What name do you want to use to log in? - Quin nom voleu usar per iniciar la sessió d'usuari? + Quin nom voleu usar per iniciar la sessió? @@ -4003,7 +4003,7 @@ La configuració pot continuar, però algunes característiques podrien estar in Choose a password to keep your account safe. - Trieu una contrasenya per tal de mantenir el compte d'usuari segur. + Trieu una contrasenya per tal de mantenir el compte segur. @@ -4018,7 +4018,7 @@ La configuració pot continuar, però algunes característiques podrien estar in Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - Escriviu la mateixa contrasenya dues vegades, de manera que se'n puguin comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars de temps. + Escriviu la mateixa contrasenya dos cops per poder-ne comprovar els errors de mecanografia. Una bona contrasenya ha de contenir una barreja de lletres, números i signes de puntuació, hauria de tenir un mínim de 8 caràcters i s'hauria de modificar a intervals regulars. @@ -4028,7 +4028,7 @@ La configuració pot continuar, però algunes característiques podrien estar in When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu fer una de dèbil. + Quan aquesta casella està marcada, es comprova la fortalesa de la contrasenya i no en podreu usar una de dèbil. diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts index 8920f7c85..d689dcefb 100644 --- a/lang/calamares_da.ts +++ b/lang/calamares_da.ts @@ -722,12 +722,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. The system language will be set to %1. - Systemsproget vil blive sat til %1. + Systemets sprog indstilles til %1. The numbers and dates locale will be set to %1. - Lokalitet for tal og datoer vil blive sat til %1. + Lokalitet for tal og datoer indstilles til %1. @@ -1548,12 +1548,12 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Set keyboard model to %1.<br/> - Sæt tastaturmodel til %1.<br/> + Indstil tastaturmodel til %1.<br/> Set keyboard layout to %1/%2. - Sæt tastaturlayout til %1/%2. + Indstil tastaturlayout til %1/%2. @@ -1711,7 +1711,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Region: - Region: + Område: @@ -1955,7 +1955,7 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Select your preferred Region, or use the default one based on your current location. - + Vælg dit foretrukne område eller bruge den som er standard for din nuværende placering. @@ -1967,17 +1967,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt. Select your preferred Zone within your Region. - + Vælg din foretrukne zone i dit område. Zones - + Zoner You can fine-tune Language and Locale settings below. - + Du kan finjustere sprog- og lokalitetsindstillinger nedenfor. @@ -3215,7 +3215,7 @@ setting Set keyboard model to %1, layout to %2-%3 - Sæt tastaturmodel til %1, layout til %2-%3 + Indstil tastaturmodel til %1, layout til %2-%3 @@ -3371,7 +3371,7 @@ setting Set timezone to %1/%2 - Sæt tidszone til %1/%2 + Indstil tidszone til %1/%2 @@ -3680,7 +3680,7 @@ setting Select application and system language - Vælg program- og systemsprog + Vælg sprog for programmet og systemet @@ -3800,7 +3800,17 @@ setting development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Ophavsret 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Ophavsret 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Tak til <a href='https://calamares.io/team/'>Calamares-teamet</a> + og <a href='https://www.transifex.com/calamares/calamares/'>Calamares-oversætterteamet</a>.<br/><br/> + Udviklingen af <a href='https://calamares.io/'>Calamares</a> + er sponsoreret af <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. @@ -3850,7 +3860,7 @@ setting Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Klik på din foretrukne tastaturmodel for at vælge layout og variant, eller brug den som er standard i det registrerede hardware @@ -3865,7 +3875,7 @@ setting Keyboard Variant - + Tastaturvariant @@ -3949,7 +3959,7 @@ setting Pick your user name and credentials to login and perform admin tasks - + Vælg dit brugernavn og loginoplysninger som bruges til at logge ind med og udføre administrative opgaver. @@ -3969,12 +3979,12 @@ setting Login Name - + Loginnavn If more than one person will use this computer, you can create multiple accounts after installation. - + Hvis mere end én person bruger computeren, kan du oprette flere konti efter installationen. @@ -3989,7 +3999,7 @@ setting This name will be used if you make the computer visible to others on a network. - + Navnet bruges, hvis du gør computeren synlig for andre på et netværk. @@ -4009,27 +4019,27 @@ setting Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl. En god adgangskode indeholder en blanding af bogstaver, tal og specialtegn, og bør være mindst 8 tegn langt og bør skiftes jævnligt. Validate passwords quality - + Validér kvaliteten af adgangskoderne When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + Når boksen er tilvalgt, så foretages der tjek af adgangskodens styrke og du vil ikke være i stand til at bruge en svag adgangskode.. Log in automatically without asking for the password - + Log ind automatisk uden at spørge efter adgangskoden Reuse user password as root password - + Genbrug brugeradgangskode som root-adgangskode @@ -4039,22 +4049,22 @@ setting Choose a root password to keep your account safe. - + Vælg en root-adgangskode til at holde din konto sikker Root Password - + Root-adgangskode Repeat Root Password - + Gentag root-adgangskode Enter the same password twice, so that it can be checked for typing errors. - + Skriv den samme adgangskode to gange, så det kan blive tjekket for skrivefejl. diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 7e12a5c75..2546a5122 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -1977,7 +1977,7 @@ The installer will quit and all changes will be lost. You can fine-tune Language and Locale settings below. - + भाषा व स्थानिकी हेतु निम्नलिखित सेटिंग्स उपयोग करें। @@ -3798,7 +3798,18 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + के लिए %3</strong><br/><br/> + प्रतिलिप्याधिकार 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + प्रतिलिप्याधिकार 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + <a href='https://calamares.io/team/'>Calamares टीम</a> + व <a href='https://www.transifex.com/calamares/calamares/'>Calamares + अनुवादक टीम</a>को धन्यवाद।<br/><br/> + <a href='https://calamares.io/'>Calamares</a> + का विकास <br/> + <a href='http://www.blue-systems.com/'>ब्लू सिस्टम्स</a> - + लिब्रेटिंग सॉफ्टवेयर द्वारा प्रायोजित है। @@ -3848,7 +3859,7 @@ Output: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + इच्छित अभिन्यास व प्रकार हेतु कुंजीपटल मॉडल पर क्लिक चुनें या फिर हार्डवेयर आधारित डिफ़ॉल्ट मॉडल उपयोग करें। @@ -3947,7 +3958,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + लॉगिन एवं प्रशासक कार्यों हेतु उपयोक्ता नाम इत्यादि चुनें। @@ -3972,7 +3983,7 @@ Output: If more than one person will use this computer, you can create multiple accounts after installation. - + यदि एक से अधिक व्यक्ति इस कंप्यूटर का उपयोग करेंगे, तो आप इंस्टॉल के उपरांत एकाधिक अकाउंट बना सकते हैं। @@ -3987,7 +3998,7 @@ Output: This name will be used if you make the computer visible to others on a network. - + यदि आपका कंप्यूटर किसी नेटवर्क पर दृश्यमान होता है, तो यह नाम उपयोग किया जाएगा। @@ -4007,27 +4018,27 @@ Output: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + एक ही कूटशब्द दो बार दर्ज़ करें, ताकि उसे टाइप त्रुटि हेतु जाँचा जा सके। एक अच्छे कूटशब्द में अक्षर, अंक व विराम चिन्हों का मेल होता है, उसमें कम-से-कम आठ अक्षर होने चाहिए, और उसे नियमित अंतराल पर बदलते रहना चाहिए। Validate passwords quality - + कूटशब्द गुणवत्ता प्रमाणीकरण When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + यह बॉक्स टिक करने के परिणाम स्वरुप कूटशब्द-क्षमता की जाँच होगी व आप कमज़ोर कूटशब्द उपयोग नहीं कर पाएंगे.. Log in automatically without asking for the password - + कूटशब्द बिना पूछे ही स्वतः लॉग इन करें Reuse user password as root password - + रुट कूटशब्द हेतु भी उपयोक्ता कूटशब्द उपयोग करें @@ -4037,22 +4048,22 @@ Output: Choose a root password to keep your account safe. - + अकाउंट सुरक्षा हेतु रुट कूटशब्द चुनें। Root Password - + रुट कूटशब्द Repeat Root Password - + रुट कूटशब्द पुनः दर्ज करें Enter the same password twice, so that it can be checked for typing errors. - + समान कूटशब्द दो बार दर्ज करें, ताकि टाइपिंग त्रुटि हेतु जाँच की जा सकें। diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 39a2549d2..401e380f8 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -694,7 +694,7 @@ O instalador será fechado e todas as alterações serão perdidas. The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. - O comando é executado no ambiente do hospedeiro e precisa saber o caminho root, mas nenhum rootMountPoint foi definido. + O comando é executado no ambiente do hospedeiro e precisa saber o caminho raiz, mas nenhum rootMountPoint foi definido. @@ -1955,7 +1955,7 @@ O instalador será fechado e todas as alterações serão perdidas. Select your preferred Region, or use the default one based on your current location. - + Selecione sua Região preferida, ou use a padrão baseada no seu local atual. @@ -1967,17 +1967,17 @@ O instalador será fechado e todas as alterações serão perdidas. Select your preferred Zone within your Region. - + Selecione a sua Zona preferida dentro da sua Região. Zones - + Zonas You can fine-tune Language and Locale settings below. - + Você pode ajustar as configurações de Idioma e Localidade abaixo. @@ -2351,7 +2351,7 @@ O instalador será fechado e todas as alterações serão perdidas. <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> - <small>Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres e deve ser alterada em intervalos regulares.</small> + <small>Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares.</small> @@ -2368,7 +2368,7 @@ O instalador será fechado e todas as alterações serão perdidas. When this box is checked, password-strength checking is done and you will not be able to use a weak password. - Quando esta caixa estiver marcada, será feita a verificação do tamanho da senha e você não poderá usar uma senha fraca. + Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca. @@ -2394,7 +2394,7 @@ O instalador será fechado e todas as alterações serão perdidas. <small>Enter the same password twice, so that it can be checked for typing errors.</small> - <small>Digite a mesma senha duas vezes para que possa ser verificada contra erros de digitação.</small> + <small>Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação.</small> @@ -3798,7 +3798,18 @@ Saída: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + para %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Obrigado ao <a href='https://calamares.io/team/'>time Calamares</a> + e ao <a href='https://www.transifex.com/calamares/calamares/'>time de + tradutores do Calamares</a>.<br/><br/> + O desenvolvimento do <a href='https://calamares.io/'>Calamares</a> + é patrocinado pela <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. @@ -3848,7 +3859,7 @@ Saída: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Clique no seu modelo de teclado preferido para selecionar o layout e a variante, ou use o padrão baseado no hardware detectado. @@ -3863,7 +3874,7 @@ Saída: Keyboard Variant - + Variante do Teclado @@ -3947,7 +3958,7 @@ Saída: Pick your user name and credentials to login and perform admin tasks - + Escolha seu nome de usuário e credenciais para fazer login e executar tarefas de administrador @@ -3967,12 +3978,12 @@ Saída: Login Name - + Nome do Login If more than one person will use this computer, you can create multiple accounts after installation. - + Se mais de uma pessoa for usar este computador, você poderá criar múltiplas contas após a instalação. @@ -3987,7 +3998,7 @@ Saída: This name will be used if you make the computer visible to others on a network. - + Este nome será usado se você fizer o computador ficar visível para outros numa rede. @@ -4007,27 +4018,27 @@ Saída: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. Uma boa senha contém uma mistura de letras, números e sinais de pontuação, deve ter pelo menos oito caracteres, e deve ser alterada em intervalos regulares. Validate passwords quality - + Validar qualidade das senhas When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + Quando esta caixa estiver marcada, será feita a verificação da força da senha e você não poderá usar uma senha fraca. Log in automatically without asking for the password - + Entrar automaticamente sem perguntar pela senha Reuse user password as root password - + Reutilizar a senha de usuário como senha de root @@ -4037,22 +4048,22 @@ Saída: Choose a root password to keep your account safe. - + Escolha uma senha de root para manter sua conta segura. Root Password - + Senha de Root Repeat Root Password - + Repita a Senha de Root Enter the same password twice, so that it can be checked for typing errors. - + Digite a mesma senha duas vezes, de modo que possam ser verificados erros de digitação. diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts index 251eb26e0..c493e99eb 100644 --- a/lang/calamares_tg.ts +++ b/lang/calamares_tg.ts @@ -1956,7 +1956,7 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default one based on your current location. - + Минтақаи пазируфтаи худро интихоб намоед ё минтақаи стандартиро дар асоси ҷойгиршавии ҷории худ истифода баред. @@ -1968,17 +1968,17 @@ The installer will quit and all changes will be lost. Select your preferred Zone within your Region. - + Шаҳри пазируфтаи худро дар ҳудуди минтақаи худ интихоб намоед. Zones - + Шаҳрҳо You can fine-tune Language and Locale settings below. - + Шумо метавонед танзимоти забон ва маҳаллисозиро дар зер дуруст кунед. @@ -3799,7 +3799,17 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + барои %3</strong><br/><br/> + Ҳуқуқи муаллиф 2014-2017 Тео Марҷавак &lt;teo@kde.org&gt;<br/> + Ҳуқуқи муаллиф 2017-2020 Адриан де Грут &lt;groot@kde.org&gt;<br/> + Ташаккури зиёд ба <a href='https://calamares.io/team/'>дастаи Calamares</a> + ва <a href='https://www.transifex.com/calamares/calamares/'>гурӯҳи тарҷумонони Calamares</a> (тарҷумаи тоҷикӣ аз ҷониби Виктор Ибрагимов &lt;victor.ibragimov@gmail.com&gt;).<br/><br/> + Барномарезии насбкунандаи <a href='https://calamares.io/'>Calamares</a> + аз тарафи <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software дастгирӣ карда мешавад. @@ -3849,7 +3859,7 @@ Output: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + Намунаи клавиатураи пазируфтаи худро барои танзими тарҳбандӣ ва варианти он интихоб кунед ё клавиатураи муқаррареро дар асоси сахтафзори муайяншуда истифода баред. @@ -3864,7 +3874,7 @@ Output: Keyboard Variant - + Вариантҳои клавиатура @@ -3948,7 +3958,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + Барои ворид шудан ба низом ва иҷро кардани вазифаҳои маъмурӣ, номи корбар ва маълумоти корбариро муайян кунед. @@ -3968,12 +3978,12 @@ Output: Login Name - + Номи корбар If more than one person will use this computer, you can create multiple accounts after installation. - + Агар зиёда аз як корбар ин компютерро истифода барад, шумо метавонед баъд аз насбкунӣ якчанд ҳисобро эҷод намоед. @@ -3988,7 +3998,7 @@ Output: This name will be used if you make the computer visible to others on a network. - + Ин ном истифода мешавад, агар шумо компютери худро барои дигарон дар шабака намоён кунед. @@ -4008,27 +4018,27 @@ Output: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. Ниҳонвожаи хуб бояд дар омезиш калимаҳо, рақамҳо ва аломатҳои китобатиро дар бар гирад, ақаллан аз ҳашт аломат иборат шавад ва мунтазам иваз карда шавад. Validate passwords quality - + Санҷиши сифати ниҳонвожаҳо When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + Агар шумо ин имконро интихоб кунед, қувваи ниҳонвожа тафтиш карда мешавад ва шумо ниҳонвожаи заифро истифода карда наметавонед. Log in automatically without asking for the password - + Ба таври худкор бе дархости ниҳонвожа ворид карда шавад Reuse user password as root password - + Ниҳонвожаи корбар ҳам барои ниҳонвожаи root истифода карда шавад @@ -4038,22 +4048,22 @@ Output: Choose a root password to keep your account safe. - + Барои эмин нигоҳ доштани ҳисоби худ ниҳонвожаи root-ро интихоб намоед. Root Password - + Ниҳонвожаи root Repeat Root Password - + Ниҳонвожаи root-ро тасдиқ намоед Enter the same password twice, so that it can be checked for typing errors. - + Ниҳонвожаи ягонаро ду маротиба ворид намоед, то ки он барои хатоҳои имлоӣ тафтиш карда шавад. diff --git a/lang/calamares_zh_CN.ts b/lang/calamares_zh_CN.ts index 4a0b3a108..2f743efcd 100644 --- a/lang/calamares_zh_CN.ts +++ b/lang/calamares_zh_CN.ts @@ -716,7 +716,7 @@ The installer will quit and all changes will be lost. Set timezone to %1/%2. - + 将时区设置为 %1/%2 。 @@ -778,22 +778,22 @@ The installer will quit and all changes will be lost. <h1>Welcome to the Calamares setup program for %1</h1> - + <h1>欢迎使用 %1 的 Calamares 安装程序</h1> <h1>Welcome to %1 setup</h1> - + <h1>欢迎使用 %1 设置</h1> <h1>Welcome to the Calamares installer for %1</h1> - + <h1>欢迎使用 %1 的 Calamares 安装程序</h1> <h1>Welcome to the %1 installer</h1> - + <h1>欢迎使用 %1 安装程序</h1> @@ -803,7 +803,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as username. - + '%1' 不允许作为用户名。 @@ -828,7 +828,7 @@ The installer will quit and all changes will be lost. '%1' is not allowed as hostname. - + '%1' 不允许作为主机名。 @@ -1802,14 +1802,16 @@ The installer will quit and all changes will be lost. Timezone: %1 - + 时区: %1 Please select your preferred location on the map so the installer can suggest the locale and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. - + 请在地图上选择您的首选位置，安装程序可以为您提供可参考的区域 +设置和时区设置。 您可以在下面微调推荐的设置。 拖动以搜索地图，然后 +用 +/- 按钮进行放大/缩小，或使用鼠标滚动进行缩放。 @@ -1955,29 +1957,29 @@ The installer will quit and all changes will be lost. Select your preferred Region, or use the default one based on your current location. - + 请选择一个地区或者使用基于您当前位置的默认值。 Timezone: %1 - + 时区: %1 Select your preferred Zone within your Region. - + 在您的区域中选择您的首选区域。 Zones - + 区域 You can fine-tune Language and Locale settings below. - + 您可以在下面微调“语言”和“区域设置”。 @@ -2882,7 +2884,8 @@ Output: <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - + <p>此计算机不满足安装 %1 的某些推荐配置。<br/> + 安装可以继续，但是一些特性可能被禁用。</p> @@ -2993,13 +2996,15 @@ Output: <p>This computer does not satisfy the minimum requirements for installing %1.<br/> Installation cannot continue.</p> - + <p>此计算机不满足安装 %1 的最低配置。<br/> + 安装无法继续。</p> <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> Setup can continue, but some features might be disabled.</p> - + <p>此计算机不满足安装 %1 的某些推荐配置。<br/> + 安装可以继续，但是一些特性可能被禁用。</p> @@ -3467,28 +3472,28 @@ Output: KDE user feedback - + KDE 用户反馈 Configuring KDE user feedback. - + 配置 KDE 用户反馈。 Error in KDE user feedback configuration. - + KDE 用户反馈配置中存在错误。 Could not configure KDE user feedback correctly, script error %1. - + 无法正确 KDE 用户反馈，脚本错误代码 %1。 Could not configure KDE user feedback correctly, Calamares error %1. - + 无法正确 KDE 用户反馈，Calamares 错误代码 %1。 @@ -3550,17 +3555,17 @@ Output: By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. - + 选中此项时，安装器将发送关于安装过程和硬件的信息。该信息仅会在安装结束后发送<b>一次</b> 。 By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. - + 通过选择此选项，您将定期将有关您 <b>计算机</b>的安装，硬件和应用程序的信息发送到 %1。 By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. - + 通过选择此选项，您将定期将有关<b>用户</b> 安装，硬件，应用程序和应用程序使用方式的信息发送到 %1。 @@ -3797,7 +3802,18 @@ Output: development is sponsored by <br/> <a href='http://www.blue-systems.com/'>Blue Systems</a> - Liberating Software. - + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + 致谢 <a href='https://calamares.io/team/'> Calamares 开发团队</a> + 和<a href='https://www.transifex.com/calamares/calamares/'>Calamares + 翻译团队</a>.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> + 开发赞助来自<br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. @@ -3811,13 +3827,15 @@ Output: <h1>Languages</h1> </br> The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. - + <h1>语言</h1> </br> + 系统语言区域设置会影响部份命令行用户界面的语言及字符集。 当前设置是 <strong>%1</strong>. <h1>Locales</h1> </br> The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. - + <h1>区域</h1> </br> + 系统区域设置会影响数字和日期格式。 当前设置是 <strong>%1</strong>。 @@ -3845,7 +3863,7 @@ Output: Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware. - + 单击您的首选键盘型号以选择布局和变体，或根据检测到的硬件使用默认键盘。 @@ -3860,7 +3878,7 @@ Output: Keyboard Variant - + 键盘变体 @@ -3873,7 +3891,7 @@ Output: Change - + 更改 @@ -3945,7 +3963,7 @@ Output: Pick your user name and credentials to login and perform admin tasks - + 选择您的用户名和凭据登录并执行管理任务 @@ -3965,12 +3983,12 @@ Output: Login Name - + 登录名 If more than one person will use this computer, you can create multiple accounts after installation. - + 如果有多人要使用此计算机，您可以在安装后创建多个账户。 @@ -3985,7 +4003,7 @@ Output: This name will be used if you make the computer visible to others on a network. - + 将计算机设置为对其他网络上计算机可见时将使用此名称。 @@ -4005,27 +4023,27 @@ Output: Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. - + 输入相同密码两次，以检查输入错误。好的密码包含字母，数字，标点的组合，应当至少为 8 个字符长，并且应按一定周期更换。 Validate passwords quality - + 验证密码质量 When this box is checked, password-strength checking is done and you will not be able to use a weak password.. - + 若选中此项，密码强度检测会开启，你将不被允许使用弱密码.. Log in automatically without asking for the password - + 不询问密码自动登录 Reuse user password as root password - + 重用用户密码作为 root 密码 @@ -4035,22 +4053,22 @@ Output: Choose a root password to keep your account safe. - + 选择一个 root 密码来保证您的账户安全。 Root Password - + Root 密码 Repeat Root Password - + 重复 Root 密码 Enter the same password twice, so that it can be checked for typing errors. - + 输入相同密码两次，以检查输入错误。 diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po index e531eea04..935c14178 100644 --- a/lang/python/az/LC_MESSAGES/python.po +++ b/lang/python/az/LC_MESSAGES/python.po @@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "mkinitfs ilə initramfs yaradılır" #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po index 5b8ed5c5d..f0643f785 100644 --- a/lang/python/az_AZ/LC_MESSAGES/python.po +++ b/lang/python/az_AZ/LC_MESSAGES/python.po @@ -320,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "mkinitfs ilə initramfs yaradılır." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Hədəfdə dracut başladılmadı" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po index a1d4b1e0f..bed50471b 100644 --- a/lang/python/bg/LC_MESSAGES/python.po +++ b/lang/python/bg/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Georgi Georgiev , 2020 +# Georgi Georgiev, 2020 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-09-03 21:19+0200\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Georgi Georgiev , 2020\n" +"Last-Translator: Georgi Georgiev, 2020\n" "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po index 469f12604..92b1fcab9 100644 --- a/lang/python/da/LC_MESSAGES/python.po +++ b/lang/python/da/LC_MESSAGES/python.po @@ -319,11 +319,11 @@ msgstr "Indstiller hardwareur." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Opretter initramfs med mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Kunne ikke køre mkinitfs på målet" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" diff --git a/lang/python/id/LC_MESSAGES/python.po b/lang/python/id/LC_MESSAGES/python.po index 8f492f1a7..00fa1341d 100644 --- a/lang/python/id/LC_MESSAGES/python.po +++ b/lang/python/id/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # Choiril Abdul, 2018 -# Harry Suryapambagya , 2018 +# harsxv , 2018 # Wantoyèk , 2018 # #, fuzzy diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po index 5e5e74b5f..ca8d8d45a 100644 --- a/lang/python/tg/LC_MESSAGES/python.po +++ b/lang/python/tg/LC_MESSAGES/python.po @@ -321,11 +321,11 @@ msgstr "Танзимкунии соати сахтафзор." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "Эҷодкунии initramfs бо mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "mkinitfs дар низоми интихобшуда иҷро нашуд" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" diff --git a/lang/tz_tg.ts b/lang/tz_tg.ts index 07c3bc368..a5888fb94 100644 --- a/lang/tz_tg.ts +++ b/lang/tz_tg.ts @@ -1762,7 +1762,7 @@ New York tz_names - Штати Ню-Йорк + Ню-Йорк diff --git a/src/calamares/CalamaresApplication.h b/src/calamares/CalamaresApplication.h index e7dea4c61..5f0037971 100644 --- a/src/calamares/CalamaresApplication.h +++ b/src/calamares/CalamaresApplication.h @@ -30,7 +30,7 @@ class CalamaresApplication : public QApplication Q_OBJECT public: CalamaresApplication( int& argc, char* argv[] ); - virtual ~CalamaresApplication(); + ~CalamaresApplication() override; /** * @brief init handles the first part of Calamares application startup. diff --git a/src/calamares/CalamaresWindow.h b/src/calamares/CalamaresWindow.h index b6e63aa6b..009425aae 100644 --- a/src/calamares/CalamaresWindow.h +++ b/src/calamares/CalamaresWindow.h @@ -28,7 +28,7 @@ class CalamaresWindow : public QWidget Q_OBJECT public: CalamaresWindow( QWidget* parent = nullptr ); - virtual ~CalamaresWindow() override {} + ~CalamaresWindow() override {} public slots: /** diff --git a/src/calamares/VariantModel.cpp b/src/calamares/VariantModel.cpp index 8b0378f03..c29c27fcf 100644 --- a/src/calamares/VariantModel.cpp +++ b/src/calamares/VariantModel.cpp @@ -229,11 +229,11 @@ VariantModel::headerData( int section, Qt::Orientation orientation, int role ) c { if ( section == 0 ) { - return tr( "Key" ); + return tr( "Key", "Column header for key/value" ); } else if ( section == 1 ) { - return tr( "Value" ); + return tr( "Value", "Column header for key/value" ); } else { diff --git a/src/calamares/progresstree/ProgressTreeView.h b/src/calamares/progresstree/ProgressTreeView.h index 98bbe10b4..5c416dfd6 100644 --- a/src/calamares/progresstree/ProgressTreeView.h +++ b/src/calamares/progresstree/ProgressTreeView.h @@ -22,7 +22,7 @@ class ProgressTreeView : public QListView Q_OBJECT public: explicit ProgressTreeView( QWidget* parent = nullptr ); - virtual ~ProgressTreeView() override; + ~ProgressTreeView() override; /** * @brief setModel assigns a model to this view. diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp index c9d6f7195..e038b5a2f 100644 --- a/src/calamares/testmain.cpp +++ b/src/calamares/testmain.cpp @@ -140,7 +140,7 @@ public: , m_delay( t ) { } - virtual ~ExecViewJob() override; + ~ExecViewJob() override; QString prettyName() const override { return m_name; } diff --git a/src/libcalamares/CppJob.h b/src/libcalamares/CppJob.h index 7569debe9..f906a0dca 100644 --- a/src/libcalamares/CppJob.h +++ b/src/libcalamares/CppJob.h @@ -28,7 +28,7 @@ class DLLEXPORT CppJob : public Job Q_OBJECT public: explicit CppJob( QObject* parent = nullptr ); - virtual ~CppJob(); + ~CppJob() override; void setModuleInstanceKey( const Calamares::ModuleSystem::InstanceKey& instanceKey ); Calamares::ModuleSystem::InstanceKey moduleInstanceKey() const { return m_instanceKey; } diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h index ed349ab30..c7578272d 100644 --- a/src/libcalamares/Job.h +++ b/src/libcalamares/Job.h @@ -86,7 +86,7 @@ class DLLEXPORT Job : public QObject Q_OBJECT public: explicit Job( QObject* parent = nullptr ); - virtual ~Job(); + ~Job() override; /** @brief The job's (relative) weight. * diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 17ea6a141..2b17b64bd 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -53,7 +53,7 @@ public: { } - virtual ~JobThread() override; + ~JobThread() override; void finalize() { diff --git a/src/libcalamares/JobQueue.h b/src/libcalamares/JobQueue.h index 5c4c6c35f..92468d535 100644 --- a/src/libcalamares/JobQueue.h +++ b/src/libcalamares/JobQueue.h @@ -25,7 +25,7 @@ class DLLEXPORT JobQueue : public QObject Q_OBJECT public: explicit JobQueue( QObject* parent = nullptr ); - virtual ~JobQueue(); + ~JobQueue() override; static JobQueue* instance(); diff --git a/src/libcalamares/ProcessJob.h b/src/libcalamares/ProcessJob.h index 126eab1f9..ab47f30dd 100644 --- a/src/libcalamares/ProcessJob.h +++ b/src/libcalamares/ProcessJob.h @@ -27,7 +27,7 @@ public: bool runInChroot = false, std::chrono::seconds secondsTimeout = std::chrono::seconds( 30 ), QObject* parent = nullptr ); - virtual ~ProcessJob() override; + ~ProcessJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/libcalamares/PythonHelper.h b/src/libcalamares/PythonHelper.h index c439f4619..0a2127fb0 100644 --- a/src/libcalamares/PythonHelper.h +++ b/src/libcalamares/PythonHelper.h @@ -48,7 +48,7 @@ public: static Helper* instance(); private: - virtual ~Helper(); + ~Helper() override; explicit Helper(); boost::python::object m_mainModule; diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 1f4680017..cd066b8bd 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -160,8 +160,7 @@ struct PythonJob::Private bp::object m_prettyStatusMessage; }; -PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance, - const QString& scriptFile, +PythonJob::PythonJob( const QString& scriptFile, const QString& workingPath, const QVariantMap& moduleConfiguration, QObject* parent ) diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h index 5b5cfb7cc..04a0645ea 100644 --- a/src/libcalamares/PythonJob.h +++ b/src/libcalamares/PythonJob.h @@ -31,12 +31,11 @@ class PythonJob : public Job { Q_OBJECT public: - explicit PythonJob( const ModuleSystem::InstanceKey& instance, - const QString& scriptFile, + explicit PythonJob( const QString& scriptFile, const QString& workingPath, const QVariantMap& moduleConfiguration = QVariantMap(), QObject* parent = nullptr ); - virtual ~PythonJob() override; + ~PythonJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp index c7f1d6028..bde7ac0d3 100644 --- a/src/libcalamares/Tests.cpp +++ b/src/libcalamares/Tests.cpp @@ -24,7 +24,7 @@ class TestLibCalamares : public QObject Q_OBJECT public: TestLibCalamares() {} - virtual ~TestLibCalamares() {} + ~TestLibCalamares() override {} private Q_SLOTS: void testGSModify(); @@ -484,7 +484,7 @@ public: : Calamares::Job( parent ) { } - virtual ~DummyJob() override; + ~DummyJob() override; QString prettyName() const override; Calamares::JobResult exec() override; diff --git a/src/libcalamares/locale/LabelModel.h b/src/libcalamares/locale/LabelModel.h index 8648dc71c..7e6f2dacc 100644 --- a/src/libcalamares/locale/LabelModel.h +++ b/src/libcalamares/locale/LabelModel.h @@ -36,7 +36,7 @@ public: }; LabelModel( const QStringList& locales, QObject* parent = nullptr ); - virtual ~LabelModel() override; + ~LabelModel() override; int rowCount( const QModelIndex& parent ) const override; diff --git a/src/libcalamares/locale/TimeZone.h b/src/libcalamares/locale/TimeZone.h index 8c16517c7..e02612f5e 100644 --- a/src/libcalamares/locale/TimeZone.h +++ b/src/libcalamares/locale/TimeZone.h @@ -94,7 +94,7 @@ public: }; RegionsModel( QObject* parent = nullptr ); - virtual ~RegionsModel() override; + ~RegionsModel() override; int rowCount( const QModelIndex& parent ) const override; QVariant data( const QModelIndex& index, int role ) const override; @@ -126,7 +126,7 @@ public: }; ZonesModel( QObject* parent = nullptr ); - virtual ~ZonesModel() override; + ~ZonesModel() override; int rowCount( const QModelIndex& parent ) const override; QVariant data( const QModelIndex& index, int role ) const override; diff --git a/src/libcalamares/modulesystem/RequirementsChecker.h b/src/libcalamares/modulesystem/RequirementsChecker.h index 3577b5397..b933a29a8 100644 --- a/src/libcalamares/modulesystem/RequirementsChecker.h +++ b/src/libcalamares/modulesystem/RequirementsChecker.h @@ -34,7 +34,7 @@ class RequirementsChecker : public QObject public: RequirementsChecker( QVector< Module* > modules, RequirementsModel* model, QObject* parent = nullptr ); - virtual ~RequirementsChecker() override; + ~RequirementsChecker() override; public Q_SLOTS: /// @brief Start checking all the requirements diff --git a/src/libcalamares/modulesystem/Tests.cpp b/src/libcalamares/modulesystem/Tests.cpp index 78d3b5077..48da558e2 100644 --- a/src/libcalamares/modulesystem/Tests.cpp +++ b/src/libcalamares/modulesystem/Tests.cpp @@ -20,7 +20,7 @@ class ModuleSystemTests : public QObject Q_OBJECT public: ModuleSystemTests() {} - virtual ~ModuleSystemTests() {} + ~ModuleSystemTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h index b3a1e23e7..a038dceae 100644 --- a/src/libcalamares/network/Manager.h +++ b/src/libcalamares/network/Manager.h @@ -99,7 +99,7 @@ public: * to keep the reference. */ static Manager& instance(); - virtual ~Manager(); + ~Manager() override; /** @brief Checks if the given @p url returns data. * diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index 61aebc58d..afdd4ec34 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -126,7 +126,7 @@ public: * @param parent the QObject parent. */ explicit System( bool doChroot, QObject* parent = nullptr ); - virtual ~System(); + ~System() override; static System* instance(); diff --git a/src/libcalamares/utils/PluginFactory.h b/src/libcalamares/utils/PluginFactory.h index 891e3c1cd..a3371dd72 100644 --- a/src/libcalamares/utils/PluginFactory.h +++ b/src/libcalamares/utils/PluginFactory.h @@ -88,7 +88,7 @@ public: Q_PLUGIN_METADATA( IID CalamaresPluginFactory_iid ) \ public: \ explicit name(); \ - ~name(); \ + ~name() override; \ }; #define CALAMARES_PLUGIN_FACTORY_DEFINITION( name, pluginRegistrations ) \ K_PLUGIN_FACTORY_DEFINITION_WITH_BASEFACTORY( name, CalamaresPluginFactory, pluginRegistrations ) diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp index f00349c8f..54c5fa859 100644 --- a/src/libcalamares/utils/TestPaths.cpp +++ b/src/libcalamares/utils/TestPaths.cpp @@ -26,7 +26,7 @@ class TestPaths : public QObject Q_OBJECT public: TestPaths() {} - virtual ~TestPaths() {} + ~TestPaths() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/libcalamares/utils/Yaml.h b/src/libcalamares/utils/Yaml.h index 3922484ce..fa2121b75 100644 --- a/src/libcalamares/utils/Yaml.h +++ b/src/libcalamares/utils/Yaml.h @@ -38,6 +38,7 @@ class QFileInfo; #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant" #pragma clang diagnostic ignored "-Wshadow" #pragma clang diagnostic ignored "-Wfloat-equal" +#pragma clang diagnostic ignored "-Wsuggest-destructor-override" #endif #include diff --git a/src/libcalamaresui/ViewManager.h b/src/libcalamaresui/ViewManager.h index 947503eaa..165358b76 100644 --- a/src/libcalamaresui/ViewManager.h +++ b/src/libcalamaresui/ViewManager.h @@ -212,7 +212,7 @@ signals: private: explicit ViewManager( QObject* parent = nullptr ); - virtual ~ViewManager() override; + ~ViewManager() override; void insertViewStep( int before, ViewStep* step ); void updateButtonLabels(); diff --git a/src/libcalamaresui/modulesystem/CppJobModule.h b/src/libcalamaresui/modulesystem/CppJobModule.h index 288f674f4..b999fd0a3 100644 --- a/src/libcalamaresui/modulesystem/CppJobModule.h +++ b/src/libcalamaresui/modulesystem/CppJobModule.h @@ -34,7 +34,7 @@ protected: private: explicit CppJobModule(); - virtual ~CppJobModule() override; + ~CppJobModule() override; QPluginLoader* m_loader; job_ptr m_job; diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp index 8c0f21f58..d630e67f2 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.cpp +++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp @@ -124,7 +124,7 @@ ModuleManager::doInit() // At this point m_availableDescriptorsByModuleName is filled with // the modules that were found in the search paths. cDebug() << "Found" << m_availableDescriptorsByModuleName.count() << "modules"; - emit initDone(); + QTimer::singleShot( 10, this, &ModuleManager::initDone ); } @@ -281,11 +281,13 @@ ModuleManager::loadModules() if ( !failedModules.isEmpty() ) { ViewManager::instance()->onInitFailed( failedModules ); - emit modulesFailed( failedModules ); + QTimer::singleShot( 10, [=]() { + emit modulesFailed( failedModules ); + } ); } else { - emit modulesLoaded(); + QTimer::singleShot( 10, this, &ModuleManager::modulesLoaded ); } } diff --git a/src/libcalamaresui/modulesystem/ModuleManager.h b/src/libcalamaresui/modulesystem/ModuleManager.h index d2beedf2e..7f7ead05e 100644 --- a/src/libcalamaresui/modulesystem/ModuleManager.h +++ b/src/libcalamaresui/modulesystem/ModuleManager.h @@ -37,7 +37,7 @@ class ModuleManager : public QObject Q_OBJECT public: explicit ModuleManager( const QStringList& paths, QObject* parent = nullptr ); - virtual ~ModuleManager() override; + ~ModuleManager() override; static ModuleManager* instance(); diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h index 0e00f5545..645127d47 100644 --- a/src/libcalamaresui/modulesystem/ProcessJobModule.h +++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h @@ -33,7 +33,7 @@ protected: private: explicit ProcessJobModule(); - virtual ~ProcessJobModule() override; + ~ProcessJobModule() override; QString m_command; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.cpp b/src/libcalamaresui/modulesystem/PythonJobModule.cpp index 20f8215d2..42acc0c69 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.cpp +++ b/src/libcalamaresui/modulesystem/PythonJobModule.cpp @@ -40,7 +40,7 @@ PythonJobModule::loadSelf() return; } - m_job = Calamares::job_ptr( new PythonJob( instanceKey(), m_scriptFileName, m_workingPath, m_configurationMap ) ); + m_job = Calamares::job_ptr( new PythonJob( m_scriptFileName, m_workingPath, m_configurationMap ) ); m_loaded = true; } diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.h b/src/libcalamaresui/modulesystem/PythonJobModule.h index 37634d6be..4424cc7d4 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.h +++ b/src/libcalamaresui/modulesystem/PythonJobModule.h @@ -30,7 +30,7 @@ protected: private: explicit PythonJobModule(); - virtual ~PythonJobModule() override; + ~PythonJobModule() override; QString m_scriptFileName; QString m_workingPath; diff --git a/src/libcalamaresui/modulesystem/ViewModule.h b/src/libcalamaresui/modulesystem/ViewModule.h index 8e5eb44b4..217611b03 100644 --- a/src/libcalamaresui/modulesystem/ViewModule.h +++ b/src/libcalamaresui/modulesystem/ViewModule.h @@ -37,7 +37,7 @@ protected: private: explicit ViewModule(); - virtual ~ViewModule() override; + ~ViewModule() override; QPluginLoader* m_loader; ViewStep* m_viewStep = nullptr; diff --git a/src/libcalamaresui/utils/ImageRegistry.cpp b/src/libcalamaresui/utils/ImageRegistry.cpp index ffc65300e..57683dbd0 100644 --- a/src/libcalamaresui/utils/ImageRegistry.cpp +++ b/src/libcalamaresui/utils/ImageRegistry.cpp @@ -34,18 +34,16 @@ ImageRegistry::icon( const QString& image, CalamaresUtils::ImageMode mode ) qint64 -ImageRegistry::cacheKey( const QSize& size, qreal opacity, QColor tint ) +ImageRegistry::cacheKey( const QSize& size ) { - return size.width() * 100 + size.height() * 10 + static_cast< qint64 >( opacity * 100.0 ) + tint.value(); + return size.width() * 100 + size.height() * 10; } QPixmap ImageRegistry::pixmap( const QString& image, const QSize& size, - CalamaresUtils::ImageMode mode, - qreal opacity, - QColor tint ) + CalamaresUtils::ImageMode mode ) { Q_ASSERT( !( size.width() < 0 || size.height() < 0 ) ); if ( size.width() < 0 || size.height() < 0 ) @@ -64,7 +62,7 @@ ImageRegistry::pixmap( const QString& image, { subsubcache = subcache.value( mode ); - const qint64 ck = cacheKey( size, opacity, tint ); + const qint64 ck = cacheKey( size ); if ( subsubcache.contains( ck ) ) { return subsubcache.value( ck ); @@ -81,23 +79,9 @@ ImageRegistry::pixmap( const QString& image, p.fill( Qt::transparent ); QPainter pixPainter( &p ); - pixPainter.setOpacity( opacity ); svgRenderer.render( &pixPainter ); pixPainter.end(); - if ( tint.alpha() > 0 ) - { - QImage resultImage( p.size(), QImage::Format_ARGB32_Premultiplied ); - QPainter painter( &resultImage ); - painter.drawPixmap( 0, 0, p ); - painter.setCompositionMode( QPainter::CompositionMode_Screen ); - painter.fillRect( resultImage.rect(), tint ); - painter.end(); - - resultImage.setAlphaChannel( p.toImage().alphaChannel() ); - p = QPixmap::fromImage( resultImage ); - } - pixmap = p; } else @@ -128,7 +112,7 @@ ImageRegistry::pixmap( const QString& image, } } - putInCache( image, size, mode, opacity, pixmap, tint ); + putInCache( image, size, mode, pixmap ); } return pixmap; @@ -139,9 +123,7 @@ void ImageRegistry::putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, - qreal opacity, - const QPixmap& pixmap, - QColor tint ) + const QPixmap& pixmap ) { QHash< qint64, QPixmap > subsubcache; QHash< int, QHash< qint64, QPixmap > > subcache; @@ -155,7 +137,7 @@ ImageRegistry::putInCache( const QString& image, } } - subsubcache.insert( cacheKey( size, opacity, tint ), pixmap ); + subsubcache.insert( cacheKey( size ), pixmap ); subcache.insert( mode, subsubcache ); s_cache.insert( image, subcache ); } diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h index 80bc25ff6..4cf48968e 100644 --- a/src/libcalamaresui/utils/ImageRegistry.h +++ b/src/libcalamaresui/utils/ImageRegistry.h @@ -24,18 +24,14 @@ public: QIcon icon( const QString& image, CalamaresUtils::ImageMode mode = CalamaresUtils::Original ); QPixmap pixmap( const QString& image, const QSize& size, - CalamaresUtils::ImageMode mode = CalamaresUtils::Original, - qreal opacity = 1.0, - QColor tint = QColor( 0, 0, 0, 0 ) ); + CalamaresUtils::ImageMode mode = CalamaresUtils::Original ); private: - qint64 cacheKey( const QSize& size, qreal opacity, QColor tint ); + qint64 cacheKey( const QSize& size ); void putInCache( const QString& image, const QSize& size, CalamaresUtils::ImageMode mode, - qreal opacity, - const QPixmap& pixmap, - QColor tint ); + const QPixmap& pixmap ); }; #endif // IMAGE_REGISTRY_H diff --git a/src/libcalamaresui/viewpages/BlankViewStep.h b/src/libcalamaresui/viewpages/BlankViewStep.h index 793241647..1845fcda9 100644 --- a/src/libcalamaresui/viewpages/BlankViewStep.h +++ b/src/libcalamaresui/viewpages/BlankViewStep.h @@ -29,7 +29,7 @@ public: const QString& description, const QString& details = QString(), QObject* parent = nullptr ); - virtual ~BlankViewStep() override; + ~BlankViewStep() override; QString prettyName() const override; diff --git a/src/libcalamaresui/viewpages/QmlViewStep.h b/src/libcalamaresui/viewpages/QmlViewStep.h index 7f04bea81..9817851b6 100644 --- a/src/libcalamaresui/viewpages/QmlViewStep.h +++ b/src/libcalamaresui/viewpages/QmlViewStep.h @@ -50,7 +50,7 @@ public: * @see Qml.h for available Calamares internals. */ QmlViewStep( QObject* parent = nullptr ); - virtual ~QmlViewStep() override; + ~QmlViewStep() override; virtual QString prettyName() const override; diff --git a/src/libcalamaresui/viewpages/Slideshow.h b/src/libcalamaresui/viewpages/Slideshow.h index 4432eed7b..41dacd46e 100644 --- a/src/libcalamaresui/viewpages/Slideshow.h +++ b/src/libcalamaresui/viewpages/Slideshow.h @@ -52,7 +52,7 @@ public: : QObject( parent ) { } - virtual ~Slideshow(); + ~Slideshow() override; /// @brief Is the slideshow being shown **right now**? bool isActive() const { return m_state == Start; } @@ -91,7 +91,7 @@ class SlideshowQML : public Slideshow Q_OBJECT public: SlideshowQML( QWidget* parent ); - virtual ~SlideshowQML() override; + ~SlideshowQML() override; QWidget* widget() override; void changeSlideShowState( Action a ) override; @@ -123,7 +123,7 @@ class SlideshowPictures : public Slideshow Q_OBJECT public: SlideshowPictures( QWidget* parent ); - virtual ~SlideshowPictures() override; + ~SlideshowPictures() override; QWidget* widget() override; virtual void changeSlideShowState( Action a ) override; diff --git a/src/libcalamaresui/viewpages/ViewStep.h b/src/libcalamaresui/viewpages/ViewStep.h index 156975fc5..c20a9d396 100644 --- a/src/libcalamaresui/viewpages/ViewStep.h +++ b/src/libcalamaresui/viewpages/ViewStep.h @@ -41,7 +41,7 @@ class UIDLLEXPORT ViewStep : public QObject Q_OBJECT public: explicit ViewStep( QObject* parent = nullptr ); - virtual ~ViewStep() override; + ~ViewStep() override; /** @brief Human-readable name of the step * diff --git a/src/libcalamaresui/widgets/ClickableLabel.h b/src/libcalamaresui/widgets/ClickableLabel.h index 83ddb3d86..8c5561677 100644 --- a/src/libcalamaresui/widgets/ClickableLabel.h +++ b/src/libcalamaresui/widgets/ClickableLabel.h @@ -32,7 +32,7 @@ class UIDLLEXPORT ClickableLabel : public QLabel public: explicit ClickableLabel( QWidget* parent = nullptr ); explicit ClickableLabel( const QString& text, QWidget* parent = nullptr ); - virtual ~ClickableLabel() override; + ~ClickableLabel() override; signals: void clicked(); diff --git a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h index ded7ba602..7dd058775 100644 --- a/src/libcalamaresui/widgets/FixedAspectRatioLabel.h +++ b/src/libcalamaresui/widgets/FixedAspectRatioLabel.h @@ -19,7 +19,7 @@ class FixedAspectRatioLabel : public QLabel Q_OBJECT public: explicit FixedAspectRatioLabel( QWidget* parent = nullptr ); - virtual ~FixedAspectRatioLabel() override; + ~FixedAspectRatioLabel() override; public slots: void setPixmap( const QPixmap& pixmap ); diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.h b/src/libcalamaresui/widgets/PrettyRadioButton.h index 6b158f353..1874457a8 100644 --- a/src/libcalamaresui/widgets/PrettyRadioButton.h +++ b/src/libcalamaresui/widgets/PrettyRadioButton.h @@ -38,7 +38,7 @@ class UIDLLEXPORT PrettyRadioButton : public QWidget Q_OBJECT public: explicit PrettyRadioButton( QWidget* parent = nullptr ); - virtual ~PrettyRadioButton() {} + ~PrettyRadioButton() override {} /// @brief Passes @p text on to the ClickableLabel void setText( const QString& text ); diff --git a/src/modules/contextualprocess/ContextualProcessJob.h b/src/modules/contextualprocess/ContextualProcessJob.h index f84afb5f1..8d58a3cbe 100644 --- a/src/modules/contextualprocess/ContextualProcessJob.h +++ b/src/modules/contextualprocess/ContextualProcessJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT ContextualProcessJob : public Calamares::CppJob public: explicit ContextualProcessJob( QObject* parent = nullptr ); - virtual ~ContextualProcessJob() override; + ~ContextualProcessJob() override; QString prettyName() const override; diff --git a/src/modules/dracutlukscfg/DracutLuksCfgJob.h b/src/modules/dracutlukscfg/DracutLuksCfgJob.h index eb517b21d..7965e9834 100644 --- a/src/modules/dracutlukscfg/DracutLuksCfgJob.h +++ b/src/modules/dracutlukscfg/DracutLuksCfgJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob public: explicit DracutLuksCfgJob( QObject* parent = nullptr ); - virtual ~DracutLuksCfgJob() override; + ~DracutLuksCfgJob() override; QString prettyName() const override; diff --git a/src/modules/dummycpp/DummyCppJob.h b/src/modules/dummycpp/DummyCppJob.h index 2f267d511..5271a73a5 100644 --- a/src/modules/dummycpp/DummyCppJob.h +++ b/src/modules/dummycpp/DummyCppJob.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT DummyCppJob : public Calamares::CppJob public: explicit DummyCppJob( QObject* parent = nullptr ); - virtual ~DummyCppJob() override; + ~DummyCppJob() override; QString prettyName() const override; diff --git a/src/modules/finished/FinishedViewStep.h b/src/modules/finished/FinishedViewStep.h index 97d38b267..729f9126d 100644 --- a/src/modules/finished/FinishedViewStep.h +++ b/src/modules/finished/FinishedViewStep.h @@ -36,7 +36,7 @@ public: static QString modeName( RestartMode m ); explicit FinishedViewStep( QObject* parent = nullptr ); - virtual ~FinishedViewStep() override; + ~FinishedViewStep() override; QString prettyName() const override; diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 5c9c961a5..52c4692e6 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -33,7 +33,7 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob public: explicit ResizeFSJob( QObject* parent = nullptr ); - virtual ~ResizeFSJob() override; + ~ResizeFSJob() override; QString prettyName() const override; diff --git a/src/modules/hostinfo/HostInfoJob.h b/src/modules/hostinfo/HostInfoJob.h index d9b450ac4..b252da7e0 100644 --- a/src/modules/hostinfo/HostInfoJob.h +++ b/src/modules/hostinfo/HostInfoJob.h @@ -43,7 +43,7 @@ class PLUGINDLLEXPORT HostInfoJob : public Calamares::CppJob public: explicit HostInfoJob( QObject* parent = nullptr ); - virtual ~HostInfoJob() override; + ~HostInfoJob() override; QString prettyName() const override; diff --git a/src/modules/hostinfo/Tests.cpp b/src/modules/hostinfo/Tests.cpp index 724340269..f3863d98b 100644 --- a/src/modules/hostinfo/Tests.cpp +++ b/src/modules/hostinfo/Tests.cpp @@ -22,7 +22,7 @@ class HostInfoTests : public QObject Q_OBJECT public: HostInfoTests() {} - virtual ~HostInfoTests() {} + ~HostInfoTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/initcpio/InitcpioJob.h b/src/modules/initcpio/InitcpioJob.h index 45421ea05..6e7f2b585 100644 --- a/src/modules/initcpio/InitcpioJob.h +++ b/src/modules/initcpio/InitcpioJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitcpioJob : public Calamares::CppJob public: explicit InitcpioJob( QObject* parent = nullptr ); - virtual ~InitcpioJob() override; + ~InitcpioJob() override; QString prettyName() const override; diff --git a/src/modules/initramfs/InitramfsJob.h b/src/modules/initramfs/InitramfsJob.h index 7b3a03911..c09c9eba2 100644 --- a/src/modules/initramfs/InitramfsJob.h +++ b/src/modules/initramfs/InitramfsJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT InitramfsJob : public Calamares::CppJob public: explicit InitramfsJob( QObject* parent = nullptr ); - virtual ~InitramfsJob() override; + ~InitramfsJob() override; QString prettyName() const override; diff --git a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h index f01a19ee6..8e0e6508f 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalViewStep.h +++ b/src/modules/interactiveterminal/InteractiveTerminalViewStep.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep public: explicit InteractiveTerminalViewStep( QObject* parent = nullptr ); - virtual ~InteractiveTerminalViewStep() override; + ~InteractiveTerminalViewStep() override; QString prettyName() const override; diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp index 66f4c7570..bd300d7e3 100644 --- a/src/modules/keyboard/KeyboardPage.cpp +++ b/src/modules/keyboard/KeyboardPage.cpp @@ -35,7 +35,7 @@ class LayoutItem : public QListWidgetItem public: QString data; - virtual ~LayoutItem(); + ~LayoutItem() override; }; LayoutItem::~LayoutItem() {} @@ -77,7 +77,7 @@ KeyboardPage::KeyboardPage( QWidget* parent ) ui->buttonRestore, &QPushButton::clicked, [this] { ui->comboBoxModel->setCurrentIndex( m_defaultIndex ); } ); connect( ui->comboBoxModel, - static_cast< void ( QComboBox::* )( const QString& ) >( &QComboBox::currentIndexChanged ), + &QComboBox::currentTextChanged, [this]( const QString& text ) { QString model = m_models.value( text, "pc105" ); diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h index 485e27ed6..4faeebd57 100644 --- a/src/modules/keyboard/KeyboardPage.h +++ b/src/modules/keyboard/KeyboardPage.h @@ -34,7 +34,7 @@ class KeyboardPage : public QWidget Q_OBJECT public: explicit KeyboardPage( QWidget* parent = nullptr ); - virtual ~KeyboardPage(); + ~KeyboardPage() override; void init(); diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h index 5d4882aca..aa9a1d335 100644 --- a/src/modules/keyboard/KeyboardViewStep.h +++ b/src/modules/keyboard/KeyboardViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep public: explicit KeyboardViewStep( QObject* parent = nullptr ); - virtual ~KeyboardViewStep() override; + ~KeyboardViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/keyboard/Tests.cpp b/src/modules/keyboard/Tests.cpp index 16983685a..4c6d0cebb 100644 --- a/src/modules/keyboard/Tests.cpp +++ b/src/modules/keyboard/Tests.cpp @@ -18,7 +18,7 @@ class KeyboardLayoutTests : public QObject Q_OBJECT public: KeyboardLayoutTests() {} - virtual ~KeyboardLayoutTests() {} + ~KeyboardLayoutTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.h b/src/modules/keyboard/keyboardwidget/keyboardpreview.h index 1a01fe1a2..6b56e4120 100644 --- a/src/modules/keyboard/keyboardwidget/keyboardpreview.h +++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.h @@ -71,8 +71,8 @@ private: QString fromUnicodeString( QString raw ); protected: - void paintEvent( QPaintEvent* event ); - void resizeEvent( QResizeEvent* event ); + void paintEvent( QPaintEvent* event ) override; + void resizeEvent( QResizeEvent* event ) override; }; #endif // KEYBOARDPREVIEW_H diff --git a/src/modules/license/LicenseViewStep.h b/src/modules/license/LicenseViewStep.h index 15e345221..0e028f8c1 100644 --- a/src/modules/license/LicenseViewStep.h +++ b/src/modules/license/LicenseViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LicenseViewStep : public Calamares::ViewStep public: explicit LicenseViewStep( QObject* parent = nullptr ); - virtual ~LicenseViewStep() override; + ~LicenseViewStep() override; QString prettyName() const override; diff --git a/src/modules/license/LicenseWidget.h b/src/modules/license/LicenseWidget.h index 2d810e80a..3f99163b9 100644 --- a/src/modules/license/LicenseWidget.h +++ b/src/modules/license/LicenseWidget.h @@ -24,7 +24,7 @@ class LicenseWidget : public QWidget { public: LicenseWidget( LicenseEntry e, QWidget* parent = nullptr ); - virtual ~LicenseWidget() override; + ~LicenseWidget() override; void retranslateUi(); diff --git a/src/modules/locale/Config.h b/src/modules/locale/Config.h index a7ae0ccaf..4383f6bb0 100644 --- a/src/modules/locale/Config.h +++ b/src/modules/locale/Config.h @@ -52,7 +52,7 @@ class Config : public QObject public: Config( QObject* parent = nullptr ); - ~Config(); + ~Config() override; void setConfigurationMap( const QVariantMap& ); void finalizeGlobalStorage() const; diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h index c8b80e906..3b76b77b7 100644 --- a/src/modules/locale/LocalePage.h +++ b/src/modules/locale/LocalePage.h @@ -32,7 +32,7 @@ class LocalePage : public QWidget Q_OBJECT public: explicit LocalePage( class Config* config, QWidget* parent = nullptr ); - virtual ~LocalePage(); + ~LocalePage() override; void onActivate(); diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index fd9c00796..12b05f9f8 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT LocaleViewStep : public Calamares::ViewStep public: explicit LocaleViewStep( QObject* parent = nullptr ); - virtual ~LocaleViewStep() override; + ~LocaleViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/locale/timezonewidget/timezonewidget.h b/src/modules/locale/timezonewidget/timezonewidget.h index 3a2911597..7ccfb2b80 100644 --- a/src/modules/locale/timezonewidget/timezonewidget.h +++ b/src/modules/locale/timezonewidget/timezonewidget.h @@ -66,8 +66,8 @@ private: const CalamaresUtils::Locale::ZonesModel* m_zonesData; const TimeZoneData* m_currentLocation = nullptr; // Not owned by me - void paintEvent( QPaintEvent* event ); - void mousePressEvent( QMouseEvent* event ); + void paintEvent( QPaintEvent* event ) override; + void mousePressEvent( QMouseEvent* event ) override; }; #endif // TIMEZONEWIDGET_H diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h index d78a7ecdc..9681228bd 100644 --- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h +++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT LuksBootKeyFileJob : public Calamares::CppJob Q_OBJECT public: explicit LuksBootKeyFileJob( QObject* parent = nullptr ); - virtual ~LuksBootKeyFileJob() override; + ~LuksBootKeyFileJob() override; QString prettyName() const override; diff --git a/src/modules/machineid/MachineIdJob.h b/src/modules/machineid/MachineIdJob.h index 136f28ecb..7f406fc55 100644 --- a/src/modules/machineid/MachineIdJob.h +++ b/src/modules/machineid/MachineIdJob.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT MachineIdJob : public Calamares::CppJob public: explicit MachineIdJob( QObject* parent = nullptr ); - virtual ~MachineIdJob() override; + ~MachineIdJob() override; QString prettyName() const override; diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp index 13cce3de7..0ad3e9e8b 100644 --- a/src/modules/machineid/Tests.cpp +++ b/src/modules/machineid/Tests.cpp @@ -27,7 +27,7 @@ class MachineIdTests : public QObject Q_OBJECT public: MachineIdTests() {} - virtual ~MachineIdTests() {} + ~MachineIdTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/netinstall/Config.h b/src/modules/netinstall/Config.h index 56cbd784b..13eb098c6 100644 --- a/src/modules/netinstall/Config.h +++ b/src/modules/netinstall/Config.h @@ -28,7 +28,7 @@ class Config : public QObject public: Config( QObject* parent = nullptr ); - virtual ~Config(); + ~Config() override; enum class Status { diff --git a/src/modules/netinstall/NetInstallPage.h b/src/modules/netinstall/NetInstallPage.h index 167f9807f..1c97423da 100644 --- a/src/modules/netinstall/NetInstallPage.h +++ b/src/modules/netinstall/NetInstallPage.h @@ -35,7 +35,7 @@ class NetInstallPage : public QWidget Q_OBJECT public: NetInstallPage( Config* config, QWidget* parent = nullptr ); - virtual ~NetInstallPage(); + ~NetInstallPage() override; /** @brief Sets the page title * diff --git a/src/modules/netinstall/NetInstallViewStep.h b/src/modules/netinstall/NetInstallViewStep.h index cd79e7a4a..c500cbcd9 100644 --- a/src/modules/netinstall/NetInstallViewStep.h +++ b/src/modules/netinstall/NetInstallViewStep.h @@ -28,7 +28,7 @@ class PLUGINDLLEXPORT NetInstallViewStep : public Calamares::ViewStep public: explicit NetInstallViewStep( QObject* parent = nullptr ); - virtual ~NetInstallViewStep() override; + ~NetInstallViewStep() override; QString prettyName() const override; diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp index 569d47d15..0b59658c1 100644 --- a/src/modules/netinstall/Tests.cpp +++ b/src/modules/netinstall/Tests.cpp @@ -21,7 +21,7 @@ class ItemTests : public QObject Q_OBJECT public: ItemTests(); - virtual ~ItemTests() {} + ~ItemTests() override {} private: void checkAllSelected( PackageTreeItem* p ); diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h index 10f249a88..485a7969e 100644 --- a/src/modules/notesqml/NotesQmlViewStep.h +++ b/src/modules/notesqml/NotesQmlViewStep.h @@ -22,7 +22,7 @@ class PLUGINDLLEXPORT NotesQmlViewStep : public Calamares::QmlViewStep public: NotesQmlViewStep( QObject* parent = nullptr ); - virtual ~NotesQmlViewStep() override; + ~NotesQmlViewStep() override; QString prettyName() const override; diff --git a/src/modules/oemid/OEMViewStep.cpp b/src/modules/oemid/OEMViewStep.cpp index 7405c6e3a..f996d4ff3 100644 --- a/src/modules/oemid/OEMViewStep.cpp +++ b/src/modules/oemid/OEMViewStep.cpp @@ -32,7 +32,7 @@ public: CALAMARES_RETRANSLATE( m_ui->retranslateUi( this ); ) } - virtual ~OEMPage() override; + ~OEMPage() override; Ui_OEMPage* m_ui; }; diff --git a/src/modules/oemid/OEMViewStep.h b/src/modules/oemid/OEMViewStep.h index c07cb7971..a0b07c6fd 100644 --- a/src/modules/oemid/OEMViewStep.h +++ b/src/modules/oemid/OEMViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT OEMViewStep : public Calamares::ViewStep public: explicit OEMViewStep( QObject* parent = nullptr ); - virtual ~OEMViewStep() override; + ~OEMViewStep() override; QString prettyName() const override; QString prettyStatus() const override; diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h index 2a10ce270..9dfd2bdee 100644 --- a/src/modules/packagechooser/PackageChooserViewStep.h +++ b/src/modules/packagechooser/PackageChooserViewStep.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT PackageChooserViewStep : public Calamares::ViewStep public: explicit PackageChooserViewStep( QObject* parent = nullptr ); - virtual ~PackageChooserViewStep() override; + ~PackageChooserViewStep() override; QString prettyName() const override; diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h index b8fc9a4ce..375cf28c4 100644 --- a/src/modules/packagechooser/PackageModel.h +++ b/src/modules/packagechooser/PackageModel.h @@ -88,7 +88,7 @@ class PackageListModel : public QAbstractListModel public: PackageListModel( PackageList&& items, QObject* parent ); PackageListModel( QObject* parent ); - virtual ~PackageListModel() override; + ~PackageListModel() override; /** @brief Add a package @p to the model * diff --git a/src/modules/partition/core/BootLoaderModel.cpp b/src/modules/partition/core/BootLoaderModel.cpp index f9743291f..08b0283b3 100644 --- a/src/modules/partition/core/BootLoaderModel.cpp +++ b/src/modules/partition/core/BootLoaderModel.cpp @@ -40,7 +40,6 @@ BootLoaderModel::~BootLoaderModel() {} void BootLoaderModel::init( const QList< Device* >& devices ) { - cDebug() << "BLM::init with" << devices.count() << "devices" << rowCount() << "rows"; beginResetModel(); blockSignals( true ); @@ -64,7 +63,6 @@ BootLoaderModel::createMbrItems() void BootLoaderModel::update() { - cDebug() << "BLM::update holds" << m_devices.count() << "devices" << rowCount() << "rows"; beginResetModel(); blockSignals( true ); updateInternal(); diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index aceda2d72..eaed27af6 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -164,22 +164,36 @@ PartitionLayout::execute( Device* dev, const PartitionRole& role ) { QList< Partition* > partList; + // Map each partition entry to its requested size (0 when calculated later) + QMap< const PartitionLayout::PartitionEntry *, qint64 > partSizeMap; qint64 minSize, maxSize, end; qint64 totalSize = lastSector - firstSector + 1; qint64 availableSize = totalSize; - // TODO: Refine partition sizes to make sure there is room for every partition - // Use a default (200-500M ?) minimum size for partition without minSize - - foreach ( const PartitionLayout::PartitionEntry& part, m_partLayout ) + // Let's check if we have enough space for each partSize + for( const PartitionLayout::PartitionEntry& part : m_partLayout ) { - Partition* currentPartition = nullptr; - qint64 size = -1; // Calculate partition size + if ( part.partSize.isValid() ) { - size = part.partSize.toSectors( totalSize, dev->logicalSize() ); + // We need to ignore the percent-defined + if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent) + { + size = part.partSize.toSectors( totalSize, dev->logicalSize() ); + } + else + { + if ( part.partMinSize.isValid() ) + { + size = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); + } + else + { + size = 0; + } + } } else { @@ -187,37 +201,81 @@ PartitionLayout::execute( Device* dev, continue; } - if ( part.partMinSize.isValid() ) - { - minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); - } - else - { - minSize = 0; - } + partSizeMap.insert (&part, size); + availableSize -= size; + } - if ( part.partMaxSize.isValid() ) + // Use partMinSize and see if we can do better afterward. + if (availableSize < 0) + { + availableSize = totalSize; + for( const PartitionLayout::PartitionEntry& part : m_partLayout ) { - maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() ); - } - else - { - maxSize = availableSize; - } + qint64 size; - // Make sure we never go under minSize once converted to sectors - if ( maxSize < minSize ) - { - cWarning() << "Partition" << part.partMountPoint << "max size (" << maxSize << "sectors) is < min size (" - << minSize << "sectors), using min size"; - maxSize = minSize; + if ( part.partMinSize.isValid() ) + { + size = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); + } + else if ( part.partSize.isValid() ) + { + if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent) + { + size = part.partSize.toSectors( totalSize, dev->logicalSize() ); + } + else + { + size = 0; + } + } + else + { + size = 0; + } + + partSizeMap.insert (&part, size); + availableSize -= size; } + } + + // Assign size for percentage-defined partitions + for( const PartitionLayout::PartitionEntry& part : m_partLayout ) + { + if ( part.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent) + { + qint64 size = partSizeMap.value (&part); + size = part.partSize.toSectors( availableSize + size, dev->logicalSize() ); + partSizeMap.insert (&part, size); + if ( part.partMinSize.isValid() ) + { + qint64 minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() ); + if (minSize > size) + { + size = minSize; + } + } + if ( part.partMaxSize.isValid() ) + { + qint64 maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() ); + if (maxSize < size) + { + size = maxSize; + } + } + } + } + + availableSize = totalSize; + + // TODO: Refine partition sizes to make sure there is room for every partition + // Use a default (200-500M ?) minimum size for partition without minSize + + for( const PartitionLayout::PartitionEntry& part : m_partLayout ) + { + qint64 size = partSizeMap.value (&part); + Partition* currentPartition = nullptr; // Adjust partition size based on user-defined boundaries and available space - if ( size < minSize ) - { - size = minSize; - } if ( size > maxSize ) { size = maxSize; diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 6b4b8b659..2e965ad93 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -270,7 +270,12 @@ ChoicePage::setupChoices() m_itemsLayout->addStretch(); - connect( m_grp, QOverload< int, bool >::of( &QButtonGroup::buttonToggled ), this, [this]( int id, bool checked ) { +#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) ) + auto buttonSignal = QOverload< int, bool >::of( &QButtonGroup::buttonToggled ); +#else + auto buttonSignal = &QButtonGroup::idToggled; +#endif + connect( m_grp, buttonSignal, this, [this]( int id, bool checked ) { if ( checked ) // An action was picked. { m_choice = static_cast< InstallChoice >( id ); diff --git a/src/modules/partition/gui/PartitionBarsView.h b/src/modules/partition/gui/PartitionBarsView.h index 4dacaaae5..39c3bafe1 100644 --- a/src/modules/partition/gui/PartitionBarsView.h +++ b/src/modules/partition/gui/PartitionBarsView.h @@ -34,7 +34,7 @@ public: }; explicit PartitionBarsView( QWidget* parent = nullptr ); - virtual ~PartitionBarsView() override; + ~PartitionBarsView() override; void setNestedPartitionsMode( NestedPartitionsMode mode ); diff --git a/src/modules/partition/gui/PartitionLabelsView.h b/src/modules/partition/gui/PartitionLabelsView.h index ac7a272ad..9b5a277ab 100644 --- a/src/modules/partition/gui/PartitionLabelsView.h +++ b/src/modules/partition/gui/PartitionLabelsView.h @@ -28,7 +28,7 @@ class PartitionLabelsView : public QAbstractItemView Q_OBJECT public: explicit PartitionLabelsView( QWidget* parent = nullptr ); - virtual ~PartitionLabelsView() override; + ~PartitionLabelsView() override; QSize minimumSizeHint() const override; diff --git a/src/modules/partition/gui/PartitionViewStep.h b/src/modules/partition/gui/PartitionViewStep.h index 6ece9a2b1..9f3da9f3d 100644 --- a/src/modules/partition/gui/PartitionViewStep.h +++ b/src/modules/partition/gui/PartitionViewStep.h @@ -40,7 +40,7 @@ class PLUGINDLLEXPORT PartitionViewStep : public Calamares::ViewStep public: explicit PartitionViewStep( QObject* parent = nullptr ); - virtual ~PartitionViewStep() override; + ~PartitionViewStep() override; QString prettyName() const override; QWidget* createSummaryWidget() const override; diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h index 364213f54..c2c01088f 100644 --- a/src/modules/partition/tests/PartitionJobTests.h +++ b/src/modules/partition/tests/PartitionJobTests.h @@ -27,7 +27,7 @@ class QueueRunner : public QObject { public: QueueRunner( Calamares::JobQueue* queue ); - virtual ~QueueRunner() override; + ~QueueRunner() override; /** * Synchronously runs the queue. Returns true on success diff --git a/src/modules/plasmalnf/PlasmaLnfJob.h b/src/modules/plasmalnf/PlasmaLnfJob.h index 314070c0c..83360434e 100644 --- a/src/modules/plasmalnf/PlasmaLnfJob.h +++ b/src/modules/plasmalnf/PlasmaLnfJob.h @@ -21,7 +21,7 @@ class PlasmaLnfJob : public Calamares::Job public: explicit PlasmaLnfJob( const QString& lnfPath, const QString& id ); - virtual ~PlasmaLnfJob() override; + ~PlasmaLnfJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h index a98ec4bf5..46c24c970 100644 --- a/src/modules/plasmalnf/PlasmaLnfViewStep.h +++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h @@ -26,7 +26,7 @@ class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep public: explicit PlasmaLnfViewStep( QObject* parent = nullptr ); - virtual ~PlasmaLnfViewStep() override; + ~PlasmaLnfViewStep() override; QString prettyName() const override; diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h index d2b7373e2..7a0aab34d 100644 --- a/src/modules/preservefiles/PreserveFiles.h +++ b/src/modules/preservefiles/PreserveFiles.h @@ -41,7 +41,7 @@ class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob public: explicit PreserveFiles( QObject* parent = nullptr ); - virtual ~PreserveFiles() override; + ~PreserveFiles() override; QString prettyName() const override; diff --git a/src/modules/removeuser/RemoveUserJob.h b/src/modules/removeuser/RemoveUserJob.h index 8f7de35e0..c8a4df15d 100644 --- a/src/modules/removeuser/RemoveUserJob.h +++ b/src/modules/removeuser/RemoveUserJob.h @@ -23,7 +23,7 @@ class PLUGINDLLEXPORT RemoveUserJob : public Calamares::CppJob public: explicit RemoveUserJob( QObject* parent = nullptr ); - virtual ~RemoveUserJob() override; + ~RemoveUserJob() override; QString prettyName() const override; diff --git a/src/modules/shellprocess/ShellProcessJob.h b/src/modules/shellprocess/ShellProcessJob.h index c63a7b91f..468aded59 100644 --- a/src/modules/shellprocess/ShellProcessJob.h +++ b/src/modules/shellprocess/ShellProcessJob.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT ShellProcessJob : public Calamares::CppJob public: explicit ShellProcessJob( QObject* parent = nullptr ); - virtual ~ShellProcessJob() override; + ~ShellProcessJob() override; QString prettyName() const override; diff --git a/src/modules/summary/SummaryViewStep.h b/src/modules/summary/SummaryViewStep.h index 0a2933d8b..c89efc42f 100644 --- a/src/modules/summary/SummaryViewStep.h +++ b/src/modules/summary/SummaryViewStep.h @@ -25,7 +25,7 @@ class PLUGINDLLEXPORT SummaryViewStep : public Calamares::ViewStep public: explicit SummaryViewStep( QObject* parent = nullptr ); - virtual ~SummaryViewStep() override; + ~SummaryViewStep() override; QString prettyName() const override; diff --git a/src/modules/tracking/Config.h b/src/modules/tracking/Config.h index 655a71410..c91d430f5 100644 --- a/src/modules/tracking/Config.h +++ b/src/modules/tracking/Config.h @@ -36,7 +36,7 @@ class TrackingStyleConfig : public QObject public: TrackingStyleConfig( QObject* parent ); - virtual ~TrackingStyleConfig(); + ~TrackingStyleConfig() override; void setConfigurationMap( const QVariantMap& ); diff --git a/src/modules/tracking/TrackingViewStep.h b/src/modules/tracking/TrackingViewStep.h index 7b27dbec6..0601dde57 100644 --- a/src/modules/tracking/TrackingViewStep.h +++ b/src/modules/tracking/TrackingViewStep.h @@ -29,7 +29,7 @@ class PLUGINDLLEXPORT TrackingViewStep : public Calamares::ViewStep public: explicit TrackingViewStep( QObject* parent = nullptr ); - virtual ~TrackingViewStep() override; + ~TrackingViewStep() override; QString prettyName() const override; diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h index 33e82cd89..e4057941c 100644 --- a/src/modules/users/Config.h +++ b/src/modules/users/Config.h @@ -104,7 +104,7 @@ public: using PasswordStatus = QPair< PasswordValidity, QString >; Config( QObject* parent = nullptr ); - ~Config(); + ~Config() override; void setConfigurationMap( const QVariantMap& ); diff --git a/src/modules/users/TestCreateUserJob.cpp b/src/modules/users/TestCreateUserJob.cpp index a801baf45..fc2d74dcd 100644 --- a/src/modules/users/TestCreateUserJob.cpp +++ b/src/modules/users/TestCreateUserJob.cpp @@ -22,7 +22,7 @@ class CreateUserTests : public QObject Q_OBJECT public: CreateUserTests(); - virtual ~CreateUserTests() {} + ~CreateUserTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp index 17061037f..03bfaa6e7 100644 --- a/src/modules/users/TestSetHostNameJob.cpp +++ b/src/modules/users/TestSetHostNameJob.cpp @@ -28,7 +28,7 @@ class UsersTests : public QObject Q_OBJECT public: UsersTests(); - virtual ~UsersTests() {} + ~UsersTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp index 78fa74780..9ed7718c7 100644 --- a/src/modules/users/Tests.cpp +++ b/src/modules/users/Tests.cpp @@ -28,7 +28,7 @@ class UserTests : public QObject Q_OBJECT public: UserTests(); - virtual ~UserTests() {} + ~UserTests() override {} private Q_SLOTS: void initTestCase(); diff --git a/src/modules/users/UsersPage.h b/src/modules/users/UsersPage.h index f4d2c47d4..ed537540c 100644 --- a/src/modules/users/UsersPage.h +++ b/src/modules/users/UsersPage.h @@ -32,7 +32,7 @@ class UsersPage : public QWidget Q_OBJECT public: explicit UsersPage( Config* config, QWidget* parent = nullptr ); - virtual ~UsersPage(); + ~UsersPage() override; void onActivate(); diff --git a/src/modules/users/UsersViewStep.h b/src/modules/users/UsersViewStep.h index a03948adf..abafc1b23 100644 --- a/src/modules/users/UsersViewStep.h +++ b/src/modules/users/UsersViewStep.h @@ -27,7 +27,7 @@ class PLUGINDLLEXPORT UsersViewStep : public Calamares::ViewStep public: explicit UsersViewStep( QObject* parent = nullptr ); - virtual ~UsersViewStep() override; + ~UsersViewStep() override; QString prettyName() const override; diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index dcc4aa76a..6f1aaa137 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -223,7 +223,7 @@ Kirigami.ScrollablePage { visible: config.allowWeakPasswords //visible: false width: parent.width - text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password..") + text: qsTr("When this box is checked, password-strength checking is done and you will not be able to use a weak password.") font.weight: Font.Thin font.pointSize: 8 color: "#6D6D6D" diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h index 691672211..339997320 100644 --- a/src/modules/webview/WebViewStep.h +++ b/src/modules/webview/WebViewStep.h @@ -41,7 +41,7 @@ class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep public: explicit WebViewStep( QObject* parent = nullptr ); - virtual ~WebViewStep() override; + ~WebViewStep() override; QString prettyName() const override; diff --git a/src/modules/welcome/WelcomeViewStep.h b/src/modules/welcome/WelcomeViewStep.h index 16eec6d29..57632f7ac 100644 --- a/src/modules/welcome/WelcomeViewStep.h +++ b/src/modules/welcome/WelcomeViewStep.h @@ -37,7 +37,7 @@ class PLUGINDLLEXPORT WelcomeViewStep : public Calamares::ViewStep public: explicit WelcomeViewStep( QObject* parent = nullptr ); - virtual ~WelcomeViewStep() override; + ~WelcomeViewStep() override; QString prettyName() const override; diff --git a/src/modules/welcome/checker/CheckerContainer.h b/src/modules/welcome/checker/CheckerContainer.h index c721f2b36..93b75ac04 100644 --- a/src/modules/welcome/checker/CheckerContainer.h +++ b/src/modules/welcome/checker/CheckerContainer.h @@ -32,7 +32,7 @@ class CheckerContainer : public QWidget Q_OBJECT public: explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr ); - virtual ~CheckerContainer(); + ~CheckerContainer() override; bool verdict() const; diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp index 1ad2c1b29..b0e8a175e 100644 --- a/src/modules/welcome/checker/ResultsListWidget.cpp +++ b/src/modules/welcome/checker/ResultsListWidget.cpp @@ -87,7 +87,7 @@ public: * or UB happens. */ ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent ); - virtual ~ResultsListDialog(); + ~ResultsListDialog() override; private: QLabel* m_title;