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
33b1bf4f
Commit
33b1bf4f
authored
13 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Patches
Plain Diff
[ #7901 ] Cosmetic and bug fixes
parent
539cf303
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
kde/src/CallView.cpp
+5
-4
5 additions, 4 deletions
kde/src/CallView.cpp
kde/src/widgets/CallTreeItem.cpp
+7
-5
7 additions, 5 deletions
kde/src/widgets/CallTreeItem.cpp
kde/src/widgets/TranslucentButtons.cpp
+1
-0
1 addition, 0 deletions
kde/src/widgets/TranslucentButtons.cpp
with
13 additions
and
9 deletions
kde/src/CallView.cpp
+
5
−
4
View file @
33b1bf4f
...
...
@@ -648,10 +648,11 @@ bool CallView::conferenceChanged(Call* conf)
kDebug
()
<<
"Call "
<<
callId
<<
" does not exist"
;
}
for
(
int
j
=
0
;
j
<
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
childCount
();
j
++
)
{
if
(
buffer
.
indexOf
(
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
child
(
j
))
==
-
1
)
insertItem
(
extractItem
(
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
child
(
j
)));
}
if
(
SFLPhone
::
model
()
->
getIndex
(
conf
))
/*Can happen is the daemon crashed*/
for
(
int
j
=
0
;
j
<
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
childCount
();
j
++
)
{
if
(
buffer
.
indexOf
(
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
child
(
j
))
==
-
1
)
insertItem
(
extractItem
(
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
child
(
j
)));
}
Q_ASSERT_X
(
SFLPhone
::
model
()
->
getIndex
(
conf
)
->
childCount
()
==
0
,
"changind conference"
,
"A conference can't have no participants"
);
...
...
This diff is collapsed.
Click to expand it.
kde/src/widgets/CallTreeItem.cpp
+
7
−
5
View file @
33b1bf4f
...
...
@@ -278,6 +278,7 @@ void CallTreeItem::dropEvent(QDropEvent *e)
{
kDebug
()
<<
"Drop accepted"
<<
e
->
pos
();
QTimer
::
singleShot
(
500
,
this
,
SLOT
(
hide
()));
m_isHover
=
false
;
if
(
e
->
pos
().
x
()
<
rect
().
width
()
/
2
)
{
emit
conversationDropEvent
(
m_pItemCall
,(
QMimeData
*
)
e
->
mimeData
());
}
...
...
@@ -291,11 +292,12 @@ void CallTreeItem::resizeEvent ( QResizeEvent *e )
{
kDebug
()
<<
"Resize"
;
if
(
m_pBtnConf
)
{
m_pBtnConf
->
setMinimumSize
(
width
()
/
2
-
5
,
height
());
m_pBtnConf
->
setMaximumSize
(
width
()
/
2
-
5
,
height
());
m_pBtnTrans
->
setMinimumSize
(
width
()
/
2
-
5
,
height
());
m_pBtnTrans
->
setMaximumSize
(
width
()
/
2
-
5
,
height
());
m_pBtnTrans
->
move
(
width
()
/
2
+
10
,
m_pBtnTrans
->
y
());
m_pBtnConf
->
setMinimumSize
(
width
()
/
2
-
15
,
height
()
-
4
);
m_pBtnConf
->
setMaximumSize
(
width
()
/
2
-
15
,
height
()
-
4
);
m_pBtnTrans
->
setMinimumSize
(
width
()
/
2
-
15
,
height
()
-
4
);
m_pBtnTrans
->
setMaximumSize
(
width
()
/
2
-
15
,
height
()
-
4
);
m_pBtnTrans
->
move
(
width
()
/
2
+
10
,
m_pBtnTrans
->
y
()
+
2
);
m_pBtnConf
->
move
(
10
,
m_pBtnConf
->
y
()
+
2
);
}
e
->
accept
();
...
...
This diff is collapsed.
Click to expand it.
kde/src/widgets/TranslucentButtons.cpp
+
1
−
0
View file @
33b1bf4f
...
...
@@ -61,6 +61,7 @@ void TranslucentButtons::setVisible(bool enabled)
m_CurrentColor
.
setAlpha
(
0
);
repaint
();
m_pTimer
->
start
(
10
);
raise
();
}
m_enabled
=
enabled
;
QWidget
::
setVisible
(
enabled
);
...
...
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