From 3db901bd09ab94e4123c316e908cd919a97cc4d3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 16 Apr 2020 15:48:17 +0200 Subject: [PATCH 01/31] [locale] Expand tests to show overlapping locations - This isn't something that Calamares can acutally fix, so the test will be disabled later. After all, if Brazzaville and Kinshasa are close enough that on the map they are the same pixel, we can't move the cities. --- src/modules/locale/Tests.cpp | 70 ++++++++++++++++++++++++++++++++++-- src/modules/locale/Tests.h | 3 +- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 8104966a4..daa585e3d 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -28,9 +28,9 @@ QTEST_MAIN( LocaleTests ) -LocaleTests::LocaleTests() { } +LocaleTests::LocaleTests() {} -LocaleTests::~LocaleTests() { } +LocaleTests::~LocaleTests() {} void LocaleTests::initTestCase() @@ -149,3 +149,69 @@ LocaleTests::testTZImages() QCOMPARE( overlapcount, 0 ); } + +bool +operator<( const QPoint& l, const QPoint& r ) +{ + if ( l.x() < r.x() ) + { + return true; + } + if ( l.x() > r.x() ) + { + return false; + } + return l.y() < r.y(); +} + +void +listAll( const QPoint& p, const CalamaresUtils::Locale::CStringPairList& zones ) +{ + using namespace CalamaresUtils::Locale; + for ( const auto* pz : zones ) + { + const TZZone* zone = dynamic_cast< const TZZone* >( pz ); + if ( p == TimeZoneImageList::getLocationPosition( zone->longitude(), zone->latitude() ) ) + { + cError() << Logger::SubEntry << zone->zone(); + } + } +} + +void +LocaleTests::testTZLocations() +{ + using namespace CalamaresUtils::Locale; + const CStringPairList& regions = TZRegion::fromZoneTab(); + + int overlapcount = 0; + for ( const auto* pr : regions ) + { + const TZRegion* region = dynamic_cast< const TZRegion* >( pr ); + QVERIFY( region ); + + Logger::setupLogLevel( Logger::LOGDEBUG ); + cDebug() << "Region" << region->region() << "zones #" << region->zones().count(); + Logger::setupLogLevel( Logger::LOGERROR ); + + std::set< QPoint > occupied; + + const auto zones = region->zones(); + QVERIFY( zones.count() > 0 ); + for ( const auto* pz : zones ) + { + const TZZone* zone = dynamic_cast< const TZZone* >( pz ); + QVERIFY( zone ); + + auto pos = TimeZoneImageList::getLocationPosition( zone->longitude(), zone->latitude() ); + if ( occupied.find( pos ) != occupied.end() ) + { + cError() << "Zone" << zone->zone() << "occupies same spot as .."; + listAll( pos, zones ); + overlapcount++; + } + occupied.insert( pos ); + } + } + QCOMPARE( overlapcount, 0 ); +} diff --git a/src/modules/locale/Tests.h b/src/modules/locale/Tests.h index e0ca7ad0b..20ef86442 100644 --- a/src/modules/locale/Tests.h +++ b/src/modules/locale/Tests.h @@ -37,7 +37,8 @@ private Q_SLOTS: void testSplitLocaleConfiguration(); // Check the TZ images for consistency - void testTZImages(); + void testTZImages(); // No overlaps in images + void testTZLocations(); // No overlaps in locations }; #endif From 82ba4be5e72bd89d23fd8b787be1531b298a7155 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 16 Apr 2020 17:59:12 +0200 Subject: [PATCH 02/31] [locale] Test for pixel-perfect location of Gibraltar and Ceuta - Can't get Gibraltar (and Ceuta) to be distinguished --- src/modules/locale/Tests.cpp | 46 ++++++++++++++++++++++++++++++++++++ src/modules/locale/Tests.h | 1 + 2 files changed, 47 insertions(+) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index daa585e3d..53cae3fb4 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -215,3 +215,49 @@ LocaleTests::testTZLocations() } QCOMPARE( overlapcount, 0 ); } + +const CalamaresUtils::Locale::TZZone* +findZone( const QString& name ) +{ + using namespace CalamaresUtils::Locale; + const CStringPairList& regions = TZRegion::fromZoneTab(); + + for ( const auto* pr : regions ) + { + const TZRegion* region = dynamic_cast< const TZRegion* >( pr ); + if ( !region ) + { + continue; + } + const auto zones = region->zones(); + for ( const auto* pz : zones ) + { + const TZZone* zone = dynamic_cast< const TZZone* >( pz ); + if ( !zone ) + { + continue; + } + + if ( zone->zone() == name ) + { + return zone; + } + } + } + return nullptr; +} + +void +LocaleTests::testSpecificLocations() +{ + const auto* gibraltar = findZone( "Gibraltar" ); + const auto* ceuta = findZone( "Ceuta" ); + QVERIFY( gibraltar ); + QVERIFY( ceuta ); + + auto gpos = TimeZoneImageList::getLocationPosition( gibraltar->longitude(), gibraltar->latitude() ); + auto cpos = TimeZoneImageList::getLocationPosition( ceuta->longitude(), ceuta->latitude() ); + QVERIFY( gpos != cpos ); + QVERIFY( gibraltar->latitude() > ceuta->latitude() ); + QVERIFY( gpos.y() < cpos.y() ); // Gibraltar is north of Ceuta +} diff --git a/src/modules/locale/Tests.h b/src/modules/locale/Tests.h index 20ef86442..e01b1a25c 100644 --- a/src/modules/locale/Tests.h +++ b/src/modules/locale/Tests.h @@ -39,6 +39,7 @@ private Q_SLOTS: // Check the TZ images for consistency void testTZImages(); // No overlaps in images void testTZLocations(); // No overlaps in locations + void testSpecificLocations(); }; #endif From 1d71ad71c2317bf3a31f5ebcb0cb2c0052fbfbd1 Mon Sep 17 00:00:00 2001 From: bill-auger Date: Mon, 13 Apr 2020 18:02:30 -0400 Subject: [PATCH 03/31] [i18n] esperanto translations --- lang/calamares_eo.ts | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/lang/calamares_eo.ts b/lang/calamares_eo.ts index e7d9636d0..5173f5527 100644 --- a/lang/calamares_eo.ts +++ b/lang/calamares_eo.ts @@ -6,17 +6,17 @@ 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. - + La <strong>praŝarga ĉirkaŭaĵo</strong> de ĉi tiu sistemo.<br><br>Pli maljuna x86 sistemoj subtenas nur <strong>BIOS</strong>.<br>Pli sistemoj kutime uzas <strong>EFI</strong>, sed povos ankaŭ aspektas kiel BIOS, sed ŝaltita en kongrua reĝimo. This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. - + Tio ĉi sistemo estis ŝaltita per <strong>EFI</strong> praŝarga ĉirkaŭaĵo.<br><br>Agordi praŝargo el EFI, la instalilo devas disponigi praŝargilon, kiel: <strong>GRUB</strong> aŭ <strong>systemd-boot</strong> sur <strong>EFI Sistema Subdisko</strong>. Tio estas aŭtomata, krom se vi selektas manan dispartigon, tiukaze vi devas selekti ĝin, aŭ kreias unu mane. This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. - + Tio ĉi sistemo estis ŝaltita per <strong>BIOS</strong> praŝarga ĉirkaŭaĵo.<br><br>Agordi praŝargo el BIOS, la instalilo devas disponigi praŝargilon, kiel: <strong>GRUB</strong>, ĉe la komenco de subdisko aŭ sur la<strong>Ĉefa Ŝargodosiero</strong> apud la komencao de la subdiska tablo (preferred). Tio estas aŭtomata, krom se vi selektas manan dispartigon, tiukaze vi devas manipuli ĝin mane. @@ -24,22 +24,22 @@ Master Boot Record of %1 - + Ĉefa Ŝargodosiero de %1 Boot Partition - + Praŝarga Subdisko System Partition - + Sistema Subdisko Do not install a boot loader - + Ne instalu praŝargilon @@ -52,7 +52,7 @@ Blank Page - + Senskriba Paĝo @@ -65,12 +65,12 @@ GlobalStorage - + GlobalStorage JobQueue - + JobQueue @@ -101,17 +101,17 @@ Reload Stylesheet - + Reŝargu Stilfolio Widget Tree - + KromprogrametArbo Debug information - + Sencimiga Informaĵo @@ -124,7 +124,7 @@ Install - Instali + Instalu @@ -513,17 +513,17 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Current: - + Nune: After: - + Poste: <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. Having a GPT partition table and <strong>fat32 512Mb /boot partition is a must for UEFI installs</strong>, either use an existing without formatting or create one. - + <strong>Manan aranĝaĵon de subdisko</strong><br/>Vi povas kreii aŭ regrandigi subdiskon ajne. @@ -543,7 +543,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Boot loader location: - + Allokigo de la Praŝargilo: @@ -801,7 +801,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Create a Partition - Kreiu Subdisko + Kreiu Subdiskon @@ -1153,12 +1153,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Format - + Strukturu Warning: Formatting the partition will erase all existing data. - + Averto: Strukturi la subdiskon, forviŝos ĉiujn eksistantajn datumojn. @@ -1173,7 +1173,7 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. MiB - + MiB @@ -1272,32 +1272,32 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. - + <h1>Plenumita!</h1><br/>%1 estis agordita sur vian komputilon.<br/>Vi povas nun ekuzi vian novan sistemon. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> - + <html><head/><body><p>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la agordilon.</p></body></html> <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. - + <h1>Plenumita!</h1><br/>%1 estis instalita sur vian komputilon.<br/>Vi povas nun restartigas en vian novan sistemon, aŭ vi povas pluiri uzi la %2 aŭtonoman sistemon. <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> - + <html><head/><body><p>Se ĉi tio elektobutono estas elektita, via sistemo restartos senprokraste, kiam vi klikas <span style="font-style:italic;">Finita</span> aŭ vi malfermas la instalilon.</p></body></html> <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. - + <h1>Agorado Malsukcesis</h1><br/>%1 ne estis agordita sur vian komputilon.<br/>La erara mesaĝo estis: %2. <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. - + <h1>Instalaĵo Malsukcesis</h1><br/>%1 ne estis instalita sur vian komputilon.<br/>La erara mesaĝo estis: %2. @@ -1305,27 +1305,27 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Finish - + Pretigu Setup Complete - + Agordaĵo Plenumita Installation Complete - + Instalaĵo Plenumita The setup of %1 is complete. - + La agordaĵo de %1 estas plenumita. The installation of %1 is complete. - + La instalaĵo de %1 estas plenumita. @@ -1333,22 +1333,22 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Strukturu subdiskon %1 (dosiersistemo: %2, grandeco: %3 MiB) ja %4. Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. - + Strukturu <strong>%3MiB</strong> subdiskon <strong>%1</strong> kiel dosiersistemo <strong>%2</strong>. Formatting partition %1 with file system %2. - + Strukturanta subdiskon %1 kiel dosiersistemo %2. The installer failed to format partition %1 on disk '%2'. - + La instalilo malsukcesis strukturi ls subdiskon %1 sur disko '%2'. @@ -2539,12 +2539,12 @@ La instalilo forlasos kaj ĉiuj ŝanĝoj perdos. Current: - + Nune: After: - + Poste: @@ -2746,7 +2746,7 @@ Output: unformatted - + nestrukturita From 7bce58f6f2dfb3c6aa54094596bab1e561cf547b Mon Sep 17 00:00:00 2001 From: bill-auger Date: Fri, 17 Apr 2020 22:24:33 -0400 Subject: [PATCH 04/31] [welcome] add optional branding banner to welcome page --- src/branding/default/branding.desc | 8 +++++++- src/libcalamaresui/Branding.cpp | 7 ++++--- src/libcalamaresui/Branding.h | 7 ++++--- src/modules/welcome/WelcomePage.cpp | 26 ++++++++++++++++++++++---- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc index b6694d1f4..d9c9e1456 100644 --- a/src/branding/default/branding.desc +++ b/src/branding/default/branding.desc @@ -106,6 +106,11 @@ strings: # These images are loaded from the branding module directory. # +# productBanner is an optional image, which if present, will be shown +# on the welcome page of the application, above the welcome text. +# It is intended to have a width much greater than height. +# It is displayed at 64px height (also on HiDPI). +# Recommended size is 64px tall, and up to 460px wide. # productIcon is used as the window icon, and will (usually) be used # by the window manager to represent the application. This image # should be square, and may be displayed by the window manager @@ -121,8 +126,9 @@ strings: # # These filenames can also use substitutions from os-release (see above). images: - productLogo: "squid.png" + productBanner: "banner.png" productIcon: "squid.png" + productLogo: "squid.png" productWelcome: "languages.png" # The slideshow is displayed during execution steps (e.g. when the diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index ff7e43fb8..38dee24a8 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -73,10 +73,11 @@ const QStringList Branding::s_stringEntryStrings = const QStringList Branding::s_imageEntryStrings = { - "productLogo", + "productBanner", "productIcon", - "productWelcome", - "productWallpaper" + "productLogo", + "productWallpaper", + "productWelcome" }; const QStringList Branding::s_styleEntryStrings = diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 023f1a511..847f28d89 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -67,10 +67,11 @@ public: enum ImageEntry : short { - ProductLogo, + ProductBanner, ProductIcon, - ProductWelcome, - ProductWallpaper + ProductLogo, + ProductWallpaper, + ProductWelcome }; Q_ENUM( ImageEntry ) diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index e4be00fe7..e77924f85 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -51,7 +51,6 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) , m_languages( nullptr ) , m_conf( conf ) { - connect( Calamares::ModuleManager::instance(), &Calamares::ModuleManager::requirementsComplete, m_checkingWidget, @@ -62,7 +61,8 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) &CheckerContainer::requirementsProgress ); ui->setupUi( this ); - ui->verticalLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() * 2 ); + const int defaultFontHeight = CalamaresUtils::defaultFontHeight(); + ui->verticalLayout->insertSpacing( 1, defaultFontHeight * 2 ); initLanguages(); ui->mainText->setAlignment( Qt::AlignCenter ); @@ -77,11 +77,29 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, CalamaresUtils::Original, - 2 * QSize( CalamaresUtils::defaultFontHeight(), CalamaresUtils::defaultFontHeight() ) ) ); + 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox ); - int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText ); + // insert system-check widget below welcome text + const int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText ); ui->verticalLayout->insertWidget( welcome_text_idx + 1, m_checkingWidget ); + + // insert optional logo banner image above welcome text + Calamares::Branding::ImageEntry bannerImage = Calamares::Branding::ProductBanner; + QString bannerPath = Calamares::Branding::instance()->imagePath( bannerImage ); + if ( QFile::exists( bannerPath ) ) + { + QPixmap bannerPixmap = QPixmap( bannerPath ); + if ( !bannerPixmap.isNull() ) + { + QLabel* bannerLabel = new QLabel; + bannerLabel->setPixmap( bannerPixmap ); + bannerLabel->setMinimumHeight( 64 ); + bannerLabel->setAlignment( Qt::AlignCenter ); + ui->verticalLayout->insertSpacing( welcome_text_idx, defaultFontHeight ); + ui->verticalLayout->insertWidget( welcome_text_idx, bannerLabel ); + } + } } void From 90cb1ebc497f6d5785ca6b02a8fff72d5c6a6b26 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sun, 19 Apr 2020 13:40:28 +0200 Subject: [PATCH 05/31] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_ja.ts | 2 +- lang/calamares_sv.ts | 14 +++++++------- lang/calamares_tr_TR.ts | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts index 870d85e79..8c14c1456 100644 --- a/lang/calamares_ja.ts +++ b/lang/calamares_ja.ts @@ -3665,7 +3665,7 @@ Output: <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/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> 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/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index d0a8d06a5..f1acd343c 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -623,12 +623,12 @@ Alla ändringar kommer att gå förlorade. Swap (no Hibernate) - + Swap (utan viloläge) Swap (with Hibernate) - + Swap (med viloläge) @@ -1789,12 +1789,12 @@ Alla ändringar kommer att gå förlorade. Browser software - + Webbläsare Browser package - + Webbläsare @@ -1839,7 +1839,7 @@ Alla ändringar kommer att gå förlorade. Office - + Kontorsprogram @@ -3723,7 +3723,7 @@ Utdata: Refresh - + Ladda om @@ -3768,7 +3768,7 @@ Utdata: <h3>Welcome to the %1 <quote>%2</quote> installer</h3> - + <h3>Välkommen till %1 <quote>%2</quote> installeraren</h3> diff --git a/lang/calamares_tr_TR.ts b/lang/calamares_tr_TR.ts index eaa871552..42738f7a8 100644 --- a/lang/calamares_tr_TR.ts +++ b/lang/calamares_tr_TR.ts @@ -3673,7 +3673,7 @@ Kuruluma devam edebilirsiniz fakat bazı özellikler devre dışı kalabilir. <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/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> 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/>Telif Hakkı 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Telif Hakkı 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Teşekkrürler <a href="https://calamares.io/team/">Calamares takımı</a> ve <a href="https://www.transifex.com/calamares/calamares/">Calamares çeviri ekibi</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> gelişim sponsoru <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Özgür Yazılım From 249150dd1b25544423335a05e1416c32e98af231 Mon Sep 17 00:00:00 2001 From: demmm Date: Mon, 20 Apr 2020 15:00:04 +0200 Subject: [PATCH 06/31] [welcomeq] add language bar reads data from languagesModel correctly, debug added to see index changes code cleanup button layout improved install info text added, better spacing of text about button no longer commented out, 3 reasons: - info provided by any about is standard, will be odd if it can't be found - about.qml is a seperate file, can be completely adjusted - not showing it takes away the options for new QML cala users to see what is possible with Loader, thus stopping new possible contributors --- .../welcomeq/img/language-icon-48px.png | Bin 0 -> 2315 bytes src/modules/welcomeq/welcomeq.qml | 85 ++++++++++++------ src/modules/welcomeq/welcomeq.qrc | 1 + 3 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 src/modules/welcomeq/img/language-icon-48px.png diff --git a/src/modules/welcomeq/img/language-icon-48px.png b/src/modules/welcomeq/img/language-icon-48px.png new file mode 100644 index 0000000000000000000000000000000000000000..4012a4bee05f8f3e38a6f9efe0ff705361b094a7 GIT binary patch literal 2315 zcma)8XHXN`5>5hGKoA8(HDII$2wg*{N&->^Bs3|ZM2dvuL8N(+qF$sU0V7?J0SN*c z+NC6*NW0V#5CuXJFd&8|oq#X?et+JN-92;8w>$HFyE}7|>}<^i`6c-Q0Dz#y4U_{n zYW%TNC%E1jw4cZgr-?UQ!vFw*^M4HZiTQxTy#$lcE+o@XoHr?u5F+ash{pjmG}X2A z)HSt@iJ6^Tg!CW8Ey5jAgm)+oaLte4gOfE248=tdLhpvjn%>g=PyPHA001Nv=;%Un zv9U(_67X>EKQMSCo(KQ}Fpg$w2*Cfo1jMr^`_l6@L{H4d6nzM7&-K#zG9D&@RS3Scl&o1+V)JN(E4>uw?MZE6BE*=HY%~YImW&wHRg~ia3 znSxhuO>K(^tJ>!v7_TOAck(mgka6X%!Uv5h%4yILI&$DHZe*}BFQOaDLTZosmA%Hl zRH3!mQVu%1vUhsM5bVk~>ULv$iG~Nca97G_>%9UG*jh?UfSxX_enPcwTA{me=7L%M zM6je5UFQ58ZOVV$+XRvf8^?>hn{1uQan#W!z4Jr(LgDNdCU%TqbCWjKUool&h1` z<}~Vx=kQG^cpe<^H#9qj_@a39tO_kFo`AsdV_>yoieR1$wKvTYA7_bLbxxF=a)**m zol>~Rr|*oNxd*T@of;dNlPhNj6U$gg)g?C8-}D7RR3oiUmI4%O=yGYt43}(P)ZOmD@J8sY&m_ z+O*;6#102HH{=Rv;T0Iv9A{_}$Ug~s0YMP7ayci3r0rT-T5u$iW7(!MuQlHL#l=14 z378Z>ir7G-X$_B#mWD?}SgC@^et!i4$@uH`*)^i*<;JhU^C6A5rx`ISRI0)~POO=U zt84BTc6cCxK%r7$xyG>!mnx?~JU%BrKE4iWloW^SdzQoup;TAHlTc77baR!d&*dSr zbxRcex$3rJcZLkbJOg5(BYD)tS8x(lK9bbycfN%QZwz5(&CSg{$|A&`@F}KeS{4JJ*T92lqpiiyE77PUi1>M^oTx?+$Rj+K3{clu_EL*!U?~YgZ zHsB{qOG{CyX0Nt(cm0oeqoboyC=>>xnLkibWa0`t8HUVst#VQY3kW6hWOSRN(R_3| z-MuMP{_^2irE~4Q6(@iw`Xz&5Bz84UnorfURh-h-nIxhZxxXpj63+f`r}iBGV=Y<) zLRwT*R5;BH$j}46b4e9b_Zpw*AL8!yVH6ap-)RTNc#c!m{=F|AN;?o;kl23xCTU~97jgGF> zTR!7SOG_)EQh6U<8xO7ETrVh?xN7Jc_Di)jtdKRgx?b9sve8Wm@-hKjW{HJ{Sjm?7O* z4FGX#$sS_-puZ`MB`zc5Kai*E=;+x0u`n<XUsr~wKG1S7#tN1k)MuB_e#Q--V-P5J@ zpjA~>r~T!)RkeHsRvy?nyb@vD-H4fFHa*4 z28V}*O-)TDCQZPgPv?XZH=^lNtx>n8LK=T_W%B}EjazIVibrBkYa7hOS`UIykL;8l z4YB6A1GJ$Zv3iCPz5SzaV`D>T_R@s>xE#J6iWPV(vUdsV^LI^3=EJz&^`)hy7v<&t zU)FYGfm6K4$>ILUi=Z<+gQ>?L8NTowPn_ZF>4G1aX2RxYupXQbDIo zwlYVoz14^kdxq;)=S^P&T+onBIflsNEMhsXF1N{=Xwm%qtl3}hJE81wB(vs2Pf5_ycTi;$1eNWOiT2VcN$`F4Os z0N^;y$=>MjU=6VDUst2&wHP?g(8q{{jm-KtKQh literal 0 HcmV?d00001 diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml index 729b61b28..8d6d47dc1 100644 --- a/src/modules/welcomeq/welcomeq.qml +++ b/src/modules/welcomeq/welcomeq.qml @@ -16,6 +16,7 @@ * You should have received a copy of the GNU General Public License * along with Calamares. If not, see . */ +import io.calamares.core 1.0 import io.calamares.ui 1.0 import QtQuick 2.10 @@ -29,21 +30,21 @@ Page { id: welcome - header: Item - { + header: Item { width: parent.width height: parent.height - Text - { + Text { id: welcomeTopText anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top + horizontalAlignment: Text.AlignHCenter + padding: 40 // In QML, QString::arg() only takes one argument - text: qsTr("

