Changeset 3893

Timestamp:

03/13/06 21:48:32 (3 years ago)

Author:

morris

Message:

Remove GUI for setting zoom mode in slideshow panel, it's too crowded

Add shift-command-T command for rotating left, rotate left also on right mouse down

Files:

• Footagehead/trunk/English.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• Footagehead/trunk/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• Footagehead/trunk/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Footagehead/trunk/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
• Footagehead/trunk/FHController.h (modified) (2 diffs)
• Footagehead/trunk/FHController.m (modified) (5 diffs)
• Footagehead/trunk/FHImageView.m (modified) (1 diff)
• Footagehead/trunk/Japanese.lproj/MainMenu.nib/classes.nib (modified) (2 diffs)
• Footagehead/trunk/Japanese.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• Footagehead/trunk/Japanese.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Footagehead/trunk/Japanese.lproj/MainMenu.nib/objects.nib (modified) (previous)

Footagehead/trunk/English.lproj/MainMenu.nib/classes.nib

@@ -20 +20 @@
-                reload = id; 
-                revealInFinder = id; 
+                rotateLeft = id; 
-                rotateRight = id; 
-                setAsDesktopPicture = id; 
@@ -50 +51 @@
-                "_screenPanel" = NSPanel; 
-                "_screenPopUpButton" = NSPopUpButton; 
-                "_screenZoomMatrix" = NSMatrix; 
-                "_scrollView" = NSScrollView; 
-                "_splitView" = WISplitView; 

Footagehead/trunk/English.lproj/MainMenu.nib/info.nib

@@ -8 +8 @@
-        <dict>
-                <key>29</key>
-224 676 317 44 0 0 1280 1002
+373 800 317 44 0 0 1920 1178
-                <key>592</key>
-                <string>118 501 223 118 0 0 1280 1002 </string>
@@ -18 +18 @@
-        <key>IBOpenObjects</key>
-        <array>
+                <integer>21</integer>
-                <integer>438</integer>
+                <integer>29</integer>
-        </array>
-        <key>IBSystem Version</key>

Footagehead/trunk/FHController.h

@@ -55 +55 @@
-        IBOutlet NSPanel                                *_screenPanel;
-        IBOutlet NSPopUpButton                  *_screenPopUpButton;
-        IBOutlet NSMatrix                               *_screenZoomMatrix;
-        IBOutlet NSPopUpButton                  *_screenBackgroundPopUpButton;
-        IBOutlet NSButton                               *_screenAutoSwitchButton;
@@ -104 +103 @@
-- (IBAction)zoom:(id)sender;
-- (IBAction)rotateRight:(id)sender;
+- (IBAction)rotateLeft:(id)sender;
-- (IBAction)slideshow:(id)sender;
-- (IBAction)autoSwitch:(id)sender;

Footagehead/trunk/FHController.m

@@ -832 +832 @@
-        [self _reloadScreenBackgrounds];
-
-        [_screenZoomMatrix selectCellWithTag:[FHSettings intForKey:FHFullscreenImageScalingMethod]];
-        [_screenBackgroundPopUpButton selectItemWithTag:[FHSettings intForKey:FHFullscreenBackground]];
-
@@ -1419 +1418 @@
-
-                [_fullscreenImageView setImageScaling:scaling];
+
+                [FHSettings setInt:scaling forKey:FHFullscreenImageScalingMethod];
-        } else {
-                scaling = [_imageView imageScaling];
@@ -1446 +1447 @@
-        else
-                rotation -= 90.0f;
+        
+        [_imageView setImageRotation:rotation];
+        [_fullscreenImageView setImageRotation:rotation];
+        
+        [self _updateRightStatus];
+
+        [FHSettings setFloat:rotation forKey:FHImageRotation];
+}
+
+
+
+- (IBAction)rotateLeft:(id)sender {
+        float           rotation;
+        
+        rotation = [_imageView imageRotation];
+        
+        if(rotation == 270.0f)
+                rotation = 0.0f;
+        else
+                rotation += 90.0f;
-        
-        [_imageView setImageRotation:rotation];
@@ -1477 +1498 @@
-                // --- save in prefs
-                [FHSettings setInt:[_screenPopUpButton indexOfSelectedItem] forKey:FHFullscreenScreen];
-                [FHSettings setInt:[[_screenZoomMatrix selectedCell] tag] forKey:FHFullscreenImageScalingMethod];
-                [FHSettings setInt:[_screenBackgroundPopUpButton tagOfSelectedItem] forKey:FHFullscreenBackground];
-                [FHSettings setBool:[_screenAutoSwitchButton state] forKey:FHFullscreenAutoSwitch];
@@ -1505 +1525 @@
-                [_fullscreenWindow setTitle:[[self window] title]];
-                [_fullscreenImageView setBackgroundColor:[_screenBackgroundPopUpButton representedObjectOfSelectedItem]];
-[_screenZoomMatrix selectedCell] tag
+FHSettings intForKey:FHFullscreenImageScalingMethod
-                [_fullscreenImageView setImageRotation:[_imageView imageRotation]];
-                [_fullscreenPanel setFrame:screenRect display:NO];

Footagehead/trunk/FHImageView.m

@@ -263 +263 @@
-
-
+- (void)rightMouseUp:(NSEvent *)event {
+        [[FHController controller] rotateRight:self];
+}
+
+
+
-- (void)mouseDragged:(NSEvent *)event {
-        NSPoint         point, originalPoint;

Footagehead/trunk/Japanese.lproj/MainMenu.nib/classes.nib

@@ -20 +20 @@
-                reload = id; 
-                revealInFinder = id; 
+                rotateLeft = id; 
-                rotateRight = id; 
-                setAsDesktopPicture = id; 
@@ -50 +51 @@
-                "_screenPanel" = NSPanel; 
-                "_screenPopUpButton" = NSPopUpButton; 
-                "_screenZoomMatrix" = NSMatrix; 
-                "_scrollView" = NSScrollView; 
-                "_splitView" = WISplitView; 

Footagehead/trunk/Japanese.lproj/MainMenu.nib/info.nib

@@ -17 +17 @@
-        <array>
-                <integer>438</integer>
+                <integer>21</integer>
-        </array>
-        <key>IBSystem Version</key>