Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
f0b77e01
Commit
f0b77e01
authored
15 years ago
by
Mathieu Leduc-Hamel
Browse files
Options
Downloads
Patches
Plain Diff
Fix kde project data loading in dev mode
parent
116a62e3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-client-kde/src/SFLPhone.cpp
+19
-8
19 additions, 8 deletions
sflphone-client-kde/src/SFLPhone.cpp
with
19 additions
and
8 deletions
sflphone-client-kde/src/SFLPhone.cpp
+
19
−
8
View file @
f0b77e01
...
...
@@ -101,9 +101,9 @@ bool SFLPhone::initialize()
void
SFLPhone
::
setObjectNames
()
{
view
->
setObjectName
(
"view"
);
statusBar
()
->
setObjectName
(
"statusBar"
);
trayIcon
->
setObjectName
(
"trayIcon"
);
view
->
setObjectName
(
"view"
);
statusBar
()
->
setObjectName
(
"statusBar"
);
trayIcon
->
setObjectName
(
"trayIcon"
);
}
void
SFLPhone
::
setupActions
()
...
...
@@ -176,13 +176,23 @@ void SFLPhone::setupActions()
actionCollection
()
->
addAction
(
"action_accountCreationWizard"
,
action_accountCreationWizard
);
QString
rcFilePath
=
QString
(
DATA_INSTALL_DIR
)
+
"/sflphone-client-kde/sflphone-client-kdeui.rc"
;
if
(
!
QFile
::
exists
(
rcFilePath
))
{
QDir
dir
;
dir
.
cdUp
();
dir
.
cdUp
();
dir
.
cd
(
"data"
);
rcFilePath
=
dir
.
filePath
(
"sflphone-client-kdeui.rc"
);
qDebug
()
<<
"rcFilePath = "
<<
rcFilePath
;
if
(
!
QFile
::
exists
(
rcFilePath
))
{
QDir
dir
;
dir
.
cdUp
();
dir
.
cdUp
();
dir
.
cd
(
"data"
);
rcFilePath
=
dir
.
filePath
(
"sflphone-client-kdeui.rc"
);
}
}
qDebug
()
<<
"rcFilePath = "
<<
rcFilePath
;
createGUI
(
rcFilePath
);
...
...
@@ -205,6 +215,7 @@ void SFLPhone::quitButton()
{
InstanceInterface
&
instance
=
InstanceInterfaceSingleton
::
getInstance
();
qDebug
()
<<
"quitButton : "
<<
view
->
listWidget_callList
->
count
()
<<
" calls open."
;
if
(
view
->
listWidget_callList
->
count
()
>
0
&&
instance
.
getRegistrationCount
()
<=
1
)
{
qDebug
()
<<
"Attempting to quit when still having some calls open."
;
...
...
@@ -232,10 +243,10 @@ void SFLPhone::sendNotif(QString caller)
void
SFLPhone
::
changeEvent
(
QEvent
*
event
)
{
if
(
event
->
type
()
==
QEvent
::
ActivationChange
&&
iconChanged
&&
isActiveWindow
())
{
iconChanged
=
false
;
}
if
(
event
->
type
()
==
QEvent
::
ActivationChange
&&
iconChanged
&&
isActiveWindow
())
{
iconChanged
=
false
;
}
}
void
SFLPhone
::
on_view_statusMessageChangeAsked
(
const
QString
&
message
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment