Checking in ITKit changes of late

[ITKit.git] / Showcase / Controller.m

diff --git a/Showcase/Controller.m b/Showcase/Controller.m
index ee2a19c..71463aa 100755 (executable)
--- a/Showcase/Controller.m
+++ b/Showcase/Controller.m
@@ -1,6 +1,13 @@
 #import "Controller.h"
 #import "ITTransientStatusWindow.h"
 #import "ITTextField.h"
 #import "Controller.h"
 #import "ITTransientStatusWindow.h"
 #import "ITTextField.h"

+#import "ITBevelView.h"
+#import "ITCutWindowEffect.h"
+#import "ITDissolveWindowEffect.h"
+#import "ITSlideHorizontallyWindowEffect.h"
+#import "ITSlideVerticallyWindowEffect.h"
+#import "ITPivotWindowEffect.h"
+

 
 #define SW_PAD    24.0
 #define SW_SPACE  24.0
 
 #define SW_PAD    24.0
 #define SW_SPACE  24.0


@@ -8,6 +15,7 @@
 #define SW_BORDER 32.0
 #define SW_IMAGE  @"Library"
 
 #define SW_BORDER 32.0
 #define SW_IMAGE  @"Library"
 

+

 @interface Controller (ITStatusItemSupport)
 - (void)createStatusItem;
 - (void)removeStatusItem;
 @interface Controller (ITStatusItemSupport)
 - (void)createStatusItem;
 - (void)removeStatusItem;


@@ -20,8 +28,15 @@
 {
     [self createStatusItem];
     [testTextField setCastsShadow:YES];
 {
     [self createStatusItem];
     [testTextField setCastsShadow:YES];

+    [tabView setAllowsDragging:YES];
+    [bevelView setBevelDepth:10];

     statusWindow = [ITTransientStatusWindow sharedWindow];
     statusWindow = [ITTransientStatusWindow sharedWindow];

+    [statusWindow setEntryEffect:[[ITCutWindowEffect alloc] initWithWindow:statusWindow]];
+    [statusWindow setExitEffect:[[ITDissolveWindowEffect alloc] initWithWindow:statusWindow]];
+    [[statusWindow entryEffect] setEffectTime:[swSpeedSlider floatValue]];
+    [[statusWindow exitEffect]  setEffectTime:[swSpeedSlider floatValue]];

 //  [tabView setAllowsDragging:YES];
 //  [tabView setAllowsDragging:YES];

+    

 }
 
 /*************************************************************************/
 }
 
 /*************************************************************************/


@@ -47,6 +62,10 @@
     }
 
     [statusItem setMenu:statusItemMenu];
     }
 
     [statusItem setMenu:statusItemMenu];

+
+    [statusItemMenu addItemWithTitle:[NSString stringWithUTF8String:"★★★★★"]
+                              action:nil
+                       keyEquivalent:@""];

 }
 
 - (void)removeStatusItem
 }
 
 - (void)removeStatusItem


@@ -199,33 +218,119 @@
     [[statusWindow contentView] setNeedsDisplay:YES];
 }
 
     [[statusWindow contentView] setNeedsDisplay:YES];
 }
 

-- (IBAction)showStatusWindow:(id)sender
+- (IBAction)toggleStatusWindow:(id)sender

 {
 {

-//    [[statusWindow contentView] setNeedsDisplay:YES];
-    [statusWindow setFrame:NSMakeRect( (0.0 - NSWidth([statusWindow frame])),
-                                       SW_BORDER,
-                                       NSWidth([statusWindow frame]),
-                                       NSHeight([statusWindow frame]) )
-                   display:YES];
-    [statusWindow orderFront:self];
-    [statusWindow setFrame:NSMakeRect( SW_BORDER,
-                                       SW_BORDER,
-                                       NSWidth([statusWindow frame]),
-                                       NSHeight([statusWindow frame]) )
-                   display:YES
-                   animate:YES];
+    if ( ([statusWindow visibilityState] == ITWindowHiddenState) ||
+         ([statusWindow visibilityState] == ITWindowVanishingState) ) {
+        [[statusWindow contentView] setNeedsDisplay:YES];
+        [statusWindow appear:self];
+    } else {
+        [statusWindow vanish:self];
+    }

 }
 
 }
 

