diff --git a/SocExplorer.pro b/SocExplorer.pro --- a/SocExplorer.pro +++ b/SocExplorer.pro @@ -24,15 +24,16 @@ unix{ SocExplorer.files = unixcfg/SocExplorer.desktop PluginConfPath.path = /etc/SocExplorer/plugin.conf.d/ PluginConfPath.files = unixcfg/plugins.conf - icon.path = /usr/share/SocExplorer - icon.files = ressources/images/Indiana_Jones_cappello.png + share.path = /usr/share/SocExplorer + share.files = ressources/images/Indiana_Jones_cappello.png \ + ressources/Grlib.xml Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \ Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \ Qt_Creator_Wizard/SocExplorerPlugin/plugin.h \ Qt_Creator_Wizard/SocExplorerPlugin/project.pro \ Qt_Creator_Wizard/SocExplorerPlugin/wizard.xml - INSTALLS+=Wizard SocExplorer icon PluginConfPath + INSTALLS+=Wizard SocExplorer share PluginConfPath } INSTALLS+=socexplorercfg diff --git a/src/SocExplorerEngine/XmlEngine/xmldriver.cpp b/src/SocExplorerEngine/XmlEngine/xmldriver.cpp --- a/src/SocExplorerEngine/XmlEngine/xmldriver.cpp +++ b/src/SocExplorerEngine/XmlEngine/xmldriver.cpp @@ -85,8 +85,8 @@ void XMLDriver::registerXmlFile(const QS void XMLDriver::scanXmlFiles() { - QDir configDir(SocExplorerEngine::configFolder()); - QFileInfoList list = configDir.entryInfoList(); + QDir shareDir(SocExplorerEngine::sharePath()); + QFileInfoList list = shareDir.entryInfoList(); for (int i = 0; i < list.size(); ++i) { QFileInfo fileInfo = list.at(i); diff --git a/src/SocExplorerEngine/engine/socexplorerengine.h b/src/SocExplorerEngine/engine/socexplorerengine.h --- a/src/SocExplorerEngine/engine/socexplorerengine.h +++ b/src/SocExplorerEngine/engine/socexplorerengine.h @@ -93,6 +93,7 @@ public: //static QString pluginFolder(){return QString(SOCEXPLORER_PLUGINS_INSTALL_PATH);} static QStringList pluginFolders(); static QString configPath(){return QString(SOCEXPLORER_CONFIG_PATH);} + static QString sharePath(){return QString(SOCEXPLORER_SHARE_PATH);} static int addEnumDevice(socexplorerplugin* rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name); static QList* getSOCs(); static QString getDevName(int VID, int PID); diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.prf b/src/SocExplorerEngine/plugins/socexplorerplugin.prf --- a/src/SocExplorerEngine/plugins/socexplorerplugin.prf +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.prf @@ -17,6 +17,7 @@ unix { SOCEXPLORER_INSTALL_PATH = /usr/local/SocExplorer SOCEXPLORER_PLUGINS_INSTALL_PATH = $$[QT_INSTALL_LIBS]"/SocExplorer/plugins" DEFINES += SOCEXPLORER_CONFIG_PATH="\"\\\"/etc/SocExplorer"\\\"\" + DEFINES += SOCEXPLORER_SHARE_PATH="\"\\\"/usr/share/SocExplorer"\\\"\" SOCEXPLORER_CONFIG_PATH=/etc/SocExplorer } diff --git a/src/src.pro b/src/src.pro --- a/src/src.pro +++ b/src/src.pro @@ -135,3 +135,4 @@ TRANSLATIONS = ../translations/socexplor +