Commit 1aa54dc12ecfd818c1ab68c18cdc29ee8e06ce3e

Tree SHA1: affd9c9
Parent SHA1: 96f7628 (Add the ability to drop an url on the tab bar which will open it in a)
raw diff | raw patch

Do not list aliases in the encoding menu.


798	798	{
799	799	#if WEBKIT_TRUNK
800	800	m_viewTextEncodingMenu->clear();
	801
801	802	int currentCodec = -1;
802		QList<QByteArray> codecs = QTextCodec::availableCodecs();
803		QByteArray defaultTextEncoding = QWebSettings::globalSettings()->defaultTextEncoding().toUtf8();
	803	QStringList codecs;
	804	QList<int> mibs = QTextCodec::availableMibs();
	805	foreach (const int &mib, mibs) {
	806	QString codec = QLatin1String(QTextCodec::codecForMib(mib)->name());
	807	codecs.append(codec);
	808	}
	809	codecs.sort();
	810
	811	QString defaultTextEncoding = QWebSettings::globalSettings()->defaultTextEncoding();
804	812	currentCodec = codecs.indexOf(defaultTextEncoding);
	813
805	814	QAction *defaultEncoding = m_viewTextEncodingMenu->addAction(tr("Default"));
806	815	defaultEncoding->setData(-1);
807	816	defaultEncoding->setCheckable(true);
808	817	if (currentCodec == -1)
809	818	defaultEncoding->setChecked(true);
810	819	m_viewTextEncodingMenu->addSeparator();
	820
811	821	for (int i = 0; i < codecs.count(); ++i) {
812		const QByteArray &codec = codecs.at(i);
813		QAction *action = m_viewTextEncodingMenu->addAction(QLatin1String(codec));
	822	const QString &codec = codecs.at(i);
	823	QAction *action = m_viewTextEncodingMenu->addAction(codec);
814	824	action->setData(i);
815	825	action->setCheckable(true);
816	826	if (currentCodec == i)