diff --git a/README.md b/README.md index 0e01ff6..7465fc0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Wat's main screen consists of 3 groupings of tasks, each of which is optional and can be disabled via settings. The idea here is to provide an interface to toggle what task you are currently working on, with lots of options for editing, annotating, and reporting on that time spent later. When you track time on a task, it will show up in the `view` page (v), which is analogous to `watson log`. -![Toggling a task in the wat interface](./assets/0-track-time.webm "time-tracking") +![Toggling a task in the wat interface](./assets/0-track-time.gif "time-tracking") The three available categories of task are `Permanent Items`, for tasks that will likely be part of your workflow for the forseeable future, `Recurring Items` for scheduled weekly meetings or tasks which come and go, and `Ad-Hoc Items` for things that will not recur. Eventually, I plan to make the `Ad-Hoc` section display items in reverse order, and remove ones beyond 10 items. This will not delete past time entries for those items. @@ -20,19 +20,19 @@ The three available categories of task are `Permanent Items`, for tasks that wil Pressing `v` on the main interface will take the user to the interface for viewing actual time entries, as created from the main interface. The default view is the 'day' view, which shows your entries for the current day. You can press `g` to `group` or `ungroup` your tasks by project. You can also navigate using `h,j,k,l` between entries, entries grouped by project, grouped by day, or all entries. You can press `y` to copy the selection to your clipboard. -![Navigating the daily view](./assets/2-daily-view-and-proj-selection.webm "daily-view") +![Navigating the daily view](./assets/2-daily-view-and-proj-selection.gif "daily-view") ### Weekly and Monthly View When in the `view` interface, you can switch to a weekly or monthly view using `w` or `m`. Grouping works the same way in these views as in the `daily` view. You can also press 'r' to reverse the order of the days in the display. -![Navigating by week or month](./assets/3-weekly-view-and-day-selection.webm "week-and-month-view") +![Navigating by week or month](./assets/3-weekly-view-and-day-selection.gif "week-and-month-view") ### Individual entry editing When an entry is selected, you can press `e` to edit the full `watson edit` configuration for your selected entry in your chosen `$EDITOR` -![Editing a time entry](./assets/4-individual-editing.webm "editing-an-entry") +![Editing a time entry](./assets/4-individual-editing.gif "editing-an-entry") ### Backfill gap and overlap correction @@ -40,18 +40,20 @@ The `ungrouped` view can also be used as an error resolution and quick edit page In the ungrouped view, entries are chronological. Entries with gaps betweent them are denoted by a blank line with three dashes (---). Entries which overlap with the previous entry (which is likely an error and should never happen) are colored yellow. In both cases, pressing `b` will resolve the issue. (You may want gaps in certain cases such as lunch breaks or short breaks, so don't do this without thinking about the context) -![Backfilling Overlapped or Disjointed Entries](./assets/5-backfill-gap-and-overlap-correction.webm "backfilling") +![Backfilling Overlapped or Disjointed Entries](./assets/5-backfill-gap-and-overlap-correction.gif "backfilling") ### Rounding The time tracking software I use at work only accepts logging for tasks and projects in 15m intervals, so I included a hotkey `R` to automatically round tasks to the nearest 15m. This reduces a little burden when reporting time, but keep in mind that if you get unlucky and many entries are rounded down you may end up under-reporting. Keep this in mind and always sanity check your time. -![Rounding](./assets/6-rounding.webm "rounding") +![Rounding](./assets/6-rounding.gif "rounding") ### Annotation Watson actually doesn't include any options for annotating time entries by default! However, it does allow you to technically assign multiple 'tags' to an entry. In `wat`, we've been treating the `tag` as the name of the time entry more-or-less. When an entry is completed, you can navigate to the view page and press `a` to add a second tag if you want to be more specific about that particular entry. In practice, it looks just fine in the final reporting. +![Annotation](./assets/7-annotation.gif "annotation") + ## Building & Running ``` cargo build diff --git a/assets/0-track-time.gif b/assets/0-track-time.gif new file mode 100644 index 0000000..b26d155 Binary files /dev/null and b/assets/0-track-time.gif differ diff --git a/assets/0-track-time.webm b/assets/0-track-time.webm deleted file mode 100644 index 879afe1..0000000 Binary files a/assets/0-track-time.webm and /dev/null differ diff --git a/assets/1-main-view.gif b/assets/1-main-view.gif new file mode 100644 index 0000000..1288889 Binary files /dev/null and b/assets/1-main-view.gif differ diff --git a/assets/1-main-view.webm b/assets/1-main-view.webm deleted file mode 100644 index 486055e..0000000 Binary files a/assets/1-main-view.webm and /dev/null differ diff --git a/assets/2-daily-view-and-proj-selection.gif b/assets/2-daily-view-and-proj-selection.gif new file mode 100644 index 0000000..2ae4068 Binary files /dev/null and b/assets/2-daily-view-and-proj-selection.gif differ diff --git a/assets/2-daily-view-and-proj-selection.webm b/assets/2-daily-view-and-proj-selection.webm deleted file mode 100644 index 4755e7c..0000000 Binary files a/assets/2-daily-view-and-proj-selection.webm and /dev/null differ diff --git a/assets/3-weekly-view-and-day-selection.gif b/assets/3-weekly-view-and-day-selection.gif new file mode 100644 index 0000000..b6afb18 Binary files /dev/null and b/assets/3-weekly-view-and-day-selection.gif differ diff --git a/assets/3-weekly-view-and-day-selection.webm b/assets/3-weekly-view-and-day-selection.webm deleted file mode 100644 index e6f9d2e..0000000 Binary files a/assets/3-weekly-view-and-day-selection.webm and /dev/null differ diff --git a/assets/4-full-individual-editing.gif b/assets/4-full-individual-editing.gif new file mode 100644 index 0000000..72cf6eb Binary files /dev/null and b/assets/4-full-individual-editing.gif differ diff --git a/assets/4-full-individual-editing.webm b/assets/4-full-individual-editing.webm deleted file mode 100644 index d82df95..0000000 Binary files a/assets/4-full-individual-editing.webm and /dev/null differ diff --git a/assets/5-backfill-gap-and-overlap-correction.gif b/assets/5-backfill-gap-and-overlap-correction.gif new file mode 100644 index 0000000..151afa8 Binary files /dev/null and b/assets/5-backfill-gap-and-overlap-correction.gif differ diff --git a/assets/5-backfill-gap-and-overlap-correction.webm b/assets/5-backfill-gap-and-overlap-correction.webm deleted file mode 100644 index 1abba69..0000000 Binary files a/assets/5-backfill-gap-and-overlap-correction.webm and /dev/null differ diff --git a/assets/6-rounding.gif b/assets/6-rounding.gif new file mode 100644 index 0000000..fc2c80c Binary files /dev/null and b/assets/6-rounding.gif differ diff --git a/assets/6-rounding.webm b/assets/6-rounding.webm deleted file mode 100644 index ca34e9b..0000000 Binary files a/assets/6-rounding.webm and /dev/null differ diff --git a/assets/7-annotation.gif b/assets/7-annotation.gif new file mode 100644 index 0000000..2bfb369 Binary files /dev/null and b/assets/7-annotation.gif differ diff --git a/assets/7-annotation.webm b/assets/7-annotation.webm deleted file mode 100644 index 269655b..0000000 Binary files a/assets/7-annotation.webm and /dev/null differ diff --git a/assets/add-task.gif b/assets/add-task.gif new file mode 100644 index 0000000..ce1a9d1 Binary files /dev/null and b/assets/add-task.gif differ diff --git a/assets/add-task.webm b/assets/add-task.webm deleted file mode 100644 index 600379f..0000000 Binary files a/assets/add-task.webm and /dev/null differ diff --git a/assets/palette.png b/assets/palette.png new file mode 100644 index 0000000..c5d22aa Binary files /dev/null and b/assets/palette.png differ diff --git a/assets/sample-conversion.sh b/assets/sample-conversion.sh index 0e97b6c..d1a8f96 100644 --- a/assets/sample-conversion.sh +++ b/assets/sample-conversion.sh @@ -1 +1,2 @@ ffmpeg -i add-task.mov -c:v libvpx-vp9 -b:v 0 -crf 30 -pix_fmt yuv420p add-task.webm +ffmpeg -i add-task.webm -i palette.png -filter_complex "fps=15,scale=800:-1:flags=lanczos[x];[x][1:v]paletteuse=dither=bayer:bayer_scale=5:diff_mode=rectangle" add-task.gif