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

Add clearJobs to PCM

Browse Source
This commit is contained in:
Teo Mrnjavac 2014-09-16 18:11:19 +02:00
parent b7f2d5d9d3
commit 8a50685c75
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
* *
* 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
@ -384,6 +385,17 @@ PartitionCoreModule::revert()
} }
void
PartitionCoreModule::clearJobs()
{
foreach ( DeviceInfo* deviceInfo, m_deviceInfos )
{
deviceInfo->forgetChanges();
}
updateIsDirty();
}
bool bool
PartitionCoreModule::isDirty() PartitionCoreModule::isDirty()
{ {

7
src/modules/partition/core/PartitionCoreModule.h
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2014, Teo Mrnjavac <teo@kde.org>
* *
* 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
@ -86,6 +87,8 @@ public:
void revert(); void revert();
void clearJobs();
bool isDirty(); bool isDirty();
/** /**
@ -101,6 +104,8 @@ public:
*/ */
QList< SummaryInfo > createSummaryInfo() const; QList< SummaryInfo > createSummaryInfo() const;
void dumpQueue() const;
Q_SIGNALS: Q_SIGNALS:
void hasRootMountPointChanged( bool value ); void hasRootMountPointChanged( bool value );
void isDirtyChanged( bool value ); void isDirtyChanged( bool value );
@ -134,8 +139,6 @@ private:
void updateHasRootMountPoint(); void updateHasRootMountPoint();
void updateIsDirty(); void updateIsDirty();
void dumpQueue() const;
DeviceInfo* infoForDevice( Device* ) const; DeviceInfo* infoForDevice( Device* ) const;
Partition* findPartitionByMountPoint( const QString& mountPoint ) const; Partition* findPartitionByMountPoint( const QString& mountPoint ) const;