Skip to content
Snippets Groups Projects
Commit f0b77e01 authored by Mathieu Leduc-Hamel's avatar Mathieu Leduc-Hamel
Browse files

Fix kde project data loading in dev mode

parent 116a62e3
Branches
Tags
No related merge requests found
...@@ -176,6 +176,15 @@ void SFLPhone::setupActions() ...@@ -176,6 +176,15 @@ void SFLPhone::setupActions()
actionCollection()->addAction("action_accountCreationWizard", action_accountCreationWizard); actionCollection()->addAction("action_accountCreationWizard", action_accountCreationWizard);
QString rcFilePath = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc"; QString rcFilePath = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc";
if(! QFile::exists(rcFilePath))
{
QDir dir;
dir.cdUp();
dir.cd("data");
rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
qDebug() << "rcFilePath = " << rcFilePath ;
if(! QFile::exists(rcFilePath)) if(! QFile::exists(rcFilePath))
{ {
QDir dir; QDir dir;
...@@ -184,6 +193,7 @@ void SFLPhone::setupActions() ...@@ -184,6 +193,7 @@ void SFLPhone::setupActions()
dir.cd("data"); dir.cd("data");
rcFilePath = dir.filePath("sflphone-client-kdeui.rc"); rcFilePath = dir.filePath("sflphone-client-kdeui.rc");
} }
}
qDebug() << "rcFilePath = " << rcFilePath ; qDebug() << "rcFilePath = " << rcFilePath ;
createGUI(rcFilePath); createGUI(rcFilePath);
...@@ -205,6 +215,7 @@ void SFLPhone::quitButton() ...@@ -205,6 +215,7 @@ void SFLPhone::quitButton()
{ {
InstanceInterface & instance = InstanceInterfaceSingleton::getInstance(); InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
qDebug() << "quitButton : " << view->listWidget_callList->count() << " calls open."; qDebug() << "quitButton : " << view->listWidget_callList->count() << " calls open.";
if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1) if(view->listWidget_callList->count() > 0 && instance.getRegistrationCount() <= 1)
{ {
qDebug() << "Attempting to quit when still having some calls open."; qDebug() << "Attempting to quit when still having some calls open.";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment