ekiga r6451 - trunk/lib/engine/gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Jul 14 20:51:13 2008
New Revision: 6451
URL: http://svn.gnome.org/viewvc/ekiga?rev=6451&view=rev

Log:
New PresentityView widget.

Added:
   trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
   trunk/lib/engine/gui/gtk-frontend/presentity-view.h
Modified:
   trunk/lib/engine/gui/gtk-frontend/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp

Modified: trunk/lib/engine/gui/gtk-frontend/Makefile.am
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/Makefile.am	(original)
+++ trunk/lib/engine/gui/gtk-frontend/Makefile.am	Mon Jul 14 20:51:13 2008
@@ -25,6 +25,8 @@
 	$(gtk_frontend_dir)/roster-view-gtk.cpp 	\
 	$(gtk_frontend_dir)/call-history-view-gtk.h 	\
 	$(gtk_frontend_dir)/call-history-view-gtk.cpp 	\
+	$(gtk_frontend_dir)/presentity-view.h		\
+	$(gtk_frontend_dir)/presentity-view.cpp		\
 	$(gtk_frontend_dir)/chat-area.h			\
 	$(gtk_frontend_dir)/chat-area.cpp		\
 	$(gtk_frontend_dir)/simple-chat-page.h		\

Added: trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
==============================================================================
--- (empty file)
+++ trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	Mon Jul 14 20:51:13 2008
@@ -0,0 +1,258 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                        presentity-view.cpp  -  description
+ *                         --------------------------------
+ *   begin                : written in july 2008 by Julien Puydt
+ *   copyright            : (C) 2008 by Julien Puydt
+ *   description          : Implementation of a Chat area (view and control)
+ *
+ */
+
+#include "presentity-view.h"
+
+class PresentityViewHelper;
+
+struct _PresentityViewPrivate
+{
+  Ekiga::Presentity* presentity;
+  sigc::connection updated_conn;
+  sigc::connection removed_conn;
+
+  /* we contain those, so no need to unref them */
+  GtkWidget* presence_image;
+  GtkWidget* name_status;
+  GtkWidget* avatar_image;
+};
+
+enum {
+  PRESENTITY_VIEW_PROP_PRESENTITY = 1
+};
+
+static GObjectClass* parent_class = NULL;
+
+/* declaration of callbacks */
+
+static void on_presentity_updated (PresentityView* self);
+
+static void on_presentity_removed (PresentityView* self);
+
+/* declaration of internal api */
+
+static void presentity_view_set_presentity (PresentityView* self,
+					    Ekiga::Presentity* presentity);
+
+static void presentity_view_unset_presentity (PresentityView* self);
+
+/* implementation of callbacks */
+
+static void
+on_presentity_updated (PresentityView* self)
+{
+  gchar *txt = NULL;
+  std::string presence;
+
+  presence = self->priv->presentity->get_presence ();
+  if (presence == "")
+    presence = "presence-unknown";
+
+  gtk_image_set_from_stock (GTK_IMAGE (self->priv->presence_image),
+			    presence.c_str (),
+			    GTK_ICON_SIZE_LARGE_TOOLBAR);
+  txt = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>\n<span size=\"small\">%s</span>",
+				 self->priv->presentity->get_name ().c_str (),
+				 self->priv->presentity->get_status ().c_str ());
+  gtk_label_set_markup (GTK_LABEL (self->priv->name_status), txt);
+  g_free (txt);
+  gtk_image_set_from_stock (GTK_IMAGE (self->priv->avatar_image),
+			    self->priv->presentity->get_avatar ().c_str (),
+			    GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
+
+static void
+on_presentity_removed (PresentityView* self)
+{
+  presentity_view_unset_presentity (self);
+}
+
+/* implementation of internal api */
+
+static void
+presentity_view_set_presentity (PresentityView* self,
+				Ekiga::Presentity* presentity)
+{
+  g_return_if_fail (self->priv->presentity == NULL);
+
+  self->priv->presentity = presentity;
+  self->priv->updated_conn = self->priv->presentity->removed.connect (sigc::bind (sigc::ptr_fun (on_presentity_updated), self));
+  self->priv->removed_conn = self->priv->presentity->removed.connect (sigc::bind (sigc::ptr_fun (on_presentity_removed), self));
+
+  on_presentity_updated (self);
+}
+
+static void
+presentity_view_unset_presentity (PresentityView* self)
+{
+  if (self->priv->presentity) {
+
+    self->priv->presentity = NULL;
+    self->priv->updated_conn.disconnect ();
+    self->priv->removed_conn.disconnect ();
+  }
+}
+
+/* GObject code */
+
+static void
+presentity_view_finalize (GObject* obj)
+{
+  PresentityView* self = NULL;
+
+  self = (PresentityView*)obj;
+
+  presentity_view_unset_presentity (self);
+
+  delete self->priv;
+  self->priv = NULL;
+
+  parent_class->finalize (obj);
+}
+
+static void
+presentity_view_set_property (GObject* obj,
+			      guint prop_id,
+			      const GValue* value,
+			      GParamSpec* spec)
+{
+  PresentityView* self = NULL;
+  Ekiga::Presentity* presentity = NULL;
+
+  self = (PresentityView* )obj;
+
+  switch (prop_id) {
+
+  case PRESENTITY_VIEW_PROP_PRESENTITY:
+    presentity = (Ekiga::Presentity*)g_value_get_pointer (value);
+    presentity_view_set_presentity (self, presentity);
+
+    break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, spec);
+    break;
+  }
+}
+
+static void
+presentity_view_class_init (gpointer g_class,
+			    G_GNUC_UNUSED gpointer class_data)
+{
+  GObjectClass* gobject_class = NULL;
+  GParamSpec* spec = NULL;
+
+  parent_class = (GObjectClass*)g_type_class_peek_parent (g_class);
+
+  gobject_class = (GObjectClass*)g_class;
+  gobject_class->finalize = presentity_view_finalize;
+  gobject_class->set_property = presentity_view_set_property;
+
+  spec = g_param_spec_pointer ("presentity",
+			       "displayed presentity",
+			       "Displayed presentity",
+			       (GParamFlags)(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+  g_object_class_install_property (gobject_class,
+				   PRESENTITY_VIEW_PROP_PRESENTITY,
+				   spec);
+}
+
+static void
+presentity_view_init (GTypeInstance* instance,
+		      G_GNUC_UNUSED gpointer g_class)
+{
+  PresentityView* self = NULL;
+
+  self = (PresentityView*)instance;
+
+  self->priv = new PresentityViewPrivate;
+  self->priv->presentity = NULL;
+
+  self->priv->presence_image = gtk_image_new ();
+  gtk_box_pack_start (GTK_BOX (self), self->priv->presence_image,
+		      FALSE, FALSE, 2);
+  gtk_widget_show (self->priv->presence_image);
+
+  self->priv->name_status = gtk_label_new (NULL);
+  gtk_box_pack_start (GTK_BOX (self), self->priv->name_status,
+		      FALSE, TRUE, 2);
+  gtk_widget_show (self->priv->name_status);
+
+  self->priv->avatar_image = gtk_image_new ();
+  gtk_box_pack_start (GTK_BOX (self), self->priv->avatar_image,
+		      FALSE, FALSE, 2);
+  gtk_widget_show (self->priv->avatar_image);
+}
+
+
+GType
+presentity_view_get_type ()
+{
+  static GType result = 0;
+
+  if (result == 0) {
+
+    static const GTypeInfo info = {
+      sizeof (PresentityViewClass),
+      NULL,
+      NULL,
+      presentity_view_class_init,
+      NULL,
+      NULL,
+      sizeof (PresentityView),
+      0,
+      presentity_view_init,
+      NULL
+    };
+
+    result = g_type_register_static (GTK_TYPE_HBOX,
+				     "PresentityView",
+				     &info, (GTypeFlags) 0);
+  }
+
+  return result;
+}
+
+/* public api */
+
+GtkWidget*
+presentity_view_new (Ekiga::Presentity& presentity)
+{
+  return (GtkWidget*)g_object_new (TYPE_PRESENTITY_VIEW,
+				   "presentity", &presentity,
+				   NULL);
+}

Added: trunk/lib/engine/gui/gtk-frontend/presentity-view.h
==============================================================================
--- (empty file)
+++ trunk/lib/engine/gui/gtk-frontend/presentity-view.h	Mon Jul 14 20:51:13 2008
@@ -0,0 +1,80 @@
+
+/* Ekiga -- A VoIP and Video-Conferencing application
+ * Copyright (C) 2000-2008 Damien Sandras
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * Ekiga is licensed under the GPL license and as a special exception,
+ * you have permission to link or otherwise combine this program with the
+ * programs OPAL, OpenH323 and PWLIB, and distribute the combination,
+ * without applying the requirements of the GNU GPL to the OPAL, OpenH323
+ * and PWLIB programs, as long as you do follow the requirements of the
+ * GNU GPL for all the rest of the software thus combined.
+ */
+
+
+/*
+ *                        presentity-view.h  -  description
+ *                         --------------------------------
+ *   begin                : written in july 2008 by Julien Puydt
+ *   copyright            : (C) 2008 by Julien Puydt
+ *   description          : Declaration of a widget displaying a Presentity
+ *
+ */
+
+#ifndef __PRESENTITY_VIEW_H__
+#define __PRESENTITY_VIEW_H__
+
+#include <gtk/gtk.h>
+
+#include "presentity.h"
+
+G_BEGIN_DECLS
+
+typedef struct _PresentityView PresentityView;
+typedef struct _PresentityViewPrivate PresentityViewPrivate;
+typedef struct _PresentityViewClass PresentityViewClass;
+
+struct _PresentityView
+{
+  GtkHBox parent;
+
+  PresentityViewPrivate* priv;
+};
+
+struct _PresentityViewClass
+{
+  GtkHBoxClass parent;
+};
+
+/* public api */
+
+GtkWidget *presentity_view_new (Ekiga::Presentity& presentity);
+
+/* GObject thingies */
+
+#define TYPE_PRESENTITY_VIEW (presentity_view_get_type ())
+#define PRESENTITY_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PRESENTITY_VIEW, PresentityView))
+#define PRESENTITY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PRESENTITY_VIEW, PresentityViewClass))
+#define GTK_IS_PRESENTITY_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PRESENTITY_VIEW))
+#define GTK_IS_PRESENTITY_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PRESENTITY_VIEW))
+#define PRESENTITY_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PRESENTITY_VIEW, PresentityViewClass))
+
+GType presentity_view_get_type () G_GNUC_CONST;
+
+
+G_END_DECLS
+#endif

Modified: trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp	Mon Jul 14 20:51:13 2008
@@ -36,6 +36,7 @@
  */
 
 #include "simple-chat-page.h"
+#include "presentity-view.h"
 #include "chat-area.h"
 
 static GObjectClass *parent_class = NULL;
@@ -107,13 +108,19 @@
 simple_chat_page_new (Ekiga::SimpleChat& chat)
 {
   SimpleChatPage* result = NULL;
+  GtkWidget* presentity_view = NULL;
   GtkWidget* area = NULL;
 
   result = (SimpleChatPage*)g_object_new (TYPE_SIMPLE_CHAT_PAGE, NULL);
 
+  presentity_view = presentity_view_new (chat.get_presentity ());
+  gtk_box_pack_start (GTK_BOX (result), presentity_view,
+		      FALSE, TRUE, 2);
+  gtk_widget_show (presentity_view);
+
   area = chat_area_new (chat);
   gtk_box_pack_start (GTK_BOX (result), area,
-		      TRUE,TRUE, 2);
+		      TRUE, TRUE, 2);
   gtk_widget_show (area);
 
   return GTK_WIDGET (result);