-- (IBAction)hideStatusWindow:(id)sender
+- (IBAction)changeWindowSetting:(id)sender

 {
 {

-    [statusWindow orderOut:self];
+    if ( [sender tag] == 3010 ) {
+
+        if ( [sender indexOfSelectedItem] == 0) {
+            [statusWindow setExitMode:ITTransientStatusWindowExitAfterDelay];
+        } else if ( [sender indexOfSelectedItem] == 1) {
+            [statusWindow setExitMode:ITTransientStatusWindowExitOnCommand];
+        }
+
+    } else if ( [sender tag] == 3020 ) {
+        // Not yet supported
+    } else if ( [sender tag] == 3030 ) {
+        [statusWindow setExitDelay:[sender floatValue]];
+    } else if ( [sender tag] == 3040 ) {
+        [statusWindow setVerticalPosition:[sender indexOfSelectedItem]];
+    } else if ( [sender tag] == 3050 ) {
+        [statusWindow setHorizontalPosition:[sender indexOfSelectedItem]];
+    } else if ( [sender tag] == 3060 ) {
+        [[statusWindow entryEffect] setEffectTime:[sender floatValue]];
+        [[statusWindow exitEffect]  setEffectTime:[sender floatValue]];
+    } else if ( [sender tag] == 3070 ) {
+    
+        if ( [sender indexOfSelectedItem] == 0 ) {
+            [statusWindow setEntryEffect:[[[ITCutWindowEffect alloc] initWithWindow:statusWindow] autorelease]];
+        } else if ( [sender indexOfSelectedItem] == 1 ) {
+            [statusWindow setEntryEffect:[[[ITDissolveWindowEffect alloc] initWithWindow:statusWindow] autorelease]];
+        } else if ( [sender indexOfSelectedItem] == 2 ) {
+            [statusWindow setEntryEffect:[[[ITSlideVerticallyWindowEffect alloc] initWithWindow:statusWindow] autorelease]];
+        } else if ( [sender indexOfSelectedItem] == 3 ) {
+            [statusWindow setEntryEffect:[[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:statusWindow] autorelease]];
+        } else if ( [sender indexOfSelectedItem] == 4 ) {
+            [statusWindow setEntryEffect:[[[ITPivotWindowEffect alloc] initWithWindow:statusWindow] autorelease]];
+        }
+
+        [[statusWindow entryEffect] setEffectTime:[swSpeedSlider floatValue]];
+        
+    } else if ( [sender tag] == 3080 ) {
+
+        if ( [sender indexOfSelectedItem] == 0 ) {
+            [statusWindow setExitEffect:[[ITCutWindowEffect alloc] initWithWindow:statusWindow]];
+        } else if ( [sender indexOfSelectedItem] == 1 ) {
+            [statusWindow setExitEffect:[[ITDissolveWindowEffect alloc] initWithWindow:statusWindow]];
+        } else if ( [sender indexOfSelectedItem] == 2 ) {
+            [statusWindow setExitEffect:[[ITSlideVerticallyWindowEffect alloc] initWithWindow:statusWindow]];
+        } else if ( [sender indexOfSelectedItem] == 3 ) {
+            [statusWindow setExitEffect:[[ITSlideHorizontallyWindowEffect alloc] initWithWindow:statusWindow]];
+        } else if ( [sender indexOfSelectedItem] == 4 ) {
+            [statusWindow setExitEffect:[[ITPivotWindowEffect alloc] initWithWindow:statusWindow]];
+        }
+
+        [[statusWindow exitEffect] setEffectTime:[swSpeedSlider floatValue]];
+
+    }

 }
 
 }
 

-- (IBAction)setRotation:(id)sender
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark ITTabView SUPPORT
+/*************************************************************************/
+
+- (IBAction)toggleTabDragging:(id)sender

 {
 {

-    [statusWindow setRotation:([sender floatValue] * (pi / 180))];
+    if ([sender state] == NSOnState) {
+        [tabView setAllowsDragging:YES];
+    } else {
+        [tabView setAllowsDragging:NO];
+    }

 }
 
 }
 

+- (IBAction)toggleCommandDragging:(id)sender
+{
+    if ([sender state] == NSOnState) {
+        [tabView setRequiredModifiers:NSCommandKeyMask];
+    } else {
+        [tabView setRequiredModifiers:0];
+    }
+}
+
+- (IBAction)toggleControlDragging:(id)sender
+{
+}
+
+- (IBAction)toggleOptionDragging:(id)sender
+{
+}
+
+- (IBAction)toggleShiftDragging:(id)sender
+{
+}
+
+
+/*************************************************************************/
+#pragma mark -
+#pragma mark ITBevelView SUPPORT
+/*************************************************************************/
+
+- (IBAction)changeBevelViewSetting:(id)sender
+{
+    [bevelView setBevelDepth:[sender intValue]];
+}

 
 /*************************************************************************/
 #pragma mark -
 
 /*************************************************************************/
 #pragma mark -