Add QTermWidget::addCustomKeyboardLayoutDir

lib/KeyboardTranslator.cpp

@@ -72,6 +72,11 @@ QString KeyboardTranslatorManager::findTranslatorPath(const QString& name)
     //return KGlobal::dirs()->findResource("data","konsole/"+name+".keytab");
 }
 
+void KeyboardTranslatorManager::addKeyboardLayoutDir(const QString &custom_dir)
+{
+    add_custom_kb_layout_dir(custom_dir);
+}
+
 void KeyboardTranslatorManager::findTranslators()
 {
     QDir dir(get_kb_layout_dir());

lib/KeyboardTranslator.h

@@ -505,6 +505,13 @@ class KONSOLEPRIVATE_EXPORT KeyboardTranslatorManager
      * translators is started.
      */
     QList<QString> allTranslators();
+
+    /**
+     * @brief Allows to add a custom location of keyboard layout.
+     *
+     * @param[in] custom_dir Custom location of keyboard layout (must end with /).
+     */
+    void addKeyboardLayoutDir(const QString& custom_dir);
 
     /** Returns the global KeyboardTranslatorManager instance. */
    static KeyboardTranslatorManager* instance();

lib/qtermwidget.cpp

@@ -491,6 +491,11 @@ void QTermWidget::addCustomColorSchemeDir(const QString& custom_dir)
     ColorSchemeManager::instance()->addCustomColorSchemeDir(custom_dir);
 }
 
+void QTermWidget::addCustomKeyboardLayoutDir(const QString &custom_dir)
+{
+    KeyboardTranslatorManager::instance()->addKeyboardLayoutDir(custom_dir);
+}
+
 void QTermWidget::setSize(const QSize &size)
 {
     m_impl->m_terminalDisplay->setSize(size.width(), size.height());

lib/qtermwidget.h

@@ -117,6 +117,7 @@ class QTERMWIDGET_EXPORT QTermWidget : public QWidget, public QTermWidgetInterfa
     QStringList getAvailableColorSchemes() override;
     static QStringList availableColorSchemes();
     static void addCustomColorSchemeDir(const QString& custom_dir);
+    static void addCustomKeyboardLayoutDir(const QString& custom_dir);
 
     /** Sets the history size (in lines)
      *

lib/tools.cpp

@@ -4,9 +4,16 @@
 #include <QDir>
 #include <QtDebug>
 
-
 Q_LOGGING_CATEGORY(qtermwidgetLogger, "qtermwidget", QtWarningMsg)
 
+static QStringList custom_kb_layout_dirs;
+
+void add_custom_kb_layout_dir(const QString& custom_dir)
+{
+    if (!custom_kb_layout_dirs.contains(custom_dir))
+        custom_kb_layout_dirs << custom_dir;
+}
+
 /*! Helper function to get possible location of layout files.
 By default the KB_LAYOUT_DIR is used (linux/BSD/macports).
 But in some cases (apple bundle) there can be more locations).
@@ -27,26 +34,44 @@ QString get_kb_layout_dir()
         return rval;
     }
 
-#ifdef Q_OS_MAC
     // subdir in the app location
-    d.setPath(QCoreApplication::applicationDirPath() + QLatin1String("/kb-layouts/"));
+    k = QCoreApplication::applicationDirPath()
+        + QDir::separator() + QLatin1String("kb-layouts") + QDir::separator();
+    d.setPath(k);
     //qDebug() << d.path();
     if (d.exists())
-        return QCoreApplication::applicationDirPath() + QLatin1String("/kb-layouts/");
+        return k;
 
-    d.setPath(QCoreApplication::applicationDirPath() + QLatin1String("/../Resources/kb-layouts/"));
+    k = QCoreApplication::applicationDirPath()
+        + QDir::separator() + QLatin1String("..") + QDir::separator()
+        + QLatin1String("Resources") + QDir::separator() + QLatin1String("kb-layouts") + QDir::separator();
+    d.setPath(k);
     if (d.exists())
-        return QCoreApplication::applicationDirPath() + QLatin1String("/../Resources/kb-layouts/");
-#endif
+        return k;
+
+    k = QCoreApplication::applicationDirPath()
+        + QDir::separator() + QLatin1String("..")
+        + QDir::separator() + QLatin1String("share")
+        + QDir::separator() + QLatin1String("qtermwidget6")
+        + QDir::separator() + QLatin1String("kb-layouts") + QDir::separator();
+    d.setPath(k);
+    if(d.exists())
+        return k;
+
+    for (const QString& custom_dir : std::as_const(custom_kb_layout_dirs))
+    {
+        d.setPath(custom_dir);
+        if (d.exists())
+            return custom_dir + QDir::separator();
+    }
+
     //qDebug() << "Cannot find KB_LAYOUT_DIR. Default:" << k;
     return QString();
 }
 
 /*! Helper function to add custom location of color schemes.
 */
-namespace {
-    QStringList custom_color_schemes_dirs;
-}
+static QStringList custom_color_schemes_dirs;
 void add_custom_color_scheme_dir(const QString& custom_dir)
 {
     if (!custom_color_schemes_dirs.contains(custom_dir))

lib/tools.h

@@ -5,6 +5,7 @@
 #include <QStringList>
 #include <QLoggingCategory>
 
+void add_custom_kb_layout_dir(const QString &custom_dir);
 QString get_kb_layout_dir();
 void add_custom_color_scheme_dir(const QString& custom_dir);
 const QStringList get_color_schemes_dirs();