Change icon

LinkedIdeas.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@
 		9B48F84F1CD614C50014758D /* Mode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B48F84E1CD614C50014758D /* Mode.swift */; };
 		9B521F851CFB37D200A71598 /* AligmentFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B521F841CFB37D200A71598 /* AligmentFunctions.swift */; };
 		9B521F871CFB380300A71598 /* SquareElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B521F861CFB380300A71598 /* SquareElement.swift */; };
-		9B6505261CB5A74800A3B41C /* icon.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 9B6505251CB5A74800A3B41C /* icon.iconset */; };
+		9B66961C1D08AF9F00CDE806 /* linked_ideas_doc_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9B66961B1D08AF9F00CDE806 /* linked_ideas_doc_icon.icns */; };
 		9B733AF71CB9B7D200C04F47 /* ResizingTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B733AF61CB9B7D200C04F47 /* ResizingTextField.swift */; };
 		9B7D535F1CB6D0A400B3D43B /* ElementView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B7D535E1CB6D0A400B3D43B /* ElementView.swift */; };
 		9B956CE51C1B11C200CF20DA /* NSPoint+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B956CE41C1B11C200CF20DA /* NSPoint+Utilities.swift */; };
@@ -74,7 +74,7 @@
 		9B48F84E1CD614C50014758D /* Mode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mode.swift; sourceTree = "<group>"; };
 		9B521F841CFB37D200A71598 /* AligmentFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AligmentFunctions.swift; sourceTree = "<group>"; };
 		9B521F861CFB380300A71598 /* SquareElement.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SquareElement.swift; sourceTree = "<group>"; };
-		9B6505251CB5A74800A3B41C /* icon.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = icon.iconset; sourceTree = "<group>"; };
+		9B66961B1D08AF9F00CDE806 /* linked_ideas_doc_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = linked_ideas_doc_icon.icns; sourceTree = "<group>"; };
 		9B733AF61CB9B7D200C04F47 /* ResizingTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResizingTextField.swift; sourceTree = "<group>"; };
 		9B7D535E1CB6D0A400B3D43B /* ElementView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementView.swift; sourceTree = "<group>"; };
 		9B956CE41C1B11C200CF20DA /* NSPoint+Utilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSPoint+Utilities.swift"; sourceTree = "<group>"; };
@@ -119,6 +119,7 @@
 		9B2F1D931BE7CFE70090CC18 = {
 			isa = PBXGroup;
 			children = (
+				9B66961B1D08AF9F00CDE806 /* linked_ideas_doc_icon.icns */,
 				9B2F1D9E1BE7CFE70090CC18 /* LinkedIdeas */,
 				9B2F1DB31BE7CFE80090CC18 /* LinkedIdeasTests */,
 				9B2F1D9D1BE7CFE70090CC18 /* Products */,
@@ -143,7 +144,6 @@
 				9B2F1DA61BE7CFE70090CC18 /* Assets.xcassets */,
 				9B2F1DA81BE7CFE80090CC18 /* MainMenu.xib */,
 				9B2F1DAB1BE7CFE80090CC18 /* Info.plist */,
-				9B6505251CB5A74800A3B41C /* icon.iconset */,
 				9BCA09E41C9217C900637F6D /* Views */,
 				9BCA09E31C9217A900637F6D /* Models */,
 				9BD2BF3E1C7F8B8D00E8A303 /* 2DMath */,
@@ -323,9 +323,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9B6505261CB5A74800A3B41C /* icon.iconset in Resources */,
 				9B2F1DA71BE7CFE70090CC18 /* Assets.xcassets in Resources */,
 				9B2F1DA51BE7CFE70090CC18 /* Document.xib in Resources */,
