feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use native separator and make the line not wrap in the table view.

Browse Source 
Reviewed-by: ck
This commit is contained in:
kh1
2010-05-31 12:28:02 +02:00
parent cca38a737e
commit 0d9c210369
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
View File

@@ -151,10 +151,12 @@ QVariantMap MaemoPackageContents::toMap() const
QVariantMap map;
map.insert(MODIFIED_KEY, m_modified);
map.insert(REMOTE_EXE_KEY, m_remoteExecutableFilePath);
QDir dir;
QStringList localFiles;
QStringList remoteFiles;
foreach (const Deployable &p, m_deployables) {
localFiles << p.localFilePath;
localFiles << dir.fromNativeSeparators(p.localFilePath);
remoteFiles << p.remoteFilePath;
}
map.insert(LOCAL_FILES_KEY, localFiles);
@@ -170,9 +172,13 @@ void MaemoPackageContents::fromMap(const QVariantMap &map)
const QStringList remoteFiles = map.value(REMOTE_FILES_KEY).toStringList();
if (localFiles.count() != remoteFiles.count())
qWarning("%s: serialized data inconsistent", Q_FUNC_INFO);
QDir dir;
const int count = qMin(localFiles.count(), remoteFiles.count());
for (int i = 0; i < count; ++i)
m_deployables << Deployable(localFiles.at(i), remoteFiles.at(i));
for (int i = 0; i < count; ++i) {
m_deployables << Deployable(dir.toNativeSeparators(localFiles.at(i)),
remoteFiles.at(i));
}
}
QString MaemoPackageContents::remoteExecutableFilePath() const

4
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
View File

@@ -64,6 +64,7 @@ MaemoPackageCreationWidget::MaemoPackageCreationWidget(MaemoPackageCreationStep
m_ui(new Ui::MaemoPackageCreationWidget)
{
m_ui->setupUi(this);
m_ui->packageContentsView->setWordWrap(false);
m_ui->packageContentsView->setModel(step->packageContents());
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
connect(step->packageContents(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),
@@ -103,7 +104,8 @@ void MaemoPackageCreationWidget::addFile()
if (localFile.isEmpty())
return;
const MaemoPackageContents::Deployable
deployable(QFileInfo(localFile).absoluteFilePath(), "/");
deployable(QDir::toNativeSeparators(QFileInfo(localFile).absoluteFilePath()),
"/");
MaemoPackageContents * const contents = m_step->packageContents();
if (!contents->addDeployable(deployable)) {
QMessageBox::information(this, tr("File already in package"),