aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-02 20:00:09 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-04 17:10:19 +0800
commit1132cbda320d086176a0228f3addf5f7288ef080 (patch)
treeae9a30afdf889f2f13fd562bd3dff31a88ceef31 /src
parent09626bb08d6bcbb5c4ff14ea696282754ab7e93c (diff)
downloadgsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar.gz
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar.bz2
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar.lz
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar.xz
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.tar.zst
gsoc2013-empathy-1132cbda320d086176a0228f3addf5f7288ef080.zip
CallWindow: add a Help->Contents menu
https://bugzilla.gnome.org/show_bug.cgi?id=655884
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c8
-rw-r--r--src/empathy-call-window.ui17
2 files changed, 25 insertions, 0 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 338686d2a..52a1907d7 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -729,6 +729,13 @@ create_pipeline (EmpathyCallWindow *self)
g_object_unref (bus);
}
+static void
+empathy_call_window_contents_cb (GtkAction *action,
+ EmpathyCallWindow *self)
+{
+ empathy_url_show (GTK_WIDGET (self), "ghelp:empathy?audio-video");
+}
+
static gboolean
empathy_call_window_configure_event_cb (GtkWidget *widget,
GdkEvent *event,
@@ -823,6 +830,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
"camera", "toggled", empathy_call_window_camera_toggled_cb,
"dialpad", "toggled", empathy_call_window_dialpad_cb,
"menufullscreen", "activate", empathy_call_window_fullscreen_cb,
+ "menucontents", "activate", empathy_call_window_contents_cb,
"menupreviewdisable", "activate", empathy_call_window_disable_camera_cb,
"menupreviewminimise", "activate", empathy_call_window_minimise_camera_cb,
"menupreviewmaximise", "activate", empathy_call_window_maximise_camera_cb,
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index aa174f338..70a1fa9ee 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -31,6 +31,20 @@
</object>
</child>
<child>
+ <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="menupreviewminimise">
<property name="name">menupreviewminimise</property>
<property name="label" translatable="yes">Minimise me</property>
@@ -58,6 +72,9 @@
<menu action="edit">
<menu action="menumicrophone"/>
</menu>
+ <menu action="help">
+ <menuitem name="menucontents" action="menucontents"/>
+ </menu>
</menubar>
<popup name="video-popup">
<menuitem name="menufullscreen" action="menufullscreen"/>