+				9B66961C1D08AF9F00CDE806 /* linked_ideas_doc_icon.icns in Resources */,
 				9B2F1DAA1BE7CFE80090CC18 /* MainMenu.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

LinkedIdeas/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,61 +3,61 @@
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "foo_16x16.png",
+      "filename" : "icon_16x16.png",
       "scale" : "1x"
     },
     {
       "size" : "16x16",
       "idiom" : "mac",
-      "filename" : "foo_16x16@2x.png",
+      "filename" : "icon_16x16@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "foo_32x32.png",
+      "filename" : "icon_32x32.png",
       "scale" : "1x"
     },
     {
       "size" : "32x32",
       "idiom" : "mac",
-      "filename" : "foo_32x32@2x.png",
+      "filename" : "icon_32x32@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "foo_128x128.png",
+      "filename" : "icon_128x128.png",
       "scale" : "1x"
     },
     {
       "size" : "128x128",
       "idiom" : "mac",
-      "filename" : "foo_128x128@2x.png",
+      "filename" : "icon_128x128@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "foo_256x256.png",
+      "filename" : "icon_256x256.png",
       "scale" : "1x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "foo_256x256@2x.png",
+      "filename" : "icon_256x256@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "foo_512x512.png",
+      "filename" : "icon_512x512.png",
       "scale" : "1x"
     },
     {
       "size" : "512x512",
       "idiom" : "mac",
-      "filename" : "foo_512x512@2x.png",
+      "filename" : "icon_512x512@2x.png",
       "scale" : "2x"
     }
   ],

LinkedIdeas/Base.lproj/Document.xib

@@ -17,6 +17,7 @@
                 <outlet property="equalHorizontalSpaceButton" destination="UOz-k6-jid" id="UMa-ZV-6zS"/>
                 <outlet property="equalVerticalSpaceButton" destination="h6j-hq-kaj" id="zGi-yO-mEG"/>
                 <outlet property="linkMode" destination="i7N-v3-T0p" id="HHb-Me-GvD"/>
+                <outlet property="scrollView" destination="Ath-s3-rsM" id="I1h-mR-FBO"/>
                 <outlet property="selectMode" destination="7v6-GU-e5B" id="WKz-LA-ejA"/>
                 <outlet property="ultraWindow" destination="xOd-HO-29H" id="y0s-jg-cSM"/>
                 <outlet property="window" destination="xOd-HO-29H" id="faa-lW-Akj"/>
@@ -150,7 +151,7 @@
                             <rect key="frame" x="1" y="1" width="896" height="530"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <customView translatesAutoresizingMaskIntoConstraints="NO" id="TBv-Q1-CwE" customClass="CanvasView" customModule="LinkedIdeas" customModuleProvider="target">
+                                <customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TBv-Q1-CwE" customClass="CanvasView" customModule="LinkedIdeas" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="897" height="530"/>
                                     <accessibility description="canvas view" identifier="canvas"/>
                                 </customView>
@@ -159,21 +160,12 @@
                                 <outlet property="nextKeyView" destination="Ath-s3-rsM" id="3sO-vn-JVb"/>
                             </connections>
                         </clipView>
-                        <constraints>
-                            <constraint firstItem="TBv-Q1-CwE" firstAttribute="top" secondItem="Ath-s3-rsM" secondAttribute="top" constant="1" id="03I-EW-dP3"/>
-                            <constraint firstAttribute="trailing" secondItem="TBv-Q1-CwE" secondAttribute="trailing" id="7GM-Qc-Leu"/>
-                            <constraint firstItem="TBv-Q1-CwE" firstAttribute="width" relation="lessThanOrEqual" secondItem="Ath-s3-rsM" secondAttribute="width" id="CfM-xX-6Ip"/>
-                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="530" id="PNv-SH-oab"/>
-                            <constraint firstAttribute="bottom" secondItem="TBv-Q1-CwE" secondAttribute="bottom" constant="1" id="UaE-yi-KId"/>
-                            <constraint firstItem="TBv-Q1-CwE" firstAttribute="leading" secondItem="Ath-s3-rsM" secondAttribute="leading" constant="1" id="gl8-KU-Fvh"/>
-                            <constraint firstItem="TBv-Q1-CwE" firstAttribute="height" relation="lessThanOrEqual" secondItem="Ath-s3-rsM" secondAttribute="height" id="oh1-vr-drr"/>
-                        </constraints>
                         <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="raK-9g-TDA">
                             <rect key="frame" x="1" y="515" width="896" height="16"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                         <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="7fF-pE-QO0">
-                            <rect key="frame" x="881" y="1" width="16" height="530"/>
+                            <rect key="frame" x="882" y="1" width="15" height="530"/>
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>

LinkedIdeas/CanvasView.swift

@@ -64,13 +64,14 @@ class CanvasView: NSView, Canvas, DocumentObserver, DraggableElementDelegate {
     let maxY = (elements.map { $0.rect.maxY }).maxElement()!
     return NSMakeRect(minX, minY, maxX - minX, maxY - minY)
   }
-
+
+  let minCanvasSize = NSMakeSize(900, 530)
   let padding: CGFloat = 30.0
   override var intrinsicContentSize: NSSize {
     let elements = concepts.map { $0 as SquareElement }
     var size = containingRectFor(elements).size
-    size.height += padding
-    size.width  += padding
+    size.height = [size.height, minCanvasSize.height].maxElement()! + padding
+    size.width  = [size.width, minCanvasSize.width].maxElement()! + padding
     return size
   }
 

LinkedIdeas/Info.plist

@@ -12,7 +12,7 @@
 				<string>idea</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>icon</string>
+			<string>linked_ideas_doc_icon</string>
 			<key>CFBundleTypeName</key>
 			<string>DocumentType</string>
 			<key>CFBundleTypeOSTypes</key>

LinkedIdeas/WindowController.swift

@@ -18,6 +18,7 @@ class WindowController: NSWindowController, AlignmentFunctions {
 
   @IBOutlet weak var colorSelector: NSColorWell!
 
+  @IBOutlet weak var scrollView: NSScrollView!
   dynamic var selectedColor: NSColor = Link.defaultColor
 
   var editionMode = Mode.Concepts
@@ -40,6 +41,7 @@ class WindowController: NSWindowController, AlignmentFunctions {
 
     let currentDocument = document as! Document
     canvas.document = currentDocument
+    canvas.frame = scrollView.bounds
   }
 
   // MARK: - Keyboard Events

README.md

@@ -23,7 +23,14 @@ way to 'explain' the connexion of ideas.
 - [x] multiple select concepts (move them) [#14](https://github.com/fespinoza/linked-ideas-osx/pull/14)
 - [x] align/space concepts [#15](https://github.com/fespinoza/linked-ideas-osx/pull/15)
 - [x] panning canvas [#16](https://github.com/fespinoza/linked-ideas-osx/pull/16)
-- [ ] add editable text to links
+
+## For releasing
+
+- [ ] BUG: dragging fails many times when concepts has already many links
+- [ ] BUG: constrains + dimensions of canvas and NSScrollView
+- [x] change app icon + document icon
+- [ ] add a folder with examples of documents
+- [ ] make a website for releasing
 
 ## Optional Features
 
@@ -32,10 +39,10 @@ way to 'explain' the connexion of ideas.
 - reorder concepts in canvas
 - add editable curvature to links
 - zooming canvas
+- add editable text to links
 
 ## A world of ideas
 
-- BUG: dragging fails many times when concepts has already many links
 - dismiss construction arrow on click
 - construction line not on same worker
 - control + dragging to create straight links