From c5d8a4378a536bb5308048946e48d16e216d2067 Mon Sep 17 00:00:00 2001 From: JosephMcc Date: Fri, 13 Jan 2017 03:21:50 -0800 Subject: [PATCH] xed-statusbar.c/h: Clean up code styling --- xed/xed-statusbar.c | 93 +++++++++++++++++---------------------------- xed/xed-statusbar.h | 60 ++++++++++++++--------------- 2 files changed, 65 insertions(+), 88 deletions(-) diff --git a/xed/xed-statusbar.c b/xed/xed-statusbar.c index 97499b9..97eb85c 100644 --- a/xed/xed-statusbar.c +++ b/xed/xed-statusbar.c @@ -39,26 +39,26 @@ #include "xed-statusbar.h" #define XED_STATUSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ - XED_TYPE_STATUSBAR,\ - XedStatusbarPrivate)) + XED_TYPE_STATUSBAR,\ + XedStatusbarPrivate)) struct _XedStatusbarPrivate { - GtkWidget *overwrite_mode_label; - GtkWidget *cursor_position_label; + GtkWidget *overwrite_mode_label; + GtkWidget *cursor_position_label; - GtkWidget *state_frame; - GtkWidget *load_image; - GtkWidget *save_image; - GtkWidget *print_image; + GtkWidget *state_frame; + GtkWidget *load_image; + GtkWidget *save_image; + GtkWidget *print_image; - GtkWidget *error_frame; - GtkWidget *error_event_box; + GtkWidget *error_frame; + GtkWidget *error_event_box; /* tmp flash timeout data */ - guint flash_timeout; - guint flash_context_id; - guint flash_message_id; + guint flash_timeout; + guint flash_context_id; + guint flash_message_id; }; G_DEFINE_TYPE(XedStatusbar, xed_statusbar, GTK_TYPE_STATUSBAR) @@ -114,25 +114,18 @@ xed_statusbar_init (XedStatusbar *statusbar) gtk_widget_set_margin_bottom (GTK_WIDGET (statusbar), 0); statusbar->priv->overwrite_mode_label = gtk_label_new (NULL); - gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), - get_overwrite_mode_length ()); + gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), get_overwrite_mode_length ()); gtk_widget_show (statusbar->priv->overwrite_mode_label); - gtk_box_pack_end (GTK_BOX (statusbar), - statusbar->priv->overwrite_mode_label, - FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->overwrite_mode_label, FALSE, TRUE, 0); gtk_widget_set_margin_right (GTK_WIDGET (statusbar->priv->overwrite_mode_label), 6); statusbar->priv->cursor_position_label = gtk_label_new (NULL); - gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->cursor_position_label), - CURSOR_POSITION_LABEL_WIDTH_CHARS); + gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->cursor_position_label), CURSOR_POSITION_LABEL_WIDTH_CHARS); gtk_widget_show (statusbar->priv->cursor_position_label); - gtk_box_pack_end (GTK_BOX (statusbar), - statusbar->priv->cursor_position_label, - FALSE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->cursor_position_label, FALSE, TRUE, 0); statusbar->priv->state_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->state_frame), - GTK_SHADOW_IN); + gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->state_frame), GTK_SHADOW_IN); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (statusbar->priv->state_frame), hbox); @@ -143,19 +136,11 @@ xed_statusbar_init (XedStatusbar *statusbar) gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (hbox), - statusbar->priv->load_image, - FALSE, TRUE, 4); - gtk_box_pack_start (GTK_BOX (hbox), - statusbar->priv->save_image, - FALSE, TRUE, 4); - gtk_box_pack_start (GTK_BOX (hbox), - statusbar->priv->print_image, - FALSE, TRUE, 4); + gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->load_image, FALSE, TRUE, 4); + gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->save_image, FALSE, TRUE, 4); + gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->print_image, FALSE, TRUE, 4); - gtk_box_pack_start (GTK_BOX (statusbar), - statusbar->priv->state_frame, - FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (statusbar), statusbar->priv->state_frame, FALSE, TRUE, 0); statusbar->priv->error_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->error_frame), GTK_SHADOW_IN); @@ -168,18 +153,13 @@ xed_statusbar_init (XedStatusbar *statusbar) gtk_widget_set_margin_bottom (error_image, 0); statusbar->priv->error_event_box = gtk_event_box_new (); - gtk_event_box_set_visible_window (GTK_EVENT_BOX (statusbar->priv->error_event_box), - FALSE); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (statusbar->priv->error_event_box), FALSE); gtk_widget_show (statusbar->priv->error_event_box); - gtk_container_add (GTK_CONTAINER (statusbar->priv->error_frame), - statusbar->priv->error_event_box); - gtk_container_add (GTK_CONTAINER (statusbar->priv->error_event_box), - error_image); + gtk_container_add (GTK_CONTAINER (statusbar->priv->error_frame), statusbar->priv->error_event_box); + gtk_container_add (GTK_CONTAINER (statusbar->priv->error_event_box), error_image); - gtk_box_pack_start (GTK_BOX (statusbar), - statusbar->priv->error_frame, - FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (statusbar), statusbar->priv->error_frame, FALSE, TRUE, 0); gtk_style_context_add_class (gtk_widget_get_style_context (statusbar), "xed-statusbar"); } @@ -206,7 +186,7 @@ xed_statusbar_new (void) **/ void xed_statusbar_set_overwrite (XedStatusbar *statusbar, - gboolean overwrite) + gboolean overwrite) { gchar *msg; @@ -237,8 +217,8 @@ xed_statusbar_clear_overwrite (XedStatusbar *statusbar) **/ void xed_statusbar_set_cursor_position (XedStatusbar *statusbar, - gint line, - gint col) + gint line, + gint col) { gchar *msg = NULL; @@ -279,8 +259,8 @@ remove_message_timeout (XedStatusbar *statusbar) */ void xed_statusbar_flash_message (XedStatusbar *statusbar, - guint context_id, - const gchar *format, ...) + guint context_id, + const gchar *format, ...) { const guint32 flash_length = 3000; /* three seconds */ va_list args; @@ -305,9 +285,7 @@ xed_statusbar_flash_message (XedStatusbar *statusbar, } statusbar->priv->flash_context_id = context_id; - statusbar->priv->flash_message_id = gtk_statusbar_push (GTK_STATUSBAR (statusbar), - context_id, - msg); + statusbar->priv->flash_message_id = gtk_statusbar_push (GTK_STATUSBAR (statusbar), context_id, msg); statusbar->priv->flash_timeout = g_timeout_add (flash_length, (GSourceFunc) remove_message_timeout, @@ -318,8 +296,8 @@ xed_statusbar_flash_message (XedStatusbar *statusbar, void xed_statusbar_set_window_state (XedStatusbar *statusbar, - XedWindowState state, - gint num_of_errors) + XedWindowState state, + gint num_of_errors) { g_return_if_fail (XED_IS_STATUSBAR (statusbar)); @@ -354,8 +332,7 @@ xed_statusbar_set_window_state (XedStatusbar *statusbar, num_of_errors), num_of_errors); - gtk_widget_set_tooltip_text (statusbar->priv->error_event_box, - tip); + gtk_widget_set_tooltip_text (statusbar->priv->error_event_box, tip); g_free (tip); gtk_widget_show (statusbar->priv->error_frame); diff --git a/xed/xed-statusbar.h b/xed/xed-statusbar.h index cda2537..47c8002 100644 --- a/xed/xed-statusbar.h +++ b/xed/xed-statusbar.h @@ -16,14 +16,14 @@ * * 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, + * Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301, USA. */ - + /* - * Modified by the xed Team, 2005. See the AUTHORS file for a - * list of people on the xed Team. - * See the ChangeLog files for a list of changes. + * Modified by the xed Team, 2005. See the AUTHORS file for a + * list of people on the xed Team. + * See the ChangeLog files for a list of changes. */ #ifndef XED_STATUSBAR_H @@ -34,22 +34,22 @@ G_BEGIN_DECLS -#define XED_TYPE_STATUSBAR (xed_statusbar_get_type ()) -#define XED_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_STATUSBAR, XedStatusbar)) -#define XED_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_STATUSBAR, XedStatusbarClass)) -#define XED_IS_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_STATUSBAR)) -#define XED_IS_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_STATUSBAR)) -#define XED_STATUSBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_STATUSBAR, XedStatusbarClass)) +#define XED_TYPE_STATUSBAR (xed_statusbar_get_type ()) +#define XED_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), XED_TYPE_STATUSBAR, XedStatusbar)) +#define XED_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), XED_TYPE_STATUSBAR, XedStatusbarClass)) +#define XED_IS_STATUSBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), XED_TYPE_STATUSBAR)) +#define XED_IS_STATUSBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), XED_TYPE_STATUSBAR)) +#define XED_STATUSBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_STATUSBAR, XedStatusbarClass)) -typedef struct _XedStatusbar XedStatusbar; -typedef struct _XedStatusbarPrivate XedStatusbarPrivate; -typedef struct _XedStatusbarClass XedStatusbarClass; +typedef struct _XedStatusbar XedStatusbar; +typedef struct _XedStatusbarPrivate XedStatusbarPrivate; +typedef struct _XedStatusbarClass XedStatusbarClass; struct _XedStatusbar { GtkStatusbar parent; - /* */ + /* */ XedStatusbarPrivate *priv; }; @@ -58,29 +58,29 @@ struct _XedStatusbarClass GtkStatusbarClass parent_class; }; -GType xed_statusbar_get_type (void) G_GNUC_CONST; +GType xed_statusbar_get_type (void) G_GNUC_CONST; -GtkWidget *xed_statusbar_new (void); +GtkWidget *xed_statusbar_new (void); /* FIXME: status is not defined in any .h */ #define XedStatus gint -void xed_statusbar_set_window_state (XedStatusbar *statusbar, - XedWindowState state, - gint num_of_errors); +void xed_statusbar_set_window_state (XedStatusbar *statusbar, + XedWindowState state, + gint num_of_errors); -void xed_statusbar_set_overwrite (XedStatusbar *statusbar, - gboolean overwrite); +void xed_statusbar_set_overwrite (XedStatusbar *statusbar, + gboolean overwrite); -void xed_statusbar_set_cursor_position (XedStatusbar *statusbar, - gint line, - gint col); +void xed_statusbar_set_cursor_position (XedStatusbar *statusbar, + gint line, + gint col); -void xed_statusbar_clear_overwrite (XedStatusbar *statusbar); +void xed_statusbar_clear_overwrite (XedStatusbar *statusbar); -void xed_statusbar_flash_message (XedStatusbar *statusbar, - guint context_id, - const gchar *format, - ...) G_GNUC_PRINTF(3, 4); +void xed_statusbar_flash_message (XedStatusbar *statusbar, + guint context_id, + const gchar *format, + ...) G_GNUC_PRINTF(3, 4); G_END_DECLS