{
clutter_actor_destroy (self->priv->preview_hidden_button);
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (self->priv->camera_button), FALSE);
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (self->priv->camera_button), FALSE);
}
static void
if (!empathy_call_handler_has_initial_video (priv->handler))
{
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), FALSE);
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->camera_button), FALSE);
}
/* If call has InitialVideo, the preview will be started once the call has
* been started (start_call()). */
gtk_widget_set_sensitive (priv->mic_button, FALSE);
/* Be sure that the mic button is enabled */
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->mic_button), TRUE);
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->mic_button), TRUE);
if (priv->camera_state == CAMERA_STATE_ON)
{
if (priv->call_state == HELD)
status = _("On hold");
- else if (!gtk_toggle_tool_button_get_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->mic_button)))
+ else if (!gtk_toggle_button_get_active (
+ GTK_TOGGLE_BUTTON (priv->mic_button)))
status = _("Mute");
else
status = _("Duration");
s == TP_SENDING_STATE_SENDING)
{
/* Enable 'send video' buttons and display the preview */
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), TRUE);
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->camera_button), TRUE);
}
else
{
- gtk_toggle_tool_button_set_active (
- GTK_TOGGLE_TOOL_BUTTON (priv->camera_button), FALSE);
+ gtk_toggle_button_set_active (
+ GTK_TOGGLE_BUTTON (priv->camera_button), FALSE);
if (priv->video_preview == NULL)
{
<object class="GtkToolbar" id="bottom_toolbar">
<property name="visible">True</property>
<property name="show_arrow">False</property>
- <property name="name">CallFloatingToolbar</property>
<child>
- <object class="GtkToggleToolButton" id="camera">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Send Video</property>
- <property name="icon_name">camera-web</property>
- <property name="sensitive">False</property>
- <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
- </object>
- </child>
- <child>
- <object class="GtkToolItem" id="toolitem3">
+ <object class="GtkToolItem" id="toolitem_group">
<property name="visible">True</property>
<child>
- <object class="GtkVolumeButton" id="volume">
+ <object class="GtkBox" id="button_group">
+ <property name="orientation">horizontal</property>
+ <property name="spacing">0</property>
<property name="visible">True</property>
- <property name="value">1.0</property>
+ <child>
+ <object class="GtkToggleButton" id="camera">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="tooltip_text" translatable="yes">Toggle video transmission</property>
+ <child>
+ <object class="GtkImage" id="camera_icon">
+ <property name="visible">True</property>
+ <property name="icon_name">camera-web-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkVolumeButton" id="volume">
+ <property name="visible">True</property>
+ <property name="value">1.0</property>
+ <property name="relief">normal</property>
+ <property name="use_symbolic">True</property>
+ <property name="size">1</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="microphone">
+ <property name="visible">True</property>
+ <property name="active">True</property>
+ <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
+ <child>
+ <object class="GtkImage" id="microphone_icon">
+ <property name="visible">True</property>
+ <property name="icon_name">audio-input-microphone-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
</child>
- <child>
- <object class="GtkToggleToolButton" id="microphone">
- <property name="visible">True</property>
- <property name="active">True</property>
- <property name="label" translatable="yes">Send Audio</property>
- <property name="icon_name">gnome-stock-mic</property>
- <property name="tooltip_text" translatable="yes">Toggle audio transmission</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorToolItem" id="toolbutton2">
<property name="draw">False</property>