xed-progress-message-area.c: Clean up code style

This commit is contained in:
JosephMcc 2017-01-07 04:13:12 -08:00
parent 01ace1d02f
commit a1671a6227
1 changed files with 118 additions and 128 deletions

View File

@ -40,9 +40,10 @@
#include "xed-progress-message-area.h"
enum {
PROP_0,
PROP_HAS_CANCEL_BUTTON
enum
{
PROP_0,
PROP_HAS_CANCEL_BUTTON
};
@ -50,194 +51,183 @@ enum {
struct _XedProgressMessageAreaPrivate
{
GtkWidget *image;
GtkWidget *label;
GtkWidget *progress;
GtkWidget *image;
GtkWidget *label;
GtkWidget *progress;
};
G_DEFINE_TYPE(XedProgressMessageArea, xed_progress_message_area, GTK_TYPE_INFO_BAR)
static void
xed_progress_message_area_set_has_cancel_button (XedProgressMessageArea *area,
gboolean has_button)
gboolean has_button)
{
if (has_button)
gtk_info_bar_add_button (GTK_INFO_BAR (area),
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
if (has_button)
{
gtk_info_bar_add_button (GTK_INFO_BAR (area), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
}
g_object_notify (G_OBJECT (area), "has-cancel-button");
g_object_notify (G_OBJECT (area), "has-cancel-button");
}
static void
xed_progress_message_area_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
XedProgressMessageArea *area;
XedProgressMessageArea *area;
area = XED_PROGRESS_MESSAGE_AREA (object);
area = XED_PROGRESS_MESSAGE_AREA (object);
switch (prop_id)
{
case PROP_HAS_CANCEL_BUTTON:
xed_progress_message_area_set_has_cancel_button (area,
g_value_get_boolean (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
switch (prop_id)
{
case PROP_HAS_CANCEL_BUTTON:
xed_progress_message_area_set_has_cancel_button (area, g_value_get_boolean (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
xed_progress_message_area_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
xed_progress_message_area_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
xed_progress_message_area_class_init (XedProgressMessageAreaClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = xed_progress_message_area_set_property;
gobject_class->get_property = xed_progress_message_area_get_property;
gobject_class->set_property = xed_progress_message_area_set_property;
gobject_class->get_property = xed_progress_message_area_get_property;
g_object_class_install_property (gobject_class,
PROP_HAS_CANCEL_BUTTON,
g_param_spec_boolean ("has-cancel-button",
"Has Cancel Button",
"If the message area has a cancel button",
TRUE,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_HAS_CANCEL_BUTTON,
g_param_spec_boolean ("has-cancel-button",
"Has Cancel Button",
"If the message area has a cancel button",
TRUE,
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS));
g_type_class_add_private (gobject_class, sizeof(XedProgressMessageAreaPrivate));
g_type_class_add_private (gobject_class, sizeof(XedProgressMessageAreaPrivate));
}
static void
xed_progress_message_area_init (XedProgressMessageArea *area)
{
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *hbox;
area->priv = XED_PROGRESS_MESSAGE_AREA_GET_PRIVATE (area);
area->priv = XED_PROGRESS_MESSAGE_AREA_GET_PRIVATE (area);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
area->priv->image = gtk_image_new_from_icon_name (GTK_STOCK_MISSING_IMAGE,
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show (area->priv->image);
gtk_widget_set_halign (area->priv->image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (area->priv->image, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (hbox), area->priv->image, FALSE, FALSE, 4);
area->priv->image = gtk_image_new_from_icon_name (GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_widget_show (area->priv->image);
gtk_widget_set_halign (area->priv->image, GTK_ALIGN_CENTER);
gtk_widget_set_valign (area->priv->image, GTK_ALIGN_CENTER);
gtk_box_pack_start (GTK_BOX (hbox), area->priv->image, FALSE, FALSE, 4);
area->priv->label = gtk_label_new ("");
gtk_widget_show (area->priv->label);
gtk_box_pack_start (GTK_BOX (hbox), area->priv->label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE);
gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5);
gtk_label_set_ellipsize (GTK_LABEL (area->priv->label),
PANGO_ELLIPSIZE_END);
area->priv->label = gtk_label_new ("");
gtk_widget_show (area->priv->label);
gtk_box_pack_start (GTK_BOX (hbox), area->priv->label, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE);
gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5);
gtk_label_set_ellipsize (GTK_LABEL (area->priv->label), PANGO_ELLIPSIZE_END);
area->priv->progress = gtk_progress_bar_new ();
gtk_widget_show (area->priv->progress);
gtk_box_pack_start (GTK_BOX (vbox), area->priv->progress, TRUE, FALSE, 0);
gtk_widget_set_size_request (area->priv->progress, -1, 15);
area->priv->progress = gtk_progress_bar_new ();
gtk_widget_show (area->priv->progress);
gtk_box_pack_start (GTK_BOX (vbox), area->priv->progress, TRUE, FALSE, 0);
gtk_widget_set_size_request (area->priv->progress, -1, 15);
GtkWidget *content;
GtkWidget *content;
content = gtk_info_bar_get_content_area (GTK_INFO_BAR (area));
gtk_container_add (GTK_CONTAINER (content), vbox);
content = gtk_info_bar_get_content_area (GTK_INFO_BAR (area));
gtk_container_add (GTK_CONTAINER (content), vbox);
}
GtkWidget *
xed_progress_message_area_new (const gchar *stock_id,
const gchar *markup,
gboolean has_cancel)
const gchar *markup,
gboolean has_cancel)
{
XedProgressMessageArea *area;
XedProgressMessageArea *area;
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (markup != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL);
g_return_val_if_fail (markup != NULL, NULL);
area = XED_PROGRESS_MESSAGE_AREA (g_object_new (XED_TYPE_PROGRESS_MESSAGE_AREA,
"has-cancel-button", has_cancel,
NULL));
area = XED_PROGRESS_MESSAGE_AREA (g_object_new (XED_TYPE_PROGRESS_MESSAGE_AREA,
"has-cancel-button", has_cancel,
NULL));
xed_progress_message_area_set_stock_image (area,
stock_id);
xed_progress_message_area_set_stock_image (area, stock_id);
xed_progress_message_area_set_markup (area, markup);
xed_progress_message_area_set_markup (area,
markup);
return GTK_WIDGET (area);
return GTK_WIDGET (area);
}
void
xed_progress_message_area_set_stock_image (XedProgressMessageArea *area,
const gchar *stock_id)
const gchar *stock_id)
{
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (stock_id != NULL);
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (stock_id != NULL);
gtk_image_set_from_stock (GTK_IMAGE (area->priv->image),
stock_id,
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_image_set_from_stock (GTK_IMAGE (area->priv->image), stock_id, GTK_ICON_SIZE_SMALL_TOOLBAR);
}
void
xed_progress_message_area_set_markup (XedProgressMessageArea *area,
const gchar *markup)
const gchar *markup)
{
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (markup != NULL);
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (markup != NULL);
gtk_label_set_markup (GTK_LABEL (area->priv->label),
markup);
gtk_label_set_markup (GTK_LABEL (area->priv->label), markup);
}
void
xed_progress_message_area_set_text (XedProgressMessageArea *area,
const gchar *text)
const gchar *text)
{
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (text != NULL);
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (text != NULL);
gtk_label_set_text (GTK_LABEL (area->priv->label),
text);
gtk_label_set_text (GTK_LABEL (area->priv->label), text);
}
void
xed_progress_message_area_set_fraction (XedProgressMessageArea *area,
gdouble fraction)
gdouble fraction)
{
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (area->priv->progress),
fraction);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (area->priv->progress), fraction);
}
void
xed_progress_message_area_pulse (XedProgressMessageArea *area)
{
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
g_return_if_fail (XED_IS_PROGRESS_MESSAGE_AREA (area));
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (area->priv->progress));
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (area->priv->progress));
}