Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
6b6ee5ff
Commit
6b6ee5ff
authored
13 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Patches
Plain Diff
[ #7901 ] Partial rewrite of the drag and drop event, does not really work
parent
2d8dc47e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Call.h
+1
-1
1 addition, 1 deletion
src/Call.h
src/CallModel.h
+8
-6
8 additions, 6 deletions
src/CallModel.h
src/CallModel.hpp
+19
-0
19 additions, 0 deletions
src/CallModel.hpp
with
28 additions
and
7 deletions
src/Call.h
+
1
−
1
View file @
6b6ee5ff
...
...
@@ -162,7 +162,7 @@ public:
void
setTransferNumber
(
const
QString
&
number
);
void
setCallNumber
(
const
QString
&
number
);
//Mut
o
tors
//Mut
a
tors
void
appendText
(
const
QString
&
str
);
void
backspaceItemText
();
void
changeCurrentState
(
call_state
newState
);
...
...
This diff is collapsed.
Click to expand it.
src/CallModel.h
+
8
−
6
View file @
6b6ee5ff
...
...
@@ -101,12 +101,14 @@ class LIB_EXPORT CallModel : public CallModelBase {
virtual
void
initContact
(
ContactBackend
*
be
);
//Call related
virtual
Call
*
addCall
(
Call
*
call
,
Call
*
parent
=
0
);
Call
*
addDialingCall
(
const
QString
&
peerName
=
""
,
QString
account
=
""
);
Call
*
addIncomingCall
(
const
QString
&
callId
);
Call
*
addRingingCall
(
const
QString
&
callId
);
static
QString
generateCallId
(
);
void
removeCall
(
Call
*
call
);
virtual
Call
*
addCall
(
Call
*
call
,
Call
*
parent
=
0
);
Call
*
addDialingCall
(
const
QString
&
peerName
=
""
,
QString
account
=
""
);
Call
*
addIncomingCall
(
const
QString
&
callId
);
Call
*
addRingingCall
(
const
QString
&
callId
);
static
QString
generateCallId
(
);
void
removeCall
(
Call
*
call
);
void
attendedTransfer
(
Call
*
toTransfer
,
Call
*
target
);
void
transfer
(
Call
*
toTransfer
,
QString
target
);
virtual
bool
selectItem
(
Call
*
item
)
{
Q_UNUSED
(
item
);
return
false
;}
...
...
This diff is collapsed.
Click to expand it.
src/CallModel.hpp
+
19
−
0
View file @
6b6ee5ff
...
...
@@ -263,6 +263,25 @@ template<typename CallWidget, typename Index> void CallModel<CallWidget,Index>::
}
}
///Transfer "toTransfer" to "target" and wait to see it it succeeded
template
<
typename
CallWidget
,
typename
Index
>
void
CallModel
<
CallWidget
,
Index
>::
attendedTransfer
(
Call
*
toTransfer
,
Call
*
target
)
{
CallManagerInterface
&
callManager
=
CallManagerInterfaceSingleton
::
getInstance
();
callManager
.
attendedTransfer
(
toTransfer
->
getCallId
(),
target
->
getCallId
());
//TODO [Daemon] Implement this correctly
toTransfer
->
changeCurrentState
(
CALL_STATE_OVER
);
target
->
changeCurrentState
(
CALL_STATE_OVER
);
}
///Transfer this call to "target" number
template
<
typename
CallWidget
,
typename
Index
>
void
CallModel
<
CallWidget
,
Index
>::
transfer
(
Call
*
toTransfer
,
QString
target
)
{
qDebug
()
<<
"Transferring call "
<<
target
;
toTransfer
->
setTransferNumber
(
target
);
toTransfer
->
actionPerformed
(
CALL_ACTION_ACCEPT
);
toTransfer
->
changeCurrentState
(
CALL_STATE_OVER
);
}
/*****************************************************************************
* *
...
...
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