[cheese/netbook-mode] thumbnav: nuke whitespaces
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [cheese/netbook-mode] thumbnav: nuke whitespaces
- Date: Wed, 29 Jul 2009 17:44:45 +0000 (UTC)
commit 01db15ab66fa5138b5cb25dbb38aa8b389ee524a
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Wed Jul 29 19:44:13 2009 +0200
thumbnav: nuke whitespaces
src/eog-thumb-nav.c | 604 +++++++++++++++++++++++++-------------------------
src/eog-thumb-nav.h | 14 +-
2 files changed, 309 insertions(+), 309 deletions(-)
---
diff --git a/src/eog-thumb-nav.c b/src/eog-thumb-nav.c
index ff808ef..0bdb580 100644
--- a/src/eog-thumb-nav.c
+++ b/src/eog-thumb-nav.c
@@ -33,384 +33,384 @@
#include <string.h>
#define EOG_THUMB_NAV_GET_PRIVATE(object) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_NAV, EogThumbNavPrivate))
+ (G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_THUMB_NAV, EogThumbNavPrivate))
G_DEFINE_TYPE (EogThumbNav, eog_thumb_nav, GTK_TYPE_HBOX);
#define EOG_THUMB_NAV_SCROLL_INC 20
#define EOG_THUMB_NAV_SCROLL_MOVE 20
-#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
+#define EOG_THUMB_NAV_SCROLL_TIMEOUT 20
enum
{
- PROP_SHOW_BUTTONS = 1,
- PROP_THUMB_VIEW,
- PROP_MODE
+ PROP_SHOW_BUTTONS = 1,
+ PROP_THUMB_VIEW,
+ PROP_MODE
};
struct _EogThumbNavPrivate {
- gboolean show_buttons;
- gboolean scroll_dir;
- gint scroll_pos;
- gint scroll_id;
-
- GtkWidget *button_left;
- GtkWidget *button_right;
- GtkWidget *sw;
- GtkWidget *thumbview;
- GtkAdjustment *adj;
+ gboolean show_buttons;
+ gboolean scroll_dir;
+ gint scroll_pos;
+ gint scroll_id;
+
+ GtkWidget *button_left;
+ GtkWidget *button_right;
+ GtkWidget *sw;
+ GtkWidget *thumbview;
+ GtkAdjustment *adj;
};
static gboolean
eog_thumb_nav_scroll_event (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
{
- EogThumbNav *nav = EOG_THUMB_NAV (user_data);
- gint inc = EOG_THUMB_NAV_SCROLL_INC * 3;
- gdouble value, upper, page_size;
-
- switch (event->direction) {
- case GDK_SCROLL_UP:
- case GDK_SCROLL_LEFT:
- inc *= -1;
- break;
-
- case GDK_SCROLL_DOWN:
- case GDK_SCROLL_RIGHT:
- break;
-
- default:
- g_assert_not_reached ();
- return FALSE;
- }
-
- value = gtk_adjustment_get_value (nav->priv->adj);
- if (inc < 0)
- gtk_adjustment_set_value (nav->priv->adj, MAX (0, value + inc));
- else {
- upper = gtk_adjustment_get_upper (nav->priv->adj);
- page_size = gtk_adjustment_get_page_size (nav->priv->adj);
- gtk_adjustment_set_value (nav->priv->adj, MIN (upper - page_size, value + inc));
+ EogThumbNav *nav = EOG_THUMB_NAV (user_data);
+ gint inc = EOG_THUMB_NAV_SCROLL_INC * 3;
+ gdouble value, upper, page_size;
+
+ switch (event->direction) {
+ case GDK_SCROLL_UP:
+ case GDK_SCROLL_LEFT:
+ inc *= -1;
+ break;
+
+ case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_RIGHT:
+ break;
+
+ default:
+ g_assert_not_reached ();
+ return FALSE;
+ }
+
+ value = gtk_adjustment_get_value (nav->priv->adj);
+ if (inc < 0)
+ gtk_adjustment_set_value (nav->priv->adj, MAX (0, value + inc));
+ else {
+ upper = gtk_adjustment_get_upper (nav->priv->adj);
+ page_size = gtk_adjustment_get_page_size (nav->priv->adj);
+ gtk_adjustment_set_value (nav->priv->adj, MIN (upper - page_size, value + inc));
}
- gtk_adjustment_value_changed (nav->priv->adj);
+ gtk_adjustment_value_changed (nav->priv->adj);
- return TRUE;
+ return TRUE;
}
static void
eog_thumb_nav_adj_changed (GtkAdjustment *adj, gpointer user_data)
{
- EogThumbNav *nav;
- EogThumbNavPrivate *priv;
- gboolean ltr;
- gdouble value, upper, page_size;
-
- nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
- ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
-
- g_object_get (adj,
- "value", &value,
- "upper", &upper,
- "page_size", &page_size,
- NULL);
-
- gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
- value < upper - page_size);
+ EogThumbNav *nav;
+ EogThumbNavPrivate *priv;
+ gboolean ltr;
+ gdouble value, upper, page_size;
+
+ nav = EOG_THUMB_NAV (user_data);
+ priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
+
+ g_object_get (adj,
+ "value", &value,
+ "upper", &upper,
+ "page_size", &page_size,
+ NULL);
+
+ gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
+ value < upper - page_size);
}
static void
eog_thumb_nav_adj_value_changed (GtkAdjustment *adj, gpointer user_data)
{
- EogThumbNav *nav;
- EogThumbNavPrivate *priv;
- gboolean ltr;
- gdouble value, upper, page_size;
+ EogThumbNav *nav;
+ EogThumbNavPrivate *priv;
+ gboolean ltr;
+ gdouble value, upper, page_size;
- nav = EOG_THUMB_NAV (user_data);
- priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
- ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
+ nav = EOG_THUMB_NAV (user_data);
+ priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ ltr = gtk_widget_get_direction (priv->sw) == GTK_TEXT_DIR_LTR;
- g_object_get (adj,
- "value", &value,
- "upper", &upper,
- "page_size", &page_size,
- NULL);
+ g_object_get (adj,
+ "value", &value,
+ "upper", &upper,
+ "page_size", &page_size,
+ NULL);
- gtk_widget_set_sensitive (ltr ? priv->button_left : priv->button_right, value > 0);
+ gtk_widget_set_sensitive (ltr ? priv->button_left : priv->button_right, value > 0);
- gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
- value < upper - page_size);
+ gtk_widget_set_sensitive (ltr ? priv->button_right : priv->button_left,
+ value < upper - page_size);
}
static gboolean
eog_thumb_nav_scroll_step (gpointer user_data)
{
- EogThumbNav *nav = EOG_THUMB_NAV (user_data);
- gint delta;
- gdouble value, upper, page_size;
-
- if (nav->priv->scroll_pos < 10)
- delta = EOG_THUMB_NAV_SCROLL_INC;
- else if (nav->priv->scroll_pos < 20)
- delta = EOG_THUMB_NAV_SCROLL_INC * 2;
- else if (nav->priv->scroll_pos < 30)
- delta = EOG_THUMB_NAV_SCROLL_INC * 2 + 5;
- else
- delta = EOG_THUMB_NAV_SCROLL_INC * 2 + 12;
-
- if (!nav->priv->scroll_dir)
- delta *= -1;
-
- g_object_get (nav->priv->adj,
- "value", &value,
- "upper", &upper,
- "page_size", &page_size,
- NULL);
-
- if ((gint) (value + (gdouble) delta) >= 0 &&
- (gint) (value + (gdouble) delta) <= upper - page_size) {
- gtk_adjustment_set_value (nav->priv->adj, value + (gdouble) delta);
- nav->priv->scroll_pos++;
- gtk_adjustment_value_changed (nav->priv->adj);
- } else {
- if (delta > 0)
- gtk_adjustment_set_value (nav->priv->adj, upper - page_size);
- else
- gtk_adjustment_set_value (nav->priv->adj, 0);
-
- nav->priv->scroll_pos = 0;
-
- gtk_adjustment_value_changed (nav->priv->adj);
-
- return FALSE;
- }
-
- return TRUE;
+ EogThumbNav *nav = EOG_THUMB_NAV (user_data);
+ gint delta;
+ gdouble value, upper, page_size;
+
+ if (nav->priv->scroll_pos < 10)
+ delta = EOG_THUMB_NAV_SCROLL_INC;
+ else if (nav->priv->scroll_pos < 20)
+ delta = EOG_THUMB_NAV_SCROLL_INC * 2;
+ else if (nav->priv->scroll_pos < 30)
+ delta = EOG_THUMB_NAV_SCROLL_INC * 2 + 5;
+ else
+ delta = EOG_THUMB_NAV_SCROLL_INC * 2 + 12;
+
+ if (!nav->priv->scroll_dir)
+ delta *= -1;
+
+ g_object_get (nav->priv->adj,
+ "value", &value,
+ "upper", &upper,
+ "page_size", &page_size,
+ NULL);
+
+ if ((gint) (value + (gdouble) delta) >= 0 &&
+ (gint) (value + (gdouble) delta) <= upper - page_size) {
+ gtk_adjustment_set_value (nav->priv->adj, value + (gdouble) delta);
+ nav->priv->scroll_pos++;
+ gtk_adjustment_value_changed (nav->priv->adj);
+ } else {
+ if (delta > 0)
+ gtk_adjustment_set_value (nav->priv->adj, upper - page_size);
+ else
+ gtk_adjustment_set_value (nav->priv->adj, 0);
+
+ nav->priv->scroll_pos = 0;
+
+ gtk_adjustment_value_changed (nav->priv->adj);
+
+ return FALSE;
+ }
+
+ return TRUE;
}
static void
eog_thumb_nav_button_clicked (GtkButton *button, EogThumbNav *nav)
{
- nav->priv->scroll_pos = 0;
+ nav->priv->scroll_pos = 0;
- nav->priv->scroll_dir = gtk_widget_get_direction (GTK_WIDGET (button)) == GTK_TEXT_DIR_LTR ?
- GTK_WIDGET (button) == nav->priv->button_right :
- GTK_WIDGET (button) == nav->priv->button_left;
+ nav->priv->scroll_dir = gtk_widget_get_direction (GTK_WIDGET (button)) == GTK_TEXT_DIR_LTR ?
+ GTK_WIDGET (button) == nav->priv->button_right :
+ GTK_WIDGET (button) == nav->priv->button_left;
- eog_thumb_nav_scroll_step (nav);
+ eog_thumb_nav_scroll_step (nav);
}
static void
eog_thumb_nav_start_scroll (GtkButton *button, EogThumbNav *nav)
{
- nav->priv->scroll_dir = gtk_widget_get_direction (GTK_WIDGET (button)) == GTK_TEXT_DIR_LTR ?
- GTK_WIDGET (button) == nav->priv->button_right :
- GTK_WIDGET (button) == nav->priv->button_left;
+ nav->priv->scroll_dir = gtk_widget_get_direction (GTK_WIDGET (button)) == GTK_TEXT_DIR_LTR ?
+ GTK_WIDGET (button) == nav->priv->button_right :
+ GTK_WIDGET (button) == nav->priv->button_left;
- nav->priv->scroll_id = g_timeout_add (EOG_THUMB_NAV_SCROLL_TIMEOUT,
- eog_thumb_nav_scroll_step,
- nav);
+ nav->priv->scroll_id = g_timeout_add (EOG_THUMB_NAV_SCROLL_TIMEOUT,
+ eog_thumb_nav_scroll_step,
+ nav);
}
static void
eog_thumb_nav_stop_scroll (GtkButton *button, EogThumbNav *nav)
{
- if (nav->priv->scroll_id > 0) {
- g_source_remove (nav->priv->scroll_id);
- nav->priv->scroll_id = 0;
- nav->priv->scroll_pos = 0;
- }
+ if (nav->priv->scroll_id > 0) {
+ g_source_remove (nav->priv->scroll_id);
+ nav->priv->scroll_id = 0;
+ nav->priv->scroll_pos = 0;
+ }
}
-static void
-eog_thumb_nav_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+static void
+eog_thumb_nav_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- EogThumbNav *nav = EOG_THUMB_NAV (object);
-
- switch (property_id)
- {
- case PROP_SHOW_BUTTONS:
- g_value_set_boolean (value,
- eog_thumb_nav_get_show_buttons (nav));
- break;
-
- case PROP_THUMB_VIEW:
- g_value_set_object (value, nav->priv->thumbview);
- break;
- }
+ EogThumbNav *nav = EOG_THUMB_NAV (object);
+
+ switch (property_id)
+ {
+ case PROP_SHOW_BUTTONS:
+ g_value_set_boolean (value,
+ eog_thumb_nav_get_show_buttons (nav));
+ break;
+
+ case PROP_THUMB_VIEW:
+ g_value_set_object (value, nav->priv->thumbview);
+ break;
+ }
}
-static void
-eog_thumb_nav_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+static void
+eog_thumb_nav_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- EogThumbNav *nav = EOG_THUMB_NAV (object);
-
- switch (property_id)
- {
- case PROP_SHOW_BUTTONS:
- eog_thumb_nav_set_show_buttons (nav,
- g_value_get_boolean (value));
- break;
-
- case PROP_THUMB_VIEW:
- nav->priv->thumbview =
- GTK_WIDGET (g_value_get_object (value));
- break;
- }
+ EogThumbNav *nav = EOG_THUMB_NAV (object);
+
+ switch (property_id)
+ {
+ case PROP_SHOW_BUTTONS:
+ eog_thumb_nav_set_show_buttons (nav,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_THUMB_VIEW:
+ nav->priv->thumbview =
+ GTK_WIDGET (g_value_get_object (value));
+ break;
+ }
}
static GObject *
eog_thumb_nav_constructor (GType type,
- guint n_construct_properties,
- GObjectConstructParam *construct_params)
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params)
{
- GObject *object;
- EogThumbNavPrivate *priv;
+ GObject *object;
+ EogThumbNavPrivate *priv;
- object = G_OBJECT_CLASS (eog_thumb_nav_parent_class)->constructor
- (type, n_construct_properties, construct_params);
+ object = G_OBJECT_CLASS (eog_thumb_nav_parent_class)->constructor
+ (type, n_construct_properties, construct_params);
- priv = EOG_THUMB_NAV (object)->priv;
+ priv = EOG_THUMB_NAV (object)->priv;
- if (priv->thumbview != NULL) {
- gtk_container_add (GTK_CONTAINER (priv->sw), priv->thumbview);
- gtk_widget_show_all (priv->sw);
- }
+ if (priv->thumbview != NULL) {
+ gtk_container_add (GTK_CONTAINER (priv->sw), priv->thumbview);
+ gtk_widget_show_all (priv->sw);
+ }
- return object;
+ return object;
}
static void
eog_thumb_nav_class_init (EogThumbNavClass *class)
{
- GObjectClass *g_object_class = (GObjectClass *) class;
-
- g_object_class->constructor = eog_thumb_nav_constructor;
- g_object_class->get_property = eog_thumb_nav_get_property;
- g_object_class->set_property = eog_thumb_nav_set_property;
-
- g_object_class_install_property (g_object_class,
- PROP_SHOW_BUTTONS,
- g_param_spec_boolean ("show-buttons",
- "Show Buttons",
- "Whether to show navigation buttons or not",
- TRUE,
- (G_PARAM_READABLE | G_PARAM_WRITABLE)));
-
- g_object_class_install_property (g_object_class,
- PROP_THUMB_VIEW,
- g_param_spec_object ("thumbview",
- "Thumbnail View",
- "The internal thumbnail viewer widget",
- CHEESE_TYPE_THUMB_VIEW,
- (G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_READABLE |
- G_PARAM_WRITABLE)));
-
- g_type_class_add_private (g_object_class, sizeof (EogThumbNavPrivate));
+ GObjectClass *g_object_class = (GObjectClass *) class;
+
+ g_object_class->constructor = eog_thumb_nav_constructor;
+ g_object_class->get_property = eog_thumb_nav_get_property;
+ g_object_class->set_property = eog_thumb_nav_set_property;
+
+ g_object_class_install_property (g_object_class,
+ PROP_SHOW_BUTTONS,
+ g_param_spec_boolean ("show-buttons",
+ "Show Buttons",
+ "Whether to show navigation buttons or not",
+ TRUE,
+ (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+
+ g_object_class_install_property (g_object_class,
+ PROP_THUMB_VIEW,
+ g_param_spec_object ("thumbview",
+ "Thumbnail View",
+ "The internal thumbnail viewer widget",
+ CHEESE_TYPE_THUMB_VIEW,
+ (G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_READABLE |
+ G_PARAM_WRITABLE)));
+
+ g_type_class_add_private (g_object_class, sizeof (EogThumbNavPrivate));
}
static void
eog_thumb_nav_init (EogThumbNav *nav)
{
- EogThumbNavPrivate *priv;
- GtkWidget *arrow;
+ EogThumbNavPrivate *priv;
+ GtkWidget *arrow;
- nav->priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
+ nav->priv = EOG_THUMB_NAV_GET_PRIVATE (nav);
- priv = nav->priv;
+ priv = nav->priv;
- priv->show_buttons = TRUE;
+ priv->show_buttons = TRUE;
- priv->button_left = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (priv->button_left), GTK_RELIEF_NONE);
+ priv->button_left = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (priv->button_left), GTK_RELIEF_NONE);
- arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
- gtk_container_add (GTK_CONTAINER (priv->button_left), arrow);
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_ETCHED_IN);
+ gtk_container_add (GTK_CONTAINER (priv->button_left), arrow);
- gtk_widget_set_size_request (GTK_WIDGET (priv->button_left), 25, 0);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->button_left), 25, 0);
- gtk_box_pack_start (GTK_BOX (nav), priv->button_left, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (nav), priv->button_left, FALSE, FALSE, 0);
- g_signal_connect (priv->button_left,
- "clicked",
- G_CALLBACK (eog_thumb_nav_button_clicked),
- nav);
+ g_signal_connect (priv->button_left,
+ "clicked",
+ G_CALLBACK (eog_thumb_nav_button_clicked),
+ nav);
- g_signal_connect (priv->button_left,
- "pressed",
- G_CALLBACK (eog_thumb_nav_start_scroll),
- nav);
+ g_signal_connect (priv->button_left,
+ "pressed",
+ G_CALLBACK (eog_thumb_nav_start_scroll),
+ nav);
- g_signal_connect (priv->button_left,
- "released",
- G_CALLBACK (eog_thumb_nav_stop_scroll),
- nav);
+ g_signal_connect (priv->button_left,
+ "released",
+ G_CALLBACK (eog_thumb_nav_stop_scroll),
+ nav);
- priv->sw = gtk_scrolled_window_new (NULL, NULL);
+ priv->sw = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (priv->sw)),
- "eog-image-collection-scrollbar");
+ gtk_widget_set_name (gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (priv->sw)),
+ "eog-image-collection-scrollbar");
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),
- GTK_SHADOW_IN);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw),
+ GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_NEVER);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER);
- g_signal_connect (priv->sw,
- "scroll-event",
- G_CALLBACK (eog_thumb_nav_scroll_event),
- nav);
+ g_signal_connect (priv->sw,
+ "scroll-event",
+ G_CALLBACK (eog_thumb_nav_scroll_event),
+ nav);
- priv->adj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->sw));
+ priv->adj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (priv->sw));
- g_signal_connect (priv->adj,
- "changed",
- G_CALLBACK (eog_thumb_nav_adj_changed),
- nav);
+ g_signal_connect (priv->adj,
+ "changed",
+ G_CALLBACK (eog_thumb_nav_adj_changed),
+ nav);
- g_signal_connect (priv->adj,
- "value-changed",
- G_CALLBACK (eog_thumb_nav_adj_value_changed),
- nav);
+ g_signal_connect (priv->adj,
+ "value-changed",
+ G_CALLBACK (eog_thumb_nav_adj_value_changed),
+ nav);
- gtk_box_pack_start (GTK_BOX (nav), priv->sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (nav), priv->sw, TRUE, TRUE, 0);
- priv->button_right = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (priv->button_right), GTK_RELIEF_NONE);
+ priv->button_right = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (priv->button_right), GTK_RELIEF_NONE);
- arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
- gtk_container_add (GTK_CONTAINER (priv->button_right), arrow);
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ gtk_container_add (GTK_CONTAINER (priv->button_right), arrow);
- gtk_widget_set_size_request (GTK_WIDGET (priv->button_right), 25, 0);
+ gtk_widget_set_size_request (GTK_WIDGET (priv->button_right), 25, 0);
- gtk_box_pack_start (GTK_BOX (nav), priv->button_right, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (nav), priv->button_right, FALSE, FALSE, 0);
- g_signal_connect (priv->button_right,
- "clicked",
- G_CALLBACK (eog_thumb_nav_button_clicked),
- nav);
+ g_signal_connect (priv->button_right,
+ "clicked",
+ G_CALLBACK (eog_thumb_nav_button_clicked),
+ nav);
- g_signal_connect (priv->button_right,
- "pressed",
- G_CALLBACK (eog_thumb_nav_start_scroll),
- nav);
+ g_signal_connect (priv->button_right,
+ "pressed",
+ G_CALLBACK (eog_thumb_nav_start_scroll),
+ nav);
- g_signal_connect (priv->button_right,
- "released",
- G_CALLBACK (eog_thumb_nav_stop_scroll),
- nav);
+ g_signal_connect (priv->button_right,
+ "released",
+ G_CALLBACK (eog_thumb_nav_stop_scroll),
+ nav);
- gtk_adjustment_value_changed (priv->adj);
+ gtk_adjustment_value_changed (priv->adj);
}
/**
@@ -424,28 +424,28 @@ eog_thumb_nav_init (EogThumbNav *nav)
* Returns: a new #EogThumbNav object.
**/
GtkWidget *
-eog_thumb_nav_new (GtkWidget *thumbview,
- gboolean show_buttons)
+eog_thumb_nav_new (GtkWidget *thumbview,
+ gboolean show_buttons)
{
- EogThumbNav *nav;
- EogThumbNavPrivate *priv;
+ EogThumbNav *nav;
+ EogThumbNavPrivate *priv;
- nav = g_object_new (EOG_TYPE_THUMB_NAV,
- "show-buttons", show_buttons,
- "thumbview", thumbview,
- "homogeneous", FALSE,
- "spacing", 0,
- NULL);
+ nav = g_object_new (EOG_TYPE_THUMB_NAV,
+ "show-buttons", show_buttons,
+ "thumbview", thumbview,
+ "homogeneous", FALSE,
+ "spacing", 0,
+ NULL);
- priv = nav->priv;
+ priv = nav->priv;
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_NEVER);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER);
- eog_thumb_nav_set_show_buttons (nav, priv->show_buttons);
+ eog_thumb_nav_set_show_buttons (nav, priv->show_buttons);
- return GTK_WIDGET (nav);
+ return GTK_WIDGET (nav);
}
/**
@@ -460,9 +460,9 @@ eog_thumb_nav_new (GtkWidget *thumbview,
gboolean
eog_thumb_nav_get_show_buttons (EogThumbNav *nav)
{
- g_return_val_if_fail (EOG_IS_THUMB_NAV (nav), FALSE);
+ g_return_val_if_fail (EOG_IS_THUMB_NAV (nav), FALSE);
- return nav->priv->show_buttons;
+ return nav->priv->show_buttons;
}
/**
@@ -473,20 +473,20 @@ eog_thumb_nav_get_show_buttons (EogThumbNav *nav)
* Sets whether the navigation buttons to the left and right of the
* widget should be visible.
**/
-void
+void
eog_thumb_nav_set_show_buttons (EogThumbNav *nav, gboolean show_buttons)
{
- g_return_if_fail (EOG_IS_THUMB_NAV (nav));
- g_return_if_fail (nav->priv->button_left != NULL);
- g_return_if_fail (nav->priv->button_right != NULL);
-
- nav->priv->show_buttons = show_buttons;
-
- if (show_buttons) {
- gtk_widget_show_all (nav->priv->button_left);
- gtk_widget_show_all (nav->priv->button_right);
- } else {
- gtk_widget_hide_all (nav->priv->button_left);
- gtk_widget_hide_all (nav->priv->button_right);
- }
+ g_return_if_fail (EOG_IS_THUMB_NAV (nav));
+ g_return_if_fail (nav->priv->button_left != NULL);
+ g_return_if_fail (nav->priv->button_right != NULL);
+
+ nav->priv->show_buttons = show_buttons;
+
+ if (show_buttons) {
+ gtk_widget_show_all (nav->priv->button_left);
+ gtk_widget_show_all (nav->priv->button_right);
+ } else {
+ gtk_widget_hide_all (nav->priv->button_left);
+ gtk_widget_hide_all (nav->priv->button_right);
+ }
}
diff --git a/src/eog-thumb-nav.h b/src/eog-thumb-nav.h
index fd54f80..d6a79eb 100644
--- a/src/eog-thumb-nav.h
+++ b/src/eog-thumb-nav.h
@@ -1,4 +1,4 @@
-/* Eye Of Gnome - Thumbnail Navigator
+/* Eye Of Gnome - Thumbnail Navigator
*
* Copyright (C) 2006 The Free Software Foundation
*
@@ -42,23 +42,23 @@ typedef struct _EogThumbNavPrivate EogThumbNavPrivate;
#define EOG_THUMB_NAV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EOG_TYPE_THUMB_NAV, EogThumbNavClass))
struct _EogThumbNav {
- GtkHBox base_instance;
+ GtkHBox base_instance;
- EogThumbNavPrivate *priv;
+ EogThumbNavPrivate *priv;
};
struct _EogThumbNavClass {
- GtkHBoxClass parent_class;
+ GtkHBoxClass parent_class;
};
-GType eog_thumb_nav_get_type (void) G_GNUC_CONST;
+GType eog_thumb_nav_get_type (void) G_GNUC_CONST;
GtkWidget *eog_thumb_nav_new (GtkWidget *thumbview,
- gboolean show_buttons);
+ gboolean show_buttons);
gboolean eog_thumb_nav_get_show_buttons (EogThumbNav *nav);
-void eog_thumb_nav_set_show_buttons (EogThumbNav *nav,
+void eog_thumb_nav_set_show_buttons (EogThumbNav *nav,
gboolean show_buttons);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
