Browse files

Big clean-up. Adopted new prefix. Fixed support for line and fill col…

…ors. Added license header. Changed -paintViewImageChanged: to paintViewImageDidChange:. Added shape and paint brush tool, renamed old paint brush tool to "freehand". Made a few tools more configurable (roundrect corner roundness etc.). Added comment what it is to each header.
  • Loading branch information...
1 parent aada1d3 commit 6a767a74568e882557243bf98832db0a1bd2f69c @uliwitness committed May 1, 2011
Showing with 4,808 additions and 894 deletions.
  1. +0 −61 English.lproj/MainMenu.nib/classes.nib
  2. +3,014 −0 English.lproj/MainMenu.nib/designable.nib
  3. +0 −23 English.lproj/MainMenu.nib/info.nib
  4. BIN English.lproj/MainMenu.nib/keyedobjects.nib
  5. BIN English.lproj/MainMenu.nib/objects.nib
  6. 0 Info-UKPaintView__Upgraded_.plist → Info-UKPaintView.plist
  7. +19 −0 NSCursor+Box.h
  8. +19 −0 NSCursor+Box.m
  9. +19 −0 NSCursor+CrossHair.h
  10. +19 −0 NSCursor+CrossHair.m
  11. +0 −32 UKLineSizeView.h
  12. +0 −18 UKPaintEraseRectTool.h
  13. +0 −18 UKPaintEraserTool.h
  14. +0 −20 UKPaintLassoTool.h
  15. +0 −18 UKPaintLineTool.h
  16. +0 −43 UKPaintLineTool.m
  17. +0 −18 UKPaintOvalTool.h
  18. +0 −22 UKPaintPathTool.h
  19. +0 −18 UKPaintRectTool.h
  20. +0 −43 UKPaintRectTool.m
  21. +0 −18 UKPaintRoundrectTool.h
  22. +0 −44 UKPaintRoundrectTool.m
  23. +0 −18 UKPaintSelectTool.h
  24. BIN UKPaintShapeTool.tiff
  25. +0 −18 UKPaintTempArrowTool.h
  26. +0 −18 UKPaintTempLineTool.h
  27. +0 −18 UKPaintTempOvalTool.h
  28. +0 −18 UKPaintTempRectTool.h
  29. +0 −18 UKPaintTempRoundrectTool.h
  30. +0 −20 UKPaintTextTool.h
  31. +198 −157 UKPaintView.xcodeproj/project.pbxproj
  32. +0 −18 UKPaintbrushTool.h
  33. +69 −0 ULILineSizeView.h
  34. +25 −2 UKLineSizeView.m → ULILineSizeView.m
  35. +3 −3 UKPixelPaintbrushTool.h → ULIPaintBrushTool.h
  36. +11 −10 UKPixelPaintbrushTool.m → ULIPaintBrushTool.m
  37. +42 −0 ULIPaintEraseRectTool.h
  38. +22 −3 UKPaintEraseRectTool.m → ULIPaintEraseRectTool.m
  39. +42 −0 ULIPaintEraserTool.h
  40. +24 −7 UKPaintEraserTool.m → ULIPaintEraserTool.m
  41. +41 −0 ULIPaintFreehandTool.h
  42. +22 −5 UKPaintbrushTool.m → ULIPaintFreehandTool.m
  43. +41 −0 ULIPaintLineTool.h
  44. +62 −0 ULIPaintLineTool.m
  45. +41 −0 ULIPaintOvalTool.h
  46. +24 −3 UKPaintOvalTool.m → ULIPaintOvalTool.m
  47. +45 −0 ULIPaintPathTool.h
  48. +23 −5 UKPaintPathTool.m → ULIPaintPathTool.m
  49. +41 −0 ULIPaintRectangleTool.h
  50. +62 −0 ULIPaintRectangleTool.m
  51. +43 −0 ULIPaintRoundedRectangleTool.h
  52. +79 −0 ULIPaintRoundedRectangleTool.m
  53. +45 −0 ULIPaintSelectionLassoTool.h
  54. +22 −3 UKPaintLassoTool.m → ULIPaintSelectionLassoTool.m
  55. +45 −0 ULIPaintSelectionRectangleTool.h
  56. +22 −3 UKPaintSelectTool.m → ULIPaintSelectionRectangleTool.m
  57. +2 −2 UKPaintShapeTool.h → ULIPaintShapeTool.h
  58. +8 −7 UKPaintShapeTool.m → ULIPaintShapeTool.m
  59. +43 −0 ULIPaintTempArrowTool.h
  60. +22 −3 UKPaintTempArrowTool.m → ULIPaintTempArrowTool.m
  61. +43 −0 ULIPaintTempLineTool.h
  62. +22 −3 UKPaintTempLineTool.m → ULIPaintTempLineTool.m
  63. +43 −0 ULIPaintTempOvalTool.h
  64. +22 −3 UKPaintTempOvalTool.m → ULIPaintTempOvalTool.m
  65. +43 −0 ULIPaintTempRectangleTool.h
  66. +23 −4 UKPaintTempRectTool.m → ULIPaintTempRectangleTool.m
  67. +44 −0 ULIPaintTempRoundrectTool.h
  68. +22 −3 UKPaintTempRoundrectTool.m → ULIPaintTempRoundrectTool.m
  69. +44 −0 ULIPaintTextTool.h
  70. +24 −13 UKPaintTextTool.m → ULIPaintTextTool.m
  71. +38 −13 UKPaintTool.h → ULIPaintTool.h
  72. +27 −8 UKPaintTool.m → ULIPaintTool.m
  73. +41 −16 UKPaintView.h → ULIPaintView.h
  74. +56 −44 UKPaintView.m → ULIPaintView.m
  75. +26 −16 UlisBresenham.c
  76. +31 −16 UlisBresenham.h
  77. BIN brush01.tiff
