Commit d01ff29492b805ed96c07371c4840def2b6e9c92

con <qtc-committer @no…a.com>
Fri Nov 20 15:03:22 GMT 2009

Tree SHA1: f73fd01
Parent SHA1: a06526a (gdb: On Windows, also substitute the debugging path for non-sdk Qt.)
raw diff | raw patch

Make context help work also when switching user interface language.

Also avoids errors because of users messing with the "Unfiltered"
filter, which is used for e.g. context help.
The strategy now is to remove the "Unfiltered" filter from previous runs
(possibly in a different language), and re-register a fresh filter with
the name in the current language, and guaranteed to not filter out
anything.

Reviewed-by: kh1
(cherry picked from commit ad4c227ca45912b27383236d8b73b790e97acf8e)

Diff rendering mode:
inline
side by side


418	418	cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl++")));
419	419	connect(a, SIGNAL(triggered()), m_centralWidget, SLOT(zoomIn()));
420	420	advancedMenu->addAction(cmd, Core::Constants::G_EDIT_FONT);
421
	421
422	422	a = new QAction(tr("Decrease Font Size"), this);
423	423	cmd = am->registerAction(a, TextEditor::Constants::DECREASE_FONT_SIZE,
424	424	modecontext);
…	…
572	572	return;
573	573	}
574	574
575		bool needsSetup = false;
576	575	bool assistantInternalDocRegistered = false;
577	576	QStringList documentationToRemove;
578	577	QStringList filtersToRemove;
…	…
600	600	QHelpEngineCore hc(m_helpEngine->collectionFile());
601	601	hc.setupData();
602	602	foreach (const QString &ns, documentationToRemove) {
603		if (hc.unregisterDocumentation(ns))
604		needsSetup = true;
	603	hc.unregisterDocumentation(ns);
605	604	}
606	605	foreach (const QString &filter, filtersToRemove) {
607		if (hc.removeCustomFilter(filter))
608		needsSetup = true;
	606	hc.removeCustomFilter(filter);
609	607	}
610	608
611	609	if (!assistantInternalDocRegistered) {
…	…
616	616	#endif
617	617	if (!hc.registerDocumentation(qchFileName))
618	618	qDebug() << qPrintable(hc.error());
619		needsSetup = true;
620	619	}
621	620
622	621	}
623	622
624		QLatin1String key("UnfilteredFilterInserted");
625		int i = m_helpEngine->customValue(key).toInt();
626		if (i != 1) {
627		{
628		QHelpEngineCore hc(m_helpEngine->collectionFile());
629		hc.setupData();
630		hc.addCustomFilter(tr("Unfiltered"), QStringList());
631		hc.setCustomValue(key, 1);
	623	const QLatin1String weAddedFilterKey("UnfilteredFilterInserted");
	624	const QLatin1String previousFilterNameKey("UnfilteredFilterName");
	625	int i = m_helpEngine->customValue(weAddedFilterKey).toInt();
	626	const QString filterName = tr("Unfiltered");
	627	if (i == 1) { // we added a filter at some point
	628	// remove previously added filter
	629	QHelpEngineCore hc(m_helpEngine->collectionFile());
	630	hc.setupData();
	631	QString previousFilterName = hc.customValue(previousFilterNameKey).toString();
	632	if (!previousFilterName.isEmpty()) { // we noted down the name of the previously added filter
	633	hc.removeCustomFilter(previousFilterName);
632	634	}
633		bool blocked = m_helpEngine->blockSignals(true);
634		m_helpEngine->setCurrentFilter(tr("Unfiltered"));
635		m_helpEngine->blockSignals(blocked);
636		needsSetup = true;
	635	if (previousFilterName != filterName) { // potentially remove a filter with new name
	636	hc.removeCustomFilter(filterName);
	637	}
637	638	}
	639	{
	640	QHelpEngineCore hc(m_helpEngine->collectionFile());
	641	hc.setupData();
	642	hc.addCustomFilter(filterName, QStringList());
	643	hc.setCustomValue(weAddedFilterKey, 1);
	644	hc.setCustomValue(previousFilterNameKey, filterName);
	645	}
	646	bool blocked = m_helpEngine->blockSignals(true);
	647	m_helpEngine->setCurrentFilter(filterName);
	648	m_helpEngine->blockSignals(blocked);
638	649
639		if (needsSetup)
640		m_helpEngine->setupData();
	650	m_helpEngine->setupData();
641	651
642	652	updateFilterComboBox();
643	653	m_bookmarkManager->setupBookmarkModels();
…	…
659	659
660	660	font = qVariantValue<QFont>(m_helpEngine->customValue(QLatin1String("font"),
661	661	font));
662
	662
663	663	webSettings->setFontFamily(QWebSettings::StandardFont, font.family());
664	664	webSettings->setFontSize(QWebSettings::DefaultFontSize, font.pointSize());
665	665	#endif

Commit d01ff29492b805ed96c07371c4840def2b6e9c92

Comments

Add a new comment:

Add your comment