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
3dd5ae7c
Commit
3dd5ae7c
authored
13 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
#10304: Make the playback seekslider hidden if calltree is selected
parent
0c91d38c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
gnome/src/mainwindow.c
+15
-2
15 additions, 2 deletions
gnome/src/mainwindow.c
gnome/src/mainwindow.h
+4
-0
4 additions, 0 deletions
gnome/src/mainwindow.h
gnome/src/uimanager.c
+18
-8
18 additions, 8 deletions
gnome/src/uimanager.c
with
37 additions
and
10 deletions
gnome/src/mainwindow.c
+
15
−
2
View file @
3dd5ae7c
...
@@ -296,6 +296,7 @@ create_main_window()
...
@@ -296,6 +296,7 @@ create_main_window()
/* show playback scale only if a recorded call is selected */
/* show playback scale only if a recorded call is selected */
sfl_seekslider_set_display
(
SFL_SEEKSLIDER
(
seekslider
),
SFL_SEEKSLIDER_DISPLAY_PLAY
);
sfl_seekslider_set_display
(
SFL_SEEKSLIDER
(
seekslider
),
SFL_SEEKSLIDER_DISPLAY_PLAY
);
gtk_widget_set_sensitive
(
seekslider
,
FALSE
);
gtk_widget_set_sensitive
(
seekslider
,
FALSE
);
main_window_hide_playback_scale
();
/* don't show waiting layer */
/* don't show waiting layer */
gtk_widget_hide
(
waitingLayer
);
gtk_widget_hide
(
waitingLayer
);
...
@@ -496,13 +497,25 @@ main_window_update_playback_scale(guint current, guint size)
...
@@ -496,13 +497,25 @@ main_window_update_playback_scale(guint current, guint size)
}
}
void
void
main_window_s
how
_playback_scale
()
main_window_s
et
_playback_scale
_sensitive
()
{
{
gtk_widget_set_sensitive
(
seekslider
,
TRUE
);
gtk_widget_set_sensitive
(
seekslider
,
TRUE
);
}
}
void
void
main_window_
hide
_playback_scale
()
main_window_
set
_playback_scale
_unsensitive
()
{
{
gtk_widget_set_sensitive
(
seekslider
,
FALSE
);
gtk_widget_set_sensitive
(
seekslider
,
FALSE
);
}
}
void
main_window_show_playback_scale
()
{
gtk_widget_show
(
seekslider
);
}
void
main_window_hide_playback_scale
()
{
gtk_widget_hide
(
seekslider
);
}
This diff is collapsed.
Click to expand it.
gnome/src/mainwindow.h
+
4
−
0
View file @
3dd5ae7c
...
@@ -110,6 +110,10 @@ void focus_on_searchbar_in();
...
@@ -110,6 +110,10 @@ void focus_on_searchbar_in();
*/
*/
void
main_window_update_playback_scale
(
guint
current
,
guint
size
);
void
main_window_update_playback_scale
(
guint
current
,
guint
size
);
void
main_window_set_playback_scale_sensitive
();
void
main_window_set_playback_scale_unsensitive
();
/**
/**
* Show the playback scale, (should occur if the user selected an history entry witch has been recorded)
* Show the playback scale, (should occur if the user selected an history entry witch has been recorded)
*/
*/
...
...
This diff is collapsed.
Click to expand it.
gnome/src/uimanager.c
+
18
−
8
View file @
3dd5ae7c
...
@@ -217,11 +217,12 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
...
@@ -217,11 +217,12 @@ update_toolbar_for_call(callable_obj_t *selectedCall, gboolean instant_messaging
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
}
else
if
(
active_calltree_tab
==
history_tab
)
{
else
if
(
active_calltree_tab
==
history_tab
)
{
if
(
is_non_empty
(
selectedCall
->
_recordfile
))
{
main_window_show_playback_scale
();
main_window_show_playback_scale
();
if
(
is_non_empty
(
selectedCall
->
_recordfile
))
{
main_window_set_playback_scale_sensitive
();
}
}
else
{
else
{
main_window_
hide
_playback_scale
();
main_window_
set
_playback_scale
_unsensitive
();
}
}
}
}
...
@@ -360,11 +361,12 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
...
@@ -360,11 +361,12 @@ update_toolbar_for_conference(conference_obj_t * selectedConf, gboolean instant_
}
}
main_window_hide_playback_scale
();
main_window_hide_playback_scale
();
}
else
if
(
active_calltree_tab
==
history_tab
)
{
}
else
if
(
active_calltree_tab
==
history_tab
)
{
if
(
is_non_empty
(
selectedConf
->
_recordfile
))
{
main_window_show_playback_scale
();
main_window_show_playback_scale
();
if
(
is_non_empty
(
selectedConf
->
_recordfile
))
{
main_window_set_playback_scale_sensitive
();
}
}
else
{
else
{
main_window_
hide
_playback_scale
();
main_window_
set
_playback_scale
_unsensitive
();
}
}
}
}
else
{
else
{
...
@@ -1038,19 +1040,27 @@ call_mailbox_cb(void)
...
@@ -1038,19 +1040,27 @@ call_mailbox_cb(void)
static
void
static
void
toggle_history_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
toggle_history_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
{
{
if
(
gtk_toggle_action_get_active
(
action
))
if
(
gtk_toggle_action_get_active
(
action
))
{
calltree_display
(
history_tab
);
calltree_display
(
history_tab
);
else
main_window_show_playback_scale
();
}
else
{
calltree_display
(
current_calls_tab
);
calltree_display
(
current_calls_tab
);
main_window_hide_playback_scale
();
}
}
}
static
void
static
void
toggle_addressbook_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
toggle_addressbook_cb
(
GtkToggleAction
*
action
,
gpointer
user_data
UNUSED
)
{
{
if
(
gtk_toggle_action_get_active
(
action
))
if
(
gtk_toggle_action_get_active
(
action
))
{
calltree_display
(
contacts_tab
);
calltree_display
(
contacts_tab
);
else
main_window_show_playback_scale
();
}
else
{
calltree_display
(
current_calls_tab
);
calltree_display
(
current_calls_tab
);
main_window_show_playback_scale
();
}
}
}
static
const
GtkActionEntry
menu_entries
[]
=
{
static
const
GtkActionEntry
menu_entries
[]
=
{
...
...
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