Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
33b1bf4f
Commit
33b1bf4f
authored
Dec 16, 2011
by
Emmanuel Lepage
Browse files
[ #7901 ] Cosmetic and bug fixes
parent
539cf303
Changes
3
Hide whitespace changes
Inline
Side-by-side
kde/src/CallView.cpp
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"
);
...
...
kde/src/widgets/CallTreeItem.cpp
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
();
...
...
kde/src/widgets/TranslucentButtons.cpp
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
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment