1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-23 07:18:53 +00:00
Commit Graph

241 Commits

Author SHA1 Message Date
Bastien Guerry
12a9381803 Add and use a new option: org-show-notification-handler
This option lets the user customize the notification mechanism.
For example, she might want to use todochiku.el.

This option defaults to nil, hence doesn't change the previous
behavior: if the program notify-send is installed on the system,
use it, and falls back on using (message [notification]) if not.
2009-07-23 17:33:52 +02:00
Bastien Guerry
fa7e23ec39 Add org-clock-in-prepare-hook. Doc update.
This hook is called in org-clock-in earlier than the existing
org-clock-in-hook.  This is useful for functions that need to
modify the Effort property, for example.
2009-07-17 09:02:56 +02:00
Carsten Dominik
7087902788 Fix bug in org-narrow-to-subtree, which could lead to clock errors
Bernt Hansen writes:

> I have a monthly repeated task (Archive tasks) that has lots of
> old clock time on it currently but has never been marked DONE
> since the creation of the property LAST_REPEAT_TIME.  If this
> task is clocking when Emacs exits and you restart emacs and
> answer Yes to continue the clock - the modeline has the total
> time for the parent task (151:04 instead of the total time for
> this task (5:04).  If I clock the task in again the modeline is
> correct.
2009-07-08 14:29:18 +02:00
Carsten Dominik
e16c5b7b64 Fix typos 2009-07-06 22:30:39 +02:00
Carsten Dominik
f648323253 Push version number to 6.28trans 2009-06-26 17:26:50 +02:00
Carsten Dominik
cd4e52a5ef Release 6.28d 2009-06-26 17:23:27 +02:00
Carsten Dominik
00ddc4dba7 Release 6.28c 2009-06-26 09:27:50 +02:00
Carsten Dominik
e7ffcc1d4d Release 6.28b 2009-06-25 09:01:20 +02:00
Carsten Dominik
7906427aa6 Release 6.28 2009-06-25 08:59:59 +02:00
Carsten Dominik
03efd877bc Clock: Add more hooks
This commit add four hooks to the clocking code.

Patch by Benjamin Andresen.
2009-06-21 17:26:52 +02:00
Carsten Dominik
7c3aba2d3a Magnus Henoch writes:
>  I just discovered that org-clock-in displays the clocked-in task
>  in the mode line, so that I can click it and go back to the Org
>  file, which I really like.  I changed it to switch to the window
>  in which I click, by prepending "@" to the interactive spec of
>  org-clock-goto.
2009-06-19 14:03:34 +02:00
Carsten Dominik
a5f080361a Clock: Manipulating effort strings, and a mode line menu
Clicking on the clock in the mode line now pops up a menu with
clocking options.

A new command `C-c C-x C-e' allows to set or change the effort
estimate of the task currently being clocked.  This is mainly useful
when using an alert notification when the task should be finished.

Based on a patch by Konstantin Antipin.
2009-06-17 07:40:22 +02:00
Carsten Dominik
951125da8d intermediate 2009-06-16 09:42:05 +02:00
Bernt Hansen
fab7da2d7c Fix typo in org-clock-get-clocked-time 2009-06-09 23:02:09 +02:00
Bernt Hansen
e0f9c00f10 Do not issue the 'task should be finished by now' message if the clock is stopped
This patch prevents the org-clock-sound notification and the

   "Task'BLAH' should be finished by now."

message when the termination time is reached and the clock is not
running.

Before this patch spurious notifications and messages were generated when
clocking in a task with estimated effort time remaining.  After clocking
out the task the remaining minutes would tick by and then the sound
and message that the task should be finished were generated - even though
you are not working on it anymore.
2009-06-09 23:02:01 +02:00
Bernt Hansen
7f9e53d6b1 Initialize org-clock-notification-was-shown on clock-in
This makes org-clock-sound a little more well-behaved.  The clock
sound was only being issued if you were already clocking a task that
was under its limit, and changed to clocking something else.  Now each
time you clock in a new task it checks the estimated effort limit and
issues the org-clock-sound if the limit is exceeded.

This patch issues the org-clock-sound whenever you clock in a task
that is already over its estimated effort amount.  This allows you to
use the estimated effort as a limit for the amount of time to spend on
a task.  Each time you clock in the task you'll be notified that you
are over the limit.  This is great for tasks where you want to limit
the amount of time spent (per day, since last repeat) and is a
reminder to go work on something else instead.
2009-06-09 23:01:34 +02:00
Carsten Dominik
379b24cc63 Fix whitespace issues 2009-06-08 08:00:46 +02:00
Carsten Dominik
855f85b46f New face for clock in mode line. 2009-06-06 08:13:40 +02:00
Carsten Dominik
90c38a0045 Clock: Improve messages 2009-06-02 17:10:23 +02:00
Carsten Dominik
a5dc9456dd New option `org-clock-out-switch-to-state'.
Can be used to change the TODO state when clocking out.
2009-06-02 17:01:11 +02:00
Carsten Dominik
8a2247454c Bug fix 2009-06-02 16:36:16 +02:00
Carsten Dominik
1db461321a Keep compiler happy 2009-06-02 14:49:38 +02:00
Carsten Dominik
ee4bcda0e9 Clock: More control about what time is shown in mode line while clocking
This commit changes which time is shown in the mode line while
clocking.  Normally this will now be the total time ever clocked on
this task and its children.

However, when the task is a repeating one, only the time since the
last reset of the task will be shown.  The time of the last reset is
now recorded in a LAST_REPEAT property.

You can also set the CLOCK_MODELINE_TOTAL property to the value
"current" to only show the current clocking instance.  Or it may be
the value "today", to only add up the time spent today on this task.
Other possible values are "repeat", "all", or "auto".

Finally, you can set your default for this property with
`org-clock-modeline-total'.
2009-06-02 13:47:50 +02:00
Carsten Dominik
5ce1c5708f Clocking: Fix bug in the new cocking code
The cursor could move while collecting the total time for the current
subtree.
2009-05-28 19:49:11 +02:00
Carsten Dominik
19748886eb Tables: Allow #+TBLFM to be indented 2009-05-28 17:44:12 +02:00
Carsten Dominik
2b6a3ac71d Clock notification: Cleaning up some issues 2009-05-28 13:24:23 +02:00
krick
e17fdc3aa9 Merge branch 'origin' into clock-effort-notify 2009-05-28 11:17:13 +02:00
krick
59c6574c05 org-clock-sound could be
* nil. No sound played.
* any string, that is not a file. Make a beep
* file name. Emacs tries to play it with aplay, if available.
  If not, use standard emacs play-sound-file function.
2009-05-28 01:10:27 +02:00
krick
8c3ffc6259 Remove setq of the org-clock-sound here :) 2009-05-27 08:49:51 +02:00
krick
3c2099c29b Show total clocked time in mode line.
(Instead time since last start)
2009-05-26 23:30:38 +02:00
Carsten Dominik
ae7b8f6b12 Push version number to 6.27trans 2009-05-26 15:41:44 +02:00
krick
7c2930e96b In case we set effort estimate on the currently clocked item,
show notification when time is up.
 * Linux only: If libnotify is used - the standard notification
   system in linux, then show notification with it.
   Note: Additional package libnotify-bin should be installed.
Additionally, use beep if variable org-clock-sound is set.
 * If aplay (alsa player) is available, interpret org-clock-sound as
   path to the file, which should be played.
2009-05-25 22:01:34 +02:00
krick
d4b85109dd Show estimated effort in the mode-line if it is set.
* Set org-clock-effort variable in org-clock-in function.
* If org-clock-effort is not nil, show estimated effort in the mode-line.
2009-05-25 16:54:03 +02:00
Carsten Dominik
0421dead4b Release 6.27a 2009-05-25 16:04:45 +02:00
Carsten Dominik
b681c7b26e Release 6.27 2009-05-23 08:22:04 +02:00
Carsten Dominik
88673a8724 Clock history: Second try to get fontification right. 2009-05-05 14:44:05 +02:00
Carsten Dominik
e1f6e949ed Clock history: Present all tasks fontified
Bernt Hansen requested this.
2009-05-05 10:23:47 +02:00
Carsten Dominik
69e6d249aa Push version number to 6.26trans 2009-04-22 09:08:13 +02:00
Carsten Dominik
73854f435d Release 6.26d 2009-04-22 06:42:17 +02:00
Carsten Dominik
38b5a9e704 Clock: New variable to allow finding a recent task with `org-clock-goto' 2009-04-22 06:41:15 +02:00
Carsten Dominik
595e9603ac Release 6.26c 2009-04-21 20:26:27 +02:00
Carsten Dominik
654e629ed9 Clock: Make `C-c C-x C-j' jump to most recently clocked task as well.
If there is no running clock, this command will go to the most
recently clocked task.
2009-04-21 20:25:30 +02:00
Carsten Dominik
e0cd12716a Release 6.26b 2009-04-21 10:21:36 +02:00
Bernt Hansen
a04237d4f4 Revert "Jump to selected clock task when starting the clock"
This reverts commit 61dfa0c67f.

This wasn't such a great idea after all.  There is one case where
this is really annoying - if you are in the middle of displaying
an agenda view with lots of filters active and you change what you
are clocking it jumps away and you lose the agenda view.

This one case makes hitting a dedicated function key that runs
org-clock-goto more desireable.
2009-04-21 06:10:30 +02:00
Carsten Dominik
b8a5f1a7fc Release 6.26a 2009-04-19 22:31:36 +02:00
Carsten Dominik
ba66d2c8ae Release 6.26 2009-04-19 08:38:49 +02:00
Bernt Hansen
61dfa0c67f Jump to selected clock task when starting the clock
Move the point to the selected task when clocking in using the clock
history.  I find I'm always going to the currently clocked task after
picking it off of the menu and this saves one small step.

This could be optionally controlled by a variable.
2009-04-16 06:02:13 +02:00
Carsten Dominik
08b81dbb1d Minor fix 2009-04-14 12:40:25 +02:00
Carsten Dominik
633e8cdd90 Clock: Fix bugs when resuming the clock.
Adam Elliot writes:

>  Automatically resuming the clock after an Emacs restart
>  fails under the following cases:
>
>  1. If org-log-states-order-reversed set to t (default), and
>     a state change line precedes the clock line to resume.
>     Error message is "Cannot restart clock because task does
>     not contain unfinished clock".
>
[...]
>  2. If org-log-states-order-reversed set to nil.  Error
>     message is the same.  Reason: point is placed *after*
>     last clock line and so fails looking-at test.
>

This commit fixes the problem, in a slightly different way
than Adam proposed.  Instead of trying to fix the old way to
find the position of the clock, we now simple search the
entry if there is an unfinished clock and go there.  Since
new clocks are added before older ones, this should be a
safe bet.
2009-04-14 09:50:05 +02:00
Carsten Dominik
ef2ee3df5d Version number pushed to 6.25trans 2009-04-07 18:43:42 +02:00