Permalink
Browse files

'merged' fork of forresty

  • Loading branch information...
1 parent 7c4e804 commit 7ab2cb16db8174e92a25d0d314054d428567fc8b @myell0w committed Dec 19, 2010
Showing with 33 additions and 1 deletion.
  1. +1 −0 .gitattributes
  2. +25 −0 .gitignore
  3. +7 −1 MTStatusBarOverlay.m
View
@@ -0,0 +1 @@
+*.pbxproj -crlf -diff -merge
View
@@ -0,0 +1,25 @@
+# This is initially compiled from the following sources:
+#
+# http://christopherroach.com/archives/35
+# http://stackoverflow.com/questions/236151/best-practices-for-using-version-controlling-on-cocoa-projects
+# http://boredzo.org/blog/archives/2008-03-20/hgignore-for-mac-os-x-applications
+# http://shanesbrain.net/2008/7/9/using-xcode-with-git
+# http://www.bluishcoder.co.nz/2007/09/git-binary-files-and-cherry-picking.html
+#
+
+build
+
+*.pbxuser
+*.mode1v3
+*.mode2v3
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+
+*.perspective
+*.perspectivev3
+
+*.swp
+*~.nib
+*~.xib
+*.DS_Store
View
@@ -429,6 +429,8 @@ - (void)showWithMessage:(NSString *)message {
return;
}
+ self.finishedLabel.hidden = YES;
+
// update status bar background
UIStatusBarStyle statusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[self setStatusBarBackgroundForSize:self.backgroundView.frame statusBarStyle:statusBarStyle];
@@ -438,7 +440,11 @@ - (void)showWithMessage:(NSString *)message {
// if status bar is currently hidden, show it
if (self.hidden) {
// set text of visible status label
- self.statusLabel1.text = message;
+ if (self.statusLabel2 == self.hiddenStatusLabel) {
+ self.statusLabel1.text = message;
+ } else {
+ self.statusLabel2.text = message;
+ }
[self show];
}

0 comments on commit 7ab2cb1

Please sign in to comment.