Permalink
Browse files

Last changes before 2.2 public beta

Fixed divider line between location field and notes views for Pre Lion
full screen.

Some localization fixes.

More work on markdown syntax for ## and >>
  • Loading branch information...
1 parent a6c8e26 commit 4f54d282256d28290b012eaf9f3761c75fdebede @elasticthreads elasticthreads committed Feb 28, 2012
Showing with 1,369 additions and 439 deletions.
  1. +2 −4 AppController.m
  2. +1 −1 Credits.html
  3. +15 −8 DFView.m
  4. +491 −8 English.lproj/MainMenu.xib
  5. +6 −10 Info.plist
  6. +3 −2 LinkingEditor.h
  7. +257 −138 LinkingEditor.m
  8. +87 −16 de.lproj/MainMenu.xib
  9. +89 −16 fr.lproj/MainMenu.xib
  10. +109 −27 it.lproj/MainMenu.xib
  11. +87 −16 pt.lproj/MainMenu.xib
  12. +222 −193 zh.lproj/MainMenu.xib
View
@@ -361,7 +361,7 @@ - (void)runDelayedUIActionsAfterLaunch {
}
#endif
theMenuItem = [fsMenuItem copy];
- [statBarMenu insertItem:theMenuItem atIndex:11];
+ [statBarMenu insertItem:theMenuItem atIndex:12];
[theMenuItem release];
}
@@ -2631,13 +2631,11 @@ - (IBAction)switchFullScreen:(id)sender
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
if (IsLionOrLater) {
// BOOL inFS=[self isInFullScreen];
- [window toggleFullScreen:nil];
-
+ [window toggleFullScreen:nil];
}else if(IsLeopardOrLater){
#else
if(IsLeopardOrLater){
#endif
-
//@try {
isEd = NO;
View
@@ -1,5 +1,5 @@
<div style="text-align: center; font-size: 8pt;">
-<p>&#xA9; ElasticThreads and Brett Terpstra, 2011</p>
+<p>&#xA9; ElasticThreads and Brett Terpstra, 2012</p>
<p>based on NV 2.0 &beta;4
Copyright &#xA9; 2011 Zachary Schneirov</p>
View
@@ -27,14 +27,21 @@ - (void)dealloc{
[super dealloc];
}
-//- (void)drawRect:(NSRect)rect {
-// NSRect bounds = [self bounds];
-// bounds.origin.x -=2.0f;
-// bounds.origin.y +=1.0f;
-// bounds.size.width +=4.0f;
-// [vColor set];
-// NSFrameRect(bounds);
-//}
+- (void)drawRect:(NSRect)rect {
+ [super drawRect:rect];
+ if (!IsLionOrLater&&([[NSApp delegate]isInFullScreen])){
+ NSRect bounds = [self bounds];
+ bounds.origin.x -=2.0f;
+ bounds.size.width +=4.0f;
+ NSBezierPath *aPath=[NSBezierPath bezierPath];
+ [aPath moveToPoint:NSMakePoint(floor(bounds.origin.x), floor(bounds.origin.y))];
+ [aPath lineToPoint:NSMakePoint(floor(bounds.origin.x+bounds.size.width), floor(bounds.origin.y))];
+ [aPath setLineWidth:1.0];
+ [vColor setStroke];
+// [[NSColor redColor] setStroke];
+ [aPath stroke];
+ }
+}
- (void)setBackgroundColor:(NSColor *)inColor{
if (vColor) {
Oops, something went wrong.

0 comments on commit 4f54d28

Please sign in to comment.