1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00

BrowserWindow: Use QActionGroup for encoding menu

This commit is contained in:
David Rosca 2018-01-04 21:43:54 +01:00
parent 8eeba9e1df
commit c0ac5ce0a2

View File

@ -524,8 +524,12 @@ void BrowserWindow::createEncodingSubMenu(const QString &name, QStringList &code
QMenu* subMenu = new QMenu(name, menu); QMenu* subMenu = new QMenu(name, menu);
const QString activeCodecName = mApp->webSettings()->defaultTextEncoding(); const QString activeCodecName = mApp->webSettings()->defaultTextEncoding();
QActionGroup *group = new QActionGroup(subMenu);
foreach (const QString &codecName, codecNames) { foreach (const QString &codecName, codecNames) {
subMenu->addAction(createEncodingAction(codecName, activeCodecName, subMenu)); QAction *act = createEncodingAction(codecName, activeCodecName, subMenu);
group->addAction(act);
subMenu->addAction(act);
} }
menu->addMenu(subMenu); menu->addMenu(subMenu);
@ -1095,8 +1099,6 @@ void BrowserWindow::createEncodingMenu(QMenu* menu)
isciiCodecs.append(codecName); isciiCodecs.append(codecName);
else if (codecName.startsWith(QLatin1String("IBM"))) else if (codecName.startsWith(QLatin1String("IBM")))
ibmCodecs.append(codecName); ibmCodecs.append(codecName);
else if (codecName == QLatin1String("System"))
menu->addAction(createEncodingAction(codecName, activeCodecName, menu));
else else
otherCodecs.append(codecName); otherCodecs.append(codecName);
} }