Welcome to the %1 %2 installer

").arg(Branding.string(Branding.ProductName)).arg(Branding.string(Branding.Version)) + text: qsTr("

Welcome to the %1 %2 installer

+

This program will ask you some questions and set up %1 on your computer.

").arg(Branding.string(Branding.ProductName)).arg(Branding.string(Branding.Version)) } - Image - { + Image { id: welcomeImage anchors.centerIn: parent // imagePath() returns a full pathname, so make it refer to the filesystem @@ -55,36 +56,31 @@ Page fillMode: Image.PreserveAspectFit } - RowLayout - { + RowLayout { id: buttonBar - width: parent.width + width: parent.width / 1.5 height: 64 anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter spacing: Kirigami.Units.largeSpacing* 2 -/* Traditionally Calamares has had an "About" button that talks about - * Calamares itself, which just isn't a very useful thing in someone - * else's installation ISO. - */ - Button - { + Button { Layout.fillWidth: true text: qsTr("About") icon.name: "dialog-information" Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4) Kirigami.Theme.textColor: Kirigami.Theme.textColor - visible: false + visible: true onClicked: { - //onClicked: load.source = "file:/usr/share/calamares/branding/kaos_branding/show.qml" + //onClicked: load.source = "file:/usr/share/calamares/branding/default/show.qml" onClicked: load.source = "about.qml" } } - Button - { + + Button { Layout.fillWidth: true text: qsTr("Support") icon.name: "system-help" @@ -94,8 +90,8 @@ Page visible: config.supportUrl !== "" onClicked: Qt.openUrlExternally(config.supportUrl) } - Button - { + + Button { Layout.fillWidth: true text: qsTr("Known issues") icon.name: "tools-report-bug" @@ -105,8 +101,8 @@ Page visible: config.knownIssuesUrl !== "" onClicked: Qt.openUrlExternally(config.knownIssuesUrl) } - Button - { + + Button { Layout.fillWidth: true text: qsTr("Release notes") icon.name: "folder-text" @@ -116,8 +112,8 @@ Page visible: config.releaseNotesUrl !== "" onClicked: Qt.openUrlExternally(config.releaseNotesUrl) } - Button - { + + Button { Layout.fillWidth: true text: qsTr("Donate") icon.name: "taxes-finances" @@ -128,8 +124,41 @@ Page onClicked: Qt.openUrlExternally(config.donateUrl) } } - Loader - { + + RowLayout { + id: languageBar + width: parent.width /1.2 + height: 48 + + anchors.bottom: parent.bottom + anchors.bottomMargin: parent.height /7 + anchors.horizontalCenter: parent.horizontalCenter + spacing: Kirigami.Units.largeSpacing* 4 + + Rectangle { + width: parent.width + Layout.fillWidth: true + focus: true + Image { + id: image + height: 48 + fillMode: Image.PreserveAspectFit + source: "img/language-icon-48px.png" + } + + ComboBox { + id: languages + anchors.left: image.right + width: languageBar.width /1.1 + textRole: "label" + currentIndex: 4 //model.currentIndex + model: config.languagesModel + onCurrentIndexChanged: console.debug(currentText, currentIndex) + } + } + } + + Loader { id:load anchors.fill: parent } diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc index 84e598a27..82c449bf4 100644 --- a/src/modules/welcomeq/welcomeq.qrc +++ b/src/modules/welcomeq/welcomeq.qrc @@ -4,5 +4,6 @@ about.qml img/squid.png img/chevron-left-solid.svg + img/language-icon-48px.png From 828448b2ffded48dc7f5de8c98fa5d42e0440d0b Mon Sep 17 00:00:00 2001 From: demmm Date: Mon, 20 Apr 2020 16:47:12 +0200 Subject: [PATCH 07/31] [welcomeq] make release notes part of welcome window use Loader option for those notes too, commented out file shows it is possible to load from anywhere --- src/modules/welcomeq/release_notes.qml | 100 +++++++++++++++++++++++++ src/modules/welcomeq/welcomeq.qml | 3 +- src/modules/welcomeq/welcomeq.qrc | 1 + 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/modules/welcomeq/release_notes.qml diff --git a/src/modules/welcomeq/release_notes.qml b/src/modules/welcomeq/release_notes.qml new file mode 100644 index 000000000..ce9d1d4af --- /dev/null +++ b/src/modules/welcomeq/release_notes.qml @@ -0,0 +1,100 @@ +/* === This file is part of Calamares - === + * + * Copyright 2020, Anke Boersma + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +import io.calamares.ui 1.0 + +import QtQuick 2.7 +import QtQuick.Controls 2.2 +import QtQuick.Window 2.2 +import QtQuick.Layouts 1.3 + +Rectangle { + width: parent.width + height: parent.height + focus: true + color: "#f2f2f2" + + Flickable { + id: flick + anchors.fill: parent + contentHeight: 3500 + + ScrollBar.vertical: ScrollBar { + id: fscrollbar + width: 10 + policy: ScrollBar.AlwaysOn + } + + TextArea { + id: intro + x: 130 + y: 8 + width: 640 + font.pointSize: 14 + textFormat: Text.RichText + antialiasing: true + activeFocusOnPress: false + wrapMode: Text.WordWrap + + text: qsTr("

