Commit 035c4af1e32286b77476c04ca5eaf35b77176b65

con <qtc-committer @no…a.com> (Committer)
Fri Oct 09 19:17:36 CEST 2009
Daniel Molkentin (Author)
Fri Oct 09 15:00:11 CEST 2009

Tree SHA1: 343ae5e
Parent SHA1: a77cf79 (Trk: Removed unneeded header.)
raw diff | raw patch

S60 -> Symbian for visible strings

Reviewed-By: con
(cherry picked from commit 5a0566249b84cb521c3a4fc93d7ccc680e451cea)

Diff rendering mode:
inline
side by side


40	40	namespace Debugger {
41	41	namespace Internal {
42	42
43		const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "S60 / Trk");
	43	const char * const TRK_SETTINGS_ID = QT_TRANSLATE_NOOP("Debugger::Internal::TrkOptionsPage", "Symbian Trk");
44	44
45	45	TrkOptionsPage::TrkOptionsPage(const TrkOptionsPtr &options) :
46	46	m_options(options)


470	470	QStringList applicationProFiles;
471	471	QList<Qt4ProFileNode *> list = qt4project->applicationProFiles();
472	472	foreach (Qt4ProFileNode * node, list) {
473		applicationProFiles.append("QtS60DeviceRunConfiguration." + node->path());
	473	applicationProFiles.append("QtSymbianDeviceRunConfiguration." + node->path());
474	474	}
475	475	return applicationProFiles;
476	476	} else {
…	…
480	480
481	481	QString S60DeviceRunConfigurationFactory::displayNameForType(const QString &type) const
482	482	{
483		QString fileName = type.mid(QString("QtS60DeviceRunConfiguration.").size());
484		return tr("%1 on S60 Device").arg(QFileInfo(fileName).completeBaseName());
	483	QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size());
	484	return tr("%1 on Symbian Device").arg(QFileInfo(fileName).completeBaseName());
485	485	}
486	486
487	487	QSharedPointer<RunConfiguration> S60DeviceRunConfigurationFactory::create(Project *project, const QString &type)
…	…
489	489	Qt4Project p = qobject_cast<Qt4Project >(project);
490	490	Q_ASSERT(p);
491	491	if (type.startsWith("QtS60DeviceRunConfiguration.")) {
492		QString fileName = type.mid(QString("QtS60DeviceRunConfiguration.").size());
	492	QString fileName = type.mid(QString("QtSymbianDeviceRunConfiguration.").size());
493	493	return QSharedPointer<RunConfiguration>(new S60DeviceRunConfiguration(p, fileName));
494	494	}
495	495	Q_ASSERT(type == "Qt4ProjectManager.DeviceRunConfiguration");
…	…
564	564	if (!checkConfiguration(&errorMessage, &settingsCategory, &settingsPage)) {
565	565	error(this, errorMessage);
566	566	emit finished();
567		Core::ICore::instance()->showWarningWithOptions(tr("S60 Debugger"), errorMessage, QString(),
	567	Core::ICore::instance()->showWarningWithOptions(tr("Debugger for Symbian Platform"),
	568	errorMessage, QString(),
568	569	settingsCategory, settingsPage);
569	570	return;
570	571	}


52	52	m_cachedTargetInformationValid(false)
53	53	{
54	54	if (!m_proFilePath.isEmpty())
55		setName(tr("%1 in S60 Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));
	55	setName(tr("%1 in Symbian Emulator").arg(QFileInfo(m_proFilePath).completeBaseName()));
56	56	else
57		setName(tr("QtS60EmulatorRunConfiguration"));
	57	setName(tr("QtSymbianEmulatorRunConfiguration"));
58	58
59	59	connect(project, SIGNAL(activeBuildConfigurationChanged()),
60	60	this, SLOT(invalidateCachedTargetInformation()));
…	…
141	141
142	142	if (!reader->readProFile(m_proFilePath)) {
143	143	delete reader;
144		Core::ICore::instance()->messageManager()->printToOutputPane(tr("Could not parse %1. The QtS60 emulator run configuration %2 can not be started.").arg(m_proFilePath).arg(name()));
	144	Core::ICore::instance()->messageManager()->printToOutputPane(tr("Could not parse %1. The Qt for Symbian emulator run configuration %2 can not be started.").arg(m_proFilePath).arg(name()));
145	145	return;
146	146	}
147	147
…	…
228	228	QStringList applicationProFiles;
229	229	QList<Qt4ProFileNode *> list = qt4project->applicationProFiles();
230	230	foreach (Qt4ProFileNode * node, list) {
231		applicationProFiles.append("QtS60EmulatorRunConfiguration." + node->path());
	231	applicationProFiles.append("QtSymbianEmulatorRunConfiguration." + node->path());
232	232	}
233	233	return applicationProFiles;
234	234	} else {
…	…
238	238
239	239	QString S60EmulatorRunConfigurationFactory::displayNameForType(const QString &type) const
240	240	{
241		QString fileName = type.mid(QString("QtS60EmulatorRunConfiguration.").size());
	241	QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
242	242	return tr("%1 in S60 Emulator").arg(QFileInfo(fileName).completeBaseName());
243	243	}
244	244
…	…
246	246	{
247	247	Qt4Project p = qobject_cast<Qt4Project >(project);
248	248	Q_ASSERT(p);
249		if (type.startsWith("QtS60EmulatorRunConfiguration.")) {
250		QString fileName = type.mid(QString("QtS60EmulatorRunConfiguration.").size());
	249	if (type.startsWith("QtSymbianEmulatorRunConfiguration.")) {
	250	QString fileName = type.mid(QString("QtSymbianEmulatorRunConfiguration.").size());
251	251	return QSharedPointer<RunConfiguration>(new S60EmulatorRunConfiguration(p, fileName));
252	252	}
253	253	Q_ASSERT(type == "Qt4ProjectManager.EmulatorRunConfiguration");


58	58	ui->sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.trolltech.com"));
59	59	ui->sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org"));
60	60	ui->sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org"));
61		ui->sitesTreeWidget->addItem(tr("Qt for S60 at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196"));
	61	ui->sitesTreeWidget->addItem(tr("Qt for Symbian at Forum Nokia"), QLatin1String("http://discussion.forum.nokia.com/forum/forumdisplay.php?f=196"));
62	62	}
63	63
64	64	CommunityWelcomePageWidget::~CommunityWelcomePageWidget()

Commit 035c4af1e32286b77476c04ca5eaf35b77176b65

Gitorious