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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
19793ffa
Commit
19793ffa
authored
17 years ago
by
Pierre-Luc Beaudoin
Browse files
Options
Downloads
Patches
Plain Diff
Better transfert button
parent
d61e3719
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
sflphone-gtk/src/actions.c
+22
-1
22 additions, 1 deletion
sflphone-gtk/src/actions.c
sflphone-gtk/src/actions.h
+1
-0
1 addition, 0 deletions
sflphone-gtk/src/actions.h
sflphone-gtk/src/calltree.c
+30
-4
30 additions, 4 deletions
sflphone-gtk/src/calltree.c
with
53 additions
and
5 deletions
sflphone-gtk/src/actions.c
+
22
−
1
View file @
19793ffa
...
@@ -171,6 +171,9 @@ sflphone_hang_up()
...
@@ -171,6 +171,9 @@ sflphone_hang_up()
case
CALL_STATE_INCOMING
:
case
CALL_STATE_INCOMING
:
dbus_refuse
(
selectedCall
);
dbus_refuse
(
selectedCall
);
break
;
break
;
case
CALL_STATE_TRANSFERT
:
dbus_hang_up
(
selectedCall
);
break
;
default:
default:
g_warning
(
"Should not happen!"
);
g_warning
(
"Should not happen!"
);
break
;
break
;
...
@@ -196,6 +199,9 @@ sflphone_pick_up()
...
@@ -196,6 +199,9 @@ sflphone_pick_up()
case
CALL_STATE_HOLD
:
case
CALL_STATE_HOLD
:
dbus_unhold
(
selectedCall
);
dbus_unhold
(
selectedCall
);
break
;
break
;
case
CALL_STATE_TRANSFERT
:
dbus_transfert
(
selectedCall
);
break
;
default:
default:
g_warning
(
"Should not happen!"
);
g_warning
(
"Should not happen!"
);
break
;
break
;
...
@@ -279,8 +285,23 @@ sflphone_set_transfert()
...
@@ -279,8 +285,23 @@ sflphone_set_transfert()
update_call_tree
(
c
);
update_call_tree
(
c
);
update_menus
();
update_menus
();
}
}
toolbar_update_buttons
();
}
}
void
sflphone_unset_transfert
()
{
call_t
*
c
=
call_get_selected
();
if
(
c
)
{
c
->
state
=
CALL_STATE_CURRENT
;
c
->
to
=
g_strdup
(
""
);
screen_set_call
(
c
);
update_call_tree
(
c
);
update_menus
();
}
toolbar_update_buttons
();
}
void
void
sflphone_incoming_call
(
call_t
*
c
)
sflphone_incoming_call
(
call_t
*
c
)
{
{
...
@@ -432,7 +453,7 @@ sflphone_keypad( guint keyval, gchar * key)
...
@@ -432,7 +453,7 @@ sflphone_keypad( guint keyval, gchar * key)
dbus_transfert
(
c
);
dbus_transfert
(
c
);
break
;
break
;
case
65307
:
/* ESCAPE */
case
65307
:
/* ESCAPE */
sflphone_
current
(
c
);
// Quit transfert
sflphone_
hang_up
(
c
);
break
;
break
;
default:
// When a call is on transfert, typing new numbers will add it to c->to
default:
// When a call is on transfert, typing new numbers will add it to c->to
process_dialing
(
c
,
keyval
,
key
);
process_dialing
(
c
,
keyval
,
key
);
...
...
This diff is collapsed.
Click to expand it.
sflphone-gtk/src/actions.h
+
1
−
0
View file @
19793ffa
...
@@ -52,6 +52,7 @@ void sflphone_off_hold ();
...
@@ -52,6 +52,7 @@ void sflphone_off_hold ();
call_t
*
sflphone_new_call
();
call_t
*
sflphone_new_call
();
void
sflphone_notify_voice_mail
(
guint
count
);
void
sflphone_notify_voice_mail
(
guint
count
);
void
sflphone_set_transfert
();
void
sflphone_set_transfert
();
void
sflphone_unset_transfert
();
/**
/**
* Accept / dial the current call
* Accept / dial the current call
*/
*/
...
...
This diff is collapsed.
Click to expand it.
sflphone-gtk/src/calltree.c
+
30
−
4
View file @
19793ffa
...
@@ -33,6 +33,7 @@ GtkToolItem * hangupButton;
...
@@ -33,6 +33,7 @@ GtkToolItem * hangupButton;
GtkToolItem
*
holdButton
;
GtkToolItem
*
holdButton
;
GtkToolItem
*
transfertButton
;
GtkToolItem
*
transfertButton
;
GtkToolItem
*
unholdButton
;
GtkToolItem
*
unholdButton
;
guint
transfertButtonConnId
;
//The button toggled signal connection ID
/**
/**
* Make a call
* Make a call
...
@@ -74,10 +75,19 @@ hold( GtkWidget *widget, gpointer data )
...
@@ -74,10 +75,19 @@ hold( GtkWidget *widget, gpointer data )
* Transfert the line
* Transfert the line
*/
*/
static
void
static
void
transfert
(
GtkWidget
*
widget
,
gpointer
data
)
transfert
(
GtkToggleToolButton
*
toggle_tool_button
,
gpointer
user_data
)
{
gboolean
up
=
gtk_toggle_tool_button_get_active
(
toggle_tool_button
);
if
(
up
)
{
{
sflphone_set_transfert
();
sflphone_set_transfert
();
}
}
else
{
sflphone_unset_transfert
();
}
}
/**
/**
* Unhold call
* Unhold call
...
@@ -103,6 +113,10 @@ toolbar_update_buttons ()
...
@@ -103,6 +113,10 @@ toolbar_update_buttons ()
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
unholdButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
unholdButton
));
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
holdButton
,
3
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
holdButton
,
3
);
gtk_signal_handler_block
(
GTK_OBJECT
(
transfertButton
),
transfertButtonConnId
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
transfertButton
),
FALSE
);
gtk_signal_handler_unblock
(
transfertButton
,
transfertButtonConnId
);
call_t
*
selectedCall
=
call_get_selected
();
call_t
*
selectedCall
=
call_get_selected
();
if
(
selectedCall
)
if
(
selectedCall
)
{
{
...
@@ -137,6 +151,16 @@ toolbar_update_buttons ()
...
@@ -137,6 +151,16 @@ toolbar_update_buttons ()
case
CALL_STATE_BUSY
:
case
CALL_STATE_BUSY
:
case
CALL_STATE_FAILURE
:
case
CALL_STATE_FAILURE
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
break
;
case
CALL_STATE_TRANSFERT
:
gtk_signal_handler_block
(
GTK_OBJECT
(
transfertButton
),
transfertButtonConnId
);
gtk_toggle_tool_button_set_active
(
GTK_TOGGLE_TOOL_BUTTON
(
transfertButton
),
TRUE
);
gtk_signal_handler_unblock
(
transfertButton
,
transfertButtonConnId
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
callButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
pickupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
holdButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
transfertButton
),
TRUE
);
break
;
break
;
default:
default:
g_warning
(
"Should not happen!"
);
g_warning
(
"Should not happen!"
);
...
@@ -252,9 +276,11 @@ create_toolbar (){
...
@@ -252,9 +276,11 @@ create_toolbar (){
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
holdButton
),
-
1
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
holdButton
),
-
1
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/transfert.svg"
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/transfert.svg"
);
transfertButton
=
gtk_tool_button_new
(
image
,
"Transfert"
);
transfertButton
=
gtk_toggle_tool_button_new
();
gtk_tool_button_set_icon_widget
(
GTK_TOOL_BUTTON
(
transfertButton
),
image
);
gtk_tool_button_set_label
(
GTK_TOOL_BUTTON
(
transfertButton
),
"Transfert"
);
gtk_widget_set_state
(
GTK_WIDGET
(
transfertButton
),
GTK_STATE_INSENSITIVE
);
gtk_widget_set_state
(
GTK_WIDGET
(
transfertButton
),
GTK_STATE_INSENSITIVE
);
g_signal_connect
(
G_OBJECT
(
transfertButton
),
"
click
ed"
,
transfertButtonConnId
=
g_signal_connect
(
G_OBJECT
(
transfertButton
),
"
toggl
ed"
,
G_CALLBACK
(
transfert
),
NULL
);
G_CALLBACK
(
transfert
),
NULL
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
transfertButton
),
-
1
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
transfertButton
),
-
1
);
...
...
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