fixed issues ugol#37, ugol#39

roryokane · Jan 21, 2010 · b677647 · b677647
1 parent 2a7dbb8
commit b677647
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 12 deletions.
diff --git a/MainMenu.xib b/MainMenu.xib
@@ -1363,6 +1363,29 @@
 															<string key="themeKey">gradientTheme</string>
 														</object>
 													</object>
+													<object class="NSButton" id="969854485">
+														<reference key="NSNextResponder" ref="38019131"/>
+														<int key="NSvFlags">268</int>
+														<string key="NSFrame">{{28, 104}, {63, 18}}</string>
+														<reference key="NSSuperview" ref="38019131"/>
+														<bool key="NSEnabled">YES</bool>
+														<object class="BGHUDButtonCell" key="NSCell" id="539200655">
+															<int key="NSCellFlags">-2080244224</int>
+															<int key="NSCellFlags2">0</int>
+															<string key="NSContents">Sticky</string>
+															<reference key="NSSupport" ref="284816210"/>
+															<reference key="NSControlView" ref="969854485"/>
+															<int key="NSButtonFlags">1211912703</int>
+															<int key="NSButtonFlags2">2</int>
+															<reference key="NSNormalImage" ref="227150842"/>
+															<reference key="NSAlternateImage" ref="383743416"/>
+															<string key="NSAlternateContents"/>
+															<string key="NSKeyEquivalent"/>
+															<int key="NSPeriodicDelay">200</int>
+															<int key="NSPeriodicInterval">25</int>
+															<string key="themeKey">gradientTheme</string>
+														</object>
+													</object>
 													<object class="NSButton" id="401487638">
 														<reference key="NSNextResponder" ref="38019131"/>
 														<int key="NSvFlags">268</int>
@@ -4736,8 +4759,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 			<object class="NSUserDefaultsController" id="227004176">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>stickyStartEnabled</string>
-					<string>growlAtStartEnabled</string>
+					<string>growlAtEndEnabled</string>
+					<string>stickyEndEnabled</string>
 				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
@@ -7577,6 +7600,38 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">1303</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: values.growlAtEndEnabled</string>
+						<reference key="source" ref="969854485"/>
+						<reference key="destination" ref="227004176"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="969854485"/>
+							<reference key="NSDestination" ref="227004176"/>
+							<string key="NSLabel">enabled: values.growlAtEndEnabled</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">values.growlAtEndEnabled</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1308</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.stickyEndEnabled</string>
+						<reference key="source" ref="969854485"/>
+						<reference key="destination" ref="227004176"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="969854485"/>
+							<reference key="NSDestination" ref="227004176"/>
+							<string key="NSLabel">value: values.stickyEndEnabled</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.stickyEndEnabled</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1309</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -7874,6 +7929,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<reference ref="949906798"/>
 							<reference ref="39369057"/>
 							<reference ref="985388742"/>
+							<reference ref="969854485"/>
 						</object>
 						<reference key="parent" ref="596806943"/>
 					</object>
@@ -9969,6 +10025,20 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						<reference key="object" ref="221267744"/>
 						<reference key="parent" ref="985388742"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1304</int>
+						<reference key="object" ref="969854485"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="539200655"/>
+						</object>
+						<reference key="parent" ref="38019131"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1305</int>
+						<reference key="object" ref="539200655"/>
+						<reference key="parent" ref="969854485"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -10049,6 +10119,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					<string>1285.IBPluginDependency</string>
 					<string>1298.IBPluginDependency</string>
 					<string>1299.IBPluginDependency</string>
+					<string>1304.IBPluginDependency</string>
+					<string>1305.IBPluginDependency</string>
 					<string>451.IBEditorWindowLastContentRect</string>
 					<string>451.IBPluginDependency</string>
 					<string>451.IBViewEditorWindowController.showingBoundsRectangles</string>
@@ -10386,6 +10458,8 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					<string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
 					<string>com.binarymethod.BGHUDAppKitPlugin</string>
 					<string>com.binarymethod.BGHUDAppKitPlugin</string>
+					<string>com.binarymethod.BGHUDAppKitPlugin</string>
+					<string>com.binarymethod.BGHUDAppKitPlugin</string>
 					<string>{{578, 553}, {524, 474}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="NO"/>
@@ -10687,7 +10761,7 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1303</int>
+			<int key="maxID">1309</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

diff --git a/Pomodoro.m b/Pomodoro.m
@@ -87,6 +87,10 @@ -(void) breakFor:(NSInteger)breakMinutes {
 -(void) reset {
 	[oneSecTimer invalidate];
 	oneSecTimer = nil;
+	if (interruptionTimer != nil) {
+		[interruptionTimer invalidate];
+		interruptionTimer = nil;
+	}
 	if ([delegate respondsToSelector: @selector(pomodoroReset)]) {
         [delegate pomodoroReset];
 	}

diff --git a/PomodoroController.m b/PomodoroController.m
@@ -540,8 +540,10 @@ -(void) pomodoroFinished {
 		[ringing play];
 	}
 
-	if ([self checkDefault:@"growlAtEndEnabled"])
-		[growl growlAlert:[self bindCommonVariables:@"growlEnd"] title:@"Pomodoro finished"];
+	if ([self checkDefault:@"growlAtEndEnabled"]) {
+		BOOL sticky = [self checkDefault:@"stickyEndEnabled"];
+		[growl growlAlert:[self bindCommonVariables:@"growlEnd"] title:@"Pomodoro finished" sticky:sticky];
+	}
 
 	if (![self checkDefault:@"mute"] && [self checkDefault:@"speechAtEndEnabled"])
 		[speech startSpeakingString:[self bindCommonVariables:@"speechEnd"]];

diff --git a/PomodoroDefaults.m b/PomodoroDefaults.m
@@ -112,6 +112,7 @@ + (void) setDefaults {
 	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"tickAtBreakEnabled"];
 
 	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"growlAtEndEnabled"];
+	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"stickyEndEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"speechAtEndEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"scriptAtEndEnabled"];
 	[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"twitterAtEndEnabled"];
@@ -240,6 +241,7 @@ +(void)removeDefaults {
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"tickAtBreakEnabled"];
 
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"growlAtEndEnabled"];
+	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"stickyEndEnabled"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"speechAtEndEnabled"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"scriptAtEndEnabled"];
 	[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"twitterAtEndEnabled"];

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -2,6 +2,11 @@
 Release Notes
 -------------
 
+0.31
+
+- Fixed a bug in interrupt/resume (http://github.com/ugol/pomodoro/issues/#issue/39)
+- Growl End can now be sticky (http://github.com/ugol/pomodoro/issues/#issue/37)
+
 0.30
 
 - Everaldo nicely contributed with new gorgeous icons (http://www.everaldo.com/)
@@ -87,10 +92,3 @@ Release Notes
 ----
 TODO
 ----
-
-- Scriptability
-- User definable keyboard shortcuts
-- Scrollview binding instead of TextFields
-- Combo editable values
-- reset default values
-- insert pomodoro in autostart