Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kumir2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kumir
kumir2
Commits
ec903a94
Commit
ec903a94
authored
Jun 29, 2021
by
Alexander A. Maly
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing wrong help path
parent
426724fa
Pipeline
#3600
failed with stages
in 2 minutes and 3 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
14 deletions
+7
-14
src/kumir2-libs/extensionsystem/settings.cpp
src/kumir2-libs/extensionsystem/settings.cpp
+1
-1
src/kumir2-libs/extensionsystem/settings.h
src/kumir2-libs/extensionsystem/settings.h
+1
-1
src/plugins/coregui/plugin.cpp
src/plugins/coregui/plugin.cpp
+5
-12
No files found.
src/kumir2-libs/extensionsystem/settings.cpp
View file @
ec903a94
...
...
@@ -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
View file @
ec903a94
...
...
@@ -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
View file @
ec903a94
...
...
@@ -312,16 +312,7 @@ QString Plugin::initialize(const QStringList ¶meters, 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 ¶meters, 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 ¶meters, 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"
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment