Skip to content

Commit e908c47

Browse files
mjdescymjdescy
committed
Merge branch 'release/2.3.0'
2 parents f80d48f + 15a1ea8 commit e908c47

File tree

5 files changed

+262
-40
lines changed

5 files changed

+262
-40
lines changed

‎TodoTxtMac/Base.lproj/MainMenu.xib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
66
</dependencies>
77
<objects>
88
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
@@ -217,7 +217,7 @@
217217
</items>
218218
</menu>
219219
</menuItem>
220-
<menuItem title="Task" id="uCE-zB-agW">
220+
<menuItem title="Task" tag="3000" id="uCE-zB-agW">
221221
<modifierMask key="keyEquivalentModifierMask"/>
222222
<menu key="submenu" title="Task" id="MoX-cC-Tbw">
223223
<items>

‎TodoTxtMac/Base.lproj/TTMDocument.xib‎

Lines changed: 158 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
66
<capability name="stacking Non-gravity area distributions on NSStackView" minToolsVersion="7.0" minSystemVersion="10.11"/>
77
</dependencies>
88
<objects>
@@ -66,6 +66,7 @@
6666
</tableColumns>
6767
<connections>
6868
<outlet property="delegate" destination="EHv-Hj-tOM" id="uvv-h2-wBm"/>
69+
<outlet property="menu" destination="oa5-ZA-h8N" id="3EN-Hs-f7b"/>
6970
<outlet property="parentDocument" destination="-2" id="rdR-3Y-03G"/>
7071
</connections>
7172
</tableView>
@@ -179,5 +180,160 @@
179180
<outlet property="arrayController" destination="z03-iY-Esn" id="bZW-B4-fSs"/>
180181
</connections>
181182
</customObject>
183+
<menu id="oa5-ZA-h8N">
184+
<items>
185+
<menuItem title="Add New Task" keyEquivalent="n" id="DaS-lw-tom">
186+
<modifierMask key="keyEquivalentModifierMask"/>
187+
<connections>
188+
<action selector="moveFocusToNewTaskTextField:" target="-1" id="P8g-Sf-ymP"/>
189+
</connections>
190+
</menuItem>
191+
<menuItem title="Update" keyEquivalent="u" id="b76-Yn-FZw">
192+
<modifierMask key="keyEquivalentModifierMask"/>
193+
<connections>
194+
<action selector="updateSelectedTask:" target="-1" id="b1F-HN-zIR"/>
195+
</connections>
196+
</menuItem>
197+
<menuItem title="Append Text" keyEquivalent="t" id="JCe-h2-3R5">
198+
<modifierMask key="keyEquivalentModifierMask"/>
199+
<connections>
200+
<action selector="appendText:" target="-1" id="70n-av-wTX"/>
201+
</connections>
202+
</menuItem>
203+
<menuItem title="Prepend Text" keyEquivalent="r" id="XdX-J7-z0X">
204+
<modifierMask key="keyEquivalentModifierMask"/>
205+
<connections>
206+
<action selector="prependText:" target="-1" id="E4e-Qe-cDu"/>
207+
</connections>
208+
</menuItem>
209+
<menuItem title="Delete" hidden="YES" keyEquivalent="d" id="c4f-YX-vjt">
210+
<modifierMask key="keyEquivalentModifierMask"/>
211+
<connections>
212+
<action selector="deleteSelectedTasks:" target="-1" id="c2H-zi-BHD"/>
213+
</connections>
214+
</menuItem>
215+
<menuItem title="Delete" id="I9O-Bd-cNZ">
216+
<string key="keyEquivalent" base64-UTF8="YES">
217+
CA
218+
</string>
219+
<modifierMask key="keyEquivalentModifierMask"/>
220+
<connections>
221+
<action selector="deleteSelectedTasks:" target="-1" id="yvS-0a-hYS"/>
222+
</connections>
223+
</menuItem>
224+
<menuItem isSeparatorItem="YES" id="xGk-rN-DCC"/>
225+
<menuItem title="Toggle Completion" keyEquivalent="x" id="N2B-it-TGO">
226+
<modifierMask key="keyEquivalentModifierMask"/>
227+
<connections>
228+
<action selector="toggleTaskCompletion:" target="-1" id="EJy-Uz-slU"/>
229+
</connections>
230+
</menuItem>
231+
<menuItem isSeparatorItem="YES" id="ezm-BQ-bR2"/>
232+
<menuItem title="Set Priority" keyEquivalent="i" id="dnL-GF-ydk">
233+
<modifierMask key="keyEquivalentModifierMask"/>
234+
<connections>
235+
<action selector="setPriority:" target="-1" id="ruw-d8-hfs"/>
236+
</connections>
237+
</menuItem>
238+
<menuItem title="Increase Priority" keyEquivalent="" id="7aA-PZ-bXA">
239+
<connections>
240+
<action selector="increasePriority:" target="-1" id="7de-cW-CqL"/>
241+
</connections>
242+
</menuItem>
243+
<menuItem title="Decrease Priority" keyEquivalent="" id="bcL-Nb-Dox">
244+
<connections>
245+
<action selector="decreasePriority:" target="-1" id="BIK-5W-D4O"/>
246+
</connections>
247+
</menuItem>
248+
<menuItem title="Remove Priority" keyEquivalent="" id="cCl-gJ-Ezx">
249+
<connections>
250+
<action selector="removePriority:" target="-1" id="lk4-kv-MSF"/>
251+
</connections>
252+
</menuItem>
253+
<menuItem title="Remove Priority" hidden="YES" keyEquivalent="" id="gZs-7t-faP">
254+
<connections>
255+
<action selector="removePriority:" target="-1" id="Y0W-ql-vLx"/>
256+
</connections>
257+
</menuItem>
258+
<menuItem isSeparatorItem="YES" id="8H5-zH-hDj"/>
259+
<menuItem title="Set Due Date" keyEquivalent="s" id="bAk-TR-UnI">
260+
<modifierMask key="keyEquivalentModifierMask"/>
261+
<connections>
262+
<action selector="setDueDate:" target="-1" id="Uon-ah-Duc"/>
263+
</connections>
264+
</menuItem>
265+
<menuItem title="Postpone" keyEquivalent="p" id="WnK-Q7-CZy">
266+
<modifierMask key="keyEquivalentModifierMask"/>
267+
<connections>
268+
<action selector="postpone:" target="-1" id="g12-14-v1p"/>
269+
</connections>
270+
</menuItem>
271+
<menuItem title="Increase Due Date By 1 Day" keyEquivalent="" id="fw1-ni-PD5">
272+
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
273+
<connections>
274+
<action selector="increaseDueDateByOneDay:" target="-1" id="Kbh-Fs-EEa"/>
275+
</connections>
276+
</menuItem>
277+
<menuItem title="Decrease Due Date By 1 Day" keyEquivalent="" id="QXa-wL-6lD">
278+
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
279+
<connections>
280+
<action selector="decreaseDueDateByOneDay:" target="-1" id="bJn-ip-371"/>
281+
</connections>
282+
</menuItem>
283+
<menuItem title="Remove Due Date" keyEquivalent="" id="yDV-Ow-fu4">
284+
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
285+
<connections>
286+
<action selector="removeDueDate:" target="-1" id="R6v-Z2-D81"/>
287+
</connections>
288+
</menuItem>
289+
<menuItem title="Remove Due Date" hidden="YES" keyEquivalent="" id="YED-n9-vGT">
290+
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
291+
<connections>
292+
<action selector="removeDueDate:" target="-1" id="4g7-AY-8O7"/>
293+
</connections>
294+
</menuItem>
295+
<menuItem title="Update Selected Task" hidden="YES" id="hdk-6A-k2B">
296+
<string key="keyEquivalent" base64-UTF8="YES">
297+
DQ
298+
</string>
299+
<modifierMask key="keyEquivalentModifierMask"/>
300+
<connections>
301+
<action selector="updateSelectedTask:" target="-1" id="aG9-LP-3Li"/>
302+
</connections>
303+
</menuItem>
304+
<menuItem isSeparatorItem="YES" id="FyL-Gq-jSo"/>
305+
<menuItem title="Set Threshold Date" keyEquivalent="s" id="fGM-0b-agh">
306+
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
307+
<connections>
308+
<action selector="setThresholdDate:" target="-1" id="IeD-mD-KUm"/>
309+
</connections>
310+
</menuItem>
311+
<menuItem title="Increase Threshold Date By 1 Day" keyEquivalent="" id="eSY-Jn-eRV">
312+
<modifierMask key="keyEquivalentModifierMask" shift="YES" option="YES" command="YES"/>
313+
<connections>
314+
<action selector="increaseThresholdDateByOneDay:" target="-1" id="oCb-9W-q5v"/>
315+
</connections>
316+
</menuItem>
317+
<menuItem title="Decrease Treshold Date By 1 Day" keyEquivalent="" id="OTg-xM-h4t">
318+
<modifierMask key="keyEquivalentModifierMask" shift="YES" option="YES" command="YES"/>
319+
<connections>
320+
<action selector="decreaseThresholdDateByOneDay:" target="-1" id="TNd-8N-PiX"/>
321+
</connections>
322+
</menuItem>
323+
<menuItem title="Remove Threshold Date" keyEquivalent="" id="fG9-Xa-uEt">
324+
<modifierMask key="keyEquivalentModifierMask" shift="YES" option="YES" command="YES"/>
325+
<connections>
326+
<action selector="removeThresholdDate:" target="-1" id="T6i-Nh-orO"/>
327+
</connections>
328+
</menuItem>
329+
<menuItem title="Remove Threshold Date" hidden="YES" keyEquivalent="" id="alZ-Ry-3E5">
330+
<modifierMask key="keyEquivalentModifierMask" shift="YES" option="YES" command="YES"/>
331+
<connections>
332+
<action selector="removeThresholdDate:" target="-1" id="tJc-eP-Twk"/>
333+
</connections>
334+
</menuItem>
335+
</items>
336+
<point key="canvasLocation" x="206.5" y="704.5"/>
337+
</menu>
182338
</objects>
183339
</document>

‎TodoTxtMac/TTMDocument.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
@class TTMTableView;
5353
@class TTMTableViewDelegate;
5454

55+
#define TASKMENUTAG 3000
5556
#define SORTMENUTAG 4000
5657
#define FILTERMENUTAG 5000
5758
#define STATUSBARMENUITEMTAG 6000
@@ -113,6 +114,9 @@ typedef enum : NSUInteger {
113114
// Task objects for undo/redo of task edits
114115
@property (nonatomic, copy) NSArray *originalTasks;
115116

117+
@property (nonatomic, retain) NSDate *lastInternalModificationDate;
118+
119+
116120
#pragma mark - File Loading and Saving Methods
117121

118122
/*!

0 commit comments

Comments
 (0)