mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-01-02 12:18:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Port away from deprecated KCodecAction API

Browse Source
This commit is contained in:
Nicolas Fella
2023-01-09 00:00:29 +01:00
committed by Kurt Hindenburg
parent feb44c226f
commit e98a6a19ff
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/session/SessionController.cpp
View File

@@ -786,6 +786,7 @@ void SessionController::setupCommonActions()
collection->addAction(QStringLiteral("set-encoding"), _codecAction);
_codecAction->setCurrentCodec(QString::fromUtf8(session()->codec()));
connect(session(), &Konsole::Session::sessionCodecChanged, this, &Konsole::SessionController::updateCodecAction);
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 103, 0)
connect(_codecAction,
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 78, 0)
QOverload<QTextCodec *>::of(&KCodecAction::codecTriggered),
@@ -795,6 +796,11 @@ void SessionController::setupCommonActions()
this,
#endif
&Konsole::SessionController::changeCodec);
#else
connect(_codecAction, &KCodecAction::codecNameTriggered, this, [this](const QByteArray &codecName) {
changeCodec(QTextCodec::codecForName(codecName));
});
#endif
connect(_codecAction, &KCodecAction::defaultItemTriggered, this, [this] {
Profile::Ptr profile = SessionManager::instance()->sessionProfile(session());
@@ -977,7 +983,7 @@ void SessionController::prepareSwitchProfileMenu()
}
void SessionController::updateCodecAction(QTextCodec *codec)
{
_codecAction->setCurrentCodec(codec);
_codecAction->setCurrentCodec(QString::fromUtf8(codec->name()));
}
void SessionController::changeCodec(QTextCodec *codec)

6
src/widgets/EditProfileDialog.cpp
View File

@@ -1871,6 +1871,7 @@ void EditProfileDialog::setupAdvancedPage(const Profile::Ptr &profile)
auto codecAction = new KCodecAction(this);
codecAction->setCurrentCodec(profile->defaultEncoding());
_advancedUi->selectEncodingButton->setMenu(codecAction->menu());
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 103, 0)
connect(codecAction,
#if KCONFIGWIDGETS_VERSION >= QT_VERSION_CHECK(5, 78, 0)
QOverload<QTextCodec *>::of(&KCodecAction::codecTriggered),
@@ -1880,6 +1881,11 @@ void EditProfileDialog::setupAdvancedPage(const Profile::Ptr &profile)
this,
#endif
&Konsole::EditProfileDialog::setDefaultCodec);
#else
connect(codecAction, &KCodecAction::codecNameTriggered, this, [this](const QByteArray &codecName) {
setDefaultCodec(QTextCodec::codecForName(codecName));
});
#endif
connect(codecAction, &KCodecAction::defaultItemTriggered, this, [this] {
setDefaultCodec(QTextCodec::codecForLocale());