wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

xed-statusbar.c/h: Clean up code styling

This commit is contained in:
JosephMcc 2017-01-13 03:21:50 -08:00
parent 9dc61e0df5
commit c5d8a4378a
2 changed files with 65 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
xed/xed-statusbar.c
View File

@ -39,26 +39,26 @@
#include "xed-statusbar.h" #include "xed-statusbar.h"
#define XED_STATUSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\ #define XED_STATUSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\
XED_TYPE_STATUSBAR,\ XED_TYPE_STATUSBAR,\
XedStatusbarPrivate)) XedStatusbarPrivate))
struct _XedStatusbarPrivate struct _XedStatusbarPrivate
{ {
GtkWidget *overwrite_mode_label; GtkWidget *overwrite_mode_label;
GtkWidget *cursor_position_label; GtkWidget *cursor_position_label;
GtkWidget *state_frame; GtkWidget *state_frame;
GtkWidget *load_image; GtkWidget *load_image;
GtkWidget *save_image; GtkWidget *save_image;
GtkWidget *print_image; GtkWidget *print_image;
GtkWidget *error_frame; GtkWidget *error_frame;
GtkWidget *error_event_box; GtkWidget *error_event_box;
/* tmp flash timeout data */ /* tmp flash timeout data */
guint flash_timeout; guint flash_timeout;
guint flash_context_id; guint flash_context_id;
guint flash_message_id; guint flash_message_id;
}; };
G_DEFINE_TYPE(XedStatusbar, xed_statusbar, GTK_TYPE_STATUSBAR) 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); gtk_widget_set_margin_bottom (GTK_WIDGET (statusbar), 0);
statusbar->priv->overwrite_mode_label = gtk_label_new (NULL); statusbar->priv->overwrite_mode_label = gtk_label_new (NULL);
gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), get_overwrite_mode_length ());
get_overwrite_mode_length ());
gtk_widget_show (statusbar->priv->overwrite_mode_label); gtk_widget_show (statusbar->priv->overwrite_mode_label);
gtk_box_pack_end (GTK_BOX (statusbar), gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->overwrite_mode_label, FALSE, TRUE, 0);
statusbar->priv->overwrite_mode_label,
FALSE, TRUE, 0);
gtk_widget_set_margin_right (GTK_WIDGET (statusbar->priv->overwrite_mode_label), 6); gtk_widget_set_margin_right (GTK_WIDGET (statusbar->priv->overwrite_mode_label), 6);
statusbar->priv->cursor_position_label = gtk_label_new (NULL); statusbar->priv->cursor_position_label = gtk_label_new (NULL);
gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->cursor_position_label), gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->cursor_position_label), CURSOR_POSITION_LABEL_WIDTH_CHARS);
CURSOR_POSITION_LABEL_WIDTH_CHARS);
gtk_widget_show (statusbar->priv->cursor_position_label); gtk_widget_show (statusbar->priv->cursor_position_label);
gtk_box_pack_end (GTK_BOX (statusbar), gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->cursor_position_label, FALSE, TRUE, 0);
statusbar->priv->cursor_position_label,
FALSE, TRUE, 0);
statusbar->priv->state_frame = gtk_frame_new (NULL); statusbar->priv->state_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->state_frame), gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->state_frame), GTK_SHADOW_IN);
GTK_SHADOW_IN);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (statusbar->priv->state_frame), hbox); gtk_container_add (GTK_CONTAINER (statusbar->priv->state_frame), hbox);
@ -143,19 +136,11 @@ xed_statusbar_init (XedStatusbar *statusbar)
gtk_widget_show (hbox); gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (hbox), gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->load_image, FALSE, TRUE, 4);
statusbar->priv->load_image, gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->save_image, FALSE, TRUE, 4);
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->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), gtk_box_pack_start (GTK_BOX (statusbar), statusbar->priv->state_frame, FALSE, TRUE, 0);
statusbar->priv->state_frame,
FALSE, TRUE, 0);
statusbar->priv->error_frame = gtk_frame_new (NULL); statusbar->priv->error_frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->error_frame), GTK_SHADOW_IN); 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); gtk_widget_set_margin_bottom (error_image, 0);
statusbar->priv->error_event_box = gtk_event_box_new (); statusbar->priv->error_event_box = gtk_event_box_new ();
gtk_event_box_set_visible_window (GTK_EVENT_BOX (statusbar->priv->error_event_box), gtk_event_box_set_visible_window (GTK_EVENT_BOX (statusbar->priv->error_event_box), FALSE);
FALSE);
gtk_widget_show (statusbar->priv->error_event_box); gtk_widget_show (statusbar->priv->error_event_box);
gtk_container_add (GTK_CONTAINER (statusbar->priv->error_frame), gtk_container_add (GTK_CONTAINER (statusbar->priv->error_frame), statusbar->priv->error_event_box);
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_event_box),
error_image);
gtk_box_pack_start (GTK_BOX (statusbar), gtk_box_pack_start (GTK_BOX (statusbar), statusbar->priv->error_frame, FALSE, TRUE, 0);
statusbar->priv->error_frame,
FALSE, TRUE, 0);
gtk_style_context_add_class (gtk_widget_get_style_context (statusbar), "xed-statusbar"); gtk_style_context_add_class (gtk_widget_get_style_context (statusbar), "xed-statusbar");
} }
@ -206,7 +186,7 @@ xed_statusbar_new (void)
**/ **/
void void
xed_statusbar_set_overwrite (XedStatusbar *statusbar, xed_statusbar_set_overwrite (XedStatusbar *statusbar,
gboolean overwrite) gboolean overwrite)
{ {
gchar *msg; gchar *msg;
@ -237,8 +217,8 @@ xed_statusbar_clear_overwrite (XedStatusbar *statusbar)
**/ **/
void void
xed_statusbar_set_cursor_position (XedStatusbar *statusbar, xed_statusbar_set_cursor_position (XedStatusbar *statusbar,
gint line, gint line,
gint col) gint col)
{ {
gchar *msg = NULL; gchar *msg = NULL;
@ -279,8 +259,8 @@ remove_message_timeout (XedStatusbar *statusbar)
*/ */
void void
xed_statusbar_flash_message (XedStatusbar *statusbar, xed_statusbar_flash_message (XedStatusbar *statusbar,
guint context_id, guint context_id,
const gchar *format, ...) const gchar *format, ...)
{ {
const guint32 flash_length = 3000; /* three seconds */ const guint32 flash_length = 3000; /* three seconds */
va_list args; va_list args;
@ -305,9 +285,7 @@ xed_statusbar_flash_message (XedStatusbar *statusbar,
} }
statusbar->priv->flash_context_id = context_id; statusbar->priv->flash_context_id = context_id;
statusbar->priv->flash_message_id = gtk_statusbar_push (GTK_STATUSBAR (statusbar), statusbar->priv->flash_message_id = gtk_statusbar_push (GTK_STATUSBAR (statusbar), context_id, msg);
context_id,
msg);
statusbar->priv->flash_timeout = g_timeout_add (flash_length, statusbar->priv->flash_timeout = g_timeout_add (flash_length,
(GSourceFunc) remove_message_timeout, (GSourceFunc) remove_message_timeout,
@ -318,8 +296,8 @@ xed_statusbar_flash_message (XedStatusbar *statusbar,
void void
xed_statusbar_set_window_state (XedStatusbar *statusbar, xed_statusbar_set_window_state (XedStatusbar *statusbar,
XedWindowState state, XedWindowState state,
gint num_of_errors) gint num_of_errors)
{ {
g_return_if_fail (XED_IS_STATUSBAR (statusbar)); 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),
num_of_errors); num_of_errors);
gtk_widget_set_tooltip_text (statusbar->priv->error_event_box, gtk_widget_set_tooltip_text (statusbar->priv->error_event_box, tip);
tip);
g_free (tip); g_free (tip);
gtk_widget_show (statusbar->priv->error_frame); gtk_widget_show (statusbar->priv->error_frame);

50
xed/xed-statusbar.h
View File

@ -34,22 +34,22 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define XED_TYPE_STATUSBAR (xed_statusbar_get_type ()) #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(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_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(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_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_STATUSBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), XED_TYPE_STATUSBAR, XedStatusbarClass))
typedef struct _XedStatusbar XedStatusbar; typedef struct _XedStatusbar XedStatusbar;
typedef struct _XedStatusbarPrivate XedStatusbarPrivate; typedef struct _XedStatusbarPrivate XedStatusbarPrivate;
typedef struct _XedStatusbarClass XedStatusbarClass; typedef struct _XedStatusbarClass XedStatusbarClass;
struct _XedStatusbar struct _XedStatusbar
{ {
GtkStatusbar parent; GtkStatusbar parent;
/* <private/> */ /* <private/> */
XedStatusbarPrivate *priv; XedStatusbarPrivate *priv;
}; };
@ -58,29 +58,29 @@ struct _XedStatusbarClass
GtkStatusbarClass parent_class; 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 */ /* FIXME: status is not defined in any .h */
#define XedStatus gint #define XedStatus gint
void xed_statusbar_set_window_state (XedStatusbar *statusbar, void xed_statusbar_set_window_state (XedStatusbar *statusbar,
XedWindowState state, XedWindowState state,
gint num_of_errors); gint num_of_errors);
void xed_statusbar_set_overwrite (XedStatusbar *statusbar, void xed_statusbar_set_overwrite (XedStatusbar *statusbar,
gboolean overwrite); gboolean overwrite);
void xed_statusbar_set_cursor_position (XedStatusbar *statusbar, void xed_statusbar_set_cursor_position (XedStatusbar *statusbar,
gint line, gint line,
gint col); gint col);
void xed_statusbar_clear_overwrite (XedStatusbar *statusbar); void xed_statusbar_clear_overwrite (XedStatusbar *statusbar);
void xed_statusbar_flash_message (XedStatusbar *statusbar, void xed_statusbar_flash_message (XedStatusbar *statusbar,
guint context_id, guint context_id,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF(3, 4); ...) G_GNUC_PRINTF(3, 4);
G_END_DECLS G_END_DECLS