Fixed the F13 key equivalent. Was showing up as F3

[MenuTunes.git] / StatusWindow.m

diff --git a/StatusWindow.m b/StatusWindow.m
index 0a1ba7f..ca229ee 100755 (executable)
--- a/StatusWindow.m
+++ b/StatusWindow.m
@@ -103,7 +103,10 @@
 //  Setup the Window, and remove all its contentview's subviews.
     windowWidth  = ( SW_PAD + imageWidth + SW_SPACE + dataWidth + SW_PAD );
     windowHeight = ( SW_PAD + contentHeight + SW_PAD );
 //  Setup the Window, and remove all its contentview's subviews.
     windowWidth  = ( SW_PAD + imageWidth + SW_SPACE + dataWidth + SW_PAD );
     windowHeight = ( SW_PAD + contentHeight + SW_PAD );

-    [self setFrame:NSMakeRect(SW_BORDER, SW_BORDER, windowWidth, windowHeight) display:YES];
+    [self setFrame:NSMakeRect( (SW_BORDER + [[self screen] visibleFrame].origin.x),
+                               (SW_BORDER + [[self screen] visibleFrame].origin.y),
+                               windowWidth,
+                               windowHeight) display:YES];

     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
 //  Setup, position, fill, and add the image view to the content view.
     [[[self contentView] subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
 //  Setup, position, fill, and add the image view to the content view.


@@ -187,7 +190,7 @@
         id            aCell       = nil;
         int           activeCount = 0;
         NSColor      *onColor     = [NSColor whiteColor];
         id            aCell       = nil;
         int           activeCount = 0;
         NSColor      *onColor     = [NSColor whiteColor];

-        NSColor      *offColor    = [NSColor colorWithCalibratedWhite:0.0 alpha:0.50];
+        NSColor      *offColor    = [NSColor colorWithCalibratedWhite:0.15 alpha:0.50];

         NSMatrix     *volMatrix   = [[[NSMatrix alloc] initWithFrame:dataRect
                                                                 mode:NSHighlightModeMatrix
                                                            cellClass:NSClassFromString(@"ITTextFieldCell")
         NSMatrix     *volMatrix   = [[[NSMatrix alloc] initWithFrame:dataRect
                                                                 mode:NSHighlightModeMatrix
                                                            cellClass:NSClassFromString(@"ITTextFieldCell")


@@ -289,6 +292,10 @@
 //      Make the buttons, set the titles, and size them to fit their titles
         okButton     = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
         cancelButton = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
 //      Make the buttons, set the titles, and size them to fit their titles
         okButton     = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];
         cancelButton = [[ITButton alloc] initWithFrame:NSMakeRect(0, 0, 300, 24)];

+        [okButton     setTarget:target];
+        [cancelButton setTarget:target];
+        [okButton     setAction:okAction];
+        [cancelButton setAction:alternateAction];

         [okButton     setBezelStyle:ITGrayRoundedBezelStyle];
         [cancelButton setBezelStyle:ITGrayRoundedBezelStyle];
         [okButton     setAlignment:NSRightTextAlignment];
         [okButton     setBezelStyle:ITGrayRoundedBezelStyle];
         [cancelButton setBezelStyle:ITGrayRoundedBezelStyle];
         [okButton     setAlignment:NSRightTextAlignment];


@@ -356,7 +363,6 @@
                                            24.0)];
         [[self contentView] addSubview:okButton];
         [[self contentView] addSubview:cancelButton];
                                            24.0)];
         [[self contentView] addSubview:okButton];
         [[self contentView] addSubview:cancelButton];

-        NSLog(@"%@", [[self contentView] description]);

 
         [self setIgnoresMouseEvents:NO];
   
 
         [self setIgnoresMouseEvents:NO];