flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #887, improved copy wizard

Browse Source 
* initAndPreselectDirectories when wizard page becomes visible
* completed copy function
This commit is contained in:
Klaus Basan
2017-03-08 05:02:04 +01:00
committed by Mathew Sutcliffe
parent 221e4c2b9c
commit 6e28dfbce3
3 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/configurationwizard.cpp
View File

@@ -46,10 +46,12 @@ namespace BlackGui
if (page == ui->wp_CopyCaches)
{
ui->comp_CopyCaches->setCacheMode();
ui->comp_CopyCaches->initAndPreselectDirectories();
}
else if (page == ui->wp_CopySettings)
{
ui->comp_CopySettings->setSettingsMode();
ui->comp_CopySettings->initAndPreselectDirectories();
}
}
} // ns

50
src/blackgui/components/copyconfigurationcomponent.cpp
View File

@@ -34,9 +34,6 @@ namespace BlackGui
ui->cb_OtherVersions->addItems(CDirectoryUtils::swiftApplicationDataDirectoryList(true, true));
m_otherVersionDirs = CDirectoryUtils::swiftApplicationDataDirectoryList(true, false); // not beautified
this->initCurrentDirectories();
this->preselectMissingOurOutdated();
connect(ui->rb_Cache, &QRadioButton::toggled, this, &CCopyConfigurationComponent::initCurrentDirectories);
connect(ui->cb_OtherVersions, &QComboBox::currentTextChanged, this, &CCopyConfigurationComponent::initCurrentDirectories);
connect(ui->pb_SelectAll, &QPushButton::clicked, ui->tv_Source, &QTreeView::selectAll);
@@ -57,10 +54,25 @@ namespace BlackGui
ui->rb_Settings->setChecked(true);
}
void CCopyConfigurationComponent::copySelectedFiles()
int CCopyConfigurationComponent::copySelectedFiles()
{
const QStringList files = this->getSelectedFiles();
if (files.isEmpty()) { return; }
if (files.isEmpty()) { return 0; }
const QString destinationDir = this->getThisVersionDirectory();
if (destinationDir.isEmpty()) { return 0; }
const QDir d(destinationDir);
if (!d.exists()) { return 0; }
int c = 0;
for (const QString &file : files)
{
const QFileInfo fileInfo(file);
const QString target = CFileUtils::appendFilePaths(destinationDir, fileInfo.fileName());
const bool s = QFile::copy(file, target);
if (s) { c++; }
}
return c;
}
void CCopyConfigurationComponent::preselectMissingOurOutdated()
@@ -72,16 +84,16 @@ namespace BlackGui
ui->tv_Destination->clearSelection();
const CDirectoryUtils::DirComparison comp = CDirectoryUtils::compareTwoDirectories(dirOther, dirCurrent);
const QFileSystemModel *model = qobject_cast<QFileSystemModel *>(ui->tv_Destination->model());
if (!model) { return; }
const QFileSystemModel *sourceModel = qobject_cast<QFileSystemModel *>(ui->tv_Source->model());
if (!sourceModel) { return; }
QStringList select = comp.missingInTarget.toList();
select.append(comp.newerInSource.toList());
for (const QString &file : as_const(comp.missingInTarget))
{
const QModelIndex index = model->index(file);
const QModelIndex index = sourceModel->index(file);
if (!index.isValid()) continue;
ui->tv_Destination->setCurrentIndex(index);
ui->tv_Source->setCurrentIndex(index);
}
}
@@ -96,8 +108,8 @@ namespace BlackGui
if (!sourceModel)
{
sourceModel = new QFileSystemModel(this);
sourceModel->setNameFilterDisables(true); // hide/disable only
sourceModel->setFilter(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
sourceModel->setNameFilterDisables(false);
sourceModel->setNameFilters(QStringList("*.json"));
ui->tv_Source->setModel(sourceModel);
connect(sourceModel, &QFileSystemModel::directoryLoaded, this, [ = ](const QString & path)
@@ -107,20 +119,18 @@ namespace BlackGui
});
}
if (!dir.isEmpty())
{
const QModelIndex sourceIndex = sourceModel->setRootPath(dir);
ui->tv_Source->setRootIndex(sourceIndex);
ui->tv_Source->setSortingEnabled(true);
}
const QModelIndex sourceIndex = sourceModel->setRootPath(dir);
ui->tv_Source->setRootIndex(sourceIndex);
ui->tv_Source->setSortingEnabled(true); // hide/disable only
ui->tv_Source->resizeColumnToContents(0);
// destination
QFileSystemModel *destinationModel = qobject_cast<QFileSystemModel *>(ui->tv_Destination->model());
if (!destinationModel)
{
destinationModel = new QFileSystemModel(this);
destinationModel->setNameFilterDisables(true);
destinationModel->setFilter(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
destinationModel->setNameFilterDisables(false);
destinationModel->setNameFilters(QStringList("*.json"));
ui->tv_Destination->setModel(destinationModel);
connect(destinationModel, &QFileSystemModel::directoryLoaded, this, [ = ](const QString & path)
@@ -136,6 +146,12 @@ namespace BlackGui
ui->tv_Destination->resizeColumnToContents(0);
}
void CCopyConfigurationComponent::initAndPreselectDirectories()
{
this->initCurrentDirectories();
this->preselectMissingOurOutdated();
}
bool CCopyConfigurationComponent::hasOtherVersionData() const
{
return !m_otherVersionDirs.isEmpty();

5
src/blackgui/components/copyconfigurationcomponent.h
View File

@@ -43,7 +43,7 @@ namespace BlackGui
void setSettingsMode();
//! Selected files are copied
void copySelectedFiles();
int copySelectedFiles();
//! Preselect newer files
void preselectMissingOurOutdated();
@@ -51,6 +51,9 @@ namespace BlackGui
//! Init file content
void initCurrentDirectories();
//! Init and preselect directories
void initAndPreselectDirectories();
//! Are there other versions to copy from
bool hasOtherVersionData() const;