X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon-hvolumebar.c;h=68fc8ac889cc13bc1c94b4dc0b6a91f189efbf08;hb=db9685e21af93630b100473c49d066de0ad3691f;hp=096651020f2fc8ef9fa1a4344214207a890d0a11;hpb=7ef5e5c43d493f2d727fdfacd1cb5d4fab297d30;p=hildon
diff --git a/src/hildon-hvolumebar.c b/src/hildon-hvolumebar.c
index 0966510..68fc8ac 100644
--- a/src/hildon-hvolumebar.c
+++ b/src/hildon-hvolumebar.c
@@ -1,5 +1,5 @@
/*
- * This file is part of hildon-libs
+ * This file is a part of hildon
*
* Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
*
@@ -8,7 +8,7 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,121 +24,155 @@
/**
* SECTION:hildon-hvolumebar
- * @short_description: A widget that displays a horizontal volume bar
+ * @short_description: A widget that displays a horizontal volume bar.
* @see_also: #HildonVVolumebar, #HildonVolumebar
*
* The #HildonHVolumebar widget displays a horizontal volume bar that allows
* increasing or decreasing volume within a pre-defined range, and includes
* a mute icon which users can click to mute the sound.
+ *
+ *
+ *
+ * GtkWidget *volbar = hildon_hvolumebar_new ();
+ * g_signal_connect (G_OBJECT(volbar), "mute_toggled", G_CALLBACK(mute_toggle), NULL);
+ * g_signal_connect (G_OBJECT(volbar), "level_changed", G_CALLBACK(level_change), NULL);
+ *
+ *
+ *
*/
+#undef HILDON_DISABLE_DEPRECATED
-/* Horizontal volumebar subclass */
-
-#include
-#include "hildon-hvolumebar.h"
-#include "hildon-volumebar.h"
-#include "hildon-volumebar-range.h"
-#include "hildon-volumebar-private.h"
-#include
+#include "hildon-hvolumebar.h"
+#include "hildon-volumebar.h"
+#include "hildon-volumebar-range.h"
+#include "hildon-volumebar-private.h"
/* Defines for normal version of HVolumebar */
/* Toggle button */
-#define DEFAULT_TBUTTON_WIDTH 26
-#define DEFAULT_TBUTTON_HEIGHT 26
+
+#define DEFAULT_TBUTTON_WIDTH 26
+
+#define DEFAULT_TBUTTON_HEIGHT 26
+
/* Volume bar */
-#define MINIMUM_BAR_WIDTH 147
-#define DEFAULT_BAR_HEIGHT 58
-#define DEFAULT_ENDING_SIZE 20
+#define MINIMUM_BAR_WIDTH 147
+
+#define DEFAULT_BAR_HEIGHT 58
+
+#define DEFAULT_ENDING_SIZE 20
/* Gap to leave for mute button */
-#define VERTICAL_MUTE_GAP 16
-#define HORIZONTAL_MUTE_GAP 6
+#define VERTICAL_MUTE_GAP 16
+
+#define HORIZONTAL_MUTE_GAP 6
/* Sizes inside a toolbar */
/* Toggle button */
-#define TOOL_DEFAULT_TBUTTON_WIDTH 26
-#define TOOL_DEFAULT_TBUTTON_HEIGHT 26
+
+#define TOOL_DEFAULT_TBUTTON_WIDTH 26
+
+#define TOOL_DEFAULT_TBUTTON_HEIGHT 26
+
/* Volumebar */
-#define TOOL_MINIMUM_BAR_WIDTH 121
-#define TOOL_DEFAULT_BAR_HEIGHT 40
-#define TOOL_DEFAULT_ENDING_SIZE 0
-#define TOOL_VERTICAL_MUTE_GAP ((TOOL_DEFAULT_BAR_HEIGHT - TOOL_DEFAULT_TBUTTON_HEIGHT) / 2)
-static HildonVolumebarClass *parent_class;
-static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass);
-static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar);
+#define TOOL_MINIMUM_BAR_WIDTH 121
-static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
- GdkEventExpose * event);
-static void hildon_hvolumebar_size_request(GtkWidget * widget,
- GtkRequisition * requisition);
-static void hildon_hvolumebar_size_allocate(GtkWidget * widget,
- GtkAllocation * allocation);
-static void hildon_hvolumebar_map(GtkWidget * widget);
+#define TOOL_DEFAULT_BAR_HEIGHT 40
+#define TOOL_DEFAULT_ENDING_SIZE 0
-GType hildon_hvolumebar_get_type(void)
+#define TOOL_VERTICAL_MUTE_GAP \
+ ((TOOL_DEFAULT_BAR_HEIGHT - TOOL_DEFAULT_TBUTTON_HEIGHT) / 2)
+
+static HildonVolumebarClass* parent_class;
+
+static void
+hildon_hvolumebar_class_init (HildonHVolumebarClass *klass);
+
+static void
+hildon_hvolumebar_init (HildonHVolumebar *hvolumebar);
+
+static gboolean
+hildon_hvolumebar_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+static void
+hildon_hvolumebar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void
+hildon_hvolumebar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void
+hildon_hvolumebar_map (GtkWidget *widget);
+
+/**
+ * hildon_hvolumebar_get_type:
+ *
+ * Returns GType for HildonHVolumebar.
+ *
+ * Returns: HildonHVolumebar type
+ */
+GType G_GNUC_CONST
+hildon_hvolumebar_get_type (void)
{
static GType type = 0;
if (!type) {
static const GTypeInfo info = {
- sizeof(HildonHVolumebarClass),
+ sizeof (HildonHVolumebarClass),
NULL, /* base_init */
NULL, /* base_finalize */
(GClassInitFunc) hildon_hvolumebar_class_init, /* class_init */
NULL, /* class_finalize */
NULL, /* class_data */
- sizeof(HildonHVolumebar),
+ sizeof (HildonHVolumebar),
0,
(GInstanceInitFunc) hildon_hvolumebar_init,
};
- type = g_type_register_static(HILDON_TYPE_VOLUMEBAR,
- "HildonHVolumebar", &info, 0);
+ type = g_type_register_static (HILDON_TYPE_VOLUMEBAR,
+ "HildonHVolumebar", &info, 0);
}
return type;
}
-
-static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass)
+static void
+hildon_hvolumebar_class_init (HildonHVolumebarClass *klass)
{
- GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS(klass);
+ GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS (klass);
- parent_class = g_type_class_peek_parent(klass);
+ parent_class = g_type_class_peek_parent (klass);
- volumebar_class->size_request = hildon_hvolumebar_size_request;
- volumebar_class->size_allocate = hildon_hvolumebar_size_allocate;
- volumebar_class->map = hildon_hvolumebar_map;
- volumebar_class->expose_event = hildon_hvolumebar_expose;
+ volumebar_class->size_request = hildon_hvolumebar_size_request;
+ volumebar_class->size_allocate = hildon_hvolumebar_size_allocate;
+ volumebar_class->map = hildon_hvolumebar_map;
+ volumebar_class->expose_event = hildon_hvolumebar_expose;
}
-
-static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar)
+static void
+hildon_hvolumebar_init (HildonHVolumebar *hvolumebar)
{
HildonVolumebarPrivate *priv;
- priv = HILDON_VOLUMEBAR_GET_PRIVATE(hvolumebar);
+ priv = HILDON_VOLUMEBAR_GET_PRIVATE (hvolumebar);
priv->volumebar =
HILDON_VOLUMEBAR_RANGE(hildon_volumebar_range_new
- (GTK_ORIENTATION_HORIZONTAL));
+ (GTK_ORIENTATION_HORIZONTAL));
- GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(hvolumebar), GTK_CAN_FOCUS);
+ gtk_widget_set_parent (GTK_WIDGET (priv->tbutton), GTK_WIDGET (hvolumebar));
+ gtk_widget_set_parent (GTK_WIDGET (priv->volumebar), GTK_WIDGET (hvolumebar));
- gtk_widget_set_parent(GTK_WIDGET(priv->tbutton), GTK_WIDGET(hvolumebar));
- gtk_widget_set_parent(GTK_WIDGET(priv->volumebar), GTK_WIDGET(hvolumebar));
-
- gtk_scale_set_draw_value(GTK_SCALE(priv->volumebar), FALSE);
+ gtk_scale_set_draw_value (GTK_SCALE (priv->volumebar), FALSE);
/* Signals */
- g_signal_connect_swapped(G_OBJECT(priv->volumebar), "value-changed",
- G_CALLBACK(hildon_volumebar_level_change),
- hvolumebar);
- g_signal_connect_swapped(priv->tbutton, "toggled",
- G_CALLBACK(_hildon_volumebar_mute_toggled), hvolumebar);
+ g_signal_connect_swapped (G_OBJECT (priv->volumebar), "value-changed",
+ G_CALLBACK(hildon_volumebar_level_change),
+ hvolumebar);
+
+ g_signal_connect_swapped (priv->tbutton, "toggled",
+ G_CALLBACK (hildon_volumebar_mute_toggled), hvolumebar);
- gtk_widget_show(GTK_WIDGET(priv->volumebar));
+ gtk_widget_show (GTK_WIDGET (priv->volumebar));
}
/**
@@ -148,48 +182,51 @@ static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar)
*
* Returns: a new #HildonHVolumebar
*/
-GtkWidget *hildon_hvolumebar_new(void)
+GtkWidget*
+hildon_hvolumebar_new (void)
{
- return GTK_WIDGET(g_object_new(HILDON_TYPE_HVOLUMEBAR, NULL));
+ return GTK_WIDGET (g_object_new(HILDON_TYPE_HVOLUMEBAR, NULL));
}
-static void hildon_hvolumebar_map(GtkWidget * widget)
+static void
+hildon_hvolumebar_map (GtkWidget* widget)
{
HildonVolumebarPrivate *priv;
GtkWidget *parent;
- g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
- parent = gtk_widget_get_ancestor(GTK_WIDGET(widget), GTK_TYPE_TOOLBAR);
+ g_assert (priv);
+
+ parent = gtk_widget_get_ancestor (GTK_WIDGET (widget), GTK_TYPE_TOOLBAR);
/* Check if the volumebar is in a toolbar */
if (parent)
priv->is_toolbar = TRUE;
- GTK_WIDGET_CLASS(parent_class)->map(widget);
+ GTK_WIDGET_CLASS (parent_class)->map (widget);
}
-static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
- GdkEventExpose * event)
+static gboolean
+hildon_hvolumebar_expose (GtkWidget * widget,
+ GdkEventExpose * event)
{
HildonVolumebarPrivate *priv;
- g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
+ g_assert (priv);
- if (GTK_WIDGET_DRAWABLE(widget)) {
+ if (GTK_WIDGET_DRAWABLE (widget)) {
/* Paint background */
- gtk_paint_box(widget->style, widget->window,
- GTK_WIDGET_STATE(priv->volumebar), GTK_SHADOW_OUT,
- NULL, widget, "background",
- widget->allocation.x,
- widget->allocation.y,
- widget->allocation.width,
- widget->allocation.height);
-
- /* The contents of the widget can paint themselves */
+ gtk_paint_box (widget->style, widget->window,
+ GTK_WIDGET_STATE (priv->volumebar), GTK_SHADOW_OUT,
+ NULL, widget, "background",
+ widget->allocation.x,
+ widget->allocation.y,
+ widget->allocation.width,
+ widget->allocation.height);
+
+ /* The contents of the widget can paint themselves */
+ /* FIXME Not sure if this is even needed here */
(*GTK_WIDGET_CLASS(parent_class)->expose_event) (widget, event);
}
@@ -197,51 +234,51 @@ static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
}
static void
-hildon_hvolumebar_size_request(GtkWidget * widget,
- GtkRequisition * requisition)
+hildon_hvolumebar_size_request (GtkWidget * widget,
+ GtkRequisition * requisition)
{
HildonVolumebarPrivate *priv;
- g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
+ g_assert (priv);
/* Volumebar has different dimensions in toolbar */
requisition->width = (priv->is_toolbar
- ? TOOL_MINIMUM_BAR_WIDTH
- : MINIMUM_BAR_WIDTH);
+ ? TOOL_MINIMUM_BAR_WIDTH
+ : MINIMUM_BAR_WIDTH);
+
requisition->height = (priv->is_toolbar
- ? TOOL_DEFAULT_BAR_HEIGHT
- : DEFAULT_BAR_HEIGHT);
+ ? TOOL_DEFAULT_BAR_HEIGHT
+ : DEFAULT_BAR_HEIGHT);
}
static void
-hildon_hvolumebar_size_allocate(GtkWidget * widget,
- GtkAllocation * allocation)
+hildon_hvolumebar_size_allocate (GtkWidget * widget,
+ GtkAllocation * allocation)
{
HildonVolumebarPrivate *priv;
GtkAllocation button_allocation, range_allocation;
- g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
-
+ g_assert (priv);
+
button_allocation.x = 0;
button_allocation.width = 0;
-
+
/* Center the widget vertically */
if (priv->is_toolbar && allocation->height > TOOL_DEFAULT_BAR_HEIGHT) {
allocation->y += (allocation->height - TOOL_DEFAULT_BAR_HEIGHT) / 2;
allocation->height = TOOL_DEFAULT_BAR_HEIGHT;
}
+
if (!priv->is_toolbar && allocation->height > DEFAULT_BAR_HEIGHT) {
allocation->y += (allocation->height - DEFAULT_BAR_HEIGHT) / 2;
allocation->height = DEFAULT_BAR_HEIGHT;
}
- GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
+ GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
- if (priv->tbutton && GTK_WIDGET_VISIBLE(priv->tbutton)) {
+ if (priv->tbutton && GTK_WIDGET_VISIBLE (priv->tbutton)) {
/* Allocate space for the mute button */
if (priv->is_toolbar) {
@@ -255,77 +292,78 @@ hildon_hvolumebar_size_allocate(GtkWidget * widget,
button_allocation.width = DEFAULT_TBUTTON_WIDTH;
button_allocation.height = DEFAULT_TBUTTON_HEIGHT;
}
- gtk_widget_size_allocate(GTK_WIDGET(priv->tbutton),
- &button_allocation);
+ gtk_widget_size_allocate (GTK_WIDGET (priv->tbutton),
+ &button_allocation);
}
- if (priv->volumebar && GTK_WIDGET_VISIBLE(priv->volumebar)) {
+ if (priv->volumebar && GTK_WIDGET_VISIBLE (priv->volumebar)) {
/* Allocate space for the slider */
range_allocation.y = allocation->y;
-
- if (priv->tbutton && GTK_WIDGET_VISIBLE(priv->tbutton))
+
+ if (priv->tbutton && GTK_WIDGET_VISIBLE (priv->tbutton))
{
- /* Leave room for the mute button */
+ /* Leave room for the mute button */
range_allocation.x = button_allocation.x
- + button_allocation.width
- + HORIZONTAL_MUTE_GAP;
-
+ + button_allocation.width
+ + HORIZONTAL_MUTE_GAP;
+
if (priv->is_toolbar)
{
- /* In toolbar with mute button */
+ /* In toolbar with mute button */
range_allocation.width = MAX(0,
- allocation->width
- - 2 * TOOL_DEFAULT_ENDING_SIZE
- - TOOL_DEFAULT_TBUTTON_WIDTH
- - HORIZONTAL_MUTE_GAP);
-
+ allocation->width
+ - 2 * TOOL_DEFAULT_ENDING_SIZE
+ - TOOL_DEFAULT_TBUTTON_WIDTH
+ - HORIZONTAL_MUTE_GAP);
+
range_allocation.height = TOOL_DEFAULT_BAR_HEIGHT;
-
+
}
-
+
else
{
- /* Standalone with mute button */
+ /* Standalone with mute button */
range_allocation.width = MAX(0,
- allocation->width
- - 2 * DEFAULT_ENDING_SIZE
- - DEFAULT_TBUTTON_WIDTH
- - HORIZONTAL_MUTE_GAP);
+ allocation->width
+ - 2 * DEFAULT_ENDING_SIZE
+ - DEFAULT_TBUTTON_WIDTH
+ - HORIZONTAL_MUTE_GAP);
range_allocation.height = DEFAULT_BAR_HEIGHT;
}
-
+
}
-
+
else
{
if (priv->is_toolbar)
{
/* In toolbar without mute button */
range_allocation.x = allocation->x;
-
+
range_allocation.width = MAX(0,
- allocation->width
- - 2 * TOOL_DEFAULT_ENDING_SIZE );
-
+ allocation->width
+ - 2 * TOOL_DEFAULT_ENDING_SIZE );
+
range_allocation.height = TOOL_DEFAULT_BAR_HEIGHT;
-
+
}
-
+
else
{
/* Standalone without mute button */
range_allocation.x = allocation->x + DEFAULT_ENDING_SIZE;
-
+
range_allocation.width = MAX(0,
- allocation->width
- - 2 * DEFAULT_ENDING_SIZE );
+ allocation->width
+ - 2 * DEFAULT_ENDING_SIZE );
range_allocation.height = DEFAULT_BAR_HEIGHT;
}
}
- gtk_widget_size_allocate(GTK_WIDGET(priv->volumebar),
- &range_allocation);
+ gtk_widget_size_allocate (GTK_WIDGET (priv->volumebar),
+ &range_allocation);
}
}
+