Skip to content

Commit c58146e

Browse files
committed
Merge branch 'dev'
2 parents 2586132 + 0f18320 commit c58146e

File tree

3 files changed

+279
-19
lines changed

3 files changed

+279
-19
lines changed

README.md

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ Installation
1010

1111
##### Pathogen
1212

13-
$ cd ~/.vim/bundle
14-
$ git clone https://github.com/aserebryakov/vim-todo-lists.git
13+
$ cd ~/.vim/bundle $ git clone https://github.com/aserebryakov/vim-todo-lists.git
1514

1615
##### NeoBundle
1716

@@ -52,6 +51,7 @@ to be **parent** and the second to be **child**.
5251
```
5352

5453
###### Rules:
54+
5555
* Changing state of the parent item changes the state of all children items accordantly
5656
* If all children items are marked done, parent will also be marked as done
5757
* If parent is marked as done and one of the children changes state to not done
@@ -67,6 +67,69 @@ Items are highlighted in accordance to the following scheme:
6767
[X] Done item (Comment)
6868
```
6969

70+
##### Items moving on state change
71+
72+
By default item when its status is changed is moved in the list in accordance
73+
to the following rules
74+
75+
###### Mark item done
76+
77+
Item marked as done is moved to the end of all done items list.
78+
If done list doesn't exist, item is placed just after the last not done item.
79+
80+
*Before*
81+
82+
```
83+
[ ] Not Done 1
84+
[ ] Will be done now
85+
[ ] Not Done 2
86+
[X] Done
87+
```
88+
89+
*After*
90+
91+
```
92+
[ ] Not Done 1
93+
[ ] Not Done 2
94+
[X] Done
95+
[X] Will be done now
96+
```
97+
98+
###### Mark item undone
99+
100+
Undone item is moved to the end of all not done items list.
101+
If all items are marked done, the items is moved before the first done item.
102+
103+
*Before*
104+
105+
```
106+
[ ] Not Done 1
107+
[ ] Not Done 2
108+
[X] Done
109+
[X] Will be undone now
110+
```
111+
*After*
112+
113+
```
114+
[ ] Not Done 1
115+
[ ] Not Done 2
116+
[ ] Will be done now
117+
[X] Done
118+
```
119+
120+
###### Interaction with items hierarchy
121+
122+
This feature also affect the items in hierarchy in accordance to the rules above.
123+
124+
###### Disable the items moving
125+
126+
If you don't want items to be moved after state change, you may add the following
127+
line into your `.vimrc` file:
128+
129+
```
130+
let g:VimTodoListsMoveItems = 0
131+
```
132+
70133
##### Commands
71134

72135
* `:VimTodoListsCreateNewItemAbove` - creates a new item in a line above cursor
@@ -168,6 +231,10 @@ Changelog
168231
* Fixed the annoying noise when navigating over items in default mode
169232
* Fixed the cursor position after the item is toggled
170233

234+
#### 0.6.0
235+
236+
* Added items moving on state change
237+
171238
Credits
172239
-------
173240

doc/vim-todo-lists.txt

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,72 @@ Items are highlighted in accordance to the following scheme:
8888
[ ] Normal item (Normal)
8989
[X] Done item (Comment)
9090

91+
92+
93+
Items moving on state change
94+
----------------------------
95+
96+
By default item when its status is changed is moved in the list in accordance
97+
to the following rules
98+
99+
Mark item done
100+
--------------
101+
102+
Item marked as done is moved to the end of all done items list.
103+
If done list doesn't exist, item is placed just after the last not done item.
104+
105+
Before
106+
------
107+
108+
[ ] Not Done 1
109+
[ ] Will be done now
110+
[ ] Not Done 2
111+
[X] Done
112+
113+
After
114+
-----
115+
116+
[ ] Not Done 1
117+
[ ] Not Done 2
118+
[X] Done
119+
[X] Will be done now
120+
121+
Mark item undone
122+
----------------
123+
124+
Undone item is moved to the end of all not done items list.
125+
If all items are marked done, the items is moved before the first done item.
126+
127+
Before
128+
------
129+
130+
[ ] Not Done 1
131+
[ ] Not Done 2
132+
[X] Done
133+
[X] Will be undone now
134+
135+
After
136+
-----
137+
138+
[ ] Not Done 1
139+
[ ] Not Done 2
140+
[ ] Will be done now
141+
[X] Done
142+
143+
Interaction with items hierarchy
144+
--------------------------------
145+
146+
This feature also affect the items in hierarchy in accordance to the rules above.
147+
148+
Disable the items moving
149+
------------------------
150+
151+
If you don't want items to be moved after state change, you may add the following
152+
line into your .vimrc file:
153+
154+
let g:VimTodoListsMoveItems = 0
155+
156+
91157
Commands
92158
--------
93159
*:VimTodoListsCreateNewItemAbove* *:VimTodoListsCreateNewItemBelow*
@@ -201,6 +267,10 @@ SOFTWARE.
201267
* Fixed the annoying noise when navigating over items in default mode
202268
* Fixed the cursor position after the item is toggled
203269

270+
0.6.0
271+
272+
* Added items moving on state change
273+
204274
==============================================================================
205275
8. Credits *VimTodoListsCredits*
206276

0 commit comments

Comments
 (0)