fix

Author: tamlok

src/core/configmgr.cpp

@@ -143,10 +143,6 @@ void ConfigMgr::locateConfigFolder()
     qInfo() << "user config folder" << m_userConfigFolderPath;
 }
 
-static QString locateExtraRcc() {
-    return QStandardPaths::locate(QStandardPaths::AppDataLocation, "vnote_extra.rcc");
-}
-
 bool ConfigMgr::checkAppConfig()
 {
     bool needUpdate = false;
@@ -195,7 +191,7 @@ bool ConfigMgr::checkAppConfig()
 
     // Load extra data.
     splash->showMessage("Loading extra resource data");
-    const QString extraRcc(locateExtraRcc());
+    const QString extraRcc("app:vnote_extra.rcc");
     bool ret = QResource::registerResource(extraRcc);
     if (!ret) {
         Exception::throwOne(Exception::Type::FailToReadFile,
@@ -574,6 +570,26 @@ QString ConfigMgr::getApplicationVersion()
     return appVersion;
 }
 
+void ConfigMgr::initAppPrefixPath()
+{
+    // Support QFile("app:abc.txt").
+    QStringList potential_dirs;
+    auto app_dir_path = QCoreApplication::applicationDirPath();
+    qInfo() << "executable dir: " << app_dir_path;
+    potential_dirs << app_dir_path;
+
+#if defined(Q_OS_LINUX)
+    QDir localBinDir(app_dir_path);
+    if (localBinDir.exists("../local/bin/vnote")) {
+        auto app_dir_path2 = localBinDir.cleanPath(localBinDir.filePath("../local/bin"));
+        qInfo() << "executable dir: " << app_dir_path2;
+        potential_dirs << app_dir_path2;
+    }
+#endif
+
+    QDir::setSearchPaths("app", potential_dirs);
+}
+
 QJsonValue ConfigMgr::parseAndReadConfig(const QString &p_exp) const
 {
     if (p_exp.startsWith(QStringLiteral("main."))) {

src/core/configmgr.h

@@ -120,6 +120,8 @@ namespace vnotex
 
         static QString getApplicationVersion();
 
+        static void initAppPrefixPath();
+
         static void initForUnitTest();
 
         static const QString c_orgName;

src/main.cpp

@@ -81,6 +81,8 @@ int main(int argc, char *argv[])
 
     Application app(argc, argv);
 
+    ConfigMgr::initAppPrefixPath();
+
     QAccessible::installFactory(&FakeAccessible::accessibleFactory);
 
     {
@@ -208,54 +210,47 @@ void loadTranslators(QApplication &p_app)
     QLocale locale;
     qInfo() << "locale:" << locale.name();
 
-    QString translationsDir;
-    auto possible_dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation,
-            "translations", QStandardPaths::LocateDirectory);
-    for (const auto& dir_path : possible_dirs) {
-        if (QDir(dir_path).exists("vnote_zh_CN.qm")) {
-            translationsDir = dir_path;
-            break;
-        }
-    }
-
-    if (translationsDir.isEmpty()) {
+    const auto translationsPath = QDir("app:translations").absolutePath();
+    qInfo() << "translations dir: " << translationsPath;
+    if (translationsPath.isEmpty()) {
         qWarning() << "failed to locate translations directory";
+        return;
     }
 
     // For QTextEdit/QTextBrowser and other basic widgets.
     QScopedPointer<QTranslator> qtbaseTranslator(new QTranslator(&p_app));
-    if (qtbaseTranslator->load(locale, "qtbase", "_", translationsDir)) {
+    if (qtbaseTranslator->load(locale, "qtbase", "_", translationsPath)) {
         p_app.installTranslator(qtbaseTranslator.take());
     }
 
     // qt_zh_CN.ts does not cover the real QDialogButtonBox which uses QPlatformTheme.
     QScopedPointer<QTranslator> dialogButtonBoxTranslator(new QTranslator(&p_app));
-    if (dialogButtonBoxTranslator->load(locale, "qdialogbuttonbox", "_", translationsDir)) {
+    if (dialogButtonBoxTranslator->load(locale, "qdialogbuttonbox", "_", translationsPath)) {
         p_app.installTranslator(dialogButtonBoxTranslator.take());
     }
 
     QScopedPointer<QTranslator> webengineTranslator(new QTranslator(&p_app));
-    if (webengineTranslator->load(locale, "qwebengine", "_", translationsDir)) {
+    if (webengineTranslator->load(locale, "qwebengine", "_", translationsPath)) {
         p_app.installTranslator(webengineTranslator.take());
     }
 
     QScopedPointer<QTranslator> qtTranslator(new QTranslator(&p_app));
-    if (qtTranslator->load(locale, "qtv", "_", translationsDir)) {
+    if (qtTranslator->load(locale, "qtv", "_", translationsPath)) {
         p_app.installTranslator(qtTranslator.take());
     }
 
     QScopedPointer<QTranslator> qtEnvTranslator(new QTranslator(&p_app));
-    if (qtEnvTranslator->load(locale, "qt", "_", translationsDir)) {
+    if (qtEnvTranslator->load(locale, "qt", "_", translationsPath)) {
         p_app.installTranslator(qtEnvTranslator.take());
     }
 
     QScopedPointer<QTranslator> vnoteTranslator(new QTranslator(&p_app));
-    if (vnoteTranslator->load(locale, "vnote", "_", translationsDir)) {
+    if (vnoteTranslator->load(locale, "vnote", "_", translationsPath)) {
         p_app.installTranslator(vnoteTranslator.take());
     }
 
     QScopedPointer<QTranslator> vtexteditTranslator(new QTranslator(&p_app));
-    if (vtexteditTranslator->load(locale, "vtextedit", "_", translationsDir)) {
+    if (vtexteditTranslator->load(locale, "vtextedit", "_", translationsPath)) {
         p_app.installTranslator(vtexteditTranslator.take());
     }
 }