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
e37c4298
Commit
e37c4298
authored
17 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Patches
Plain Diff
Update the call button
We use now only one button to pick up and place a call
parent
dfb51bc8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-gtk/src/actions.c
+0
-1
0 additions, 1 deletion
sflphone-gtk/src/actions.c
sflphone-gtk/src/calltree.c
+28
-13
28 additions, 13 deletions
sflphone-gtk/src/calltree.c
with
28 additions
and
14 deletions
sflphone-gtk/src/actions.c
+
0
−
1
View file @
e37c4298
...
@@ -205,7 +205,6 @@ sflphone_pick_up()
...
@@ -205,7 +205,6 @@ sflphone_pick_up()
dbus_accept
(
selectedCall
);
dbus_accept
(
selectedCall
);
break
;
break
;
case
CALL_STATE_HOLD
:
case
CALL_STATE_HOLD
:
//dbus_unhold (selectedCall);
sflphone_new_call
();
sflphone_new_call
();
break
;
break
;
case
CALL_STATE_TRANSFERT
:
case
CALL_STATE_TRANSFERT
:
...
...
This diff is collapsed.
Click to expand it.
sflphone-gtk/src/calltree.c
+
28
−
13
View file @
e37c4298
...
@@ -28,11 +28,10 @@
...
@@ -28,11 +28,10 @@
GtkListStore
*
store
;
GtkListStore
*
store
;
GtkWidget
*
view
;
GtkWidget
*
view
;
//GtkWidget *item;
GtkWidget
*
toolbar
;
GtkWidget
*
toolbar
;
GtkToolItem
*
pickupButton
;
GtkToolItem
*
callButton
;
GtkToolItem
*
callButton
;
//GtkToolItem * pickupButton;
GtkToolItem
*
hangupButton
;
GtkToolItem
*
hangupButton
;
GtkToolItem
*
holdButton
;
GtkToolItem
*
holdButton
;
GtkToolItem
*
transfertButton
;
GtkToolItem
*
transfertButton
;
...
@@ -67,8 +66,10 @@ button_pressed(GtkWidget* widget, GdkEventButton *event, gpointer user_data)
...
@@ -67,8 +66,10 @@ button_pressed(GtkWidget* widget, GdkEventButton *event, gpointer user_data)
static
void
static
void
call_button
(
GtkWidget
*
widget
,
gpointer
data
)
call_button
(
GtkWidget
*
widget
,
gpointer
data
)
{
{
if
(
call_list_get_size
()
>
0
)
sflphone_pick_up
();
sflphone_pick_up
();
//sflphone_new_call();
else
sflphone_new_call
();
}
}
/**
/**
...
@@ -136,12 +137,14 @@ toolbar_update_buttons ()
...
@@ -136,12 +137,14 @@ toolbar_update_buttons ()
gtk_widget_set_sensitive
(
GTK_WIDGET
(
unholdButton
),
FALSE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
unholdButton
),
FALSE
);
g_object_ref
(
holdButton
);
g_object_ref
(
holdButton
);
g_object_ref
(
unholdButton
);
g_object_ref
(
unholdButton
);
//g_object_ref(callButton);
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
holdButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
holdButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
unholdButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
unholdButton
));
//gtk_container_remove(GTK_CONTAINER(toolbar), GTK_WIDGET(callButton));
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
holdButton
,
3
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
holdButton
,
3
);
// gtk_toolbar_insert(GTK_TOOLBAR(toolbar), callButton, 0);
g_object_ref
(
callButton
);
g_object_ref
(
pickupButton
);
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
callButton
));
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
pickupButton
));
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
callButton
,
0
);
gtk_signal_handler_block
(
GTK_OBJECT
(
transfertButton
),
transfertButtonConnId
);
gtk_signal_handler_block
(
GTK_OBJECT
(
transfertButton
),
transfertButtonConnId
);
...
@@ -154,8 +157,11 @@ toolbar_update_buttons ()
...
@@ -154,8 +157,11 @@ toolbar_update_buttons ()
switch
(
selectedCall
->
state
)
switch
(
selectedCall
->
state
)
{
{
case
CALL_STATE_INCOMING
:
case
CALL_STATE_INCOMING
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
call
Button
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
pickup
Button
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
g_object_ref
(
callButton
);
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
holdButton
));
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
pickupButton
,
0
);
break
;
break
;
case
CALL_STATE_HOLD
:
case
CALL_STATE_HOLD
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
...
@@ -171,7 +177,11 @@ toolbar_update_buttons ()
...
@@ -171,7 +177,11 @@ toolbar_update_buttons ()
break
;
break
;
case
CALL_STATE_DIALING
:
case
CALL_STATE_DIALING
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
callButton
),
TRUE
);
//gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
pickupButton
),
TRUE
);
g_object_ref
(
callButton
);
gtk_container_remove
(
GTK_CONTAINER
(
toolbar
),
GTK_WIDGET
(
callButton
));
gtk_toolbar_insert
(
GTK_TOOLBAR
(
toolbar
),
pickupButton
,
0
);
break
;
break
;
case
CALL_STATE_CURRENT
:
case
CALL_STATE_CURRENT
:
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
gtk_widget_set_sensitive
(
GTK_WIDGET
(
hangupButton
),
TRUE
);
...
@@ -267,21 +277,26 @@ create_toolbar (){
...
@@ -267,21 +277,26 @@ create_toolbar (){
GtkWidget
*
image
;
GtkWidget
*
image
;
ret
=
gtk_toolbar_new
();
ret
=
gtk_toolbar_new
();
toolbar
=
ret
;
toolbar
=
ret
;
gtk_toolbar_set_orientation
(
GTK_TOOLBAR
(
ret
),
GTK_ORIENTATION_HORIZONTAL
);
//gtk_toolbar_set_style(GTK_TOOLBAR(ret), GTK_TOOLBAR_BOTH);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/call.svg"
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/call.svg"
);
callButton
=
gtk_
menu_
tool_button_new
(
image
,
"Place a Call"
);
callButton
=
gtk_tool_button_new
(
image
,
"Place a Call"
);
g_signal_connect
(
G_OBJECT
(
callButton
),
"clicked"
,
g_signal_connect
(
G_OBJECT
(
callButton
),
"clicked"
,
G_CALLBACK
(
call_button
),
NULL
);
G_CALLBACK
(
call_button
),
NULL
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
callButton
),
-
1
);
gtk_toolbar_insert
(
GTK_TOOLBAR
(
ret
),
GTK_TOOL_ITEM
(
callButton
),
-
1
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/accept.svg"
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/accept.svg"
);
pickupButton
=
gtk_tool_button_new
(
image
,
"Pick up"
);
gtk_widget_set_state
(
GTK_WIDGET
(
pickupButton
),
GTK_STATE_INSENSITIVE
);
g_signal_connect
(
G_OBJECT
(
pickupButton
),
"clicked"
,
G_CALLBACK
(
call_button
),
NULL
);
gtk_widget_show_all
(
GTK_WIDGET
(
pickupButton
));
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/hang_up.svg"
);
image
=
gtk_image_new_from_file
(
ICONS_DIR
"/hang_up.svg"
);
hangupButton
=
gtk_tool_button_new
(
image
,
"Hang up"
);
hangupButton
=
gtk_tool_button_new
(
image
,
"Hang up"
);
//gtk_widget_hide( hangupButton );
gtk_widget_set_state
(
GTK_WIDGET
(
hangupButton
),
GTK_STATE_INSENSITIVE
);
gtk_widget_set_state
(
GTK_WIDGET
(
hangupButton
),
GTK_STATE_INSENSITIVE
);
g_signal_connect
(
G_OBJECT
(
hangupButton
),
"clicked"
,
g_signal_connect
(
G_OBJECT
(
hangupButton
),
"clicked"
,
G_CALLBACK
(
hang_up
),
NULL
);
G_CALLBACK
(
hang_up
),
NULL
);
...
...
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