From 856ef859eb9f6e09c0a51018241c69bd0471e802 Mon Sep 17 00:00:00 2001 From: Volker Lanz Date: Mon, 1 Mar 2010 12:00:07 +0000 Subject: [PATCH] rename msdos_vista to msdos and make sure to use sector-based-alignment instead of vista. also use cylinder based instead of msdos legacy. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1097441 --- src/backend/libparted/libpartedbackend.cpp | 4 ++-- src/config.kcfg | 2 +- src/core/partitiontable.cpp | 21 +++++++++++---------- src/core/partitiontable.h | 4 ++-- src/gui/configurepageadvanced.ui | 4 ++-- src/gui/createpartitiontabledialog.cpp | 4 ++-- src/gui/devicepropsdialog.cpp | 18 +++++++++--------- src/gui/devicepropsdialog.h | 4 ++-- src/gui/devicepropswidget.h | 12 ++++++------ src/gui/devicepropswidgetbase.ui | 8 ++++---- src/gui/mainwindow.cpp | 6 +++--- 11 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/backend/libparted/libpartedbackend.cpp b/src/backend/libparted/libpartedbackend.cpp index 2bf9cf5..e65cbd1 100644 --- a/src/backend/libparted/libpartedbackend.cpp +++ b/src/backend/libparted/libpartedbackend.cpp @@ -322,8 +322,8 @@ static void scanDevicePartitions(PedDevice* pedDevice, Device& d, PedDisk* pedDi d.partitionTable()->updateUnallocated(d); - if (d.partitionTable()->isVistaTableType()) - d.partitionTable()->setType(d, PartitionTable::msdos_vista); + if (d.partitionTable()->isSectorBased()) + d.partitionTable()->setType(d, PartitionTable::msdos_sectorbased); foreach(const Partition* part, partitions) PartitionTable::isAligned(d, *part); diff --git a/src/config.kcfg b/src/config.kcfg index 7a63179..3629b8a 100644 --- a/src/config.kcfg +++ b/src/config.kcfg @@ -19,7 +19,7 @@ 2048 - + false diff --git a/src/core/partitiontable.cpp b/src/core/partitiontable.cpp index abf6b67..a7f1c2d 100644 --- a/src/core/partitiontable.cpp +++ b/src/core/partitiontable.cpp @@ -461,7 +461,8 @@ Partition* createUnallocated(const Device& device, PartitionNode& parent, qint64 return NULL; } - // Leave a track (msdos) or sector alignment sectors (vista) free at the start for a new partition's metadata + // Leave a track (cylinder aligned) or sector alignment sectors (sector based) free at the + // start for a new partition's metadata start += device.partitionTable()->type() == PartitionTable::msdos ? device.sectorsPerTrack() : sectorAlignment(device); // .. and also at the end for the metadata for a partition to follow us, if we're not @@ -567,7 +568,7 @@ void PartitionTable::updateUnallocated(const Device& d) qint64 PartitionTable::defaultFirstUsable(const Device& d, TableType t) { - if (t == msdos && Config::useLegacyMsDosAlignment()) + if (t == msdos && Config::useCylinderAlignment()) return d.sectorsPerTrack(); return Config::sectorAlignment(); @@ -594,7 +595,7 @@ static struct { "bsd", 8, false, true, PartitionTable::bsd }, { "dasd", 1, false, true, PartitionTable::dasd }, { "msdos", 4, true, false, PartitionTable::msdos }, - { "msdos (vista)", 4, true, false, PartitionTable::msdos_vista }, + { "msdos", 4, true, false, PartitionTable::msdos_sectorbased }, { "dvh", 16, true, true, PartitionTable::dvh }, { "gpt", 128, false, false, PartitionTable::gpt }, { "loop", 1, false, true, PartitionTable::loop }, @@ -649,25 +650,25 @@ bool PartitionTable::tableTypeIsReadOnly(TableType l) return false; } -/** Simple heuristic to determine if the PartitionTable is MS Vista compatible (i.e. +/** Simple heuristic to determine if the PartitionTable is sector aligned (i.e. if its Partitions begin at sectors evenly divisable by Config::sectorAlignment(). - @return true if is msdos_vista, otherwise false + @return true if is sector aligned, otherwise false */ -bool PartitionTable::isVistaTableType() const +bool PartitionTable::isSectorBased() const { if (type() == PartitionTable::msdos) { - // user has turned ms dos legacy off and partition table is empty - if (Config::useLegacyMsDosAlignment() == false && children().size() == 0) + // user has turned cylinder based alignment off and partition table is empty + if (Config::useCylinderAlignment() == false && children().size() == 0) return true; // if not all partitions start at a point evenly divisable by sectorAlignment it's - // a legacy msdos partition table + // a cylinder-aligned msdos partition table foreach(const Partition* p, children()) if (p->firstSector() % Config::sectorAlignment() != 0) return false; - // must be vista + // must be sector aligned return true; } diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index b2c2497..15f5518 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -56,7 +56,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT PartitionTable : public PartitionNode bsd, dasd, msdos, - msdos_vista, + msdos_sectorbased, dvh, gpt, loop, @@ -123,7 +123,7 @@ class LIBPARTITIONMANAGERPRIVATE_EXPORT PartitionTable : public PartitionNode void updateUnallocated(const Device& d); void insertUnallocated(const Device& d, PartitionNode* p, qint64 start) const; - bool isVistaTableType() const; + bool isSectorBased() const; static QList flagList(); static QString flagName(Flag f); diff --git a/src/gui/configurepageadvanced.ui b/src/gui/configurepageadvanced.ui index fe65bba..068dcba 100644 --- a/src/gui/configurepageadvanced.ui +++ b/src/gui/configurepageadvanced.ui @@ -15,9 +15,9 @@ - + - Use Legacy MS-Dos Partition Alignment (Windows XP compatible) + Use Cylinder Based MS-Dos Partition Alignment (Windows XP compatible) true diff --git a/src/gui/createpartitiontabledialog.cpp b/src/gui/createpartitiontabledialog.cpp index 643d597..c8dd35b 100644 --- a/src/gui/createpartitiontabledialog.cpp +++ b/src/gui/createpartitiontabledialog.cpp @@ -42,8 +42,8 @@ PartitionTable::TableType CreatePartitionTableDialog::type() const if (widget().radioGPT().isChecked()) return PartitionTable::gpt; - if (widget().radioMSDOS().isChecked() && Config::useLegacyMsDosAlignment() == true) + if (widget().radioMSDOS().isChecked() && Config::useCylinderAlignment() == true) return PartitionTable::msdos; - return PartitionTable::msdos_vista; + return PartitionTable::msdos_sectorbased; } diff --git a/src/gui/devicepropsdialog.cpp b/src/gui/devicepropsdialog.cpp index 2db0083..9c0754a 100644 --- a/src/gui/devicepropsdialog.cpp +++ b/src/gui/devicepropsdialog.cpp @@ -83,9 +83,9 @@ void DevicePropsDialog::setupDialog() dialogWidget().type().setText(type); if (device().partitionTable()->type() == PartitionTable::msdos) - dialogWidget().radioLegacy().setChecked(true); - else if (device().partitionTable()->type() == PartitionTable::msdos_vista) - dialogWidget().radioVista().setChecked(true); + dialogWidget().radioCylinderBased().setChecked(true); + else if (device().partitionTable()->type() == PartitionTable::msdos_sectorbased) + dialogWidget().radioSectorBased().setChecked(true); else dialogWidget().hideTypeRadioButtons(); @@ -95,8 +95,8 @@ void DevicePropsDialog::setupDialog() void DevicePropsDialog::setupConnections() { - connect(&dialogWidget().radioVista(), SIGNAL(toggled(bool)), SLOT(setDirty(bool))); - connect(&dialogWidget().radioLegacy(), SIGNAL(toggled(bool)), SLOT(setDirty(bool))); + connect(&dialogWidget().radioSectorBased(), SIGNAL(toggled(bool)), SLOT(setDirty(bool))); + connect(&dialogWidget().radioCylinderBased(), SIGNAL(toggled(bool)), SLOT(setDirty(bool))); } void DevicePropsDialog::setDirty(bool) @@ -105,12 +105,12 @@ void DevicePropsDialog::setDirty(bool) enableButtonOk(true); } -bool DevicePropsDialog::legacyAlignment() const +bool DevicePropsDialog::cylinderBasedAlignment() const { - return dialogWidget().radioLegacy().isChecked(); + return dialogWidget().radioCylinderBased().isChecked(); } -bool DevicePropsDialog::vistaAlignment() const +bool DevicePropsDialog::sectorBasedAlignment() const { - return dialogWidget().radioVista().isChecked(); + return dialogWidget().radioSectorBased().isChecked(); } diff --git a/src/gui/devicepropsdialog.h b/src/gui/devicepropsdialog.h index c7641da..72ec3c4 100644 --- a/src/gui/devicepropsdialog.h +++ b/src/gui/devicepropsdialog.h @@ -45,8 +45,8 @@ class DevicePropsDialog : public KDialog ~DevicePropsDialog(); public: - bool legacyAlignment() const; - bool vistaAlignment() const; + bool cylinderBasedAlignment() const; + bool sectorBasedAlignment() const; protected: void setupDialog(); diff --git a/src/gui/devicepropswidget.h b/src/gui/devicepropswidget.h index cc6d93a..5d45c67 100644 --- a/src/gui/devicepropswidget.h +++ b/src/gui/devicepropswidget.h @@ -44,18 +44,18 @@ class DevicePropsWidget : public QWidget, public Ui::DevicePropsWidgetBase QLabel& totalSectors() { Q_ASSERT(m_LabelTotalSectors); return *m_LabelTotalSectors; } QLabel& type() { Q_ASSERT(m_LabelType); return *m_LabelType; } - QRadioButton& radioLegacy() { Q_ASSERT(m_RadioLegacy); return *m_RadioLegacy; } - const QRadioButton& radioLegacy() const { Q_ASSERT(m_RadioLegacy); return *m_RadioLegacy; } + QRadioButton& radioCylinderBased() { Q_ASSERT(m_RadioCylinderBased); return *m_RadioCylinderBased; } + const QRadioButton& radioCylinderBased() const { Q_ASSERT(m_RadioCylinderBased); return *m_RadioCylinderBased; } - QRadioButton& radioVista() { Q_ASSERT(m_RadioVista); return *m_RadioVista; } - const QRadioButton& radioVista() const { Q_ASSERT(m_RadioVista); return *m_RadioVista; } + QRadioButton& radioSectorBased() { Q_ASSERT(m_RadioSectorBased); return *m_RadioSectorBased; } + const QRadioButton& radioSectorBased() const { Q_ASSERT(m_RadioSectorBased); return *m_RadioSectorBased; } QSpacerItem& spacerType() { Q_ASSERT(m_SpacerType); return *m_SpacerType; } void hideTypeRadioButtons() { - radioVista().setVisible(false); - radioLegacy().setVisible(false); + radioSectorBased().setVisible(false); + radioCylinderBased().setVisible(false); } }; diff --git a/src/gui/devicepropswidgetbase.ui b/src/gui/devicepropswidgetbase.ui index 8b9a5e5..44883d5 100644 --- a/src/gui/devicepropswidgetbase.ui +++ b/src/gui/devicepropswidgetbase.ui @@ -81,16 +81,16 @@ - + - Legacy Alignment + Cylinder Alignment - + - Vista Compatible Alignment + Sector Based Alignment diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index e398e03..cd8bc87 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -688,9 +688,9 @@ void MainWindow::onPropertiesDevice(const QString&) QPointer dlg = new DevicePropsDialog(this, d); if (dlg->exec() == KDialog::Accepted) { - if (d.partitionTable()->type() == PartitionTable::msdos && dlg->vistaAlignment()) - d.partitionTable()->setType(d, PartitionTable::msdos_vista); - else if (d.partitionTable()->type() == PartitionTable::msdos_vista && dlg->legacyAlignment()) + if (d.partitionTable()->type() == PartitionTable::msdos && dlg->sectorBasedAlignment()) + d.partitionTable()->setType(d, PartitionTable::msdos_sectorbased); + else if (d.partitionTable()->type() == PartitionTable::msdos_sectorbased && dlg->cylinderBasedAlignment()) d.partitionTable()->setType(d, PartitionTable::msdos); on_m_OperationStack_devicesChanged();