Profile Info: autocomplete for country

src/aboutdlg.cpp

@@ -19,6 +19,7 @@
 
 #include "aboutdlg.h"
 #include "applicationinfo.h"
+#include "fileutil.h"
 #include "iconset.h"
 
 #include <QFile>
@@ -41,7 +42,7 @@ AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent)
                           + "<br/><br/>Copyright © 2001-2025 The Psi Team<br/></p></body></html>");
     ui_.lb_name->setText(QString("<h3><b>%1 v%2</b></h3>").arg(ApplicationInfo::name(), ApplicationInfo::version()));
 
-    ui_.te_license->setText(loadText(":/COPYING"));
+    ui_.te_license->setText(FileUtil::readFileText(":/COPYING"));
 
     QString lang_name = qApp->translate("@default", "language_name");
     if (lang_name == "language_name") // remove the translation tab, if no translation is used
@@ -125,21 +126,6 @@ AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent)
     ui_.te_translation->appendText(translation);
 }
 
-QString AboutDlg::loadText(const QString &fileName)
-{
-    QString text;
-
-    QFile f(fileName);
-    if (f.open(QIODevice::ReadOnly)) {
-        QTextStream t(&f);
-        while (!t.atEnd())
-            text += t.readLine() + '\n';
-        f.close();
-    }
-
-    return text;
-}
-
 QString AboutDlg::details(QString name, QString email, QString xmppAddress, QString www, QString desc)
 {
     QString       ret;

src/aboutdlg.h

@@ -31,7 +31,6 @@ class AboutDlg : public QDialog {
     AboutDlg(QWidget *parent = nullptr);
 
 protected:
-    QString loadText(const QString &fileName);
     QString details(QString name, QString email, QString xmppAddress, QString www, QString desc);
 
 private:

src/fileutil.cpp

@@ -33,6 +33,7 @@
 #ifdef Q_OS_WIN
 #include <sys/utime.h>
 #else
+#include <QTextStream>
 #include <utime.h>
 #endif
 
@@ -160,7 +161,7 @@ QString FileUtil::getSaveDirName(QWidget *parent, const QString &caption)
 
 QString FileUtil::getImageFileName(QWidget *parent, QString caption)
 {
-    // double extenstions because of QTBUG-51712
+    // double extensions because of QTBUG-51712
     return FileUtil::getOpenFileName(parent, caption.isEmpty() ? tr("Choose a file") : caption,
                                      tr("Images (*.png *.xpm *.jpg *.jpeg *.webp *.PNG *.XPM *.JPG *.JPEG *.WEBP)"));
 }
@@ -249,3 +250,43 @@ void FileUtil::setModificationTime(const QString &filename, const QDateTime &mti
     utime(filename.toLocal8Bit().data(), &t);
 #endif
 }
+
+QString FileUtil::readFileText(const QString &filename)
+{
+    QFile f(filename);
+    if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return "";
+    }
+    QString     text;
+    QTextStream in(&f);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    in.setEncoding(QStringConverter::Utf8);
+#else
+    in.setCodec("UTF-8");
+#endif
+    while (!in.atEnd()) {
+        text += in.readLine() + '\n';
+    }
+    f.close();
+    return text;
+}
+
+QStringList FileUtil::readFileLines(const QString &filename) {
+    QStringList lines;
+    QFile f(filename);
+    if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return lines;
+    }
+    QString     text;
+    QTextStream in(&f);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    in.setEncoding(QStringConverter::Utf8);
+#else
+    in.setCodec("UTF-8");
+#endif
+    while (!in.atEnd()) {
+        lines << in.readLine();
+    }
+    f.close();
+    return lines;
+}

src/fileutil.h

@@ -50,11 +50,13 @@ class FileUtil : public QObject {
     static void    openFolder(const QString &path);
 
     /**
-     * @brief setModificationTime sets file mofication and access time
+     * @brief setModificationTime sets file modification and access time
      * @param filename - relative or absolute file name
      * @param mtime - new file modification time
      */
     static void setModificationTime(const QString &filename, const QDateTime &mtime);
+    static QString readFileText(const QString &filename);
+    static QStringList readFileLines(const QString &filename);
 };
 
 #endif // FILEUTIL_H

src/historyimp.cpp

@@ -211,7 +211,7 @@ void HistoryImport::showDialog()
 {
     dlg = new QDialog();
     dlg->setModal(true);
-    dlg->setWindowTitle(tr("Psi+ Import history"));
+    dlg->setWindowTitle(CAP(tr("Import history")));
     QVBoxLayout *mainLayout = new QVBoxLayout(dlg);
     stackedWidget           = new QStackedWidget(dlg);