View
61 English.lproj/MainMenu.nib/classes.nib
@@ -1,61 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- ACTIONS = {
- paintViewImageChanged = id;
- paintViewToolDidChange = id;
- paintViewToolWillChange = id;
- };
- CLASS = NSObject;
- LANGUAGE = ObjC;
- },
- {CLASS = UKFloatingWindow; LANGUAGE = ObjC; SUPERCLASS = NSPanel; },
- {
- ACTIONS = {setTarget = id; };
- CLASS = UKLineSizeView;
- LANGUAGE = ObjC;
- OUTLETS = {target = id; };
- SUPERCLASS = NSView;
- },
- {CLASS = UKPaintEraseRectTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintEraserTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintLassoTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintPathTool; },
- {CLASS = UKPaintLineTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintOvalTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintPathTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintRectTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintRoundrectTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintSelectTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {CLASS = UKPaintTextTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; },
- {
- ACTIONS = {chooseTool = id; };
- CLASS = UKPaintTool;
- LANGUAGE = ObjC;
- OUTLETS = {owner = UKPaintView; toolButton = NSButton; };
- SUPERCLASS = NSObject;
- },
- {
- ACTIONS = {
- clear = id;
- clearMarkersBuffer = id;
- clearSelectionBuffer = id;
- copy = id;
- cut = id;
- delete = id;
- drawSelectionBuffer = id;
- paintToolDidChange = id;
- paintToolWillChange = id;
- paste = id;
- takeLineSizeFromObject = id;
- takeToolFromObject = id;
- };
- CLASS = UKPaintView;
- LANGUAGE = ObjC;
- OUTLETS = {currentTool = UKPaintTool; delegate = id; selectionTool = UKPaintTool; };
- SUPERCLASS = NSView;
- },
- {CLASS = UKPaintbrushTool; LANGUAGE = ObjC; SUPERCLASS = UKPaintTool; }
- );
- IBVersion = 1;
-}
View
3,014 English.lproj/MainMenu.nib/designable.nib
3,014 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
23 English.lproj/MainMenu.nib/info.nib
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBDocumentLocation</key>
- <string>60 273 356 240 0 0 1280 1002 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>95 344 338 44 0 0 1280 1002 </string>
- </dict>
- <key>IBFramework Version</key>
- <string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>29</integer>
- <integer>279</integer>
- <integer>21</integer>
- </array>
- <key>IBSystem Version</key>
- <string>8L2127</string>
-</dict>
-</plist>
View
BIN English.lproj/MainMenu.nib/keyedobjects.nib
Binary file not shown.
View
BIN English.lproj/MainMenu.nib/objects.nib
Binary file not shown.
View
0 Info-UKPaintView__Upgraded_.plist → Info-UKPaintView.plist
File renamed without changes.
View
19 NSCursor+Box.h
@@ -5,6 +5,25 @@
// Created by Uli Kusterer on Mon Nov 03 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
#import <AppKit/AppKit.h>
View
19 NSCursor+Box.m
@@ -5,6 +5,25 @@
// Created by Uli Kusterer on Mon Nov 03 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
#import "NSCursor+Box.h"
View
19 NSCursor+CrossHair.h
@@ -5,6 +5,25 @@
// Created by Uli Kusterer on Mon Nov 03 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
#import <AppKit/AppKit.h>
View
19 NSCursor+CrossHair.m
@@ -5,6 +5,25 @@
// Created by Uli Kusterer on Mon Nov 03 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
#import "NSCursor+CrossHair.h"
View
32 UKLineSizeView.h
@@ -1,32 +0,0 @@
-//
-// UKLineSizeView.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Mon Nov 03 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <AppKit/AppKit.h>
-
-
-@interface UKLineSizeView : NSView
-{
- float floatValue; // Current line size value.
- float maxValue; // Maximum line size we display (used for swatch widths).
- SEL action; // Action to send to the target when our value changes through user input.
- id target; // Object to notify when user changes our value.
-}
-
--(float) floatValue;
--(void) setFloatValue: (float)v;
-
--(float) maxValue;
--(void) setMaxValue: (float)v;
-
--(id) target;
--(void) setTarget: (id)anObject;
-
--(SEL) action;
--(void) setAction: (SEL)aSelector;
-
-@end
View
18 UKPaintEraseRectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintEraseRectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintEraseRectTool : UKPaintTool
-{
-
-}
-
-@end
View
18 UKPaintEraserTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintEraserTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Fri Oct 31 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintEraserTool : UKPaintTool
-{
-
-}
-
-@end
View
20 UKPaintLassoTool.h
@@ -1,20 +0,0 @@
-//
-// UKPaintLassoTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Fri Oct 31 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-/* This tool lets the user draw an arbitrarily-shaped selection. */
-
-#import <Foundation/Foundation.h>
-#import "UKPaintPathTool.h"
-
-
-@interface UKPaintLassoTool : UKPaintPathTool
-{
- BOOL dragNotCreate;
-}
-
-@end
View
18 UKPaintLineTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintLineTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintLineTool : UKPaintTool
-{
-
-}
-
-@end
View
43 UKPaintLineTool.m
@@ -1,43 +0,0 @@
-//
-// UKPaintLineTool.m
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import "UKPaintLineTool.h"
-#import "UKPaintView.h"
-
-
-@implementation UKPaintLineTool
-
-/* Override this to draw a shape during tracking:
- The drawings you do in here will be undone before you're called again.
- This is also called when tracking has finished by drawFinalToolShapeFrom:to: by default. */
--(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)prevPos to: (NSPoint)currPos
-{
- NSRect box = [self rectFrom: [owner initialPos] to: currPos];
- NSRect oldBox = [self rectWithLineSizeFrom: [owner initialPos] to: *prevPos];
-
- [[owner lineColor] set];
- [NSBezierPath setDefaultLineWidth: [owner lineSize].width];
- [NSBezierPath strokeLineFromPoint: [owner initialPos] toPoint: currPos];
-
- box = [self rectWithLineSizeFrom: [owner initialPos] to: currPos];
-
- [owner setNeedsDisplayInRect: oldBox];
- [owner setNeedsDisplayInRect: box];
-
- *prevPos = currPos;
-}
-
-
--(NSString*) toolIconName
-{
- return @"UKPaintLineTool";
-}
-
-
-
-@end
View
18 UKPaintOvalTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintOvalTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintOvalTool : UKPaintTool
-{
-
-}
-
-@end
View
22 UKPaintPathTool.h
@@ -1,22 +0,0 @@
-//
-// UKPaintPathTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Fri Oct 31 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-/* This tool lets the user draw a path, i.e. an arbitrarily-shaped closed
- region that is mathematically described and can thus be used for clipping,
- selection and lots of other useful things. I.e. this is a vector shape. */
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintPathTool : UKPaintTool
-{
- NSBezierPath* currentPath;
-}
-
-@end
View
18 UKPaintRectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintRectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintRectTool : UKPaintTool
-{
-
-}
-
-@end
View
43 UKPaintRectTool.m
@@ -1,43 +0,0 @@
-//
-// UKPaintRectTool.m
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import "UKPaintRectTool.h"
-#import "UKPaintView.h"
-
-
-@implementation UKPaintRectTool
-
-/* Override this to draw a shape during tracking:
- The drawings you do in here will be undone before you're called again.
- This is also called when tracking has finished by drawFinalToolShapeFrom:to: by default. */
--(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)prevPos to: (NSPoint)currPos
-{
- NSRect box = [self rectFrom: [owner initialPos] to: currPos];
- NSRect oldBox = [self rectWithLineSizeFrom: [owner initialPos] to: *prevPos];
-
- [[owner lineColor] set];
- [NSBezierPath setDefaultLineWidth: [owner lineSize].width];
- [NSBezierPath strokeRect: box];
-
- box = [self rectWithLineSizeFrom: [owner initialPos] to: currPos];
-
- [owner setNeedsDisplayInRect: oldBox];
- [owner setNeedsDisplayInRect: box];
-
- *prevPos = currPos;
-}
-
-
--(NSString*) toolIconName
-{
- return @"UKPaintRectTool";
-}
-
-
-
-@end
View
18 UKPaintRoundrectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintRoundrectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Wed Feb 04 2004.
-// Copyright (c) 2004 M. Uli Kusterer. All rights reserved.
-//
-
-#import <AppKit/AppKit.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintRoundrectTool : UKPaintTool
-{
-
-}
-
-@end
View
44 UKPaintRoundrectTool.m
@@ -1,44 +0,0 @@
-//
-// UKPaintRoundrectTool.m
-// UKPaintView
-//
-// Created by Uli Kusterer on Wed Feb 04 2004.
-// Copyright (c) 2004 M. Uli Kusterer. All rights reserved.
-//
-
-#import "UKPaintRoundrectTool.h"
-#import "UKPaintView.h"
-#import "NSBezierPath+RoundRect.h"
-
-
-@implementation UKPaintRoundrectTool
-
-/* Override this to draw a shape during tracking:
- The drawings you do in here will be undone before you're called again.
- This is also called when tracking has finished by drawFinalToolShapeFrom:to: by default. */
--(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)prevPos to: (NSPoint)currPos
-{
- NSRect box = [self rectFrom: [owner initialPos] to: currPos];
- NSRect oldBox = [self rectWithLineSizeFrom: [owner initialPos] to: *prevPos];
-
- [[owner lineColor] set];
- [NSBezierPath setDefaultLineWidth: [owner lineSize].width];
- [NSBezierPath strokeRoundRectInRect: box radius: 8];
-
- box = [self rectWithLineSizeFrom: [owner initialPos] to: currPos];
-
- [owner setNeedsDisplayInRect: oldBox];
- [owner setNeedsDisplayInRect: box];
-
- *prevPos = currPos;
-}
-
-
--(NSString*) toolIconName
-{
- return @"UKPaintRoundrectTool";
-}
-
-
-
-@end
View
18 UKPaintSelectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintSelectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2007 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintSelectTool : UKPaintTool
-{
- BOOL dragNotCreate;
-}
-
-@end
View
BIN UKPaintShapeTool.tiff
Binary file not shown.
View
18 UKPaintTempArrowTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintTempArrowTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTempArrowTool : UKPaintTool
-{
-
-}
-
-@end
View
18 UKPaintTempLineTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintTempLineTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTempLineTool : UKPaintTool
-{
-
-}
-
-@end
View
18 UKPaintTempOvalTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintTempOvalTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTempOvalTool : UKPaintTool
-{
-
-}
-
-@end
View
18 UKPaintTempRectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintTempRectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTempRectTool : UKPaintTool
-{
-
-}
-
-@end
View
18 UKPaintTempRoundrectTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintTempRoundrectTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Wed Feb 04 2004.
-// Copyright (c) 2004 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTempRoundrectTool : UKPaintTool
-{
-
-}
-
-@end
View
20 UKPaintTextTool.h
@@ -1,20 +0,0 @@
-//
-// UKPaintTextTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Sat Nov 01 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintTextTool : UKPaintTool
-{
- NSTextView* textbox;
-}
-
--(void) toolFinished;
-
-@end
View
355 UKPaintView.xcodeproj/project.pbxproj
@@ -7,18 +7,18 @@
objects = {
/* Begin PBXBuildFile section */
- 3D5F94380BA5BC9F0037BC78 /* UKPaintView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD149420552F8AA00000202 /* UKPaintView.h */; };
- 3D5F94390BA5BC9F0037BC78 /* UKPaintTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1494605531A9300000202 /* UKPaintTool.h */; };
- 3D5F943A0BA5BC9F0037BC78 /* UKPaintbrushTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1494A05531FF800000202 /* UKPaintbrushTool.h */; };
- 3D5F943B0BA5BC9F0037BC78 /* UKPaintRectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1495705532B2900000202 /* UKPaintRectTool.h */; };
- 3D5F943C0BA5BC9F0037BC78 /* UKPaintTextTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1DCC320553CE7500000202 /* UKPaintTextTool.h */; };
- 3D5F943D0BA5BC9F0037BC78 /* UKPaintEraseRectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB39F05567A6700000202 /* UKPaintEraseRectTool.h */; };
- 3D5F943E0BA5BC9F0037BC78 /* UKPaintEraserTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB3A105567A6700000202 /* UKPaintEraserTool.h */; };
+ 3D5F94380BA5BC9F0037BC78 /* ULIPaintView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD149420552F8AA00000202 /* ULIPaintView.h */; };
+ 3D5F94390BA5BC9F0037BC78 /* ULIPaintTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1494605531A9300000202 /* ULIPaintTool.h */; };
+ 3D5F943A0BA5BC9F0037BC78 /* ULIPaintFreehandTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1494A05531FF800000202 /* ULIPaintFreehandTool.h */; };
+ 3D5F943B0BA5BC9F0037BC78 /* ULIPaintRectangleTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD1495705532B2900000202 /* ULIPaintRectangleTool.h */; };
+ 3D5F943C0BA5BC9F0037BC78 /* ULIPaintTextTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D1DCC320553CE7500000202 /* ULIPaintTextTool.h */; };
+ 3D5F943D0BA5BC9F0037BC78 /* ULIPaintEraseRectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB39F05567A6700000202 /* ULIPaintEraseRectTool.h */; };
+ 3D5F943E0BA5BC9F0037BC78 /* ULIPaintEraserTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB3A105567A6700000202 /* ULIPaintEraserTool.h */; };
3D5F943F0BA5BC9F0037BC78 /* NSCursor+CrossHair.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB3A70556823100000202 /* NSCursor+CrossHair.h */; };
3D5F94400BA5BC9F0037BC78 /* NSCursor+Box.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB3AC055686B400000202 /* NSCursor+Box.h */; };
3D5F94410BA5BC9F0037BC78 /* UlisBresenham.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CB3AF0556917600000202 /* UlisBresenham.h */; };
- 3D5F94420BA5BC9F0037BC78 /* UKLineSizeView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CC14305570BF400000202 /* UKLineSizeView.h */; };
- 3D5F94430BA5BC9F0037BC78 /* UKPaintLineTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DA9B23E055A941F00F486B9 /* UKPaintLineTool.h */; };
+ 3D5F94420BA5BC9F0037BC78 /* ULILineSizeView.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D3CC14305570BF400000202 /* ULILineSizeView.h */; };
+ 3D5F94430BA5BC9F0037BC78 /* ULIPaintLineTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DA9B23E055A941F00F486B9 /* ULIPaintLineTool.h */; };
3D5F94450BA5BC9F0037BC78 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
3D5F94460BA5BC9F0037BC78 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
3D5F94470BA5BC9F0037BC78 /* UKPaintbrushTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DC4520F0553447100000202 /* UKPaintbrushTool.tiff */; };
@@ -28,54 +28,62 @@
3D5F944B0BA5BC9F0037BC78 /* UKPaintEraserTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3D3CB39C05567A1C00000202 /* UKPaintEraserTool.tiff */; };
3D5F944C0BA5BC9F0037BC78 /* UKPaintLineTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3D5F942F0BA5BBF40037BC78 /* UKPaintLineTool.tiff */; };
3D5F944E0BA5BC9F0037BC78 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
- 3D5F944F0BA5BC9F0037BC78 /* UKPaintView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD149430552F8AA00000202 /* UKPaintView.m */; };
- 3D5F94500BA5BC9F0037BC78 /* UKPaintTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1494705531A9300000202 /* UKPaintTool.m */; };
- 3D5F94510BA5BC9F0037BC78 /* UKPaintbrushTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1494B05531FF800000202 /* UKPaintbrushTool.m */; };
- 3D5F94520BA5BC9F0037BC78 /* UKPaintRectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1495805532B2900000202 /* UKPaintRectTool.m */; };
- 3D5F94530BA5BC9F0037BC78 /* UKPaintTextTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1DCC340553CE7500000202 /* UKPaintTextTool.m */; };
- 3D5F94540BA5BC9F0037BC78 /* UKPaintEraserTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3A005567A6700000202 /* UKPaintEraserTool.m */; };
- 3D5F94550BA5BC9F0037BC78 /* UKPaintEraseRectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3A205567A6700000202 /* UKPaintEraseRectTool.m */; };
+ 3D5F944F0BA5BC9F0037BC78 /* ULIPaintView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD149430552F8AA00000202 /* ULIPaintView.m */; };
+ 3D5F94500BA5BC9F0037BC78 /* ULIPaintTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1494705531A9300000202 /* ULIPaintTool.m */; };
+ 3D5F94510BA5BC9F0037BC78 /* ULIPaintFreehandTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1494B05531FF800000202 /* ULIPaintFreehandTool.m */; };
+ 3D5F94520BA5BC9F0037BC78 /* ULIPaintRectangleTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD1495805532B2900000202 /* ULIPaintRectangleTool.m */; };
+ 3D5F94530BA5BC9F0037BC78 /* ULIPaintTextTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D1DCC340553CE7500000202 /* ULIPaintTextTool.m */; };
+ 3D5F94540BA5BC9F0037BC78 /* ULIPaintEraserTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3A005567A6700000202 /* ULIPaintEraserTool.m */; };
+ 3D5F94550BA5BC9F0037BC78 /* ULIPaintEraseRectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3A205567A6700000202 /* ULIPaintEraseRectTool.m */; };
3D5F94560BA5BC9F0037BC78 /* NSCursor+CrossHair.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3A80556823100000202 /* NSCursor+CrossHair.m */; };
3D5F94570BA5BC9F0037BC78 /* NSCursor+Box.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3AB055686B400000202 /* NSCursor+Box.m */; };
3D5F94580BA5BC9F0037BC78 /* UlisBresenham.c in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CB3B10556917F00000202 /* UlisBresenham.c */; };
- 3D5F94590BA5BC9F0037BC78 /* UKLineSizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CC14405570BF400000202 /* UKLineSizeView.m */; };
- 3D5F945A0BA5BC9F0037BC78 /* UKPaintLineTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DA9B23F055A941F00F486B9 /* UKPaintLineTool.m */; };
+ 3D5F94590BA5BC9F0037BC78 /* ULILineSizeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D3CC14405570BF400000202 /* ULILineSizeView.m */; };
+ 3D5F945A0BA5BC9F0037BC78 /* ULIPaintLineTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DA9B23F055A941F00F486B9 /* ULIPaintLineTool.m */; };
3D5F945C0BA5BC9F0037BC78 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
- 3D910C970BAF62320039C0AD /* UKPaintPathTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D910C950BAF62320039C0AD /* UKPaintPathTool.m */; };
- 3D910C980BAF62320039C0AD /* UKPaintPathTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D910C960BAF62320039C0AD /* UKPaintPathTool.h */; };
+ 3D910C970BAF62320039C0AD /* ULIPaintPathTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D910C950BAF62320039C0AD /* ULIPaintPathTool.m */; };
+ 3D910C980BAF62320039C0AD /* ULIPaintPathTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D910C960BAF62320039C0AD /* ULIPaintPathTool.h */; };
3D910C9A0BAF62430039C0AD /* UKPaintPathTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3D910C990BAF62430039C0AD /* UKPaintPathTool.tiff */; };
- 3D910D1B0BAF67390039C0AD /* UKPaintLassoTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D910D190BAF67390039C0AD /* UKPaintLassoTool.m */; };
- 3D910D1C0BAF67390039C0AD /* UKPaintLassoTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D910D1A0BAF67390039C0AD /* UKPaintLassoTool.h */; };
+ 3D910D1B0BAF67390039C0AD /* ULIPaintSelectionLassoTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D910D190BAF67390039C0AD /* ULIPaintSelectionLassoTool.m */; };
+ 3D910D1C0BAF67390039C0AD /* ULIPaintSelectionLassoTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D910D1A0BAF67390039C0AD /* ULIPaintSelectionLassoTool.h */; };
3D910D1E0BAF673F0039C0AD /* UKPaintLassoTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3D910D1D0BAF673F0039C0AD /* UKPaintLassoTool.tiff */; };
3D910DBC0BAF70F70039C0AD /* TODO.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3D910DBB0BAF70F70039C0AD /* TODO.txt */; };
3DD4B9000BAB598C0066C1AE /* UKPaintSelectTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DD4B8FF0BAB598C0066C1AE /* UKPaintSelectTool.tiff */; };
- 3DD4B9030BAB599C0066C1AE /* UKPaintSelectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD4B9010BAB599C0066C1AE /* UKPaintSelectTool.h */; };
- 3DD4B9040BAB599C0066C1AE /* UKPaintSelectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD4B9020BAB599C0066C1AE /* UKPaintSelectTool.m */; };
+ 3DD4B9030BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD4B9010BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.h */; };
+ 3DD4B9040BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD4B9020BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.m */; };
3DD4BDB40BAC02FF0066C1AE /* UKFloatingWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DD4BDB20BAC02FF0066C1AE /* UKFloatingWindow.h */; };
3DD4BDB50BAC02FF0066C1AE /* UKFloatingWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DD4BDB30BAC02FF0066C1AE /* UKFloatingWindow.m */; };
- 3DF9B8040BA5C133001A72D2 /* UKPaintRoundrectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8020BA5C133001A72D2 /* UKPaintRoundrectTool.m */; };
- 3DF9B8050BA5C133001A72D2 /* UKPaintRoundrectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8030BA5C133001A72D2 /* UKPaintRoundrectTool.h */; };
- 3DF9B80A0BA5C1A9001A72D2 /* UKPaintOvalTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8080BA5C1A9001A72D2 /* UKPaintOvalTool.m */; };
- 3DF9B80B0BA5C1A9001A72D2 /* UKPaintOvalTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8090BA5C1A9001A72D2 /* UKPaintOvalTool.h */; };
+ 3DF9B8040BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8020BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.m */; };
+ 3DF9B8050BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8030BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.h */; };
+ 3DF9B80A0BA5C1A9001A72D2 /* ULIPaintOvalTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8080BA5C1A9001A72D2 /* ULIPaintOvalTool.m */; };
+ 3DF9B80B0BA5C1A9001A72D2 /* ULIPaintOvalTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8090BA5C1A9001A72D2 /* ULIPaintOvalTool.h */; };
3DF9B80E0BA5C1F4001A72D2 /* UKPaintOvalTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B80C0BA5C1F4001A72D2 /* UKPaintOvalTool.tiff */; };
3DF9B80F0BA5C1F4001A72D2 /* UKPaintRoundrectTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B80D0BA5C1F4001A72D2 /* UKPaintRoundrectTool.tiff */; };
3DF9B8150BA5C25C001A72D2 /* UKPaintTempArrowTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B8100BA5C25C001A72D2 /* UKPaintTempArrowTool.tiff */; };
3DF9B8160BA5C25C001A72D2 /* UKPaintTempLineTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B8110BA5C25C001A72D2 /* UKPaintTempLineTool.tiff */; };
3DF9B8170BA5C25C001A72D2 /* UKPaintTempOvalTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B8120BA5C25C001A72D2 /* UKPaintTempOvalTool.tiff */; };
3DF9B8180BA5C25C001A72D2 /* UKPaintTempRectTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B8130BA5C25C001A72D2 /* UKPaintTempRectTool.tiff */; };
3DF9B8190BA5C25C001A72D2 /* UKPaintTempRoundrectTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3DF9B8140BA5C25C001A72D2 /* UKPaintTempRoundrectTool.tiff */; };
- 3DF9B8240BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81A0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.m */; };
- 3DF9B8250BA5C2BC001A72D2 /* UKPaintTempRectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81B0BA5C2BC001A72D2 /* UKPaintTempRectTool.h */; };
- 3DF9B8260BA5C2BC001A72D2 /* UKPaintTempRectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81C0BA5C2BC001A72D2 /* UKPaintTempRectTool.m */; };
- 3DF9B8270BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81D0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.h */; };
- 3DF9B8280BA5C2BC001A72D2 /* UKPaintTempOvalTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81E0BA5C2BC001A72D2 /* UKPaintTempOvalTool.h */; };
- 3DF9B8290BA5C2BC001A72D2 /* UKPaintTempOvalTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81F0BA5C2BC001A72D2 /* UKPaintTempOvalTool.m */; };
- 3DF9B82A0BA5C2BC001A72D2 /* UKPaintTempLineTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8200BA5C2BC001A72D2 /* UKPaintTempLineTool.h */; };
- 3DF9B82B0BA5C2BC001A72D2 /* UKPaintTempLineTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8210BA5C2BC001A72D2 /* UKPaintTempLineTool.m */; };
- 3DF9B82C0BA5C2BC001A72D2 /* UKPaintTempArrowTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8220BA5C2BC001A72D2 /* UKPaintTempArrowTool.h */; };
- 3DF9B82D0BA5C2BC001A72D2 /* UKPaintTempArrowTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8230BA5C2BC001A72D2 /* UKPaintTempArrowTool.m */; };
+ 3DF9B8240BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81A0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.m */; };
+ 3DF9B8250BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81B0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.h */; };
+ 3DF9B8260BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81C0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.m */; };
+ 3DF9B8270BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81D0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.h */; };
+ 3DF9B8280BA5C2BC001A72D2 /* ULIPaintTempOvalTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B81E0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.h */; };
+ 3DF9B8290BA5C2BC001A72D2 /* ULIPaintTempOvalTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B81F0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.m */; };
+ 3DF9B82A0BA5C2BC001A72D2 /* ULIPaintTempLineTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8200BA5C2BC001A72D2 /* ULIPaintTempLineTool.h */; };
+ 3DF9B82B0BA5C2BC001A72D2 /* ULIPaintTempLineTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8210BA5C2BC001A72D2 /* ULIPaintTempLineTool.m */; };
+ 3DF9B82C0BA5C2BC001A72D2 /* ULIPaintTempArrowTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8220BA5C2BC001A72D2 /* ULIPaintTempArrowTool.h */; };
+ 3DF9B82D0BA5C2BC001A72D2 /* ULIPaintTempArrowTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8230BA5C2BC001A72D2 /* ULIPaintTempArrowTool.m */; };
3DF9B8380BA5C4B4001A72D2 /* NSBezierPath+RoundRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 3DF9B8360BA5C4B4001A72D2 /* NSBezierPath+RoundRect.h */; };
3DF9B8390BA5C4B4001A72D2 /* NSBezierPath+RoundRect.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DF9B8370BA5C4B4001A72D2 /* NSBezierPath+RoundRect.m */; };
+ 55039F74136C9EDB0082E32E /* ULIPaintShapeTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 55039F72136C9ECF0082E32E /* ULIPaintShapeTool.h */; };
+ 55039F75136C9EDB0082E32E /* ULIPaintShapeTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 55039F73136C9ED30082E32E /* ULIPaintShapeTool.m */; };
+ 55039F78136C9EEB0082E32E /* ULIPaintBrushTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 55039F76136C9EE30082E32E /* ULIPaintBrushTool.h */; };
+ 55039F79136C9EEB0082E32E /* ULIPaintBrushTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 55039F77136C9EE70082E32E /* ULIPaintBrushTool.m */; };
+ 55039F7C136CA4330082E32E /* NSBezierPath+ULIRegularPolygon.h in Headers */ = {isa = PBXBuildFile; fileRef = 55039F7A136CA42A0082E32E /* NSBezierPath+ULIRegularPolygon.h */; };
+ 55039F7D136CA4330082E32E /* NSBezierPath+ULIRegularPolygon.m in Sources */ = {isa = PBXBuildFile; fileRef = 55039F7B136CA42F0082E32E /* NSBezierPath+ULIRegularPolygon.m */; };
+ 55039F7F136CA6150082E32E /* UKPaintShapeTool.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 55039F7E136CA6150082E32E /* UKPaintShapeTool.tiff */; };
+ 55039F81136CC84B0082E32E /* brush01.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 55039F80136CC84A0082E32E /* brush01.tiff */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -85,74 +93,82 @@
29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
- 3D1DCC320553CE7500000202 /* UKPaintTextTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTextTool.h; sourceTree = "<group>"; };
+ 3D1DCC320553CE7500000202 /* ULIPaintTextTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTextTool.h; sourceTree = "<group>"; };
3D1DCC330553CE7500000202 /* UKPaintTextTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTextTool.tiff; sourceTree = "<group>"; };
- 3D1DCC340553CE7500000202 /* UKPaintTextTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTextTool.m; sourceTree = "<group>"; };
+ 3D1DCC340553CE7500000202 /* ULIPaintTextTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTextTool.m; sourceTree = "<group>"; };
3D3CB39B05567A1C00000202 /* UKPaintEraseRectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintEraseRectTool.tiff; sourceTree = "<group>"; };
3D3CB39C05567A1C00000202 /* UKPaintEraserTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintEraserTool.tiff; sourceTree = "<group>"; };
- 3D3CB39F05567A6700000202 /* UKPaintEraseRectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintEraseRectTool.h; sourceTree = "<group>"; };
- 3D3CB3A005567A6700000202 /* UKPaintEraserTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintEraserTool.m; sourceTree = "<group>"; };
- 3D3CB3A105567A6700000202 /* UKPaintEraserTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintEraserTool.h; sourceTree = "<group>"; };
- 3D3CB3A205567A6700000202 /* UKPaintEraseRectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintEraseRectTool.m; sourceTree = "<group>"; };
+ 3D3CB39F05567A6700000202 /* ULIPaintEraseRectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintEraseRectTool.h; sourceTree = "<group>"; };
+ 3D3CB3A005567A6700000202 /* ULIPaintEraserTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintEraserTool.m; sourceTree = "<group>"; };
+ 3D3CB3A105567A6700000202 /* ULIPaintEraserTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintEraserTool.h; sourceTree = "<group>"; };
+ 3D3CB3A205567A6700000202 /* ULIPaintEraseRectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintEraseRectTool.m; sourceTree = "<group>"; };
3D3CB3A70556823100000202 /* NSCursor+CrossHair.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSCursor+CrossHair.h"; sourceTree = "<group>"; };
3D3CB3A80556823100000202 /* NSCursor+CrossHair.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSCursor+CrossHair.m"; sourceTree = "<group>"; };
3D3CB3AB055686B400000202 /* NSCursor+Box.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = "NSCursor+Box.m"; sourceTree = "<group>"; };
3D3CB3AC055686B400000202 /* NSCursor+Box.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = "NSCursor+Box.h"; sourceTree = "<group>"; };
3D3CB3AF0556917600000202 /* UlisBresenham.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UlisBresenham.h; sourceTree = "<group>"; };
3D3CB3B10556917F00000202 /* UlisBresenham.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = UlisBresenham.c; sourceTree = "<group>"; };
- 3D3CC14305570BF400000202 /* UKLineSizeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKLineSizeView.h; sourceTree = "<group>"; };
- 3D3CC14405570BF400000202 /* UKLineSizeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKLineSizeView.m; sourceTree = "<group>"; };
+ 3D3CC14305570BF400000202 /* ULILineSizeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULILineSizeView.h; sourceTree = "<group>"; };
+ 3D3CC14405570BF400000202 /* ULILineSizeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULILineSizeView.m; sourceTree = "<group>"; };
3D5F942F0BA5BBF40037BC78 /* UKPaintLineTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintLineTool.tiff; sourceTree = "<group>"; };
- 3D5F94610BA5BC9F0037BC78 /* Info-UKPaintView__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-UKPaintView__Upgraded_.plist"; sourceTree = "<group>"; };
+ 3D5F94610BA5BC9F0037BC78 /* Info-UKPaintView.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-UKPaintView.plist"; sourceTree = "<group>"; };
3D5F94620BA5BC9F0037BC78 /* UKPaintView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UKPaintView.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 3D910C950BAF62320039C0AD /* UKPaintPathTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintPathTool.m; sourceTree = "<group>"; };
- 3D910C960BAF62320039C0AD /* UKPaintPathTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintPathTool.h; sourceTree = "<group>"; };
+ 3D910C950BAF62320039C0AD /* ULIPaintPathTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintPathTool.m; sourceTree = "<group>"; };
+ 3D910C960BAF62320039C0AD /* ULIPaintPathTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintPathTool.h; sourceTree = "<group>"; };
3D910C990BAF62430039C0AD /* UKPaintPathTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintPathTool.tiff; sourceTree = "<group>"; };
- 3D910D190BAF67390039C0AD /* UKPaintLassoTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintLassoTool.m; sourceTree = "<group>"; };
- 3D910D1A0BAF67390039C0AD /* UKPaintLassoTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintLassoTool.h; sourceTree = "<group>"; };
+ 3D910D190BAF67390039C0AD /* ULIPaintSelectionLassoTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintSelectionLassoTool.m; sourceTree = "<group>"; };
+ 3D910D1A0BAF67390039C0AD /* ULIPaintSelectionLassoTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintSelectionLassoTool.h; sourceTree = "<group>"; };
3D910D1D0BAF673F0039C0AD /* UKPaintLassoTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintLassoTool.tiff; sourceTree = "<group>"; };
3D910DBB0BAF70F70039C0AD /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TODO.txt; sourceTree = "<group>"; };
- 3DA9B23E055A941F00F486B9 /* UKPaintLineTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintLineTool.h; sourceTree = "<group>"; };
- 3DA9B23F055A941F00F486B9 /* UKPaintLineTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintLineTool.m; sourceTree = "<group>"; };
+ 3DA9B23E055A941F00F486B9 /* ULIPaintLineTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintLineTool.h; sourceTree = "<group>"; };
+ 3DA9B23F055A941F00F486B9 /* ULIPaintLineTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintLineTool.m; sourceTree = "<group>"; };
3DC4520F0553447100000202 /* UKPaintbrushTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintbrushTool.tiff; sourceTree = "<group>"; };
3DC452100553447100000202 /* UKPaintRectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintRectTool.tiff; sourceTree = "<group>"; };
3DCA62F20BB36F180015B87E /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO.txt; sourceTree = "<group>"; };
- 3DD149420552F8AA00000202 /* UKPaintView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKPaintView.h; sourceTree = "<group>"; };
- 3DD149430552F8AA00000202 /* UKPaintView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKPaintView.m; sourceTree = "<group>"; };
- 3DD1494605531A9300000202 /* UKPaintTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKPaintTool.h; sourceTree = "<group>"; };
- 3DD1494705531A9300000202 /* UKPaintTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKPaintTool.m; sourceTree = "<group>"; };
- 3DD1494A05531FF800000202 /* UKPaintbrushTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKPaintbrushTool.h; sourceTree = "<group>"; };
- 3DD1494B05531FF800000202 /* UKPaintbrushTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKPaintbrushTool.m; sourceTree = "<group>"; };
- 3DD1495705532B2900000202 /* UKPaintRectTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UKPaintRectTool.h; sourceTree = "<group>"; };
- 3DD1495805532B2900000202 /* UKPaintRectTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UKPaintRectTool.m; sourceTree = "<group>"; };
+ 3DD149420552F8AA00000202 /* ULIPaintView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintView.h; sourceTree = "<group>"; };
+ 3DD149430552F8AA00000202 /* ULIPaintView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintView.m; sourceTree = "<group>"; };
+ 3DD1494605531A9300000202 /* ULIPaintTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintTool.h; sourceTree = "<group>"; };
+ 3DD1494705531A9300000202 /* ULIPaintTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTool.m; sourceTree = "<group>"; };
+ 3DD1494A05531FF800000202 /* ULIPaintFreehandTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintFreehandTool.h; sourceTree = "<group>"; };
+ 3DD1494B05531FF800000202 /* ULIPaintFreehandTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintFreehandTool.m; sourceTree = "<group>"; };
+ 3DD1495705532B2900000202 /* ULIPaintRectangleTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintRectangleTool.h; sourceTree = "<group>"; };
+ 3DD1495805532B2900000202 /* ULIPaintRectangleTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintRectangleTool.m; sourceTree = "<group>"; };
3DD4B8FF0BAB598C0066C1AE /* UKPaintSelectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintSelectTool.tiff; sourceTree = "<group>"; };
- 3DD4B9010BAB599C0066C1AE /* UKPaintSelectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintSelectTool.h; sourceTree = "<group>"; };
- 3DD4B9020BAB599C0066C1AE /* UKPaintSelectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintSelectTool.m; sourceTree = "<group>"; };
+ 3DD4B9010BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintSelectionRectangleTool.h; sourceTree = "<group>"; };
+ 3DD4B9020BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintSelectionRectangleTool.m; sourceTree = "<group>"; };
3DD4BDB20BAC02FF0066C1AE /* UKFloatingWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UKFloatingWindow.h; path = ../UliKit/UKFloatingWindow.h; sourceTree = "<group>"; };
3DD4BDB30BAC02FF0066C1AE /* UKFloatingWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = UKFloatingWindow.m; path = ../UliKit/UKFloatingWindow.m; sourceTree = "<group>"; };
- 3DF9B8020BA5C133001A72D2 /* UKPaintRoundrectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintRoundrectTool.m; sourceTree = "<group>"; };
- 3DF9B8030BA5C133001A72D2 /* UKPaintRoundrectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintRoundrectTool.h; sourceTree = "<group>"; };
- 3DF9B8080BA5C1A9001A72D2 /* UKPaintOvalTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintOvalTool.m; sourceTree = "<group>"; };
- 3DF9B8090BA5C1A9001A72D2 /* UKPaintOvalTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintOvalTool.h; sourceTree = "<group>"; };
+ 3DF9B8020BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintRoundedRectangleTool.m; sourceTree = "<group>"; };
+ 3DF9B8030BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintRoundedRectangleTool.h; sourceTree = "<group>"; };
+ 3DF9B8080BA5C1A9001A72D2 /* ULIPaintOvalTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintOvalTool.m; sourceTree = "<group>"; };
+ 3DF9B8090BA5C1A9001A72D2 /* ULIPaintOvalTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintOvalTool.h; sourceTree = "<group>"; };
3DF9B80C0BA5C1F4001A72D2 /* UKPaintOvalTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintOvalTool.tiff; sourceTree = "<group>"; };
3DF9B80D0BA5C1F4001A72D2 /* UKPaintRoundrectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintRoundrectTool.tiff; sourceTree = "<group>"; };
3DF9B8100BA5C25C001A72D2 /* UKPaintTempArrowTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTempArrowTool.tiff; sourceTree = "<group>"; };
3DF9B8110BA5C25C001A72D2 /* UKPaintTempLineTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTempLineTool.tiff; sourceTree = "<group>"; };
3DF9B8120BA5C25C001A72D2 /* UKPaintTempOvalTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTempOvalTool.tiff; sourceTree = "<group>"; };
3DF9B8130BA5C25C001A72D2 /* UKPaintTempRectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTempRectTool.tiff; sourceTree = "<group>"; };
3DF9B8140BA5C25C001A72D2 /* UKPaintTempRoundrectTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintTempRoundrectTool.tiff; sourceTree = "<group>"; };
- 3DF9B81A0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTempRoundrectTool.m; sourceTree = "<group>"; };
- 3DF9B81B0BA5C2BC001A72D2 /* UKPaintTempRectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTempRectTool.h; sourceTree = "<group>"; };
- 3DF9B81C0BA5C2BC001A72D2 /* UKPaintTempRectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTempRectTool.m; sourceTree = "<group>"; };
- 3DF9B81D0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTempRoundrectTool.h; sourceTree = "<group>"; };
- 3DF9B81E0BA5C2BC001A72D2 /* UKPaintTempOvalTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTempOvalTool.h; sourceTree = "<group>"; };
- 3DF9B81F0BA5C2BC001A72D2 /* UKPaintTempOvalTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTempOvalTool.m; sourceTree = "<group>"; };
- 3DF9B8200BA5C2BC001A72D2 /* UKPaintTempLineTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTempLineTool.h; sourceTree = "<group>"; };
- 3DF9B8210BA5C2BC001A72D2 /* UKPaintTempLineTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTempLineTool.m; sourceTree = "<group>"; };
- 3DF9B8220BA5C2BC001A72D2 /* UKPaintTempArrowTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UKPaintTempArrowTool.h; sourceTree = "<group>"; };
- 3DF9B8230BA5C2BC001A72D2 /* UKPaintTempArrowTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = UKPaintTempArrowTool.m; sourceTree = "<group>"; };
+ 3DF9B81A0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTempRoundrectTool.m; sourceTree = "<group>"; };
+ 3DF9B81B0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTempRectangleTool.h; sourceTree = "<group>"; };
+ 3DF9B81C0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTempRectangleTool.m; sourceTree = "<group>"; };
+ 3DF9B81D0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTempRoundrectTool.h; sourceTree = "<group>"; };
+ 3DF9B81E0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTempOvalTool.h; sourceTree = "<group>"; };
+ 3DF9B81F0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTempOvalTool.m; sourceTree = "<group>"; };
+ 3DF9B8200BA5C2BC001A72D2 /* ULIPaintTempLineTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTempLineTool.h; sourceTree = "<group>"; };
+ 3DF9B8210BA5C2BC001A72D2 /* ULIPaintTempLineTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTempLineTool.m; sourceTree = "<group>"; };
+ 3DF9B8220BA5C2BC001A72D2 /* ULIPaintTempArrowTool.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ULIPaintTempArrowTool.h; sourceTree = "<group>"; };
+ 3DF9B8230BA5C2BC001A72D2 /* ULIPaintTempArrowTool.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ULIPaintTempArrowTool.m; sourceTree = "<group>"; };
3DF9B8360BA5C4B4001A72D2 /* NSBezierPath+RoundRect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "NSBezierPath+RoundRect.h"; path = "../UliKit/NSBezierPath+RoundRect.h"; sourceTree = SOURCE_ROOT; };
3DF9B8370BA5C4B4001A72D2 /* NSBezierPath+RoundRect.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = "NSBezierPath+RoundRect.m"; path = "../UliKit/NSBezierPath+RoundRect.m"; sourceTree = SOURCE_ROOT; };
+ 55039F72136C9ECF0082E32E /* ULIPaintShapeTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintShapeTool.h; sourceTree = "<group>"; };
+ 55039F73136C9ED30082E32E /* ULIPaintShapeTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintShapeTool.m; sourceTree = "<group>"; };
+ 55039F76136C9EE30082E32E /* ULIPaintBrushTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ULIPaintBrushTool.h; sourceTree = "<group>"; };
+ 55039F77136C9EE70082E32E /* ULIPaintBrushTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ULIPaintBrushTool.m; sourceTree = "<group>"; };
+ 55039F7A136CA42A0082E32E /* NSBezierPath+ULIRegularPolygon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSBezierPath+ULIRegularPolygon.h"; path = "../UliKit/NSBezierPath+ULIRegularPolygon.h"; sourceTree = "<group>"; };
+ 55039F7B136CA42F0082E32E /* NSBezierPath+ULIRegularPolygon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSBezierPath+ULIRegularPolygon.m"; path = "../UliKit/NSBezierPath+ULIRegularPolygon.m"; sourceTree = "<group>"; };
+ 55039F7E136CA6150082E32E /* UKPaintShapeTool.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = UKPaintShapeTool.tiff; sourceTree = "<group>"; };
+ 55039F80136CC84A0082E32E /* brush01.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = brush01.tiff; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -170,12 +186,12 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
- 3DD149420552F8AA00000202 /* UKPaintView.h */,
- 3DD149430552F8AA00000202 /* UKPaintView.m */,
- 3DD1494605531A9300000202 /* UKPaintTool.h */,
- 3DD1494705531A9300000202 /* UKPaintTool.m */,
- 3D3CC14305570BF400000202 /* UKLineSizeView.h */,
- 3D3CC14405570BF400000202 /* UKLineSizeView.m */,
+ 3DD149420552F8AA00000202 /* ULIPaintView.h */,
+ 3DD149430552F8AA00000202 /* ULIPaintView.m */,
+ 3DD1494605531A9300000202 /* ULIPaintTool.h */,
+ 3DD1494705531A9300000202 /* ULIPaintTool.m */,
+ 3D3CC14305570BF400000202 /* ULILineSizeView.h */,
+ 3D3CC14405570BF400000202 /* ULILineSizeView.m */,
3DD1494E0553201D00000202 /* Tools */,
3DD4BDF40BAC04630066C1AE /* UliKit */,
);
@@ -216,7 +232,7 @@
29B97317FDCFA39411CA2CEA /* Resources */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
- 3D5F94610BA5BC9F0037BC78 /* Info-UKPaintView__Upgraded_.plist */,
+ 3D5F94610BA5BC9F0037BC78 /* Info-UKPaintView.plist */,
3D910DBB0BAF70F70039C0AD /* TODO.txt */,
);
name = UKPaintView;
@@ -259,6 +275,8 @@
3DD4B8FF0BAB598C0066C1AE /* UKPaintSelectTool.tiff */,
3D910C990BAF62430039C0AD /* UKPaintPathTool.tiff */,
3D910D1D0BAF673F0039C0AD /* UKPaintLassoTool.tiff */,
+ 55039F7E136CA6150082E32E /* UKPaintShapeTool.tiff */,
+ 55039F80136CC84A0082E32E /* brush01.tiff */,
);
name = Resources;
sourceTree = "<group>";
@@ -275,45 +293,51 @@
3DD1494E0553201D00000202 /* Tools */ = {
isa = PBXGroup;
children = (
- 3DD1494A05531FF800000202 /* UKPaintbrushTool.h */,
- 3DD1494B05531FF800000202 /* UKPaintbrushTool.m */,
- 3DD1495705532B2900000202 /* UKPaintRectTool.h */,
- 3DD1495805532B2900000202 /* UKPaintRectTool.m */,
- 3DF9B8030BA5C133001A72D2 /* UKPaintRoundrectTool.h */,
- 3DF9B8020BA5C133001A72D2 /* UKPaintRoundrectTool.m */,
- 3DF9B8080BA5C1A9001A72D2 /* UKPaintOvalTool.m */,
- 3DF9B8090BA5C1A9001A72D2 /* UKPaintOvalTool.h */,
- 3D1DCC320553CE7500000202 /* UKPaintTextTool.h */,
- 3D1DCC340553CE7500000202 /* UKPaintTextTool.m */,
- 3D3CB39F05567A6700000202 /* UKPaintEraseRectTool.h */,
- 3D3CB3A205567A6700000202 /* UKPaintEraseRectTool.m */,
- 3D3CB3A105567A6700000202 /* UKPaintEraserTool.h */,
- 3D3CB3A005567A6700000202 /* UKPaintEraserTool.m */,
- 3DA9B23E055A941F00F486B9 /* UKPaintLineTool.h */,
- 3DA9B23F055A941F00F486B9 /* UKPaintLineTool.m */,
- 3DF9B81B0BA5C2BC001A72D2 /* UKPaintTempRectTool.h */,
- 3DF9B81C0BA5C2BC001A72D2 /* UKPaintTempRectTool.m */,
- 3DF9B81D0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.h */,
- 3DF9B81A0BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.m */,
- 3DF9B81E0BA5C2BC001A72D2 /* UKPaintTempOvalTool.h */,
- 3DF9B81F0BA5C2BC001A72D2 /* UKPaintTempOvalTool.m */,
- 3DF9B8200BA5C2BC001A72D2 /* UKPaintTempLineTool.h */,
- 3DF9B8210BA5C2BC001A72D2 /* UKPaintTempLineTool.m */,
- 3DF9B8220BA5C2BC001A72D2 /* UKPaintTempArrowTool.h */,
- 3DF9B8230BA5C2BC001A72D2 /* UKPaintTempArrowTool.m */,
- 3DD4B9010BAB599C0066C1AE /* UKPaintSelectTool.h */,
- 3DD4B9020BAB599C0066C1AE /* UKPaintSelectTool.m */,
- 3D910C960BAF62320039C0AD /* UKPaintPathTool.h */,
- 3D910C950BAF62320039C0AD /* UKPaintPathTool.m */,
- 3D910D1A0BAF67390039C0AD /* UKPaintLassoTool.h */,
- 3D910D190BAF67390039C0AD /* UKPaintLassoTool.m */,
+ 3DD1494A05531FF800000202 /* ULIPaintFreehandTool.h */,
+ 3DD1494B05531FF800000202 /* ULIPaintFreehandTool.m */,
+ 3DD1495705532B2900000202 /* ULIPaintRectangleTool.h */,
+ 3DD1495805532B2900000202 /* ULIPaintRectangleTool.m */,
+ 3DF9B8030BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.h */,
+ 3DF9B8020BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.m */,
+ 3DF9B8090BA5C1A9001A72D2 /* ULIPaintOvalTool.h */,
+ 3DF9B8080BA5C1A9001A72D2 /* ULIPaintOvalTool.m */,
+ 3D1DCC320553CE7500000202 /* ULIPaintTextTool.h */,
+ 3D1DCC340553CE7500000202 /* ULIPaintTextTool.m */,
+ 3D3CB39F05567A6700000202 /* ULIPaintEraseRectTool.h */,
+ 3D3CB3A205567A6700000202 /* ULIPaintEraseRectTool.m */,
+ 3D3CB3A105567A6700000202 /* ULIPaintEraserTool.h */,
+ 3D3CB3A005567A6700000202 /* ULIPaintEraserTool.m */,
+ 3DA9B23E055A941F00F486B9 /* ULIPaintLineTool.h */,
+ 3DA9B23F055A941F00F486B9 /* ULIPaintLineTool.m */,
+ 3DF9B81B0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.h */,
+ 3DF9B81C0BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.m */,
+ 3DF9B81D0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.h */,
+ 3DF9B81A0BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.m */,
+ 3DF9B81E0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.h */,
+ 3DF9B81F0BA5C2BC001A72D2 /* ULIPaintTempOvalTool.m */,
+ 3DF9B8200BA5C2BC001A72D2 /* ULIPaintTempLineTool.h */,
+ 3DF9B8210BA5C2BC001A72D2 /* ULIPaintTempLineTool.m */,
+ 3DF9B8220BA5C2BC001A72D2 /* ULIPaintTempArrowTool.h */,
+ 3DF9B8230BA5C2BC001A72D2 /* ULIPaintTempArrowTool.m */,
+ 3DD4B9010BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.h */,
+ 3DD4B9020BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.m */,
+ 3D910D1A0BAF67390039C0AD /* ULIPaintSelectionLassoTool.h */,
+ 3D910D190BAF67390039C0AD /* ULIPaintSelectionLassoTool.m */,
+ 3D910C960BAF62320039C0AD /* ULIPaintPathTool.h */,
+ 3D910C950BAF62320039C0AD /* ULIPaintPathTool.m */,
+ 55039F72136C9ECF0082E32E /* ULIPaintShapeTool.h */,
+ 55039F73136C9ED30082E32E /* ULIPaintShapeTool.m */,
+ 55039F76136C9EE30082E32E /* ULIPaintBrushTool.h */,
+ 55039F77136C9EE70082E32E /* ULIPaintBrushTool.m */,
);
name = Tools;
sourceTree = "<group>";
};
3DD4BDF40BAC04630066C1AE /* UliKit */ = {
isa = PBXGroup;
children = (
+ 55039F7A136CA42A0082E32E /* NSBezierPath+ULIRegularPolygon.h */,
+ 55039F7B136CA42F0082E32E /* NSBezierPath+ULIRegularPolygon.m */,
3DD4BDB20BAC02FF0066C1AE /* UKFloatingWindow.h */,
3DD4BDB30BAC02FF0066C1AE /* UKFloatingWindow.m */,
);
@@ -327,30 +351,33 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 3D5F94380BA5BC9F0037BC78 /* UKPaintView.h in Headers */,
- 3D5F94390BA5BC9F0037BC78 /* UKPaintTool.h in Headers */,
- 3D5F943A0BA5BC9F0037BC78 /* UKPaintbrushTool.h in Headers */,
- 3D5F943B0BA5BC9F0037BC78 /* UKPaintRectTool.h in Headers */,
- 3D5F943C0BA5BC9F0037BC78 /* UKPaintTextTool.h in Headers */,
- 3D5F943D0BA5BC9F0037BC78 /* UKPaintEraseRectTool.h in Headers */,
- 3D5F943E0BA5BC9F0037BC78 /* UKPaintEraserTool.h in Headers */,
+ 3D5F94380BA5BC9F0037BC78 /* ULIPaintView.h in Headers */,
+ 3D5F94390BA5BC9F0037BC78 /* ULIPaintTool.h in Headers */,
+ 3D5F943A0BA5BC9F0037BC78 /* ULIPaintFreehandTool.h in Headers */,
+ 3D5F943B0BA5BC9F0037BC78 /* ULIPaintRectangleTool.h in Headers */,
+ 3D5F943C0BA5BC9F0037BC78 /* ULIPaintTextTool.h in Headers */,
+ 3D5F943D0BA5BC9F0037BC78 /* ULIPaintEraseRectTool.h in Headers */,
+ 3D5F943E0BA5BC9F0037BC78 /* ULIPaintEraserTool.h in Headers */,
3D5F943F0BA5BC9F0037BC78 /* NSCursor+CrossHair.h in Headers */,
3D5F94400BA5BC9F0037BC78 /* NSCursor+Box.h in Headers */,
3D5F94410BA5BC9F0037BC78 /* UlisBresenham.h in Headers */,
- 3D5F94420BA5BC9F0037BC78 /* UKLineSizeView.h in Headers */,
- 3D5F94430BA5BC9F0037BC78 /* UKPaintLineTool.h in Headers */,
- 3DF9B8050BA5C133001A72D2 /* UKPaintRoundrectTool.h in Headers */,
- 3DF9B80B0BA5C1A9001A72D2 /* UKPaintOvalTool.h in Headers */,
- 3DF9B8250BA5C2BC001A72D2 /* UKPaintTempRectTool.h in Headers */,
- 3DF9B8270BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.h in Headers */,
- 3DF9B8280BA5C2BC001A72D2 /* UKPaintTempOvalTool.h in Headers */,
- 3DF9B82A0BA5C2BC001A72D2 /* UKPaintTempLineTool.h in Headers */,
- 3DF9B82C0BA5C2BC001A72D2 /* UKPaintTempArrowTool.h in Headers */,
+ 3D5F94420BA5BC9F0037BC78 /* ULILineSizeView.h in Headers */,
+ 3D5F94430BA5BC9F0037BC78 /* ULIPaintLineTool.h in Headers */,
+ 3DF9B8050BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.h in Headers */,
+ 3DF9B80B0BA5C1A9001A72D2 /* ULIPaintOvalTool.h in Headers */,
+ 3DF9B8250BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.h in Headers */,
+ 3DF9B8270BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.h in Headers */,
+ 3DF9B8280BA5C2BC001A72D2 /* ULIPaintTempOvalTool.h in Headers */,
+ 3DF9B82A0BA5C2BC001A72D2 /* ULIPaintTempLineTool.h in Headers */,
+ 3DF9B82C0BA5C2BC001A72D2 /* ULIPaintTempArrowTool.h in Headers */,
3DF9B8380BA5C4B4001A72D2 /* NSBezierPath+RoundRect.h in Headers */,
- 3DD4B9030BAB599C0066C1AE /* UKPaintSelectTool.h in Headers */,
+ 3DD4B9030BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.h in Headers */,
3DD4BDB40BAC02FF0066C1AE /* UKFloatingWindow.h in Headers */,
- 3D910C980BAF62320039C0AD /* UKPaintPathTool.h in Headers */,
- 3D910D1C0BAF67390039C0AD /* UKPaintLassoTool.h in Headers */,
+ 3D910C980BAF62320039C0AD /* ULIPaintPathTool.h in Headers */,
+ 3D910D1C0BAF67390039C0AD /* ULIPaintSelectionLassoTool.h in Headers */,
+ 55039F74136C9EDB0082E32E /* ULIPaintShapeTool.h in Headers */,
+ 55039F78136C9EEB0082E32E /* ULIPaintBrushTool.h in Headers */,
+ 55039F7C136CA4330082E32E /* NSBezierPath+ULIRegularPolygon.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -382,9 +409,15 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 3D5F94290BA5BBE70037BC78 /* Build configuration list for PBXProject "UKPaintView" */;
+ compatibilityVersion = "Xcode 2.4";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* UKPaintView */;
projectDirPath = "";
+ projectRoot = "";
targets = (
3D5F94360BA5BC9F0037BC78 /* UKPaintView */,
);
@@ -415,6 +448,8 @@
3D910C9A0BAF62430039C0AD /* UKPaintPathTool.tiff in Resources */,
3D910D1E0BAF673F0039C0AD /* UKPaintLassoTool.tiff in Resources */,
3D910DBC0BAF70F70039C0AD /* TODO.txt in Resources */,
+ 55039F7F136CA6150082E32E /* UKPaintShapeTool.tiff in Resources */,
+ 55039F81136CC84B0082E32E /* brush01.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -426,30 +461,33 @@
buildActionMask = 2147483647;
files = (
3D5F944E0BA5BC9F0037BC78 /* main.m in Sources */,
- 3D5F944F0BA5BC9F0037BC78 /* UKPaintView.m in Sources */,
- 3D5F94500BA5BC9F0037BC78 /* UKPaintTool.m in Sources */,
- 3D5F94510BA5BC9F0037BC78 /* UKPaintbrushTool.m in Sources */,
- 3D5F94520BA5BC9F0037BC78 /* UKPaintRectTool.m in Sources */,
- 3D5F94530BA5BC9F0037BC78 /* UKPaintTextTool.m in Sources */,
- 3D5F94540BA5BC9F0037BC78 /* UKPaintEraserTool.m in Sources */,
- 3D5F94550BA5BC9F0037BC78 /* UKPaintEraseRectTool.m in Sources */,
+ 3D5F944F0BA5BC9F0037BC78 /* ULIPaintView.m in Sources */,
+ 3D5F94500BA5BC9F0037BC78 /* ULIPaintTool.m in Sources */,
+ 3D5F94510BA5BC9F0037BC78 /* ULIPaintFreehandTool.m in Sources */,
+ 3D5F94520BA5BC9F0037BC78 /* ULIPaintRectangleTool.m in Sources */,
+ 3D5F94530BA5BC9F0037BC78 /* ULIPaintTextTool.m in Sources */,
+ 3D5F94540BA5BC9F0037BC78 /* ULIPaintEraserTool.m in Sources */,
+ 3D5F94550BA5BC9F0037BC78 /* ULIPaintEraseRectTool.m in Sources */,
3D5F94560BA5BC9F0037BC78 /* NSCursor+CrossHair.m in Sources */,
3D5F94570BA5BC9F0037BC78 /* NSCursor+Box.m in Sources */,
3D5F94580BA5BC9F0037BC78 /* UlisBresenham.c in Sources */,
- 3D5F94590BA5BC9F0037BC78 /* UKLineSizeView.m in Sources */,
- 3D5F945A0BA5BC9F0037BC78 /* UKPaintLineTool.m in Sources */,
- 3DF9B8040BA5C133001A72D2 /* UKPaintRoundrectTool.m in Sources */,
- 3DF9B80A0BA5C1A9001A72D2 /* UKPaintOvalTool.m in Sources */,
- 3DF9B8240BA5C2BC001A72D2 /* UKPaintTempRoundrectTool.m in Sources */,
- 3DF9B8260BA5C2BC001A72D2 /* UKPaintTempRectTool.m in Sources */,
- 3DF9B8290BA5C2BC001A72D2 /* UKPaintTempOvalTool.m in Sources */,
- 3DF9B82B0BA5C2BC001A72D2 /* UKPaintTempLineTool.m in Sources */,
- 3DF9B82D0BA5C2BC001A72D2 /* UKPaintTempArrowTool.m in Sources */,
+ 3D5F94590BA5BC9F0037BC78 /* ULILineSizeView.m in Sources */,
+ 3D5F945A0BA5BC9F0037BC78 /* ULIPaintLineTool.m in Sources */,
+ 3DF9B8040BA5C133001A72D2 /* ULIPaintRoundedRectangleTool.m in Sources */,
+ 3DF9B80A0BA5C1A9001A72D2 /* ULIPaintOvalTool.m in Sources */,
+ 3DF9B8240BA5C2BC001A72D2 /* ULIPaintTempRoundrectTool.m in Sources */,
+ 3DF9B8260BA5C2BC001A72D2 /* ULIPaintTempRectangleTool.m in Sources */,
+ 3DF9B8290BA5C2BC001A72D2 /* ULIPaintTempOvalTool.m in Sources */,
+ 3DF9B82B0BA5C2BC001A72D2 /* ULIPaintTempLineTool.m in Sources */,
+ 3DF9B82D0BA5C2BC001A72D2 /* ULIPaintTempArrowTool.m in Sources */,
3DF9B8390BA5C4B4001A72D2 /* NSBezierPath+RoundRect.m in Sources */,
- 3DD4B9040BAB599C0066C1AE /* UKPaintSelectTool.m in Sources */,
+ 3DD4B9040BAB599C0066C1AE /* ULIPaintSelectionRectangleTool.m in Sources */,
3DD4BDB50BAC02FF0066C1AE /* UKFloatingWindow.m in Sources */,
- 3D910C970BAF62320039C0AD /* UKPaintPathTool.m in Sources */,
- 3D910D1B0BAF67390039C0AD /* UKPaintLassoTool.m in Sources */,
+ 3D910C970BAF62320039C0AD /* ULIPaintPathTool.m in Sources */,
+ 3D910D1B0BAF67390039C0AD /* ULIPaintSelectionLassoTool.m in Sources */,
+ 55039F75136C9EDB0082E32E /* ULIPaintShapeTool.m in Sources */,
+ 55039F79136C9EEB0082E32E /* ULIPaintBrushTool.m in Sources */,
+ 55039F7D136CA4330082E32E /* NSBezierPath+ULIRegularPolygon.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -504,8 +542,9 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = UKPaintView_Prefix.h;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "";
- INFOPLIST_FILE = "Info-UKPaintView__Upgraded_.plist";
+ INFOPLIST_FILE = "Info-UKPaintView.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
@@ -530,8 +569,9 @@
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = UKPaintView_Prefix.h;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "";
- INFOPLIST_FILE = "Info-UKPaintView__Upgraded_.plist";
+ INFOPLIST_FILE = "Info-UKPaintView.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
@@ -554,8 +594,9 @@
FRAMEWORK_SEARCH_PATHS = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = UKPaintView_Prefix.h;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = "";
- INFOPLIST_FILE = "Info-UKPaintView__Upgraded_.plist";
+ INFOPLIST_FILE = "Info-UKPaintView.plist";
INSTALL_PATH = "$(HOME)/Applications";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "";
View
18 UKPaintbrushTool.h
@@ -1,18 +0,0 @@
-//
-// UKPaintbrushTool.h
-// UKPaintView
-//
-// Created by Uli Kusterer on Fri Oct 31 2003.
-// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
-
-
-@interface UKPaintbrushTool : UKPaintTool
-{
-
-}
-
-@end
View
69 ULILineSizeView.h
@@ -0,0 +1,69 @@
+//
+// UKLineSizeView.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Mon Nov 03 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A view that shows little sample swatches of line widths and lets you select
+ one.
+*/
+
+#import <AppKit/AppKit.h>
+
+
+@class ULIPaintView;
+
+
+@protocol ULILineSizeViewDelegate <NSObject>
+
+-(NSColor*) lineColor;
+
+@end
+
+
+@interface ULILineSizeView : NSView
+{
+ float floatValue; // Current line size value.
+ float maxValue; // Maximum line size we display (used for swatch widths).
+ SEL action; // Action to send to the target when our value changes through user input.
+ id target; // Object to notify when user changes our value.
+ id<ULILineSizeViewDelegate> delegate;
+}
+
+@property (assign) IBOutlet id<ULILineSizeViewDelegate> delegate;
+
+-(float) floatValue;
+-(void) setFloatValue: (float)v;
+
+-(float) maxValue;
+-(void) setMaxValue: (float)v;
+
+-(id) target;
+-(void) setTarget: (id)anObject;
+
+-(SEL) action;
+-(void) setAction: (SEL)aSelector;
+
+@end
View
27 UKLineSizeView.m → ULILineSizeView.m
@@ -5,11 +5,32 @@
// Created by Uli Kusterer on Mon Nov 03 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+#import "ULILineSizeView.h"
-#import "UKLineSizeView.h"
+@implementation ULILineSizeView
-@implementation UKLineSizeView
+@synthesize delegate;
-(id) initWithFrame: (NSRect)frame
{
@@ -44,6 +65,8 @@ -(void) drawRect: (NSRect)rect
short numSamples,
x;
NSColor* currColor = [[NSColorPanel sharedColorPanel] color];
+ if( delegate && [delegate respondsToSelector: @selector(lineColor)] )
+ currColor = [delegate lineColor];
topPos.x += 4 +(maxValue /2) +0.5;
botPos.x += topPos.x;
View
6 UKPixelPaintbrushTool.h → ULIPaintBrushTool.h
@@ -1,16 +1,16 @@
//
// UKPixelPaintbrushTool.h
-// UKPaintView
+// ULIPaintView
//
// Created by Uli Kusterer on Fri Oct 31 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
#import <Foundation/Foundation.h>
-#import "UKPaintTool.h"
+#import "ULIPaintTool.h"
-@interface UKPixelPaintbrushTool : UKPaintTool
+@interface ULIPaintBrushTool : ULIPaintTool
{
NSImage * mBrushImage;
NSImage * mTintedBrushImage;
View
21 UKPixelPaintbrushTool.m → ULIPaintBrushTool.m
@@ -1,23 +1,24 @@
//
// UKPixelPaintbrushTool.m
-// UKPaintView
+// ULIPaintView
//
// Created by Uli Kusterer on Fri Oct 31 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
-#import "UKPixelPaintbrushTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintBrushTool.h"
+#import "ULIPaintView.h"
#import "NSCursor+Box.h"
#import "UlisBresenham.h"
+#import "UKHelperMacros.h"
-@implementation UKPixelPaintbrushTool
+@implementation ULIPaintBrushTool
@synthesize brushImage = mBrushImage;
@synthesize tintedBrushImage = mTintedBrushImage;
--(id) initWithPaintView: (UKPaintView*)pv
+-(id) initWithPaintView: (ULIPaintView*)pv
{
if(( self = [super initWithPaintView: pv] ))
{
@@ -30,16 +31,16 @@ -(id) initWithPaintView: (UKPaintView*)pv
-(void) dealloc
{
- DESTROY(mBrushImage);
- DESTROY(mTintedBrushImage);
+ DESTROY_DEALLOC(mBrushImage);
+ DESTROY_DEALLOC(mTintedBrushImage);
[super dealloc];
}
-void UKPaintbrushBresenhamPixelProc( float x, float y, void* data )
+void ULIPaintbrushBresenhamPixelProc( float x, float y, void* data )
{
- UKPixelPaintbrushTool* tool = (UKPixelPaintbrushTool*) data;
+ ULIPaintBrushTool* tool = (ULIPaintBrushTool*) data;
NSImage* brushImage = [tool tintedBrushImage];
NSSize brushSize = [brushImage size];
NSRect box = NSZeroRect;
@@ -76,7 +77,7 @@ -(void) drawTrackingToolShapeFrom: (NSPoint*)lastPos to: (NSPoint)currPos
{
// Draw a brush line using the owning paint view's line color:
DrawBresenhamLine( lastPos->x, lastPos->y, currPos.x, currPos.y,
- UKPaintbrushBresenhamPixelProc, self );
+ ULIPaintbrushBresenhamPixelProc, self );
*lastPos = currPos; // Make sure we continue drawing at end of this line segment.
}
View
42 ULIPaintEraseRectTool.h
@@ -0,0 +1,42 @@
+//
+// UKPaintEraseRectTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A tool that lets you drag out a rectangle, which will then be replaced
+ with a transparent color, completely obliterating previous drawings in it.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintEraseRectTool : ULIPaintTool
+{
+
+}
+
+@end
View
25 UKPaintEraseRectTool.m → ULIPaintEraseRectTool.m
@@ -5,13 +5,32 @@
// Created by Uli Kusterer on Sat Nov 01 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
-#import "UKPaintEraseRectTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintEraseRectTool.h"
+#import "ULIPaintView.h"
#import "NSCursor+CrossHair.h"
-@implementation UKPaintEraseRectTool
+@implementation ULIPaintEraseRectTool
/* Override this to draw a shape during tracking:
The drawings you do in here will be undone before you're called again.
View
42 ULIPaintEraserTool.h
@@ -0,0 +1,42 @@
+//
+// UKPaintEraserTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Fri Oct 31 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A tool that gives you a little box-shaped cursor the size of the line size
+ which clears everything in that box with transparency.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintEraserTool : ULIPaintTool
+{
+
+}
+
+@end
View
31 UKPaintEraserTool.m → ULIPaintEraserTool.m
@@ -5,18 +5,37 @@
// Created by Uli Kusterer on Fri Oct 31 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
-#import "UKPaintEraserTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintEraserTool.h"
+#import "ULIPaintView.h"
#import "NSCursor+Box.h"
#import "UlisBresenham.h"
-@implementation UKPaintEraserTool
+@implementation ULIPaintEraserTool
void UKPaintEraserBresenhamPixelProc( float x, float y, void* data )
{
- UKPaintEraserTool* tool = (UKPaintEraserTool*) data;
+ ULIPaintEraserTool* tool = (ULIPaintEraserTool*) data;
NSSize lineSize = [[tool owner] lineSize];
NSRect box;
@@ -28,7 +47,7 @@ void UKPaintEraserBresenhamPixelProc( float x, float y, void* data )
}
-/* Override this to draw a brush during tracking:
+/* Draw a brush during tracking:
The drawings you do in here will end up in the actual image buffer. */
-(void) drawTrackingToolShapeFrom: (NSPoint*)lastPos to: (NSPoint)currPos
{
@@ -62,6 +81,4 @@ -(BOOL) isSaveableTool
return NO;
}
-
-
@end
View
41 ULIPaintFreehandTool.h
@@ -0,0 +1,41 @@
+//
+// UKPaintbrushTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Fri Oct 31 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A paint tool that draws a rounded freehand line.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintFreehandTool : ULIPaintTool
+{
+
+}
+
+@end
View
27 UKPaintbrushTool.m → ULIPaintFreehandTool.m
@@ -5,12 +5,31 @@
// Created by Uli Kusterer on Fri Oct 31 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
-#import "UKPaintbrushTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintFreehandTool.h"
+#import "ULIPaintView.h"
-@implementation UKPaintbrushTool
+@implementation ULIPaintFreehandTool
/* Override this to draw a brush during tracking:
@@ -45,6 +64,4 @@ -(BOOL) isSaveableTool
return NO;
}
-
-
@end
View
41 ULIPaintLineTool.h
@@ -0,0 +1,41 @@
+//
+// UKPaintLineTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ Draw a line from a start point to an end point.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintLineTool : ULIPaintTool
+{
+
+}
+
+@end
View
62 ULIPaintLineTool.m
@@ -0,0 +1,62 @@
+//
+// UKPaintLineTool.m
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+#import "ULIPaintLineTool.h"
+#import "ULIPaintView.h"
+
+
+@implementation ULIPaintLineTool
+
+/* Draw a shape during tracking:
+ The drawings you do in here will be undone before you're called again.
+ This is also called when tracking has finished by drawFinalToolShapeFrom:to: by default. */
+-(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)prevPos to: (NSPoint)currPos
+{
+ NSRect box = [self rectFrom: [owner initialPos] to: currPos];
+ NSRect oldBox = [self rectWithLineSizeFrom: [owner initialPos] to: *prevPos];
+
+ [[owner lineColor] set];
+ [NSBezierPath setDefaultLineWidth: [owner lineSize].width];
+ [NSBezierPath strokeLineFromPoint: [owner initialPos] toPoint: currPos];
+
+ box = [self rectWithLineSizeFrom: [owner initialPos] to: currPos];
+
+ [owner setNeedsDisplayInRect: oldBox];
+ [owner setNeedsDisplayInRect: box];
+
+ *prevPos = currPos;
+}
+
+
+-(NSString*) toolIconName
+{
+ return @"UKPaintLineTool";
+}
+
+
+
+@end
View
41 ULIPaintOvalTool.h
@@ -0,0 +1,41 @@
+//
+// UKPaintOvalTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A tool that draws an oval.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintOvalTool : ULIPaintTool
+{
+
+}
+
+@end
View
27 UKPaintOvalTool.m → ULIPaintOvalTool.m
@@ -5,12 +5,31 @@
// Created by Uli Kusterer on Sat Nov 01 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
-#import "UKPaintOvalTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintOvalTool.h"
+#import "ULIPaintView.h"
-@implementation UKPaintOvalTool
+@implementation ULIPaintOvalTool
/* Override this to draw a shape during tracking:
The drawings you do in here will be undone before you're called again.
@@ -22,9 +41,11 @@ -(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)prevPos to: (NSPoint)cur
NSBezierPath* path = [[NSBezierPath alloc] init];
[[owner lineColor] set];
+ [[owner fillColor] setFill];
[path setLineWidth: [owner lineSize].width];
[path appendBezierPathWithOvalInRect: box];
[path stroke];
+ [path fill];
[path release];
box = [self rectWithLineSizeFrom: [owner initialPos] to: currPos];
View
45 ULIPaintPathTool.h
@@ -0,0 +1,45 @@
+//
+// UKPaintPathTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Fri Oct 31 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/* This tool lets the user draw a path, i.e. an arbitrarily-shaped closed
+ region that is mathematically described and can thus be used for clipping,
+ selection and lots of other useful things. I.e. this is a vector shape.
+
+ *** THIS IS AN ABSTRACT BASE CLASS ***
+ It draws a line during tracking, but you have to subclass and override to
+ actually save the resulting path somewhere. */
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintPathTool : ULIPaintTool
+{
+ NSBezierPath* currentPath;
+}
+
+@end
View
28 UKPaintPathTool.m → ULIPaintPathTool.m
@@ -5,12 +5,31 @@
// Created by Uli Kusterer on Fri Oct 31 2003.
// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
-#import "UKPaintPathTool.h"
-#import "UKPaintView.h"
+#import "ULIPaintPathTool.h"
+#import "ULIPaintView.h"
-@implementation UKPaintPathTool
+@implementation ULIPaintPathTool
-(void) dealloc
{
@@ -20,11 +39,10 @@ -(void) dealloc
}
-/* Override this to draw a brush during tracking:
+/* Draw a brush during tracking:
The drawings you do in here will end up in the actual image buffer. */
-(void) drawTemporaryTrackingToolShapeFrom: (NSPoint*)lastPos to: (NSPoint)currPos
{
- //[currentPath moveToPoint: *lastPos];
[currentPath lineToPoint: currPos];
[[NSColor blackColor] set];
View
41 ULIPaintRectangleTool.h
@@ -0,0 +1,41 @@
+//
+// UKPaintRectTool.h
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software
+// in a product, an acknowledgment in the product documentation would be
+// appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such, and must not be
+// misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source
+// distribution.
+//
+
+/*
+ A tool that draws a rectangle.
+*/
+
+#import <AppKit/AppKit.h>
+#import "ULIPaintTool.h"
+
+
+@interface ULIPaintRectangleTool : ULIPaintTool
+{
+
+}
+
+@end
View
62 ULIPaintRectangleTool.m
@@ -0,0 +1,62 @@
+//
+// UKPaintRectTool.m
+// UKPaintView
+//
+// Created by Uli Kusterer on Sat Nov 01 2003.
+// Copyright (c) 2003 M. Uli Kusterer. All rights reserved.
+//
+// This software is provided 'as-is', without any express or implied
+// warranty. In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+// claim that you wrote the original software. If you use this software