summaryrefslogtreecommitdiff
path: root/src/progress.c
diff options
context:
space:
mode:
authorScott Pakin <pakin@lanl.gov>2014-08-05 15:22:12 -0600
committerArx Cruz <arxcruz@gnome.org>2014-10-21 15:22:11 +0200
commit673550b6d326e111867fa78ba4d796045715202e (patch)
treeca8d8eae3c976e532d4e283f3bb393c91e0b4fd0 /src/progress.c
parentDon't quit zenity when the input stream is closed (diff)
downloadzenity-673550b6d326e111867fa78ba4d796045715202e.tar.gz
zenity-673550b6d326e111867fa78ba4d796045715202e.tar.bz2
zenity-673550b6d326e111867fa78ba4d796045715202e.zip
Added time-remaining support to progress bars
Introduced a --time-remaining command-line option that uses the time and percent complete to extrapolate the time remaining until progress reaches 100%.
Diffstat (limited to 'src/progress.c')
-rw-r--r--src/progress.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/src/progress.c b/src/progress.c
index cbffe08e..00544873 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -29,6 +29,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <signal.h>
+#include <time.h>
#include "zenity.h"
#include "util.h"
@@ -72,6 +73,39 @@ zenity_progress_pulsate_start (GObject *progress_bar)
}
}
+static void
+zenity_progress_update_time_remaining (ZenityProgressData *progress_data)
+{
+ static GObject *progress_time = NULL;
+ static time_t start_time = (time_t)(-1);
+ float percentage = progress_data->percentage;
+
+ if (progress_time == NULL)
+ progress_time = gtk_builder_get_object (builder, "zenity_progress_time");
+ if (start_time == (time_t)(-1) || percentage <= 0.0 || percentage >= 100.0) {
+ start_time = time(NULL);
+ gtk_label_set_text (GTK_LABEL (progress_time), "");
+ } else {
+ time_t current_time = time (NULL);
+ time_t elapsed_time = current_time - start_time;
+ time_t total_time = (time_t) (100.0*elapsed_time/progress_data->percentage);
+ time_t remaining_time = total_time - elapsed_time;
+ gulong hours, minutes, seconds;
+ gchar *remaining_message;
+
+ seconds = (gulong) (remaining_time%60);
+ remaining_time /= 60;
+ minutes = (gulong) (remaining_time%60);
+ remaining_time /= 60;
+ hours = (gulong) remaining_time;
+
+ remaining_message = g_strdup_printf (_("Time remaining: %lu:%02lu:%02lu"),
+ hours, minutes, seconds);
+ gtk_label_set_text (GTK_LABEL (progress_time), remaining_message);
+ g_free (remaining_message);
+ }
+}
+
static gboolean
zenity_progress_handle_stdin (GIOChannel *channel,
GIOCondition condition,
@@ -160,6 +194,9 @@ zenity_progress_handle_stdin (GIOChannel *channel,
progress_data->percentage = percentage;
+ if (progress_data->time_remaining == TRUE)
+ zenity_progress_update_time_remaining (progress_data);
+
if (percentage == 100) {
GObject *button;
bgstack15