diff --git a/Docsis Toolkit.xcodeproj/project.pbxproj b/Docsis Toolkit.xcodeproj/project.pbxproj index 396dbfb..c4571de 100644 --- a/Docsis Toolkit.xcodeproj/project.pbxproj +++ b/Docsis Toolkit.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ E2218D621EF41415004298F6 /* CollectionViewMonth.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218D611EF41415004298F6 /* CollectionViewMonth.swift */; }; E2218D641EF45F37004298F6 /* LossDistributionPie.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218D631EF45F37004298F6 /* LossDistributionPie.swift */; }; E2218D671EF463B4004298F6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2218D661EF463B4004298F6 /* QuartzCore.framework */; }; + E2218D691EF478C0004298F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2218CA81EF2D37B004298F6 /* Assets.xcassets */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -451,6 +452,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E2218D691EF478C0004298F6 /* Assets.xcassets in Resources */, E2218D5E1EF3DD6F004298F6 /* CollectionViewItemMonth.xib in Resources */, E2218D541EF32BC4004298F6 /* Document.xib in Resources */, E2218D3B1EF32764004298F6 /* Graph.icns in Resources */, @@ -547,7 +549,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -591,7 +593,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; diff --git a/Graphic Analysis 2/CollectionViewItemMonth.xib b/Graphic Analysis 2/CollectionViewItemMonth.xib index 273d249..987e21b 100644 --- a/Graphic Analysis 2/CollectionViewItemMonth.xib +++ b/Graphic Analysis 2/CollectionViewItemMonth.xib @@ -22,7 +22,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -49,13 +49,31 @@ - + - + + + + + + + + + + + + + + + + + + + diff --git a/Graphic Analysis 2/CollectionViewMonth.swift b/Graphic Analysis 2/CollectionViewMonth.swift index 8aebd2c..0f359ce 100644 --- a/Graphic Analysis 2/CollectionViewMonth.swift +++ b/Graphic Analysis 2/CollectionViewMonth.swift @@ -47,3 +47,16 @@ extension CollectionViewMonth: NSCollectionViewDataSource { return item2 } } + +extension CollectionViewMonth : NSCollectionViewDelegate { + func collectionView(_ collectionView: NSCollectionView, didSelectItemsAt indexPaths: Set) { + guard let layer = (collectionView.item(at: indexPaths.first!) as? CollectionViewItemMonth)?.view.layer else { return } + layer.borderColor = NSColor.gray.cgColor + } + + func collectionView(_ collectionView: NSCollectionView, didDeselectItemsAt indexPaths: Set) { + guard let layer = (collectionView.item(at: indexPaths.first!) as? CollectionViewItemMonth)?.view.layer else { return } + layer.borderColor = NSColor.clear.cgColor + } +} + diff --git a/Graphic Analysis 2/Document.swift b/Graphic Analysis 2/Document.swift index 97cf2d0..063bb74 100644 --- a/Graphic Analysis 2/Document.swift +++ b/Graphic Analysis 2/Document.swift @@ -73,7 +73,7 @@ class Document: NSDocument { collectionViewYear.dataSource = yearDatasource collectionViewYear.delegate = yearDatasource collectionViewMonth.dataSource = monthDatasource - //collectionViewMonth.delegate = monthDatasource + collectionViewMonth.delegate = monthDatasource } override func shouldCloseWindowController(_ windowController: NSWindowController, delegate: Any?, shouldClose shouldCloseSelector: Selector?, contextInfo: UnsafeMutableRawPointer?) { diff --git a/Graphic Analysis 2/Document.xib b/Graphic Analysis 2/Document.xib index 71cd369..dca56f1 100644 --- a/Graphic Analysis 2/Document.xib +++ b/Graphic Analysis 2/Document.xib @@ -17,8 +17,8 @@ - - + + diff --git a/Graphic Analysis 2/Info.plist b/Graphic Analysis 2/Info.plist index 9cd434a..6bf5fec 100644 --- a/Graphic Analysis 2/Info.plist +++ b/Graphic Analysis 2/Info.plist @@ -44,7 +44,7 @@ CFBundleShortVersionString 2.0 CFBundleVersion - 208 + 216 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Graphic Analysis 2/buildnum.ver b/Graphic Analysis 2/buildnum.ver index ee4023d..d7387f2 100644 --- a/Graphic Analysis 2/buildnum.ver +++ b/Graphic Analysis 2/buildnum.ver @@ -1,2 +1,2 @@ version 2.0 -build 208 +build 216 diff --git a/Logger4/Info.plist b/Logger4/Info.plist index f1f78b7..d6a1da3 100644 --- a/Logger4/Info.plist +++ b/Logger4/Info.plist @@ -17,7 +17,7 @@ CFBundleShortVersionString 4.0 CFBundleVersion - 26 + 27 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Logger4/buildnum.ver b/Logger4/buildnum.ver index 48c2f33..843bd93 100644 --- a/Logger4/buildnum.ver +++ b/Logger4/buildnum.ver @@ -1,2 +1,2 @@ version 4.0 -build 26 +build 27