* also be included.
*/
-#include <config.h>
-#include "hildon-note.h"
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbutton.h>
-#include <libintl.h>
-#include "hildon-defines.h"
-#include "hildon-sound.h"
-#include "hildon-banner.h"
-#include "hildon-enum-types.h"
-
-#include <stdio.h>
-#include <string.h>
-
-/* FIXME: Can these be included from somewhere? */
-#define CONFIRMATION_SOUND_PATH "/usr/share/sounds/ui-confirmation_note.wav"
-#define INFORMATION_SOUND_PATH "/usr/share/sounds/ui-information_note.wav"
-#define HILDON_NOTE_CONFIRMATION_ICON "qgn_note_confirm"
-#define HILDON_NOTE_INFORMATION_ICON "qgn_note_info"
-
-#define _(String) dgettext(PACKAGE, String)
-
-static GtkDialogClass *parent_class;
-
-#define HILDON_NOTE_GET_PRIVATE(obj)\
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- HILDON_TYPE_NOTE, HildonNotePrivate));
-
-typedef struct _HildonNotePrivate HildonNotePrivate;
-
-static void hildon_note_class_init(HildonNoteClass * class);
-static void hildon_note_init(HildonNote * dialog);
-
-static void hildon_note_rebuild(HildonNote *note);
-static void hildon_note_finalize(GObject * obj_self);
-static void hildon_note_realize (GtkWidget *widget);
-
-static void hildon_note_set_property(GObject * object,
- guint prop_id,
- const GValue * value,
- GParamSpec * pspec);
-static void hildon_note_get_property(GObject * object,
- guint prop_id,
- GValue * value, GParamSpec * pspec);
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "hildon-note.h"
+#include <gtk/gtklabel.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkvbox.h>
+#include <gtk/gtkbutton.h>
+#include <libintl.h>
+#include "hildon-defines.h"
+#include "hildon-sound.h"
+#include "hildon-banner.h"
+#include "hildon-enum-types.h"
+#include <stdio.h>
+#include <string.h>
+#include "hildon-note-private.h"
+
+#define CONFIRMATION_SOUND_PATH \
+ "/usr/share/sounds/ui-confirmation_note.wav"
+
+#define INFORMATION_SOUND_PATH \
+ "/usr/share/sounds/ui-information_note.wav"
+
+#define HILDON_NOTE_CONFIRMATION_ICON \
+ "qgn_note_confirm"
+
+#define HILDON_NOTE_INFORMATION_ICON \
+ "qgn_note_info"
+
+#define _(String) dgettext(PACKAGE, String)
+
+static void
+hildon_note_class_init (HildonNoteClass *class);
-static gboolean
-sound_handling(GtkWidget * widget, GdkEventExpose *event, gpointer data);
+static void
+hildon_note_init (HildonNote *dialog);
-struct _HildonNotePrivate {
- GtkWidget *okButton;
- GtkWidget *cancelButton;
- GtkWidget *label;
- GtkWidget *box;
- GtkWidget *icon;
+static void
+hildon_note_rebuild (HildonNote *note);
- HildonNoteType note_n;
- GtkWidget *progressbar;
- gulong sound_signal_handler;
+static void
+hildon_note_finalize (GObject *obj_self);
- gchar *original_description;
-};
+static void
+hildon_note_realize (GtkWidget *widget);
+
+static void
+hildon_note_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+
+static void
+hildon_note_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static gboolean
+sound_handling (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer data);
-enum {
- PROP_NONE = 0,
+enum
+{
+ PROP_0,
PROP_HILDON_NOTE_TYPE,
PROP_HILDON_NOTE_DESCRIPTION,
PROP_HILDON_NOTE_ICON,
PROP_HILDON_NOTE_STOCK_ICON
};
+static GtkDialogClass* parent_class;
+
static void
-hildon_note_set_property(GObject * object,
- guint prop_id,
- const GValue * value, GParamSpec * pspec)
+hildon_note_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec * pspec)
{
- HildonNote *note = HILDON_NOTE(object);
+ HildonNote *note = HILDON_NOTE (object);
HildonNotePrivate *priv;
GtkWidget *widget;
- priv = HILDON_NOTE_GET_PRIVATE(note);
+ priv = HILDON_NOTE_GET_PRIVATE (note);
+ g_assert (priv);
switch (prop_id) {
- case PROP_HILDON_NOTE_TYPE:
- priv->note_n = g_value_get_enum(value);
- hildon_note_rebuild(note);
- break;
- case PROP_HILDON_NOTE_DESCRIPTION:
- g_free(priv->original_description);
- priv->original_description = g_value_dup_string(value);
-
- _hildon_gtk_label_set_text_n_lines(GTK_LABEL(priv->label),
- priv->original_description,
- priv->note_n == HILDON_NOTE_PROGRESSBAR_TYPE ? 1 : 5);
-
- break;
- case PROP_HILDON_NOTE_ICON:
- gtk_image_set_from_icon_name(GTK_IMAGE(priv->icon),
- g_value_get_string(value), HILDON_ICON_SIZE_BIG_NOTE);
- break;
- case PROP_HILDON_NOTE_STOCK_ICON:
- gtk_image_set_from_stock(GTK_IMAGE(priv->icon),
- g_value_get_string(value), HILDON_ICON_SIZE_BIG_NOTE);
- break;
- case PROP_HILDON_NOTE_PROGRESSBAR:
- widget = g_value_get_object(value);
- if (widget != priv->progressbar)
- {
- if (priv->progressbar)
- g_object_unref(priv->progressbar);
-
- priv->progressbar = widget;
-
- if (widget)
+
+ case PROP_HILDON_NOTE_TYPE:
+ priv->note_n = g_value_get_enum (value);
+ hildon_note_rebuild (note);
+ break;
+
+ case PROP_HILDON_NOTE_DESCRIPTION:
+ g_free (priv->original_description);
+ priv->original_description = g_value_dup_string (value);
+
+ _hildon_gtk_label_set_text_n_lines (GTK_LABEL (priv->label),
+ priv->original_description,
+ priv->note_n == HILDON_NOTE_PROGRESSBAR_TYPE ? 1 : 5);
+
+ break;
+
+ case PROP_HILDON_NOTE_ICON:
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ g_value_get_string(value), HILDON_ICON_SIZE_BIG_NOTE);
+ break;
+
+ case PROP_HILDON_NOTE_STOCK_ICON:
+ gtk_image_set_from_stock (GTK_IMAGE (priv->icon),
+ g_value_get_string (value), HILDON_ICON_SIZE_BIG_NOTE);
+ break;
+
+ case PROP_HILDON_NOTE_PROGRESSBAR:
+ widget = g_value_get_object (value);
+ if (widget != priv->progressbar)
{
- g_object_ref(widget);
- gtk_object_sink(GTK_OBJECT(widget));
+ if (priv->progressbar)
+ g_object_unref (priv->progressbar);
+
+ priv->progressbar = widget;
+
+ if (widget)
+ {
+ g_object_ref (widget);
+ gtk_object_sink (GTK_OBJECT (widget));
+ }
+
+ hildon_note_rebuild (note);
}
+ break;
- hildon_note_rebuild(note);
- }
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
static void
-hildon_note_get_property(GObject * object,
- guint prop_id, GValue * value, GParamSpec * pspec)
+hildon_note_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- HildonNote *note = HILDON_NOTE(object);
+ HildonNote *note = HILDON_NOTE (object);
HildonNotePrivate *priv;
- priv = HILDON_NOTE_GET_PRIVATE(note);
+ priv = HILDON_NOTE_GET_PRIVATE (note);
switch (prop_id) {
- case PROP_HILDON_NOTE_TYPE:
- g_value_set_enum(value, priv->note_n);
- break;
- case PROP_HILDON_NOTE_DESCRIPTION:
- g_value_set_string(value, priv->original_description);
- break;
- case PROP_HILDON_NOTE_ICON:
- g_object_get_property(G_OBJECT(priv->icon), "icon-name", value);
- break;
- case PROP_HILDON_NOTE_STOCK_ICON:
- g_object_get_property(G_OBJECT(priv->icon), "stock", value);
- break;
- case PROP_HILDON_NOTE_PROGRESSBAR:
- g_value_set_object(value, priv->progressbar);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
- break;
+
+ case PROP_HILDON_NOTE_TYPE:
+ g_value_set_enum (value, priv->note_n);
+ break;
+
+ case PROP_HILDON_NOTE_DESCRIPTION:
+ g_value_set_string (value, priv->original_description);
+ break;
+
+ case PROP_HILDON_NOTE_ICON:
+ g_object_get_property (G_OBJECT (priv->icon), "icon-name", value);
+ break;
+
+ case PROP_HILDON_NOTE_STOCK_ICON:
+ g_object_get_property (G_OBJECT (priv->icon), "stock", value);
+ break;
+
+ case PROP_HILDON_NOTE_PROGRESSBAR:
+ g_value_set_object (value, priv->progressbar);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+ break;
}
}
-GType hildon_note_get_type()
+GType G_GNUC_CONST
+hildon_note_get_type (void)
{
static GType dialog_type = 0;
- if (!dialog_type) {
+ if (! dialog_type) {
static const GTypeInfo dialog_info = {
sizeof(HildonNoteClass),
NULL, /* base_init */
0, /* n_preallocs */
(GInstanceInitFunc) hildon_note_init
};
- dialog_type = g_type_register_static(GTK_TYPE_DIALOG,
- "HildonNote",
- &dialog_info, 0);
+ dialog_type = g_type_register_static (GTK_TYPE_DIALOG,
+ "HildonNote",
+ &dialog_info, 0);
}
return dialog_type;
}
-static void hildon_note_class_init(HildonNoteClass * class)
+static void
+hildon_note_class_init (HildonNoteClass *class)
{
- GObjectClass *object_class = G_OBJECT_CLASS(class);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(class);
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
/* set the global parent_class */
- parent_class = g_type_class_peek_parent(class);
-
- g_type_class_add_private(class, sizeof(HildonNotePrivate));
-
- object_class->finalize = hildon_note_finalize;
- object_class->set_property = hildon_note_set_property;
- object_class->get_property = hildon_note_get_property;
- widget_class->realize = hildon_note_realize;
-
- g_object_class_install_property(object_class,
- PROP_HILDON_NOTE_TYPE,
- g_param_spec_enum("note_type",
- "note type",
- "The type of the note dialog",
- hildon_note_type_get_type(),
- HILDON_NOTE_CONFIRMATION_TYPE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
- /**
- * HildonNote:description:
- *
- * Description for note.
- */
- g_object_class_install_property(object_class,
- PROP_HILDON_NOTE_DESCRIPTION,
- g_param_spec_string("description",
- "note description",
- "The text that appears in the note dialog",
- "",
- G_PARAM_READWRITE));
-
- /**
- * HildonNote:icon:
- *
- * Icon for note.
- */
- g_object_class_install_property(object_class,
- PROP_HILDON_NOTE_ICON,
- g_param_spec_string("icon",
- "note icon",
- "The name of the icon that appears in the note dialog",
- "",
- G_PARAM_READWRITE));
-
- /**
- * HildonNote:stock-icon:
- *
- * Stock icon for note.
- */
- g_object_class_install_property(object_class,
- PROP_HILDON_NOTE_STOCK_ICON,
- g_param_spec_string("stock-icon",
- "Stock note icon",
- "The stock name of the icon that appears in the note dialog",
- "",
- G_PARAM_READWRITE));
-
- /**
- * HildonNote:progressbar:
- *
- * Progressbar for note.
- */
- g_object_class_install_property(object_class,
- PROP_HILDON_NOTE_PROGRESSBAR,
- g_param_spec_object("progressbar",
- "Progressbar widget",
- "The progressbar that appears in the note dialog",
- GTK_TYPE_PROGRESS_BAR,
- G_PARAM_READWRITE));
+ parent_class = g_type_class_peek_parent (class);
+
+ g_type_class_add_private (class, sizeof (HildonNotePrivate));
+
+ object_class->finalize = hildon_note_finalize;
+ object_class->set_property = hildon_note_set_property;
+ object_class->get_property = hildon_note_get_property;
+ widget_class->realize = hildon_note_realize;
+
+ g_object_class_install_property (object_class,
+ PROP_HILDON_NOTE_TYPE,
+ g_param_spec_enum ("note_type",
+ "note type",
+ "The type of the note dialog",
+ hildon_note_type_get_type(),
+ HILDON_NOTE_CONFIRMATION_TYPE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+ /**
+ * HildonNote:description:
+ *
+ * Description for note.
+ */
+ g_object_class_install_property (object_class,
+ PROP_HILDON_NOTE_DESCRIPTION,
+ g_param_spec_string ("description",
+ "note description",
+ "The text that appears in the note dialog",
+ "",
+ G_PARAM_READWRITE));
+
+ /**
+ * HildonNote:icon:
+ *
+ * Icon for note.
+ */
+ g_object_class_install_property (object_class,
+ PROP_HILDON_NOTE_ICON,
+ g_param_spec_string ("icon",
+ "note icon",
+ "The name of the icon that appears in the note dialog",
+ "",
+ G_PARAM_READWRITE));
+
+ /**
+ * HildonNote:stock-icon:
+ *
+ * Stock icon for note.
+ */
+ g_object_class_install_property (object_class,
+ PROP_HILDON_NOTE_STOCK_ICON,
+ g_param_spec_string ("stock-icon",
+ "Stock note icon",
+ "The stock name of the icon that appears in the note dialog",
+ "",
+ G_PARAM_READWRITE));
+
+ /**
+ * HildonNote:progressbar:
+ *
+ * Progressbar for note.
+ */
+ g_object_class_install_property (object_class,
+ PROP_HILDON_NOTE_PROGRESSBAR,
+ g_param_spec_object ("progressbar",
+ "Progressbar widget",
+ "The progressbar that appears in the note dialog",
+ GTK_TYPE_PROGRESS_BAR,
+ G_PARAM_READWRITE));
}
-static void hildon_note_init(HildonNote * dialog)
+static void
+hildon_note_init (HildonNote *dialog)
{
- HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE(dialog);
+ HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE (dialog);
+ g_assert (priv);
- priv->label = gtk_label_new(NULL);
- priv->icon = gtk_image_new();
+ priv->label = gtk_label_new (NULL);
+ priv->icon = gtk_image_new ();
/* Acquire real references to our internal children, since
they are not nessecarily packed into container in each
layout */
- g_object_ref(priv->label);
- g_object_ref(priv->icon);
- gtk_object_sink(GTK_OBJECT(priv->label));
- gtk_object_sink(GTK_OBJECT(priv->icon));
-
- gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
- gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ g_object_ref (priv->label);
+ g_object_ref (priv->icon);
+
+ gtk_object_sink (GTK_OBJECT (priv->label));
+ gtk_object_sink (GTK_OBJECT (priv->icon));
+
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
}
-static void hildon_note_finalize(GObject * obj_self)
+static void
+hildon_note_finalize (GObject *obj_self)
{
- HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE(obj_self);
-
+ HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE (obj_self);
+ g_assert (priv);
+
+ /* FIXME Some of this stuff should be moved to dispose */
+
/* Free internal data */
- g_object_unref(priv->label);
- g_object_unref(priv->icon);
+ if (priv->label)
+ g_object_unref (priv->label);
+
+ if (priv->icon)
+ g_object_unref (priv->icon);
+
if (priv->progressbar)
- g_object_unref(priv->progressbar);
+ g_object_unref (priv->progressbar);
- g_free(priv->original_description);
+ if (priv->original_description)
+ g_free (priv->original_description);
- G_OBJECT_CLASS(parent_class)->finalize(obj_self);
+ G_OBJECT_CLASS (parent_class)->finalize (obj_self);
}
static void
-hildon_note_realize (GtkWidget *widget)
+hildon_note_realize (GtkWidget *widget)
{
- HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE(widget);
+ HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE (widget);
+ g_assert (priv);
/* Make widget->window accessible */
GTK_WIDGET_CLASS (parent_class)->realize (widget);
note is already on screen to avoid blocking its appearance */
if (priv->sound_signal_handler == 0)
priv->sound_signal_handler = g_signal_connect_after(widget,
- "expose-event", G_CALLBACK(sound_handling), NULL);
+ "expose-event", G_CALLBACK (sound_handling), NULL);
}
/* Helper function for removing a widget from it's container.
we own a separate reference to each object we try to unpack,
so extra referencing is not needed. */
-static void unpack_widget(GtkWidget *widget)
+static void
+unpack_widget (GtkWidget *widget)
{
- g_assert(widget == NULL || GTK_IS_WIDGET(widget));
+ g_assert (widget == NULL || GTK_IS_WIDGET (widget));
if (widget && widget->parent)
- gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
+ gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
}
static void
-hildon_note_rebuild(HildonNote *note)
+hildon_note_rebuild (HildonNote *note)
{
GtkDialog *dialog;
HildonNotePrivate *priv;
gboolean IsHorizontal = TRUE;
- g_assert(HILDON_IS_NOTE(note));
+ g_assert (HILDON_IS_NOTE (note));
priv = HILDON_NOTE_GET_PRIVATE (note);
- dialog = GTK_DIALOG(note);
+ g_assert (priv);
+
+ dialog = GTK_DIALOG (note);
/* Reuse exiting content widgets for new layout */
- unpack_widget(priv->label);
- unpack_widget(priv->icon);
- unpack_widget(priv->progressbar);
+ unpack_widget (priv->label);
+ unpack_widget (priv->icon);
+ unpack_widget (priv->progressbar);
/* Destroy old layout and buttons */
if (priv->box) {
- gtk_widget_destroy(priv->box);
+ gtk_widget_destroy (priv->box);
priv->box = NULL;
}
if (priv->okButton) {
- gtk_widget_destroy(priv->okButton);
+ gtk_widget_destroy (priv->okButton);
priv->okButton = NULL;
}
if (priv->cancelButton) {
- gtk_widget_destroy(priv->cancelButton);
+ gtk_widget_destroy (priv->cancelButton);
priv->cancelButton = NULL;
}
switch (priv->note_n)
{
case HILDON_NOTE_CONFIRMATION_TYPE:
- priv->okButton = gtk_dialog_add_button(dialog,
+ priv->okButton = gtk_dialog_add_button (dialog,
_("ecdg_bd_confirmation_note_ok"), GTK_RESPONSE_OK);
- priv->cancelButton = gtk_dialog_add_button(dialog,
+ priv->cancelButton = gtk_dialog_add_button (dialog,
_("ecdg_bd_confirmation_note_cancel"), GTK_RESPONSE_CANCEL);
/* Fall through */
case HILDON_NOTE_CONFIRMATION_BUTTON_TYPE:
- gtk_image_set_from_icon_name(GTK_IMAGE(priv->icon),
- HILDON_NOTE_CONFIRMATION_ICON,
- HILDON_ICON_SIZE_BIG_NOTE);
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ HILDON_NOTE_CONFIRMATION_ICON,
+ HILDON_ICON_SIZE_BIG_NOTE);
break;
case HILDON_NOTE_INFORMATION_THEME_TYPE:
case HILDON_NOTE_INFORMATION_TYPE:
/* Add clickable OK button (cancel really,
but doesn't matter since this is info) */
- priv->cancelButton = gtk_dialog_add_button(dialog,
+ priv->cancelButton = gtk_dialog_add_button (dialog,
_("ecdg_bd_information_note_ok"), GTK_RESPONSE_CANCEL);
- gtk_image_set_from_icon_name(GTK_IMAGE(priv->icon),
- HILDON_NOTE_INFORMATION_ICON,
- HILDON_ICON_SIZE_BIG_NOTE);
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ HILDON_NOTE_INFORMATION_ICON,
+ HILDON_ICON_SIZE_BIG_NOTE);
break;
case HILDON_NOTE_PROGRESSBAR_TYPE:
- priv->cancelButton = gtk_dialog_add_button(dialog,
+ priv->cancelButton = gtk_dialog_add_button (dialog,
_("ecdg_bd_cancel_note_cancel"), GTK_RESPONSE_CANCEL);
IsHorizontal = FALSE;
break;
if (IsHorizontal) {
/* Pack item with label horizontally */
- priv->box = gtk_hbox_new(FALSE, HILDON_MARGIN_DEFAULT);
- gtk_container_add(GTK_CONTAINER(dialog->vbox), priv->box);
+ priv->box = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
+ gtk_container_add (GTK_CONTAINER (dialog->vbox), priv->box);
if (priv->icon) {
- GtkWidget *alignment = gtk_alignment_new(0, 0, 0, 0);
+ GtkWidget *alignment = gtk_alignment_new (0, 0, 0, 0);
- gtk_box_pack_start(GTK_BOX(priv->box), alignment, FALSE, FALSE, 0);
- gtk_container_add(GTK_CONTAINER(alignment), priv->icon);
+ gtk_box_pack_start (GTK_BOX (priv->box), alignment, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (alignment), priv->icon);
}
- gtk_box_pack_start(GTK_BOX(priv->box), priv->label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->box), priv->label, TRUE, TRUE, 0);
} else {
/* Pack item with label vertically */
- priv->box = gtk_vbox_new(FALSE, HILDON_MARGIN_DOUBLE);
- gtk_container_add(GTK_CONTAINER(dialog->vbox), priv->box);
- gtk_box_pack_start(GTK_BOX(priv->box), priv->label, TRUE, TRUE, 0);
+ priv->box = gtk_vbox_new (FALSE, HILDON_MARGIN_DOUBLE);
+ gtk_container_add (GTK_CONTAINER (dialog->vbox), priv->box);
+ gtk_box_pack_start (GTK_BOX (priv->box), priv->label, TRUE, TRUE, 0);
if (priv->progressbar)
- gtk_box_pack_start(GTK_BOX(priv->box), priv->progressbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->box), priv->progressbar, FALSE, FALSE, 0);
}
-
- gtk_widget_show_all(priv->box);
+
+ gtk_widget_show_all (priv->box);
}
/**
*
* Returns: A #GtkWidget pointer of the note
*/
-GtkWidget *hildon_note_new_confirmation_add_buttons(GtkWindow *parent,
- const gchar *description,
- ...)
+GtkWidget*
+hildon_note_new_confirmation_add_buttons (GtkWindow *parent,
+ const gchar *description,
+ ...)
{
va_list args;
char *message;
int value;
- g_return_val_if_fail(parent == NULL || GTK_IS_WINDOW(parent), NULL);
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
GtkWidget *conf_note =
- g_object_new(HILDON_TYPE_NOTE,
- "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE,
- "description", description,
- "icon", HILDON_NOTE_CONFIRMATION_ICON,
- NULL);
+ g_object_new (HILDON_TYPE_NOTE,
+ "note_type", HILDON_NOTE_CONFIRMATION_BUTTON_TYPE,
+ "description", description,
+ "icon", HILDON_NOTE_CONFIRMATION_ICON,
+ NULL);
if (parent != NULL)
- gtk_window_set_transient_for(GTK_WINDOW(conf_note), parent);
+ gtk_window_set_transient_for (GTK_WINDOW (conf_note), parent);
/* Add the buttons from varargs */
va_start(args, description);
while (TRUE) {
- message = va_arg(args, char *);
+ message = va_arg (args, char *);
- if (!message) {
+ if (! message) {
break;
}
- value = va_arg(args, int);
+ value = va_arg (args, int);
- gtk_dialog_add_button(GTK_DIALOG(conf_note), message, value);
+ gtk_dialog_add_button (GTK_DIALOG (conf_note), message, value);
}
- va_end(args);
+ va_end (args);
return conf_note;
}
*
* Returns: a #GtkWidget pointer of the note
*/
-GtkWidget *hildon_note_new_confirmation(GtkWindow * parent,
- const gchar * description)
+GtkWidget*
+hildon_note_new_confirmation (GtkWindow *parent,
+ const gchar *description)
{
return hildon_note_new_confirmation_with_icon_name
(parent, description, HILDON_NOTE_CONFIRMATION_ICON);
*
* Returns: a #GtkWidget pointer of the note
*/
-GtkWidget *hildon_note_new_confirmation_with_icon_name(GtkWindow * parent,
- const gchar *
- description,
- const gchar *
- icon_name)
+GtkWidget*
+hildon_note_new_confirmation_with_icon_name (GtkWindow *parent,
+ const gchar *description,
+ const gchar *icon_name)
{
GtkWidget *dialog = NULL;
- g_return_val_if_fail(parent == NULL || GTK_IS_WINDOW(parent), NULL);
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+
+ dialog = g_object_new (HILDON_TYPE_NOTE,
+ "note_type",
+ HILDON_NOTE_CONFIRMATION_TYPE,
+ "description", description, "icon",
+ icon_name, NULL);
- dialog = g_object_new(HILDON_TYPE_NOTE,
- "note_type",
- HILDON_NOTE_CONFIRMATION_TYPE,
- "description", description, "icon",
- icon_name, NULL);
if (parent != NULL)
- gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
return dialog;
}
*
* Returns: a #GtkWidget pointer of the note
*/
-GtkWidget *hildon_note_new_information(GtkWindow * parent,
- const gchar * description)
+GtkWidget*
+hildon_note_new_information (GtkWindow *parent,
+ const gchar *description)
{
return hildon_note_new_information_with_icon_name
(parent, description, HILDON_NOTE_INFORMATION_ICON);
*
* Returns: a #GtkWidget pointer of the note
*/
-GtkWidget *hildon_note_new_information_with_icon_name(GtkWindow * parent,
- const gchar *
- description,
- const gchar *
- icon_name)
+GtkWidget*
+hildon_note_new_information_with_icon_name (GtkWindow * parent,
+ const gchar *description,
+ const gchar *icon_name)
{
GtkWidget *dialog = NULL;
- g_return_val_if_fail(parent == NULL || GTK_IS_WINDOW(parent), NULL);
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+
+ dialog = g_object_new (HILDON_TYPE_NOTE,
+ "note_type",
+ HILDON_NOTE_INFORMATION_THEME_TYPE,
+ "description", description,
+ "icon", icon_name, NULL);
- dialog = g_object_new(HILDON_TYPE_NOTE,
- "note_type",
- HILDON_NOTE_INFORMATION_THEME_TYPE,
- "description", description,
- "icon", icon_name, NULL);
if (parent != NULL)
- gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
return dialog;
}
* Returns: a #GtkDialog. Use this to get rid of this note when you
* no longer need it.
*/
-GtkWidget *hildon_note_new_cancel_with_progress_bar(GtkWindow * parent,
- const gchar *
- description,
- GtkProgressBar *
- progressbar)
+GtkWidget*
+hildon_note_new_cancel_with_progress_bar (GtkWindow *parent,
+ const gchar *description,
+ GtkProgressBar *progressbar)
{
GtkWidget *dialog = NULL;
- g_return_val_if_fail(parent == NULL || GTK_IS_WINDOW(parent), NULL);
+ g_return_val_if_fail (GTK_IS_WINDOW (parent), NULL);
+
+ dialog = g_object_new (HILDON_TYPE_NOTE,
+ "note_type",
+ HILDON_NOTE_PROGRESSBAR_TYPE,
+ "description", description,
+ "progressbar",
+ progressbar, NULL);
- dialog = g_object_new(HILDON_TYPE_NOTE,
- "note_type",
- HILDON_NOTE_PROGRESSBAR_TYPE,
- "description", description,
- "progressbar",
- progressbar, NULL);
if (parent != NULL)
- gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
return dialog;
}
*
* Sets the button text to be used by the hildon_note widget.
*/
-void hildon_note_set_button_text(HildonNote * note, const gchar * text)
+void
+hildon_note_set_button_text (HildonNote *note,
+ const gchar *text)
{
HildonNotePrivate *priv;
- g_return_if_fail(HILDON_IS_NOTE(note));
+ g_return_if_fail (HILDON_IS_NOTE (note));
+
+ priv = HILDON_NOTE_GET_PRIVATE (HILDON_NOTE (note));
+ g_assert (priv);
- priv = HILDON_NOTE_GET_PRIVATE(HILDON_NOTE(note));
if (priv->okButton) {
- gtk_button_set_label(GTK_BUTTON(priv->okButton), text);
- gtk_button_set_label(GTK_BUTTON(priv->cancelButton),
- _("ecdg_bd_confirmation_note_cancel"));
+ gtk_button_set_label (GTK_BUTTON (priv->okButton), text);
+ gtk_button_set_label (GTK_BUTTON (priv->cancelButton),
+ _("ecdg_bd_confirmation_note_cancel"));
} else {
- gtk_button_set_label(GTK_BUTTON(priv->cancelButton), text);
+ gtk_button_set_label (GTK_BUTTON (priv->cancelButton), text);
}
}
*
* Sets the button texts to be used by this hildon_note widget.
*/
-void hildon_note_set_button_texts(HildonNote * note,
- const gchar * textOk,
- const gchar * textCancel)
+void
+hildon_note_set_button_texts (HildonNote *note,
+ const gchar *text_ok,
+ const gchar *text_cancel)
{
HildonNotePrivate *priv;
- g_return_if_fail(HILDON_IS_NOTE(note));
+ g_return_if_fail (HILDON_IS_NOTE (note));
+
+ priv = HILDON_NOTE_GET_PRIVATE (HILDON_NOTE (note));
+ g_assert (priv);
- priv = HILDON_NOTE_GET_PRIVATE(HILDON_NOTE(note));
if (priv->okButton) {
- gtk_button_set_label(GTK_BUTTON(priv->okButton), textOk);
- gtk_button_set_label(GTK_BUTTON(priv->cancelButton),
- textCancel);
+ gtk_button_set_label (GTK_BUTTON (priv->okButton), text_ok);
+ gtk_button_set_label (GTK_BUTTON (priv->cancelButton), text_cancel);
} else {
- gtk_button_set_label(GTK_BUTTON(priv->cancelButton), textCancel);
+ gtk_button_set_label (GTK_BUTTON (priv->cancelButton), text_cancel);
}
}
/* We play a system sound when the note comes visible */
static gboolean
-sound_handling(GtkWidget * widget, GdkEventExpose *event, gpointer data)
+sound_handling (GtkWidget *widget,
+ GdkEventExpose *event,
+ gpointer data)
{
- HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE(widget);
- g_signal_handler_disconnect(widget, priv->sound_signal_handler);
- priv->sound_signal_handler = 0;
-
- switch (priv->note_n)
- {
- case HILDON_NOTE_INFORMATION_TYPE:
- case HILDON_NOTE_INFORMATION_THEME_TYPE:
- hildon_play_system_sound(INFORMATION_SOUND_PATH);
- break;
- case HILDON_NOTE_CONFIRMATION_TYPE:
- case HILDON_NOTE_CONFIRMATION_BUTTON_TYPE:
- hildon_play_system_sound(CONFIRMATION_SOUND_PATH);
- break;
- default:
- break;
- };
-
- return FALSE;
+ HildonNotePrivate *priv = HILDON_NOTE_GET_PRIVATE (widget);
+ g_assert (priv);
+
+ g_signal_handler_disconnect (widget, priv->sound_signal_handler);
+
+ priv->sound_signal_handler = 0;
+
+ switch (priv->note_n)
+ {
+ case HILDON_NOTE_INFORMATION_TYPE:
+ case HILDON_NOTE_INFORMATION_THEME_TYPE:
+ hildon_play_system_sound (INFORMATION_SOUND_PATH);
+ break;
+
+ case HILDON_NOTE_CONFIRMATION_TYPE:
+ case HILDON_NOTE_CONFIRMATION_BUTTON_TYPE:
+ hildon_play_system_sound (CONFIRMATION_SOUND_PATH);
+ break;
+
+ default:
+ break;
+ };
+
+ return FALSE;
}
projects / hildon / commitdiff