Revision: 12500
http://sourceforge.net/p/skim-app/code/12500
Author: hofman
Date: 2021-11-01 15:19:08 +0000 (Mon, 01 Nov 2021)
Log Message:
-----------
No need for thumbnail page view and cell subclasses
Modified Paths:
--------------
trunk/LeftSideView.xib
trunk/Skim.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/SKThumbnailPageCell.h
trunk/SKThumbnailPageCell.m
trunk/SKThumbnailPageView.h
trunk/SKThumbnailPageView.m
Modified: trunk/LeftSideView.xib
===================================================================
--- trunk/LeftSideView.xib 2021-11-01 15:17:02 UTC (rev 12499)
+++ trunk/LeftSideView.xib 2021-11-01 15:19:08 UTC (rev 12500)
@@ -176,7 +176,7 @@
<subviews>
<textField
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="uth-up-lE7">
<rect key="frame" x="0.0"
y="9" width="40" height="15"/>
- <textFieldCell key="cell"
scrollable="YES" lineBreakMode="clipping" allowsUndo="NO"
sendsActionOnEndEditing="YES" alignment="right" id="avZ-Yh-zVv"
customClass="SKThumbnailPageCell">
+ <textFieldCell key="cell"
scrollable="YES" lineBreakMode="clipping" allowsUndo="NO"
sendsActionOnEndEditing="YES" alignment="right" id="avZ-Yh-zVv">
<font key="font"
metaFont="cellTitle"/>
<color key="textColor"
name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color
key="backgroundColor" name="controlColor" catalog="System"
colorSpace="catalog"/>
Deleted: trunk/SKThumbnailPageCell.h
===================================================================
--- trunk/SKThumbnailPageCell.h 2021-11-01 15:17:02 UTC (rev 12499)
+++ trunk/SKThumbnailPageCell.h 2021-11-01 15:19:08 UTC (rev 12500)
@@ -1,48 +0,0 @@
-//
-// SKthumbnailPageCell.h
-// Skim
-//
-// Created by Christiaan Hofman on 20/04/2021.
-/*
- This software is Copyright (c) 2021
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface SKThumbnailPageCell : NSTextFieldCell {
- BOOL marked;
-}
-
-@property (nonatomic, getter=isMarked) BOOL marked;
-
-@end
Deleted: trunk/SKThumbnailPageCell.m
===================================================================
--- trunk/SKThumbnailPageCell.m 2021-11-01 15:17:02 UTC (rev 12499)
+++ trunk/SKThumbnailPageCell.m 2021-11-01 15:19:08 UTC (rev 12500)
@@ -1,74 +0,0 @@
-//
-// SKthumbnailPageCell.m
-// Skim
-//
-// Created by Christiaan Hofman on 20/04/2021.
-/*
- This software is Copyright (c) 2021
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SKThumbnailPageCell.h"
-#import "NSImage_SKExtensions.h"
-
-#define MARKIMAGE_OFFSET 4.0
-
-@implementation SKThumbnailPageCell
-
-@synthesize marked;
-
-- (id)copyWithZone:(NSZone *)aZone {
- SKThumbnailPageCell *copy = [super copyWithZone:aZone];
- copy->marked = marked;
- return copy;
-}
-
-- (NSRect)drawingRectForBounds:(NSRect)rect {
- CGFloat height = [self cellSizeForBounds:rect].height;
- if (height < NSHeight(rect))
- rect = NSInsetRect(rect, 0.0, 0.5 * (NSHeight(rect) - height));
- return [super drawingRectForBounds:rect];
-}
-
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- if ([self isMarked]) {
- NSImage *markImage = [NSImage markImage];
- NSRect rect = NSMakeRect(NSMaxX(cellFrame) - markImage.size.width -
MARKIMAGE_OFFSET, [controlView isFlipped] ? NSMinY(cellFrame) +
MARKIMAGE_OFFSET : NSMaxY(cellFrame) - markImage.size.height -
MARKIMAGE_OFFSET, markImage.size.width, markImage.size.height);
- [markImage drawInRect:rect];
- }
- [super drawWithFrame:cellFrame inView:controlView];
-}
-
-- (void)drawWithExpansionFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- [super drawWithFrame:cellFrame inView:controlView];
-}
-
-@end
Deleted: trunk/SKThumbnailPageView.h
===================================================================
--- trunk/SKThumbnailPageView.h 2021-11-01 15:17:02 UTC (rev 12499)
+++ trunk/SKThumbnailPageView.h 2021-11-01 15:19:08 UTC (rev 12500)
@@ -1,46 +0,0 @@
-//
-// SKThumbnailPageView.h
-// Skim
-//
-// Created by Christiaan Hofman on 20/04/2021.
-/*
- This software is Copyright (c) 2021
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface SKThumbnailPageView : NSTextField
-
-@property (nonatomic, getter=isMarked) BOOL marked;
-
-@end
Deleted: trunk/SKThumbnailPageView.m
===================================================================
--- trunk/SKThumbnailPageView.m 2021-11-01 15:17:02 UTC (rev 12499)
+++ trunk/SKThumbnailPageView.m 2021-11-01 15:19:08 UTC (rev 12500)
@@ -1,60 +0,0 @@
-//
-// SKThumbnailPageView.m
-// Skim
-//
-// Created by Christiaan Hofman on 20/04/2021.
-/*
- This software is Copyright (c) 2021
- Christiaan Hofman. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- - Neither the name of Christiaan Hofman nor the names of any
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "SKThumbnailPageView.h"
-#import "SKThumbnailPageCell.h"
-
-@implementation SKThumbnailPageView
-
-@dynamic marked;
-
-+ (Class)cellClass { return [SKThumbnailPageCell class]; }
-
-- (BOOL)isMarked {
- return [[self cell] respondsToSelector:_cmd] && [[self cell] isMarked];
-}
-
-- (void)setMarked:(BOOL)marked {
- if ([[self cell] respondsToSelector:_cmd]) {
- if ([self isMarked] != marked)
- [self setNeedsDisplay:YES];
- [[self cell] setMarked:marked];
- }
-}
-
-@end
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2021-11-01 15:17:02 UTC (rev
12499)
+++ trunk/Skim.xcodeproj/project.pbxproj 2021-11-01 15:19:08 UTC (rev
12500)
@@ -274,8 +274,6 @@
CEECD61C12E9E30B00B9E35E /* NSError_SKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEECD61B12E9E30B00B9E35E /*
NSError_SKExtensions.m */; };
CEED148C2709EE4D00A8C4AA /* SKBasePDFView.m in Sources */ =
{isa = PBXBuildFile; fileRef = CEED148B2709EE4D00A8C4AA /* SKBasePDFView.m */;
};
CEEE7C520E7D3F2000B7B208 /* PDFAnnotationInk_SKExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEEE7C510E7D3F2000B7B208 /*
PDFAnnotationInk_SKExtensions.m */; };
- CEF39F39262ED6B20071606F /* SKThumbnailPageCell.m in Sources */
= {isa = PBXBuildFile; fileRef = CEF39F38262ED6B20071606F /*
SKThumbnailPageCell.m */; };
- CEF39F4E262ED7A40071606F /* SKThumbnailPageView.m in Sources */
= {isa = PBXBuildFile; fileRef = CEF39F4D262ED7A40071606F /*
SKThumbnailPageView.m */; };
CEF60D6A114C0DA60074ACC4 /* TransitionSheet.strings in
Resources */ = {isa = PBXBuildFile; fileRef = CEF60D40114C0DA60074ACC4 /*
TransitionSheet.strings */; };
CEF60D6C114C0DA60074ACC4 /* ScaleSheet.strings in Resources */
= {isa = PBXBuildFile; fileRef = CEF60D44114C0DA60074ACC4 /* ScaleSheet.strings
*/; };
CEF60D6D114C0DA60074ACC4 /* ReleaseNotes.strings in Resources
*/ = {isa = PBXBuildFile; fileRef = CEF60D46114C0DA60074ACC4 /*
ReleaseNotes.strings */; };
@@ -1156,10 +1154,6 @@
CEEE7C500E7D3F2000B7B208 /* PDFAnnotationInk_SKExtensions.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = PDFAnnotationInk_SKExtensions.h; sourceTree = "<group>";
};
CEEE7C510E7D3F2000B7B208 /* PDFAnnotationInk_SKExtensions.m */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = PDFAnnotationInk_SKExtensions.m; sourceTree =
"<group>"; };
CEF1D626117EFB760069E249 /* applehelp.init */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path =
applehelp.init; sourceTree = "<group>"; };
- CEF39F37262ED6B20071606F /* SKThumbnailPageCell.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
SKThumbnailPageCell.h; sourceTree = "<group>"; };
- CEF39F38262ED6B20071606F /* SKThumbnailPageCell.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
SKThumbnailPageCell.m; sourceTree = "<group>"; };
- CEF39F4C262ED7A40071606F /* SKThumbnailPageView.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
SKThumbnailPageView.h; sourceTree = "<group>"; };
- CEF39F4D262ED7A40071606F /* SKThumbnailPageView.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
SKThumbnailPageView.m; sourceTree = "<group>"; };
CEF60D41114C0DA60074ACC4 /* en */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path =
en.lproj/TransitionSheet.strings; sourceTree = "<group>"; };
CEF60D45114C0DA60074ACC4 /* en */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path =
en.lproj/ScaleSheet.strings; sourceTree = "<group>"; };
CEF60D47114C0DA60074ACC4 /* en */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path =
en.lproj/ReleaseNotes.strings; sourceTree = "<group>"; };
@@ -1838,10 +1832,6 @@
CE40D6151677A9DC00573882 /* SKTextNoteEditor.m
*/,
CED4DA232707B330001E09A8 /*
SKThumbnailImageView.h */,
CED4DA242707B330001E09A8 /*
SKThumbnailImageView.m */,
- CEF39F37262ED6B20071606F /*
SKThumbnailPageCell.h */,
- CEF39F38262ED6B20071606F /*
SKThumbnailPageCell.m */,
- CEF39F4C262ED7A40071606F /*
SKThumbnailPageView.h */,
- CEF39F4D262ED7A40071606F /*
SKThumbnailPageView.m */,
CE1CF48323FAA2DD005B5B40 /* SKThumbnailView.h
*/,
CE1CF48423FAA2DD005B5B40 /* SKThumbnailView.m
*/,
CE20938E0C5F9A8D009D3EFB /* SKTopBarView.h */,
@@ -2649,7 +2639,6 @@
CE546FC40B32D5DB00F8AFB6 /*
SKNoteWindowController.m in Sources */,
CEED148C2709EE4D00A8C4AA /* SKBasePDFView.m in
Sources */,
CE48EFB121C3DC3900249D4C /* SKDownloadsWindow.m
in Sources */,
- CEF39F4E262ED7A40071606F /*
SKThumbnailPageView.m in Sources */,
CE54898F0B35D50E00F8AFB6 /*
SKInfoWindowController.m in Sources */,
F92DB5AD0B36FE1F002A26E9 /* SKSnapshotPDFView.m
in Sources */,
F97751630B37461000DF673B /*
SKConversionProgressController.m in Sources */,
@@ -2810,7 +2799,6 @@
CE94D17B125535DE0053A520 /*
synctex_parser_utils.m in Sources */,
CE1D798F129FE44E00EA3AF0 /*
NSScriptCommand_SKExtensions.m in Sources */,
CE4E1E9A12BCFF5A005227ED /* HIDRemote.m in
Sources */,
- CEF39F39262ED6B20071606F /*
SKThumbnailPageCell.m in Sources */,
CE171E3512C3AC1600291179 /*
SKFileUpdateChecker.m in Sources */,
CEECD61C12E9E30B00B9E35E /*
NSError_SKExtensions.m in Sources */,
CE12A73E134F215F003AED67 /* SKSelectCommand.m
in Sources */,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
