napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[partition] Simplify code

Browse Source 
- isEfi only used meaningfully once
- if (isEfi) followed by if (!isEfi) can be simpler
- create bios-but-not-GPT strings in one go
- mark TODO that this should warn only if needed
- use weird * notation for branding-strings
This commit is contained in:
Adriaan de Groot 2020-03-24 22:32:49 +01:00
parent b57e198c29
commit 26dd93b67c
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/partition/gui/PartitionViewStep.cpp
View File

@ -2,8 +2,9 @@
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2018-2019, Adriaan de Groot <groot@kde.org> * Copyright 2018-2019, 2020, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com> * Copyright 2019, Collabora Ltd <arnaud.ferraris@collabora.com>
* Copyright 2020, Anke Boersma <demm@kaosx.us
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,7 +39,6 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "Job.h" #include "Job.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/NamedEnum.h" #include "utils/NamedEnum.h"
@ -51,7 +51,6 @@
#include <kpmcore/core/partition.h> #include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h> #include <kpmcore/fs/filesystem.h>
// Qt
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QFormLayout> #include <QFormLayout>
@ -414,13 +413,7 @@ PartitionViewStep::onLeave()
if ( m_widget->currentWidget() == m_manualPartitionPage ) if ( m_widget->currentWidget() == m_manualPartitionPage )
{ {
bool isEfi = false;
if ( PartUtils::isEfiSystem() ) if ( PartUtils::isEfiSystem() )
{
isEfi = true;
}
if ( isEfi )
{ {
QString espMountPoint QString espMountPoint
= Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString(); = Calamares::JobQueue::instance()->globalStorage()->value( "efiSystemPartition" ).toString();
@ -464,18 +457,15 @@ PartitionViewStep::onLeave()
QMessageBox::warning( m_manualPartitionPage, message, description ); QMessageBox::warning( m_manualPartitionPage, message, description );
} }
} }
else
if ( !isEfi )
{ {
cDebug() << "device: BIOS"; cDebug() << "device: BIOS";
// TODO: this *always* warns, which might be annoying, so it'd be
// best to find a way to detect that bios_grub partition.
Partition* bios_p = m_core->findPartitionByMountPoint( "" ); QString message = tr( "Option to use GPT on BIOS" );
QString message; QString description = tr( "A GPT partition table is the best option for all "
QString description;
message = tr( "Option to use GPT on BIOS" );
description = tr( "A GPT partition table is the best option for all "
"systems. This installer supports such a setup for " "systems. This installer supports such a setup for "
"BIOS systems too." "BIOS systems too."
"<br/><br/>" "<br/><br/>"
@ -486,12 +476,9 @@ PartitionViewStep::onLeave()
"<strong>bios_grub</strong> flag enabled.<br/><br/>" "<strong>bios_grub</strong> flag enabled.<br/><br/>"
"An unformatted 8 MB partition is necessary " "An unformatted 8 MB partition is necessary "
"to start %1 on a BIOS system with GPT." ) "to start %1 on a BIOS system with GPT." )
.arg( Calamares::Branding::instance()->string( Calamares::Branding::ShortProductName ) ); .arg( *Calamares::Branding::ShortProductName );
if ( !message.isEmpty() ) QMessageBox::information( m_manualPartitionPage, message, description );
{
QMessageBox::information( m_manualPartitionPage, message, description );
}
} }
Partition* root_p = m_core->findPartitionByMountPoint( "/" ); Partition* root_p = m_core->findPartitionByMountPoint( "/" );