Disabling momentary for macOS bundle :

let user define the file system path of the common and custom elements
collections


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5458 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2018-07-27 14:41:23 +00:00
parent 3347983788
commit 1d5940a6a1

View File

@@ -463,6 +463,7 @@ QString QETApp::userName() {
*/ */
QString QETApp::commonElementsDir() QString QETApp::commonElementsDir()
{ {
#ifndef Q_OS_MAC
QSettings settings; QSettings settings;
QString path = settings.value("elements-collections/common-collection-path", "default").toString(); QString path = settings.value("elements-collections/common-collection-path", "default").toString();
if (path != "default" && !path.isEmpty()) if (path != "default" && !path.isEmpty())
@@ -472,6 +473,7 @@ QString QETApp::commonElementsDir()
return path; return path;
} }
} }
#endif
#ifdef QET_ALLOW_OVERRIDE_CED_OPTION #ifdef QET_ALLOW_OVERRIDE_CED_OPTION
if (common_elements_dir != QString()) return(common_elements_dir); if (common_elements_dir != QString()) return(common_elements_dir);
@@ -496,6 +498,7 @@ QString QETApp::commonElementsDir()
*/ */
QString QETApp::customElementsDir() QString QETApp::customElementsDir()
{ {
#ifndef Q_OS_MAC
QSettings settings; QSettings settings;
QString path = settings.value("elements-collections/custom-collection-path", "default").toString(); QString path = settings.value("elements-collections/custom-collection-path", "default").toString();
if (path != "default" && !path.isEmpty()) if (path != "default" && !path.isEmpty())
@@ -505,7 +508,7 @@ QString QETApp::customElementsDir()
return path; return path;
} }
} }
#endif
return(configDir() + "elements/"); return(configDir() + "elements/");
} }