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

Improved deployment information for Symbian

Browse Source
This commit is contained in:
Pawel Polanski
2010-09-09 13:43:29 +02:00
parent 628afc5ac1
commit 7d8a5423a2
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View File

@@ -244,11 +244,11 @@ void S60DeployStep::setupConnections()
connect(m_launcher, SIGNAL(finished()), this, SLOT(launcherFinished()));
connect(m_launcher, SIGNAL(canNotConnect(QString)), this, SLOT(connectFailed(QString)));
connect(m_launcher, SIGNAL(copyingStarted()), this, SLOT(printCopyingNotice()));
connect(m_launcher, SIGNAL(copyingStarted(QString)), this, SLOT(printCopyingNotice(QString)));
connect(m_launcher, SIGNAL(canNotCreateFile(QString,QString)), this, SLOT(createFileFailed(QString,QString)));
connect(m_launcher, SIGNAL(canNotWriteFile(QString,QString)), this, SLOT(writeFileFailed(QString,QString)));
connect(m_launcher, SIGNAL(canNotCloseFile(QString,QString)), this, SLOT(closeFileFailed(QString,QString)));
connect(m_launcher, SIGNAL(installingStarted()), this, SLOT(printInstallingNotice()));
connect(m_launcher, SIGNAL(installingStarted(QString)), this, SLOT(printInstallingNotice(QString)));
connect(m_launcher, SIGNAL(canNotInstall(QString,QString)), this, SLOT(installFailed(QString,QString)));
connect(m_launcher, SIGNAL(installingFinished()), this, SLOT(printInstallingFinished()));
connect(m_launcher, SIGNAL(stateChanged(int)), this, SLOT(slotLauncherStateChanged(int)));
@@ -359,14 +359,14 @@ void S60DeployStep::connectFailed(const QString &errorMessage)
m_deployResult = false;
}
void S60DeployStep::printCopyingNotice()
void S60DeployStep::printCopyingNotice(const QString &fileName)
{
appendMessage(tr("Copying installation file..."), false);
appendMessage(tr("Copying \"%1\"...").arg(fileName), false);
}
void S60DeployStep::printInstallingNotice()
void S60DeployStep::printInstallingNotice(const QString &packageName)
{
appendMessage(tr("Installing application on drive %1:...").arg(m_installationDrive), false);
appendMessage(tr("Installing package \"%1\" on drive %2:...").arg(packageName).arg(m_installationDrive), false);
}
void S60DeployStep::printInstallingFinished()

4
src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
View File

@@ -99,11 +99,11 @@ protected slots:
private slots:
void connectFailed(const QString &errorMessage);
void printCopyingNotice();
void printCopyingNotice(const QString &fileName);
void createFileFailed(const QString &filename, const QString &errorMessage);
void writeFileFailed(const QString &filename, const QString &errorMessage);
void closeFileFailed(const QString &filename, const QString &errorMessage);
void printInstallingNotice();
void printInstallingNotice(const QString &packageName);
void installFailed(const QString &filename, const QString &errorMessage);
void printInstallingFinished();
void launcherFinished();

11
src/shared/symbianutils/launcher.cpp
View File

@@ -40,6 +40,7 @@
#include <QtCore/QDebug>
#include <QtCore/QQueue>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QScopedPointer>
#include <cstdio>
@@ -872,7 +873,8 @@ void Launcher::disconnectTrk()
void Launcher::copyFileToRemote()
{
emit copyingStarted();
QFileInfo fileInfo(d->m_copyState.destinationFileNames.at(d->m_copyState.currentFileName));
emit copyingStarted(fileInfo.fileName());
QByteArray ba;
ba.append(char(10)); //kDSFileOpenWrite | kDSFileOpenBinary
appendString(&ba, d->m_copyState.destinationFileNames.at(d->m_copyState.currentFileName).toLocal8Bit(), TargetByteOrder, false);
@@ -881,7 +883,8 @@ void Launcher::copyFileToRemote()
void Launcher::copyFileFromRemote()
{
emit copyingStarted();
QFileInfo fileInfo(d->m_copyState.destinationFileNames.at(d->m_copyState.currentFileName));
emit copyingStarted(fileInfo.fileName());
QByteArray ba;
ba.append(char(9)); //kDSFileOpenRead | kDSFileOpenBinary
appendString(&ba, d->m_downloadState.sourceFileName.toLocal8Bit(), TargetByteOrder, false);
@@ -890,7 +893,7 @@ void Launcher::copyFileFromRemote()
void Launcher::installRemotePackageSilently()
{
emit installingStarted();
emit installingStarted(d->m_installFileNames.at(d->m_currentInstallFileName));
d->m_currentInstallationStep = InstallationModeSilent;
QByteArray ba;
ba.append(static_cast<char>(QChar::toUpper((ushort)d->m_installationDrive)));
@@ -900,7 +903,7 @@ void Launcher::installRemotePackageSilently()
void Launcher::installRemotePackageByUser()
{
emit installingStarted();
emit installingStarted(d->m_installFileNames.at(d->m_currentInstallFileName));
d->m_currentInstallationStep = InstallationModeUser;
QByteArray ba;
appendString(&ba, d->m_installFileNames.at(d->m_currentInstallFileName).toLocal8Bit(), TargetByteOrder, false);

4
src/shared/symbianutils/launcher.h
View File

@@ -135,14 +135,14 @@ public:
signals:
void deviceDescriptionReceived(const QString &port, const QString &description);
void copyingStarted();
void copyingStarted(const QString &fileName);
void canNotConnect(const QString &errorMessage);
void canNotCreateFile(const QString &filename, const QString &errorMessage);
void canNotOpenFile(const QString &filename, const QString &errorMessage);
void canNotOpenLocalFile(const QString &filename, const QString &errorMessage);
void canNotWriteFile(const QString &filename, const QString &errorMessage);
void canNotCloseFile(const QString &filename, const QString &errorMessage);
void installingStarted();
void installingStarted(const QString &packageName);
void canNotInstall(const QString &packageFilename, const QString &errorMessage);
void installingFinished();
void startingApplication();