summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2015-05-26 10:10:40 +0200
committerraveit65 <[email protected]>2015-05-26 10:10:40 +0200
commitf71fa9d585bb6426658fac9b6236a566bb8b8fbd (patch)
treef19068453ab4ced828ec91e5933577f7b64d3bc5
parente71c723f62971343e9ca83d3371a0ded28747e48 (diff)
downloadeom-f71fa9d585bb6426658fac9b6236a566bb8b8fbd.tar.bz2
eom-f71fa9d585bb6426658fac9b6236a566bb8b8fbd.tar.xz
Use a simple GtkLabel for the image counter in the statusbar
This was an extra GtkStatusbar before. This is not needed anymore as the resize handle now works independently from the GtkStatusbar. Also the GtkLabel seems to require less horizontal space in the statusbar.
-rw-r--r--src/eom-statusbar.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/eom-statusbar.c b/src/eom-statusbar.c
index 634818e..215b9db 100644
--- a/src/eom-statusbar.c
+++ b/src/eom-statusbar.c
@@ -38,7 +38,7 @@ G_DEFINE_TYPE (EomStatusbar, eom_statusbar, GTK_TYPE_STATUSBAR)
struct _EomStatusbarPrivate
{
GtkWidget *progressbar;
- GtkWidget *img_num_statusbar;
+ GtkWidget *img_num_label;
};
static void
@@ -58,12 +58,12 @@ eom_statusbar_init (EomStatusbar *statusbar)
statusbar->priv = EOM_STATUSBAR_GET_PRIVATE (statusbar);
priv = statusbar->priv;
- priv->img_num_statusbar = gtk_statusbar_new ();
- gtk_widget_set_size_request (priv->img_num_statusbar, 100, 10);
- gtk_widget_show (priv->img_num_statusbar);
+ priv->img_num_label = gtk_label_new (NULL);
+ gtk_widget_set_size_request (priv->img_num_label, 100, 10);
+ gtk_widget_show (priv->img_num_label);
gtk_box_pack_end (GTK_BOX (statusbar),
- priv->img_num_statusbar,
+ priv->img_num_label,
FALSE,
TRUE,
0);
@@ -107,8 +107,6 @@ eom_statusbar_set_image_number (EomStatusbar *statusbar,
g_return_if_fail (EOM_IS_STATUSBAR (statusbar));
- gtk_statusbar_pop (GTK_STATUSBAR (statusbar->priv->img_num_statusbar), 0);
-
/* Hide number display if values don't make sense */
if (G_UNLIKELY (num <= 0 || tot <= 0))
return;
@@ -125,7 +123,7 @@ eom_statusbar_set_image_number (EomStatusbar *statusbar,
* too.*/
msg = g_strdup_printf (_("%d / %d"), num, tot);
- gtk_statusbar_push (GTK_STATUSBAR (statusbar->priv->img_num_statusbar), 0, msg);
+ gtk_label_set_text (GTK_LABEL (statusbar->priv->img_num_label), msg);
g_free (msg);
}
@@ -141,10 +139,10 @@ eom_statusbar_set_progress (EomStatusbar *statusbar,
if (progress > 0 && progress < 1) {
gtk_widget_show (statusbar->priv->progressbar);
- gtk_widget_hide (statusbar->priv->img_num_statusbar);
+ gtk_widget_hide (statusbar->priv->img_num_label);
} else {
gtk_widget_hide (statusbar->priv->progressbar);
- gtk_widget_show (statusbar->priv->img_num_statusbar);
+ gtk_widget_show (statusbar->priv->img_num_label);
}
}