Revision: 4823
http://skim-app.svn.sourceforge.net/skim-app/?rev=4823&view=rev
Author: hofman
Date: 2008-10-19 19:41:41 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Use segment cap image to fill middle, remove separate images for middle of
segment
Modified Paths:
--------------
trunk/SKSegmentedControl.m
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/Images/Segment_Middle.tiff
trunk/Images/Segment_MiddlePress.tiff
Deleted: trunk/Images/Segment_Middle.tiff
===================================================================
(Binary files differ)
Deleted: trunk/Images/Segment_MiddlePress.tiff
===================================================================
(Binary files differ)
Modified: trunk/SKSegmentedControl.m
===================================================================
--- trunk/SKSegmentedControl.m 2008-10-19 19:38:49 UTC (rev 4822)
+++ trunk/SKSegmentedControl.m 2008-10-19 19:41:41 UTC (rev 4823)
@@ -129,7 +129,7 @@
[image drawFlipped:[controlView isFlipped] inRect:sideRect
fromRect:sliverRect operation:NSCompositeSourceOver fraction:1.0];
}
if (NSWidth(midRect) > 0.0) {
- image = [NSImage imageNamed:isPressed ? @"Segment_MiddlePress" :
@"Segment_Middle"];
+ image = [NSImage imageNamed:isPressed ? @"Segment_RightCapPress" :
@"Segment_RightCap"];
[image drawFlipped:[controlView isFlipped] inRect:midRect
fromRect:sliverRect operation:NSCompositeSourceOver fraction:1.0];
}
if (keySegment == i && [[controlView window] isKeyWindow] &&
[[controlView window] firstResponder] == controlView)
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2008-10-19 19:38:49 UTC (rev
4822)
+++ trunk/Skim.xcodeproj/project.pbxproj 2008-10-19 19:41:41 UTC (rev
4823)
@@ -272,8 +272,6 @@
CE51633A0EAB5EE2009FA237 /* Segment_RightCapPress.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE51632E0EAB5EE2009FA237 /*
Segment_RightCapPress.tiff */; };
CE51633C0EAB5EE2009FA237 /* Segment_SeparatorPress.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE5163300EAB5EE2009FA237 /*
Segment_SeparatorPress.tiff */; };
CE51633D0EAB5EE2009FA237 /* Segment_Separator.tiff in Resources
*/ = {isa = PBXBuildFile; fileRef = CE5163310EAB5EE2009FA237 /*
Segment_Separator.tiff */; };
- CE5163400EAB5EE2009FA237 /* Segment_Middle.tiff in Resources */
= {isa = PBXBuildFile; fileRef = CE5163340EAB5EE2009FA237 /*
Segment_Middle.tiff */; };
- CE51635C0EAB618A009FA237 /* Segment_MiddlePress.tiff in
Resources */ = {isa = PBXBuildFile; fileRef = CE51635B0EAB618A009FA237 /*
Segment_MiddlePress.tiff */; };
CE546FC40B32D5DB00F8AFB6 /* SKNoteWindowController.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE546FC30B32D5DB00F8AFB6 /*
SKNoteWindowController.m */; };
CE5470030B32D96500F8AFB6 /* NoteWindow.nib in Resources */ =
{isa = PBXBuildFile; fileRef = CE5470010B32D96500F8AFB6 /* NoteWindow.nib */; };
CE54898C0B35D4EF00F8AFB6 /* InfoWindow.nib in Resources */ =
{isa = PBXBuildFile; fileRef = CE54898A0B35D4EF00F8AFB6 /* InfoWindow.nib */; };
@@ -787,8 +785,6 @@
CE51632E0EAB5EE2009FA237 /* Segment_RightCapPress.tiff */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; path =
Segment_RightCapPress.tiff; sourceTree = "<group>"; };
CE5163300EAB5EE2009FA237 /* Segment_SeparatorPress.tiff */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; path =
Segment_SeparatorPress.tiff; sourceTree = "<group>"; };
CE5163310EAB5EE2009FA237 /* Segment_Separator.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; path =
Segment_Separator.tiff; sourceTree = "<group>"; };
- CE5163340EAB5EE2009FA237 /* Segment_Middle.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; path = Segment_Middle.tiff;
sourceTree = "<group>"; };
- CE51635B0EAB618A009FA237 /* Segment_MiddlePress.tiff */ = {isa
= PBXFileReference; lastKnownFileType = image.tiff; path =
Segment_MiddlePress.tiff; sourceTree = "<group>"; };
CE546FC20B32D5DB00F8AFB6 /* SKNoteWindowController.h */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= SKNoteWindowController.h; sourceTree = "<group>"; };
CE546FC30B32D5DB00F8AFB6 /* SKNoteWindowController.m */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = SKNoteWindowController.m; sourceTree = "<group>"; };
CE5470020B32D96500F8AFB6 /* English */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path =
English.lproj/NoteWindow.nib; sourceTree = "<group>"; };
@@ -1607,8 +1603,6 @@
CE51632E0EAB5EE2009FA237 /*
Segment_RightCapPress.tiff */,
CE5163310EAB5EE2009FA237 /*
Segment_Separator.tiff */,
CE5163300EAB5EE2009FA237 /*
Segment_SeparatorPress.tiff */,
- CE5163340EAB5EE2009FA237 /* Segment_Middle.tiff
*/,
- CE51635B0EAB618A009FA237 /*
Segment_MiddlePress.tiff */,
CEF84C620C78A89900A3AD51 /*
SmallPreferences.tiff */,
CE7B85FC0CCF4AA800793F46 /* SmallMenu.tiff */,
CEAA56D20C6DEE83006BD633 /* Cancel.tiff */,
@@ -2199,8 +2193,6 @@
CE51633A0EAB5EE2009FA237 /*
Segment_RightCapPress.tiff in Resources */,
CE51633C0EAB5EE2009FA237 /*
Segment_SeparatorPress.tiff in Resources */,
CE51633D0EAB5EE2009FA237 /*
Segment_Separator.tiff in Resources */,
- CE5163400EAB5EE2009FA237 /* Segment_Middle.tiff
in Resources */,
- CE51635C0EAB618A009FA237 /*
Segment_MiddlePress.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
