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

Patch from Markus Berg <mberg@hp.com> to fix bug #123141.

Browse source 
2004-07-28  Richard Hult  <richard@imendio.com>

	* drw-break-window.c: Patch from Markus Berg <mberg@hp.com> to fix
	bug #123141.

	* drwright.c: Remove some cruft. Shorten the warning period a bit.
This commit is contained in:
Richard Hult 2004-07-27 23:08:47 +00:00 • committed by Richard Hult
parent 7007308123
commit 14b9f41c61
3 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
typing-break/ChangeLog
View file

@ -1,3 +1,10 @@
2004-07-28 Richard Hult <richard@imendio.com>
* drw-break-window.c: Patch from Markus Berg <mberg@hp.com> to fix
bug #123141.
* drwright.c: Remove some cruft. Shorten the warning period a bit.
2004-05-02 Richard Hult <richard@imendio.com> 2004-05-02 Richard Hult <richard@imendio.com>
* drw-monitor.c Raise the threshold for detecting activity, makes * drw-monitor.c Raise the threshold for detecting activity, makes

29
typing-break/drw-break-window.c
View file

@ -141,11 +141,19 @@ drw_break_window_init (DrwBreakWindow *window)
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *align; GtkWidget *align;
GtkWidget *monitor_box;
gchar *str; gchar *str;
GtkWidget *outer_vbox; GtkWidget *outer_vbox;
GtkWidget *button_box; GtkWidget *button_box;
gboolean allow_postpone; gboolean allow_postpone;
gint root_monitor = 0;
GdkScreen *screen = NULL;
GdkRectangle monitor;
gint right_padding;
gint bottom_padding;
priv = g_new0 (DrwBreakWindowPriv, 1); priv = g_new0 (DrwBreakWindowPriv, 1);
window->priv = priv; window->priv = priv;
@ -159,9 +167,12 @@ drw_break_window_init (DrwBreakWindow *window)
GTK_WINDOW (window)->type = GTK_WINDOW_POPUP; GTK_WINDOW (window)->type = GTK_WINDOW_POPUP;
screen = gdk_screen_get_default ();
gdk_screen_get_monitor_geometry (screen, root_monitor, &monitor);
gtk_window_set_default_size (GTK_WINDOW (window), gtk_window_set_default_size (GTK_WINDOW (window),
gdk_screen_width (), gdk_screen_get_width (screen),
gdk_screen_height ()); gdk_screen_get_height (screen));
gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE);
gtk_widget_realize (GTK_WIDGET (window)); gtk_widget_realize (GTK_WIDGET (window));
@ -178,7 +189,19 @@ drw_break_window_init (DrwBreakWindow *window)
outer_vbox = gtk_vbox_new (FALSE, 0); outer_vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_show (outer_vbox); gtk_widget_show (outer_vbox);
gtk_container_add (GTK_CONTAINER (window), outer_vbox); right_padding = gdk_screen_get_width (screen) - monitor.width - monitor.x;
bottom_padding = gdk_screen_get_height (screen) - monitor.height - monitor.y;
monitor_box = gtk_alignment_new (0.5, 0.5, 1, 1);
gtk_alignment_set_padding (GTK_ALIGNMENT (monitor_box),
monitor.y,
bottom_padding,
monitor.x,
right_padding);
gtk_widget_show (monitor_box);
gtk_container_add (GTK_CONTAINER (window), monitor_box);
gtk_container_add (GTK_CONTAINER (monitor_box), outer_vbox);
gtk_box_pack_start (GTK_BOX (outer_vbox), align, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (outer_vbox), align, TRUE, TRUE, 0);

12
typing-break/drwright.c
View file

@ -529,13 +529,6 @@ gconf_notify_cb (GConfClient *client,
dr->state = STATE_START; dr->state = STATE_START;
} }
} }
/* else if (!strcmp (entry->key, GCONF_PATH "/warn_time")) {
if (entry->value->type == GCONF_VALUE_INT) {
dr->warn_time = 60 * gconf_value_get_int (entry->value);
dr->state = STATE_START;
}
}
*/
else if (!strcmp (entry->key, GCONF_PATH "/break_time")) { else if (!strcmp (entry->key, GCONF_PATH "/break_time")) {
if (entry->value->type == GCONF_VALUE_INT) { if (entry->value->type == GCONF_VALUE_INT) {
dr->break_time = 60 * gconf_value_get_int (entry->value); dr->break_time = 60 * gconf_value_get_int (entry->value);
@ -936,10 +929,7 @@ drwright_new (void)
dr->type_time = 60 * gconf_client_get_int ( dr->type_time = 60 * gconf_client_get_int (
client, GCONF_PATH "/type_time", NULL); client, GCONF_PATH "/type_time", NULL);
/* dr->warn_time = 60 * gconf_client_get_int ( dr->warn_time = MIN (dr->type_time / 12, 60*3);
client, GCONF_PATH /warn_time", NULL);
*/
dr->warn_time = MIN (dr->type_time / 10, 60*5);
dr->break_time = 60 * gconf_client_get_int ( dr->break_time = 60 * gconf_client_get_int (
client, GCONF_PATH "/break_time", NULL); client, GCONF_PATH "/break_time", NULL);