Fixing wrong help path

src/kumir2-libs/extensionsystem/settings.cpp

@@ -103,7 +103,7 @@ QString Settings::settingsFilePath() const
 	return result;
 }
 
-QString Settings::defaultSettingsScope()
+QString defaultSettingsScope()
 {
 #ifdef Q_OS_MAC
 	static const QString result = "kumir2";

src/kumir2-libs/extensionsystem/settings.h

@@ -35,7 +35,6 @@ public:
 protected:
 	explicit Settings(const QString & pluginName_);
 	void changeWorkingDirectory(const QString & workDirPath);
-	static QString defaultSettingsScope();
 
 private:
 	QString pluginName_;
@@ -46,6 +45,7 @@ private:
 };
 
 typedef QSharedPointer<Settings> SettingsPtr;
+extern QString defaultSettingsScope();
 
 } // namespace ExtensionSystem
 

src/plugins/coregui/plugin.cpp

@@ -312,16 +312,7 @@ QString Plugin::initialize(const QStringList &parameters, const ExtensionSystem:
 		"/userdocs/";
 
 
-	const QString applicationLanucher = QDir::fromNativeSeparators(qApp->arguments().at(0));
-	QString applicationName =
-		applicationLanucher.startsWith(qApp->applicationDirPath())
-		? applicationLanucher.mid(qApp->applicationDirPath().length() + 1)
-		: applicationLanucher;
-#ifdef Q_OS_WIN32
-	if (applicationName.endsWith(".exe")) {
-		applicationName.remove(applicationName.length() - 4, 4);
-	}
-#endif
+	QString applicationName = defaultSettingsScope();
 
 #ifndef Q_OS_MACX
 	QString indexFileName = applicationName + ".xml";
@@ -330,6 +321,8 @@ QString Plugin::initialize(const QStringList &parameters, const ExtensionSystem:
 	QString indexFileName = "index-macx.xml";
 #endif
 
+	qDebug() << "IndexFileName:" << indexFileName;
+
 	Shared::AnalizerInterface *analizerPlugin =
 		ExtensionSystem::PluginManager::instance()
 		->findPlugin<Shared::AnalizerInterface>();
@@ -364,12 +357,12 @@ QString Plugin::initialize(const QStringList &parameters, const ExtensionSystem:
 	}
 
 	indexFileName = helpPath + indexFileName;
+	qDebug() << "Full indexFileName:" << indexFileName;
+
 	if (QFile::exists(indexFileName)) {
 		helpViewer_->addDocument(QUrl::fromLocalFile(indexFileName));
 	}
 
-
-
 	helpWindow_ = Widgets::SecondaryWindow::createSecondaryWindow(
 			helpViewer_,
 			tr("Help"),