Skip to content

Show Pomodoro Name in Menu Bar #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show Pomodoro Name in Menu Bar #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Pomodoro.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,7 @@
69AE95DA133B4705004DC14D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
ORGANIZATIONNAME = iUgol;
};
buildConfigurationList = 69AE95DD133B4705004DC14D /* Build configuration list for PBXProject "Pomodoro" */;
Expand Down
2 changes: 1 addition & 1 deletion Pomodoro/Pomodoro-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBuildNumber</key>
<integer>42</integer>
<integer>51</integer>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Expand Down
28 changes: 22 additions & 6 deletions Pomodoro/src/PomodoroController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,27 @@ @implementation PomodoroController

#pragma mark ---- Helper methods ----

- (void) showTimeOnStatusBar:(NSInteger) time {
if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
[statusItem setTitle:[NSString stringWithFormat:@" %.2d:%.2d",time/60, time%60]];
} else {
[statusItem setTitle:@""];
}
- (void) showTimeOnStatusBar:(NSInteger) time {
enum PomoState state = pomodoro.state;
if(state == PomoTicking){
if ([self checkDefault:@"showNameOnStatusEnabled"] && [self checkDefault:@"showTimeOnStatusEnabled"]) {
[statusItem setTitle:[NSString stringWithFormat:@" %@ - %.2d:%.2d",_pomodoroName, time/60, time%60]];
}
else if ([self checkDefault:@"showNameOnStatusEnabled"]) {
[statusItem setTitle:[NSString stringWithFormat:@" %@",_pomodoroName]];
}
else if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
[statusItem setTitle:[NSString stringWithFormat:@"%.2d:%.2d", time/60, time%60]];
} else {
[statusItem setTitle:@""];
}
} else {
if ([self checkDefault:@"showTimeOnStatusEnabled"]) {
[statusItem setTitle:[NSString stringWithFormat:@"%.2d:%.2d", time/60, time%60]];
} else {
[statusItem setTitle:@""];
}
}
}

- (void) longBreakCheckerFinished {
Expand Down Expand Up @@ -584,6 +599,7 @@ - (void)awakeFromNib {
[self observeUserDefault:@"tickVolume"];
[self observeUserDefault:@"initialTime"];

[self observeUserDefault:@"showNameOnStatusEnabled"];
[self observeUserDefault:@"showTimeOnStatusEnabled"];

if ([self checkDefault:@"showSplashScreenAtStartup"]) {
Expand Down
2 changes: 2 additions & 0 deletions Pomodoro/src/PomodoroDefaults.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ + (void) setDefaults {
[defaultValues setObject:[NSNumber numberWithInt:80] forKey:@"voiceVolume"];
[defaultValues setObject:[NSNumber numberWithInt:20] forKey:@"tickVolume"];

[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"showNameOnStatusEnabled"];
[defaultValues setObject:[NSNumber numberWithBool:YES] forKey:@"showTimeOnStatusEnabled"];

[defaultValues setObject:[NSNumber numberWithBool:NO] forKey:@"calendarEnabled"];
Expand Down Expand Up @@ -314,6 +315,7 @@ +(void)removeDefaults {
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"ringBreakVolume"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"voiceVolume"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"tickVolume"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showNameOnStatusEnabled"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"showTimeOnStatusEnabled"];

[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"calendarEnabled"];
Expand Down