%1

+

This an example QML file, showing options in RichText with Flickable content.

+ +

QML with RichText can use HTML tags, Flickable content is useful for touchscreens.

+ +

This is bold text

+

This is italic text

+

This is underlined text

+

This text will be center-aligned.

+

This is strikethrough

+ +

Code example: + ls -l /home

+ +

Lists:

+
    +
  • Intel CPU systems
    • +
  • AMD CPU systems
    • +
+ +

The vertical scrollbar is adjustable, current width set to 10.

").arg(Branding.string(Branding.VersionedName)) + + } + } + + ToolButton { + id: toolButton + x: 19 + y: 29 + width: 105 + height: 48 + text: qsTr("Back") + hoverEnabled: true + onClicked: load.source = "" + + Image { + id: image1 + x: 0 + y: 13 + width: 22 + height: 22 + source: "img/chevron-left-solid.svg" + fillMode: Image.PreserveAspectFit + } + } + +} diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml index 8d6d47dc1..6330f5116 100644 --- a/src/modules/welcomeq/welcomeq.qml +++ b/src/modules/welcomeq/welcomeq.qml @@ -110,7 +110,8 @@ Page Kirigami.Theme.textColor: Kirigami.Theme.textColor visible: config.releaseNotesUrl !== "" - onClicked: Qt.openUrlExternally(config.releaseNotesUrl) + onClicked: load.source = "release_notes.qml" + //onClicked: load.source = "file:/usr/share/calamares/release_notes.qml" } Button { diff --git a/src/modules/welcomeq/welcomeq.qrc b/src/modules/welcomeq/welcomeq.qrc index 82c449bf4..71431254e 100644 --- a/src/modules/welcomeq/welcomeq.qrc +++ b/src/modules/welcomeq/welcomeq.qrc @@ -2,6 +2,7 @@ welcomeq.qml about.qml + release_notes.qml img/squid.png img/chevron-left-solid.svg img/language-icon-48px.png From 69fae85fe88d949dd20c8e1daedc76336b2316d3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 12:43:45 +0200 Subject: [PATCH 08/31] [locale] Fix test-build - needs if it doesn't get pulled in implicitly - mark tests as expected-to-fail to not block release - SEE #1374 --- src/modules/locale/Tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index 53cae3fb4..b24f37734 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -25,6 +25,8 @@ #include +#include + QTEST_MAIN( LocaleTests ) @@ -213,6 +215,8 @@ LocaleTests::testTZLocations() occupied.insert( pos ); } } + + QEXPECT_FAIL("", "TZ Images contain pixel-overlaps", Continue); QCOMPARE( overlapcount, 0 ); } @@ -257,7 +261,9 @@ LocaleTests::testSpecificLocations() auto gpos = TimeZoneImageList::getLocationPosition( gibraltar->longitude(), gibraltar->latitude() ); auto cpos = TimeZoneImageList::getLocationPosition( ceuta->longitude(), ceuta->latitude() ); + QEXPECT_FAIL("", "Gibraltar and Ceuta are really close", Continue); QVERIFY( gpos != cpos ); QVERIFY( gibraltar->latitude() > ceuta->latitude() ); + QEXPECT_FAIL("", "Gibraltar and Ceuta are really close", Continue); QVERIFY( gpos.y() < cpos.y() ); // Gibraltar is north of Ceuta } From f8df49e40f198c073f453735d5e42e7d102005ab Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 13:35:01 +0200 Subject: [PATCH 09/31] [partition] Fix up tests - Although we long ago replaced the getPartitions implementation, the test is still there, and on a machine with no /dev/sda (e.g. because root is on nvme) the echo-awk-shell-pipeline can give an empty string; this is turned into a QStringList{""} which has one element, while the new version has 0 elements. - Special-case the test that empty strings should be empty lists, rather than 1-element lists with an empty element. --- src/modules/partition/tests/ClearMountsJobTests.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/tests/ClearMountsJobTests.cpp b/src/modules/partition/tests/ClearMountsJobTests.cpp index 1f01c4638..17ff48945 100644 --- a/src/modules/partition/tests/ClearMountsJobTests.cpp +++ b/src/modules/partition/tests/ClearMountsJobTests.cpp @@ -42,7 +42,11 @@ getPartitionsForDevice_other(const QString& deviceName) process.start(); process.waitForFinished(); - const QString partitions = process.readAllStandardOutput(); + const QString partitions = process.readAllStandardOutput().trimmed(); + if ( partitions.isEmpty() ) + { + return QStringList(); + } const QStringList partitionsList = partitions.simplified().split( ' ' ); return partitionsList; From d348977d07b37ddd87bd91aa44287db25c3c415f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 13:41:04 +0200 Subject: [PATCH 10/31] [libcalamares] Fix tests - the test checks that the default locale is C or en_US .. let's just make it so instead of relying on the environment. This fixes tests on my dev-laptop, which happens to be set to en_NL (with volapuk date format). --- src/libcalamares/locale/Tests.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcalamares/locale/Tests.cpp b/src/libcalamares/locale/Tests.cpp index bf71fb0a2..6cbe980be 100644 --- a/src/libcalamares/locale/Tests.cpp +++ b/src/libcalamares/locale/Tests.cpp @@ -37,6 +37,7 @@ void LocaleTests::initTestCase() { // Otherwise plain get() is dubious in the TranslatableConfiguration tests + QLocale::setDefault( QLocale( QStringLiteral( "en_US" ) ) ); QVERIFY( ( QLocale().name() == "C" ) || ( QLocale().name() == "en_US" ) ); } From e51fbdc85110c7767560d725529a528505a175b7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 15:35:10 +0200 Subject: [PATCH 11/31] [locale] Apply coding style --- src/modules/locale/Tests.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp index fbc76fa9b..af37a664b 100644 --- a/src/modules/locale/Tests.cpp +++ b/src/modules/locale/Tests.cpp @@ -149,7 +149,7 @@ LocaleTests::testTZImages() } } - QEXPECT_FAIL("", "TZ Images not yet all fixed", Continue); + QEXPECT_FAIL( "", "TZ Images not yet all fixed", Continue ); QCOMPARE( overlapcount, 0 ); } @@ -217,7 +217,7 @@ LocaleTests::testTZLocations() } } - QEXPECT_FAIL("", "TZ Images contain pixel-overlaps", Continue); + QEXPECT_FAIL( "", "TZ Images contain pixel-overlaps", Continue ); QCOMPARE( overlapcount, 0 ); } @@ -262,9 +262,9 @@ LocaleTests::testSpecificLocations() auto gpos = TimeZoneImageList::getLocationPosition( gibraltar->longitude(), gibraltar->latitude() ); auto cpos = TimeZoneImageList::getLocationPosition( ceuta->longitude(), ceuta->latitude() ); - QEXPECT_FAIL("", "Gibraltar and Ceuta are really close", Continue); + QEXPECT_FAIL( "", "Gibraltar and Ceuta are really close", Continue ); QVERIFY( gpos != cpos ); QVERIFY( gibraltar->latitude() > ceuta->latitude() ); - QEXPECT_FAIL("", "Gibraltar and Ceuta are really close", Continue); + QEXPECT_FAIL( "", "Gibraltar and Ceuta are really close", Continue ); QVERIFY( gpos.y() < cpos.y() ); // Gibraltar is north of Ceuta } From c59af8881cfe787a185c0b01682e7f166dd54aff Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 16:13:19 +0200 Subject: [PATCH 12/31] [umount] Avoid SIGPIPE - collect output from umount process, and then ignore it --- src/modules/umount/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/umount/main.py b/src/modules/umount/main.py index a337c481a..454222c5c 100644 --- a/src/modules/umount/main.py +++ b/src/modules/umount/main.py @@ -98,7 +98,9 @@ def run(): lst.sort(key=lambda x: x[1], reverse=True) for device, mount_point in lst: - subprocess.check_call(["umount", "-lv", mount_point]) + # On success, no output; if the command fails, its output is + # in the exception object. + subprocess.check_output(["umount", "-lv", mount_point], stderr=subprocess.STDOUT) os.rmdir(root_mount_point) From 6de82e6857ebabf47f50a4517ed5d69fde9044c7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 16:39:02 +0200 Subject: [PATCH 13/31] [libcalamares] Add convenience for QDebug.noquote() - Use << Logger::NoQuote{} to turn off quoting **and** the space - In practice, in Calamares we use this only around other processes' output, where we want neither quotes nor spaces. --- src/libcalamares/utils/Logger.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h index fe4b98fd4..24198e256 100644 --- a/src/libcalamares/utils/Logger.h +++ b/src/libcalamares/utils/Logger.h @@ -33,6 +33,9 @@ struct FuncSuppressor const char* m_s; }; +struct NoQuote {}; +struct Quote {}; + DLLEXPORT extern const FuncSuppressor Continuation; DLLEXPORT extern const FuncSuppressor SubEntry; @@ -74,6 +77,18 @@ operator<<( QDebug& s, const FuncSuppressor& f ) return s << f.m_s; } +inline QDebug& +operator<<( QDebug& s, const NoQuote& ) +{ + return s.noquote().nospace(); +} + +inline QDebug& +operator<<( QDebug& s, const Quote& ) +{ + return s.quote().space(); +} + /** * @brief The full path of the log file. */ From 86ffab18737b6f7ee1299786369841db36242269 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Apr 2020 16:42:48 +0200 Subject: [PATCH 14/31] [libcalamares] Use convenience Logger::NoQuote --- src/libcalamares/utils/CalamaresUtilsSystem.cpp | 6 +++--- src/libcalamaresui/Branding.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 651ac2c1e..327bece92 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -195,7 +195,7 @@ System::runCommand( System::RunLocation location, ? ( static_cast< int >( std::chrono::milliseconds( timeoutSec ).count() ) ) : -1 ) ) { - ( cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" ).noquote().nospace() << process.readAllStandardOutput(); + cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" << Logger::NoQuote{} << process.readAllStandardOutput(); return ProcessResult::Code::TimedOut; } @@ -203,7 +203,7 @@ System::runCommand( System::RunLocation location, if ( process.exitStatus() == QProcess::CrashExit ) { - ( cWarning() << "Process" << args.first() << "crashed. Output so far:\n" ).noquote().nospace() << output; + cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote{} << output; return ProcessResult::Code::Crashed; } @@ -212,7 +212,7 @@ System::runCommand( System::RunLocation location, bool showDebug = ( !Calamares::Settings::instance() ) || ( Calamares::Settings::instance()->debugMode() ); if ( ( r != 0 ) || showDebug ) { - ( cDebug() << "Target cmd:" << RedactedList( args ) << "output:\n" ).noquote().nospace() << output; + cDebug() << "Target cmd:" << RedactedList( args ) << "output:\n" << Logger::NoQuote{} << output; } return ProcessResult( r, output ); } diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 38dee24a8..67054a902 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -538,7 +538,7 @@ Branding::initSimpleSettings( const YAML::Node& doc ) [[noreturn]] void Branding::bail( const QString& message ) { - cError() << "FATAL in" << m_descriptorPath << "\n" + message; + cError() << "FATAL in" << m_descriptorPath << Logger::Continuation << Logger::NoQuote{} << message; ::exit( EXIT_FAILURE ); } From d6c373c48d6e229761432ad09b1212f785073b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 21 Apr 2020 18:11:16 -0400 Subject: [PATCH 15/31] [partition] Allow a configurable EFI System Partition name This commit adds the new configuration `efiSystemPartitionName` to the file partition.conf. This option sets the partition name to the EFI System Partition that is created. If this option is unset, the partition is left unnamed. --- src/modules/partition/core/PartitionActions.cpp | 4 ++++ src/modules/partition/gui/PartitionViewStep.cpp | 6 ++++++ src/modules/partition/partition.conf | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 5e785c9d1..d0de2c0d4 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -151,6 +151,10 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO KPM_PARTITION_FLAG( None ) ); PartitionInfo::setFormat( efiPartition, true ); PartitionInfo::setMountPoint( efiPartition, o.efiPartitionMountPoint ); + if ( gs->contains( "efiSystemPartitionName" ) ) + { + efiPartition->setLabel( gs->value( "efiSystemPartitionName" ).toString() ); + } core->createPartition( dev, efiPartition, KPM_PARTITION_FLAG_ESP ); firstFreeSector = lastSector + 1; } diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index ed35fafa4..48d250ca4 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -538,6 +538,12 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap ) gs->insert( "efiSystemPartitionSize", CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" ) ); } + // Read and parse key efiSystemPartitionName + if ( configurationMap.contains( "efiSystemPartitionName" ) ) + { + gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) ); + } + // SWAP SETTINGS // // This is a bit convoluted because there's legacy settings to handle as well diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf index 241e4ea05..f6cc34ee4 100644 --- a/src/modules/partition/partition.conf +++ b/src/modules/partition/partition.conf @@ -7,6 +7,10 @@ efiSystemPartition: "/boot/efi" # If nothing is specified, the default size of 300MiB will be used. # efiSystemPartitionSize: 300M +# This optional setting specifies the name of the EFI system partition. +# If nothing is specified, the partition name is left unset. +# efiSystemPartitionName: EFI + # In autogenerated partitioning, allow the user to select a swap size? # If there is exactly one choice, no UI is presented, and the user # cannot make a choice -- this setting is used. If there is more than From 77a31ac3b287beeb25a0e3757cc0bd7f0e6c8d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 17 Mar 2020 09:31:17 -0400 Subject: [PATCH 16/31] [partition] Update debug output The mount-point is known as mountPoint in the global storage. This commit updates the trace to reflect its real name. --- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index ac65b5ff6..a302a3f31 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -107,7 +107,7 @@ mapForPartition( Partition* partition, const QString& uuid ) Logger::CDebug deb; using TR = Logger::DebugRow< const char* const, const QString& >; deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode() - << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() ) + << TR( "mountPoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() ) << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid ) << TR( "claimed", map[ "claimed" ].toString() ); From be86561913f47a54b31c8fc949c17bdcec6ab6ff Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 22 Apr 2020 00:09:43 +0200 Subject: [PATCH 17/31] [branding] Example banner graphic that matches the default branding.desc - Bogus "CalaMinix" (maybe the example branding should be consistent with that) banner. - Turn off the (example) banner in the default branding. --- src/branding/default/banner.png | Bin 0 -> 5937 bytes src/branding/default/branding.desc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/branding/default/banner.png diff --git a/src/branding/default/banner.png b/src/branding/default/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..d1baeee85569fac787067c199f2dcb93738597da GIT binary patch literal 5937 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 y#rQT Date: Wed, 22 Apr 2020 11:01:50 +0200 Subject: [PATCH 18/31] [welcome] Shuffle code - things that can be done in the designer file should be there, not weirdly repeated in code elsewhere - drop the insertion of an extra spacer (why not include it in the designer file?) - shuffle all the connect() calls down to the end of the constructor --- src/modules/welcome/WelcomePage.cpp | 40 ++++++++++++----------------- src/modules/welcome/WelcomePage.ui | 12 ++++++--- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index e77924f85..d71ad70a8 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -51,34 +51,12 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) , m_languages( nullptr ) , m_conf( conf ) { - connect( Calamares::ModuleManager::instance(), - &Calamares::ModuleManager::requirementsComplete, - m_checkingWidget, - &CheckerContainer::requirementsComplete ); - connect( Calamares::ModuleManager::instance(), - &Calamares::ModuleManager::requirementsProgress, - m_checkingWidget, - &CheckerContainer::requirementsProgress ); - ui->setupUi( this ); - const int defaultFontHeight = CalamaresUtils::defaultFontHeight(); - ui->verticalLayout->insertSpacing( 1, defaultFontHeight * 2 ); - initLanguages(); - - ui->mainText->setAlignment( Qt::AlignCenter ); - ui->mainText->setWordWrap( true ); - ui->mainText->setOpenExternalLinks( true ); - - cDebug() << "Welcome string" << Calamares::Branding::instance()->welcomeStyleCalamares() - << *Calamares::Branding::VersionedName; - - CALAMARES_RETRANSLATE_SLOT( &WelcomePage::retranslate ) - + ui->setupUi( this ); ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::Information, CalamaresUtils::Original, 2 * QSize( defaultFontHeight, defaultFontHeight ) ) ); - connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox ); // insert system-check widget below welcome text const int welcome_text_idx = ui->verticalLayout->indexOf( ui->mainText ); @@ -100,6 +78,22 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) ui->verticalLayout->insertWidget( welcome_text_idx, bannerLabel ); } } + + initLanguages(); + + cDebug() << "Welcome string" << Calamares::Branding::instance()->welcomeStyleCalamares() + << *Calamares::Branding::VersionedName; + CALAMARES_RETRANSLATE_SLOT( &WelcomePage::retranslate ) + + connect( ui->aboutButton, &QPushButton::clicked, this, &WelcomePage::showAboutBox ); + connect( Calamares::ModuleManager::instance(), + &Calamares::ModuleManager::requirementsComplete, + m_checkingWidget, + &CheckerContainer::requirementsComplete ); + connect( Calamares::ModuleManager::instance(), + &Calamares::ModuleManager::requirementsProgress, + m_checkingWidget, + &CheckerContainer::requirementsProgress ); } void diff --git a/src/modules/welcome/WelcomePage.ui b/src/modules/welcome/WelcomePage.ui index 590029558..6c0d4c338 100644 --- a/src/modules/welcome/WelcomePage.ui +++ b/src/modules/welcome/WelcomePage.ui @@ -43,6 +43,12 @@ <Calamares welcome text> + + Qt::AlignCenter + + + true + @@ -78,15 +84,15 @@ - - Select application and system language - 2 0 + + Select application and system language + From 1f6752307de1bd5050b525f188238ccff530ea20 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 22 Apr 2020 14:36:09 +0200 Subject: [PATCH 19/31] [welcome] Massage layout when banner is used - simplify handling of image loading (if the image doesn't exist, Branding will bail out on startup) - reduce space above the banner if it is in use --- src/modules/welcome/WelcomePage.cpp | 10 +++++++--- src/modules/welcome/WelcomePage.ui | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index d71ad70a8..89fde33a0 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -51,6 +51,8 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) , m_languages( nullptr ) , m_conf( conf ) { + using Branding = Calamares::Branding; + const int defaultFontHeight = CalamaresUtils::defaultFontHeight(); ui->setupUi( this ); ui->aboutButton->setIcon( CalamaresUtils::defaultPixmap( @@ -63,10 +65,10 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) ui->verticalLayout->insertWidget( welcome_text_idx + 1, m_checkingWidget ); // insert optional logo banner image above welcome text - Calamares::Branding::ImageEntry bannerImage = Calamares::Branding::ProductBanner; - QString bannerPath = Calamares::Branding::instance()->imagePath( bannerImage ); - if ( QFile::exists( bannerPath ) ) + QString bannerPath = Branding::instance()->imagePath( Branding::ProductBanner ); + if ( !bannerPath.isEmpty() ) { + // If the name is not empty, the file exists -- Branding checks that at startup QPixmap bannerPixmap = QPixmap( bannerPath ); if ( !bannerPixmap.isNull() ) { @@ -74,6 +76,8 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent ) bannerLabel->setPixmap( bannerPixmap ); bannerLabel->setMinimumHeight( 64 ); bannerLabel->setAlignment( Qt::AlignCenter ); + ui->aboveTextSpacer->changeSize( 20, defaultFontHeight ); // Shrink it down + ui->aboveTextSpacer->invalidate(); ui->verticalLayout->insertSpacing( welcome_text_idx, defaultFontHeight ); ui->verticalLayout->insertWidget( welcome_text_idx, bannerLabel ); } diff --git a/src/modules/welcome/WelcomePage.ui b/src/modules/welcome/WelcomePage.ui index 6c0d4c338..04b89f256 100644 --- a/src/modules/welcome/WelcomePage.ui +++ b/src/modules/welcome/WelcomePage.ui @@ -17,7 +17,7 @@ - + Qt::Vertical From cca067a34d56cc829e06c772adbc587c05d9bf25 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 22 Apr 2020 15:38:42 +0200 Subject: [PATCH 20/31] [libcalamares] Add a bogus test showing flag names --- src/libcalamares/CMakeLists.txt | 18 +++++-- src/libcalamares/partition/KPMTests.cpp | 65 +++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 src/libcalamares/partition/KPMTests.cpp diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 91dce96cd..904511ce7 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -226,6 +226,14 @@ calamares_add_test( partition/Tests.cpp ) +if( KPMcore_FOUND ) + calamares_add_test( + libcalamarespartitionkpmtest + SOURCES + partition/KPMTests.cpp + ) +endif() + calamares_add_test( libcalamareslocaletest SOURCES @@ -244,8 +252,8 @@ calamares_add_test( modulesystem/Tests.cpp ) -if( BUILD_TESTING ) - add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) - target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) - calamares_automoc( test_geoip ) -endif() +# This is not an actual test, it's a test / demo application +# for experimenting with GeoIP. +add_executable( test_geoip geoip/test_geoip.cpp ${geoip_src} ) +target_link_libraries( test_geoip calamares Qt5::Network yamlcpp ) +calamares_automoc( test_geoip ) diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp new file mode 100644 index 000000000..425393d9d --- /dev/null +++ b/src/libcalamares/partition/KPMTests.cpp @@ -0,0 +1,65 @@ +/* === This file is part of Calamares - === + * + * Copyright 2019, Adriaan de Groot + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +#include "utils/Logger.h" + +#include + +#include + +class KPMTests +{ + Q_OBJECT +public: + KPMTests(); + ~KPMTests() overr; +private Q_SLOTS: + void initTestCase(); + + void testFlagNames(); +}; + +KPMTests::KPMTests() {} + +KPMTests::~KPMTests() {} + +void +KPMTests::initTestCase() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); +} + +void +KPMTests::testFlagNames() +{ + int f = 1; + QStringList names; + QString s; + while ( !( s = PartitionTable::flagName( static_cast< PartitionTable::Flag >( f ) ) ).isEmpty() ) + { + cDebug() << f << s; + names.append( s ); + } +} + + +QTEST_GUILESS_MAIN( KPMTests ) + +#include "moc-warnings.h" + +#include "KPMTests.moc" From 261ab35b9cc282e2a5a6860e5ec9d1b7e4afdfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 18:07:41 +0200 Subject: [PATCH 21/31] [displaymanager] update autologin for OEM setup --- src/modules/displaymanager/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index c00ae1dac..ed00bb635 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2018, Philip Müller +# Copyright 2014-2018 & 2020, Philip Müller # Copyright 2014-2015, Teo Mrnjavac # Copyright 2014, Kevin Kofler # Copyright 2017, Alf Gaida @@ -299,6 +299,8 @@ class DMmdm(DisplayManager): "[daemon]\n" "AutomaticLoginEnable=False\n" ) + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) mdm_conf.write(line) else: @@ -405,6 +407,8 @@ class DMgdm(DisplayManager): ) else: line = "[daemon]\nAutomaticLoginEnable=False\n" + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) gdm_conf.write(line) else: From 7778518afde318a2cf9c03f58e98b49514271b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:01:58 +0200 Subject: [PATCH 22/31] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index ed00bb635..40189bfc7 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,7 +287,9 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if '[daemon]' in line: + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) + else '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -299,8 +301,6 @@ class DMmdm(DisplayManager): "[daemon]\n" "AutomaticLoginEnable=False\n" ) - if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) mdm_conf.write(line) else: @@ -398,7 +398,9 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if '[daemon]' in line: + if 'AutomaticLogin=' in line: + line = "AutomaticLogin={!s}\n".format(username) + else '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -407,8 +409,6 @@ class DMgdm(DisplayManager): ) else: line = "[daemon]\nAutomaticLoginEnable=False\n" - if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) gdm_conf.write(line) else: From 4d654b71e3826dd4ee234e051d16c12d507151f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:24:10 +0200 Subject: [PATCH 23/31] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 40189bfc7..a737ece60 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -289,7 +289,7 @@ class DMmdm(DisplayManager): for line in text: if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else '[daemon]' in line: + elif '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -400,7 +400,7 @@ class DMgdm(DisplayManager): for line in text: if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else '[daemon]' in line: + elif '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" From 0dd93810ac1393174751504153873dce64be373b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:34:29 +0200 Subject: [PATCH 24/31] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index a737ece60..0f8b6a302 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,10 +287,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if 'AutomaticLogin=' in line: + if 'AutomaticLogin=' in line and do_autologin:: line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: - if do_autologin: + else: + if '[daemon]' in line and do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" @@ -398,10 +398,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if 'AutomaticLogin=' in line: + if 'AutomaticLogin=' in line and do_autologin:: line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: - if do_autologin: + else: + if '[daemon]' in line and do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" From 96251ed1c3d27fe424fae595b2df8a3d159cca78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 19:48:23 +0200 Subject: [PATCH 25/31] Revert "[displaymanager] update OEM autologin" This reverts commit 0dd93810ac1393174751504153873dce64be373b. --- src/modules/displaymanager/main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 0f8b6a302..a737ece60 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -287,10 +287,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: - if 'AutomaticLogin=' in line and do_autologin:: + if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else: - if '[daemon]' in line and do_autologin: + elif '[daemon]' in line: + if do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" @@ -398,10 +398,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: - if 'AutomaticLogin=' in line and do_autologin:: + if 'AutomaticLogin=' in line: line = "AutomaticLogin={!s}\n".format(username) - else: - if '[daemon]' in line and do_autologin: + elif '[daemon]' in line: + if do_autologin: line = ( "[daemon]\n" "AutomaticLogin={!s}\n" From b64e8c831dd31738e57bc871383b64f77e9eb990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Apr 2020 20:22:16 +0200 Subject: [PATCH 26/31] [displaymanager] update OEM autologin --- src/modules/displaymanager/main.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index a737ece60..1529aab17 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -3,7 +3,7 @@ # # === This file is part of Calamares - === # -# Copyright 2014-2018 & 2020, Philip Müller +# Copyright 2014-2018, Philip Müller # Copyright 2014-2015, Teo Mrnjavac # Copyright 2014, Kevin Kofler # Copyright 2017, Alf Gaida @@ -288,8 +288,10 @@ class DMmdm(DisplayManager): with open(mdm_conf_path, 'w') as mdm_conf: for line in text: if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: + line = "" + if 'AutomaticLoginEnable=True' in line: + line = "" + if '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" @@ -399,8 +401,10 @@ class DMgdm(DisplayManager): with open(gdm_conf_path, 'w') as gdm_conf: for line in text: if 'AutomaticLogin=' in line: - line = "AutomaticLogin={!s}\n".format(username) - elif '[daemon]' in line: + line = "" + if 'AutomaticLoginEnable=True' in line: + line = "" + if '[daemon]' in line: if do_autologin: line = ( "[daemon]\n" From 43c5e1fc9695d32010f08d5e97a50a912d3e375b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Apr 2020 11:45:12 +0200 Subject: [PATCH 27/31] [libcalamares] Fix build of tests - Typed in on FreeBSD, where it doesn't get built --- src/libcalamares/CMakeLists.txt | 2 ++ src/libcalamares/partition/KPMTests.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index 904511ce7..dd6f01fb1 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -231,6 +231,8 @@ if( KPMcore_FOUND ) libcalamarespartitionkpmtest SOURCES partition/KPMTests.cpp + LIBRARIES + ${OPTIONAL_PRIVATE_LIBRARIES} ) endif() diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp index 425393d9d..edf7edf61 100644 --- a/src/libcalamares/partition/KPMTests.cpp +++ b/src/libcalamares/partition/KPMTests.cpp @@ -22,12 +22,12 @@ #include -class KPMTests +class KPMTests : public QObject { Q_OBJECT public: KPMTests(); - ~KPMTests() overr; + ~KPMTests() override; private Q_SLOTS: void initTestCase(); @@ -54,6 +54,8 @@ KPMTests::testFlagNames() { cDebug() << f << s; names.append( s ); + + f <<= 1; } } From 3f4e167acacdcccde1a1b385c7f6a4d68f615bc6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Apr 2020 12:16:30 +0200 Subject: [PATCH 28/31] [libcalamares] Expand kpm test with API 3/4 differences - fix build - KPMCore 3 distinguishes esp and boot - KPMCore 4 does not --- src/libcalamares/partition/KPMTests.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp index edf7edf61..c84d70c99 100644 --- a/src/libcalamares/partition/KPMTests.cpp +++ b/src/libcalamares/partition/KPMTests.cpp @@ -57,11 +57,21 @@ KPMTests::testFlagNames() f <<= 1; } + +#ifdef WITH_KPMCORE4API + // KPMCore 4 unifies the flags and handles them internally + QVERIFY( names.contains( QStringLiteral( "boot" ) ) ); + QVERIFY( !names.contains( QStringLiteral( "esp" ) ) ); +#else + // KPMCore 3 has separate flags + QVERIFY( names.contains( QStringLiteral( "boot" ) ) ); + QVERIFY( names.contains( QStringLiteral( "esp" ) ) ); +#endif } QTEST_GUILESS_MAIN( KPMTests ) -#include "moc-warnings.h" +#include "utils/moc-warnings.h" #include "KPMTests.moc" From ded923fb9545b8191ae84a091e3fdbabcc6bde5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Tue, 21 Apr 2020 08:44:14 -0400 Subject: [PATCH 29/31] Docs: Add support for bash-completion --- CHANGES | 5 +++-- CMakeLists.txt | 8 ++++++++ data/completion/bash/calamares | 36 ++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 data/completion/bash/calamares diff --git a/CHANGES b/CHANGES index cf5f9637e..58602f256 100644 --- a/CHANGES +++ b/CHANGES @@ -6,10 +6,11 @@ website will have to do for older versions. # 3.2.24 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Gaël PORTAY ## Core ## - - No core changes yet + - There is now a bash-completions script for Calamares; turn on + the (CMake-time) option INSTALL_COMPLETION to get it. (Thanks Gaël) ## Modules ## - No module changes yet diff --git a/CMakeLists.txt b/CMakeLists.txt index bc14780a9..6edece315 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,7 @@ set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during develop # option( INSTALL_CONFIG "Install configuration files" OFF ) option( INSTALL_POLKIT "Install Polkit configuration" ON ) +option( INSTALL_COMPLETION "Install shell completions" OFF ) option( BUILD_TESTING "Build the testing tree." ON ) option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON ) option( WITH_PYTHONQT "Enable next generation Python modules API (experimental, requires PythonQt)." OFF ) @@ -389,6 +390,13 @@ list( SORT CALAMARES_TRANSLATION_LANGUAGES ) add_subdirectory( lang ) # i18n tools +if ( INSTALL_COMPLETION ) + if( NOT CMAKE_INSTALL_BASHCOMPLETIONDIR ) + set( CMAKE_INSTALL_BASHCOMPLETIONDIR "${CMAKE_INSTALL_DATADIR}/bash-completion/completions" ) + endif() + + install( FILES ${CMAKE_SOURCE_DIR}/data/completion/bash/calamares DESTINATION "${CMAKE_INSTALL_BASHCOMPLETIONDIR}" ) +endif() ### Example Distro # diff --git a/data/completion/bash/calamares b/data/completion/bash/calamares new file mode 100644 index 000000000..47c2bb268 --- /dev/null +++ b/data/completion/bash/calamares @@ -0,0 +1,36 @@ +# === This file is part of Calamares - === +# +# Copyright 2020, Gaël PORTAY +# +# Calamares is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Calamares is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Calamares. If not, see . + +_calamares() +{ + local cur prev words cword + _init_completion || return + + case "$prev" in + -D) + COMPREPLY=( $( compgen -W "$( seq 0 1 8 )" -- "$cur" ) ) + return + ;; + -c|--config) + _filedir + return + ;; + esac + + COMPREPLY=( $( compgen -W "-h --help -v --version -d --debug -D -c --config -X -xdg-config -T --debug-translation" -- "$cur" ) ) +} && +complete -F _calamares calamares From 79e8c447b93ae4d97b948bd3f2c8bb7e90189846 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Apr 2020 13:46:09 +0200 Subject: [PATCH 30/31] [libcalamares] Test some specific KPM partition flags --- src/libcalamares/partition/KPMTests.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp index c84d70c99..7468d3938 100644 --- a/src/libcalamares/partition/KPMTests.cpp +++ b/src/libcalamares/partition/KPMTests.cpp @@ -58,12 +58,17 @@ KPMTests::testFlagNames() f <<= 1; } + QCOMPARE( PartitionTable::flagName( static_cast< PartitionTable::Flag >( 1 ) ), QStringLiteral( "boot" ) ); + #ifdef WITH_KPMCORE4API // KPMCore 4 unifies the flags and handles them internally + QCOMPARE( PartitionTable::flagName( PartitionTable::Flag::Boot ), QStringLiteral( "boot" ) ); QVERIFY( names.contains( QStringLiteral( "boot" ) ) ); QVERIFY( !names.contains( QStringLiteral( "esp" ) ) ); #else // KPMCore 3 has separate flags + QCOMPARE( PartitionTable::flagName( PartitionTable::FlagBoot ), QStringLiteral( "boot" ) ); + QCOMPARE( PartitionTable::flagName( PartitionTable::FlagEsp ), QStringLiteral( "esp" ) ); QVERIFY( names.contains( QStringLiteral( "boot" ) ) ); QVERIFY( names.contains( QStringLiteral( "esp" ) ) ); #endif From 479b467bb64ff67d9d114427d4ee4cfee0b9a0c8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Apr 2020 13:53:30 +0200 Subject: [PATCH 31/31] [partition] Substitute in the right flag name - This uses "esp" in KPMCore 3 and "boot" in KPMCore 4 --- src/modules/partition/gui/PartitionViewStep.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp index ed35fafa4..f568d766a 100644 --- a/src/modules/partition/gui/PartitionViewStep.cpp +++ b/src/modules/partition/gui/PartitionViewStep.cpp @@ -417,6 +417,12 @@ PartitionViewStep::onLeave() { QString espMountPoint = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); +#ifdef WITH_KPMCORE4API + auto espFlag = PartitionTable::Flag::Boot; +#else + auto espFlag = PartitionTable::FlagEsp; +#endif + QString espFlagName = PartitionTable::flagName( espFlag ); Partition* esp = m_core->findPartitionByMountPoint( espMountPoint ); QString message; @@ -428,12 +434,12 @@ PartitionViewStep::onLeave() "

" "To configure an EFI system partition, go back and " "select or create a FAT32 filesystem with the " - "esp flag enabled and mount point " + "%3 flag enabled and mount point " "%2.

" "You can continue without setting up an EFI system " "partition but your system may fail to start." ) .arg( *Calamares::Branding::ShortProductName ) - .arg( espMountPoint ); + .arg( espMountPoint, espFlagName ); } else if ( esp && !PartUtils::isEfiBootable( esp ) ) { @@ -441,14 +447,14 @@ PartitionViewStep::onLeave() description = tr( "An EFI system partition is necessary to start %1." "

" "A partition was configured with mount point " - "%2 but its esp " + "%2 but its %3 " "flag is not set.
" "To set the flag, go back and edit the partition." "

" "You can continue without setting the flag but your " "system may fail to start." ) .arg( *Calamares::Branding::ShortProductName ) - .arg( espMountPoint ); + .arg( espMountPoint, espFlagName ); } if ( !message.isEmpty() )