applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Go back to the timer value from before the break if postponing a manual

Browse source 
2005-02-03  Richard Hult  <richard@imendio.com>

	* drwright.c (break_window_postpone_cb), (maybe_change_state),
	(popup_break_cb): Go back to the timer value from before the break
	if postponing a manual break. Fixes bug #134595, based on patch
	from Vinay M R <vinay.mandyakoppal@wipro.com>. Modified to use the
	right enum type and changed to update the tooltip immendiately
	after a break.
This commit is contained in:
Richard Hult 2005-02-03 22:59:58 +00:00 • committed by Richard Hult
parent 7c1d70b04a
commit f86cf16e33
2 changed files with 40 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
typing-break/ChangeLog
View file

@ -1,3 +1,12 @@
2005-02-03 Richard Hult <richard@imendio.com>
* drwright.c (break_window_postpone_cb), (maybe_change_state),
(popup_break_cb): Go back to the timer value from before the break
if postponing a manual break. Fixes bug #134595, based on patch
from Vinay M R <vinay.mandyakoppal@wipro.com>. Modified to use the
right enum type and changed to update the tooltip immendiately
after a break.
2004-12-25 Kjartan Maraas <kmaraas@gnome.org>
* drw-selection.c: (drw_selection_start): ANSIfication.

40
typing-break/drwright.c
View file

@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2003-2004 Imendio HB
* Copyright (C) 2003-2004 Imendio AB
* Copyright (C) 2002-2003 Richard Hult <richard@imendio.com>
* Copyright (C) 2002 CodeFactory AB
*
@ -57,6 +57,11 @@ typedef enum {
STATE_BREAK_DONE
} DrwState;
typedef enum {
AUTO_BREAK,
MANUAL_BREAK
} DrwBreakType;
struct _DrWright {
/* Widgets. */
GtkWidget *break_window;
@ -69,6 +74,7 @@ struct _DrWright {
DrwState state;
GTimer *timer;
GTimer *idle_timer;
GTimer *break_warn_timer;
gint last_elapsed_time;
@ -80,6 +86,7 @@ struct _DrWright {
gint warn_time;
gboolean enabled;
DrwBreakType break_type;
guint clock_timeout_id;
guint blink_timeout_id;
@ -310,6 +317,7 @@ maybe_change_state (DrWright *dr)
{
gint elapsed_time;
gint elapsed_idle_time;
gint elapsed_break_warn_time;
if (debug) {
g_timer_reset (dr->idle_timer);
@ -317,6 +325,7 @@ maybe_change_state (DrWright *dr)
elapsed_time = g_timer_elapsed (dr->timer, NULL);
elapsed_idle_time = g_timer_elapsed (dr->idle_timer, NULL);
elapsed_break_warn_time = g_timer_elapsed (dr->break_warn_timer, NULL);
if (elapsed_time > dr->last_elapsed_time + dr->warn_time) {
/* If the timeout is delayed by the amount of warning time, then
@ -358,7 +367,8 @@ maybe_change_state (DrWright *dr)
case STATE_TYPE:
if (elapsed_time >= dr->type_time - dr->warn_time) {
dr->state = STATE_WARN_TYPE;
g_timer_start (dr->timer);
g_timer_stop (dr->timer);
g_timer_start(dr->break_warn_timer);
start_blinking (dr);
} else if (elapsed_time >= dr->type_time) {
@ -371,7 +381,7 @@ maybe_change_state (DrWright *dr)
break;
case STATE_WARN_TYPE:
if (elapsed_time >= dr->warn_time) {
if (elapsed_break_warn_time >= dr->warn_time) {
dr->state = STATE_BREAK_SETUP;
}
else if (!dr->is_active) {
@ -401,7 +411,11 @@ maybe_change_state (DrWright *dr)
stop_blinking (dr);
gtk_image_set_from_pixbuf (GTK_IMAGE (dr->icon_image), dr->red_bar);
g_timer_start (dr->timer);
if (dr->break_type == AUTO_BREAK)
g_timer_start (dr->timer);
else
g_timer_stop (dr->timer);
g_timer_start (dr->break_warn_timer);
dr->break_window = drw_break_window_new ();
@ -430,7 +444,7 @@ maybe_change_state (DrWright *dr)
break;
case STATE_BREAK:
if (elapsed_time >= dr->break_time) {
if (elapsed_break_warn_time >= dr->break_time) {
dr->state = STATE_BREAK_DONE_SETUP;
}
break;
@ -559,6 +573,7 @@ popup_break_cb (gpointer callback_data,
DrWright *dr = callback_data;
if (dr->enabled) {
dr->break_type = MANUAL_BREAK;
dr->state = STATE_BREAK_SETUP;
maybe_change_state (dr);
}
@ -752,6 +767,7 @@ break_window_done_cb (GtkWidget *window,
dr->state = STATE_BREAK_DONE_SETUP;
dr->break_window = NULL;
update_tooltip (dr);
maybe_change_state (dr);
}
@ -761,11 +777,16 @@ break_window_postpone_cb (GtkWidget *window,
{
gtk_widget_destroy (dr->break_window);
dr->state = STATE_WARN_TYPE;
if (dr->break_type == MANUAL_BREAK) {
dr->state = STATE_TYPE;
g_timer_continue (dr->timer);
dr->break_type = AUTO_BREAK;
} else {
dr->state = STATE_WARN_TYPE;
start_blinking (dr);
}
dr->break_window = NULL;
g_timer_start (dr->timer);
start_blinking (dr);
update_icon (dr);
update_tooltip (dr);
}
@ -964,6 +985,7 @@ drwright_new (void)
dr->timer = g_timer_new ();
dr->idle_timer = g_timer_new ();
dr->break_warn_timer = g_timer_new ();
dr->state = STATE_START;
@ -983,7 +1005,7 @@ drwright_new (void)
init_tray_icon (dr);
g_timeout_add (15*1000,
g_timeout_add (10*1000,
(GSourceFunc) update_tooltip,
dr);
g_timeout_add (500,