</object>
</child>
<child>
- <object class="GtkAction" id="menuhangup">
- <property name="icon_name">call-stop</property>
- <property name="name">menuhangup</property>
- <property name="label" translatable="yes">Hang up</property>
+ <object class="GtkAction" id="menufullscreen">
+ <property name="stock_id">gtk-fullscreen</property>
+ <property name="name">menufullscreen</property>
</object>
+ <accelerator key="F11"/>
</child>
<child>
- <object class="GtkToggleAction" id="menusidebar">
- <property name="name">menusidebar</property>
- <property name="label" translatable="yes">_Sidebar</property>
+ <object class="GtkAction" id="edit">
+ <property name="name">edit</property>
+ <property name="label" translatable="yes">_Edit</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menumicrophone">
+ <property name="label" translatable="yes">_Microphone</property>
+ <property name="name">menumicrophone</property>
+ <property name="icon_name">gnome-stock-mic</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menucamera">
+ <property name="label" translatable="yes">_Camera</property>
+ <property name="name">menucamera</property>
+ <property name="icon_name">camera-web</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menusettings">
+ <property name="stock_id">preferences-desktop</property>
+ <property name="name">menusettings</property>
+ <property name="label" translatable="yes">_Settings</property>
</object>
</child>
<child>
</object>
</child>
<child>
- <object class="GtkAction" id="menufullscreen">
- <property name="stock_id">gtk-fullscreen</property>
- <property name="name">menufullscreen</property>
+ <object class="GtkAction" id="help">
+ <property name="name">help</property>
+ <property name="label" translatable="yes">_Help</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menucontents">
+ <property name="stock_id">gtk-help</property>
+ <property name="name">menucontents</property>
+ <property name="label" translatable="yes">_Contents</property>
+ </object>
+ <accelerator key="F1" modifiers=""/>
+ </child>
+ <child>
+ <object class="GtkAction" id="menudebug">
+ <property name="name">menudebug</property>
+ <property name="label" translatable="yes">_Debug</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menudebuggst">
+ <property name="name">menudebuggst</property>
+ <property name="label" translatable="yes">_GStreamer</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menudebugtp">
+ <property name="name">menudebugtp</property>
+ <property name="label" translatable="yes">_Telepathy</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menuabout">
+ <property name="stock_id">gtk-about</property>
+ <property name="name">menuabout</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkAction" id="menupreviewswap">
+ <property name="name">menupreviewswap</property>
+ <property name="label" translatable="yes">Swap camera</property>
</object>
- <accelerator key="F11"/>
</child>
<child>
<object class="GtkAction" id="menupreviewminimise">
<ui>
<menubar name="menubar1">
<menu action="call">
- <menuitem action="menuhangup"/>
- </menu>
- <menu action="view">
<menuitem action="menufullscreen"/>
- <menuitem action="menusidebar"/>
+ </menu>
+ <menu action="edit">
+ <menu action="menumicrophone"/>
+ <menu action="menucamera"/>
+ <menuitem name="menusettings" action="menusettings"/>
+ </menu>
+ <menu action="help">
+ <menuitem name="menucontents" action="menucontents"/>
+ <menu name="menudebug" action="menudebug">
+ <menuitem action="menudebuggst"/>
+ <menuitem action="menudebugtp"/>
+ </menu>
+ <menuitem name="menuabout" action="menuabout"/>
</menu>
</menubar>
<popup name="video-popup">
<menuitem name="menufullscreen" action="menufullscreen"/>
</popup>
<popup name="preview-menu">
+ <menuitem name="menupreviewswap" action="menupreviewswap"/>
<menuitem name="menupreviewminimise" action="menupreviewminimise"/>
<menuitem name="menupreviewdisable" action="menupreviewdisable"/>
</popup>
<popup name="preview-hidden-menu">
+ <menuitem name="menupreviewswap" action="menupreviewswap"/>
<menuitem name="menupreviewmaximise" action="menupreviewmaximise"/>
<menuitem name="menupreviewdisable" action="menupreviewdisable"/>
</popup>
<property name="draw">False</property>
<property name="visible">True</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
+
<object class="GtkToolItem" id="toolitem2">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="remote_user_name_toolbar">
- <property name="visible">True</property>
+ <object class="GtkVBox" id="uservbox">
+ <child>
+ <object class="GtkLabel" id="remote_user_name_toolbar">
+ <property name="visible">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="remote_user_status_toolbar">
+ <property name="visible">True</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</object>
</child>
</object>
- </child>
- <child>
- <object class="GtkToolItem" id="toolbar_space1">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- </packing>
+ <packing> <property name="expand">True</property></packing>
</child>
<child>
<object class="GtkToolButton" id="hangup">
<property name="icon_name">call-stop</property>
<property name="tooltip_text" translatable="yes">Hang up current call</property>
</object>
- <packing>
- <property name="homogeneous">False</property>
- </packing>
</child>
<child>
<object class="GtkToolButton" id="videocall">
<property name="icon_name">camera-web</property>
<property name="tooltip_text" translatable="yes">Start a video call</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
<object class="GtkToolButton" id="audiocall">
<property name="icon_name">call-start</property>
<property name="tooltip_text" translatable="yes">Start an audio call</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
<object class="GtkToggleToolButton" id="dialpad">
<property name="visible">True</property>
<property name="label" translatable="yes">Show dialpad</property>
- <property name="icon_name">accessories-calculator</property>
+ <property name="icon_name">input-dialpad</property>
<property name="tooltip_text" translatable="yes">Display the dialpad</property>
</object>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
</object>
<packing>
</packing>
</child>
<child>
- <object class="GtkHPaned" id="pane">
+ <object class="GtkHBox" id="pane">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">3</property>
<child>
<object class="GtkToolbar" id="bottom_toolbar">
<property name="visible">True</property>
- <style>
- <class name="bottom-toolbar"/>
- </style>
- <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>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="show_arrow">False</property>
<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="GtkButton" id="microphone">
+ <property name="visible">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>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
- </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>
- <packing>
- <property name="homogeneous">True</property>
- </packing>
</child>
<child>
- <object class="GtkToolItem" id="toolbar_space2">
+ <object class="GtkSeparatorToolItem" id="toolbutton2">
+ <property name="draw">False</property>
<property name="visible">True</property>
</object>
<packing>
<child>
<object class="GtkLabel" id="status_label">
<property name="visible">True</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
</object>
</child>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
</child>
</object>
<property name="right_padding">0</property>
<child>
- <object class="GtkTable" id="video">
+ <object class="GtkGrid" id="video">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
<property name="right_padding">0</property>
<child>
- <object class="GtkTable" id="audio">
+ <object class="GtkGrid" id="audio">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="right_attach">1</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">fill</property>
- <property name="y_options"/>
</packing>
</child>