Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

issue #12: implemented basic download management #16

Merged
merged 9 commits into from
May 1, 2015
Merged

issue #12: implemented basic download management #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bd9201
issue #12: implemented basic download management
art-divin Apr 26, 2015
e05741e
Merge branch 'master' into issue-12
art-divin Apr 26, 2015
3527c2e
Merge branch 'master' into issue-12
art-divin Apr 26, 2015
7aeae76
issue #12: implemented download listing
art-divin Apr 26, 2015
2648a34
Merge branch 'master' into issue-12
art-divin Apr 28, 2015
b3dfa76
UI improvements
art-divin Apr 28, 2015
fa77057
Merge branch 'master' into issue-12
art-divin Apr 30, 2015
e770744
issue #12: improved UX
art-divin May 1, 2015
c2128b9
removed missing IBAction
art-divin May 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions WWDC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

/* Begin PBXBuildFile section */
1C967BAA1AE7EB27003662B2 /* NSString+QualifierSearchParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C967BA91AE7EB27003662B2 /* NSString+QualifierSearchParser.m */; };
C913E99A1AED1D2900EBC693 /* DownloadListWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C913E9991AED1D2900EBC693 /* DownloadListWindowController.xib */; };
C913E99C1AED21FB00EBC693 /* DownloadListWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C913E99B1AED21FB00EBC693 /* DownloadListWindowController.swift */; };
C913E9A21AED435800EBC693 /* DownloadListProgressCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C913E9A11AED435800EBC693 /* DownloadListProgressCellView.swift */; };
DD2016061AE3FA6600DD8155 /* SessionProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD2016051AE3FA6600DD8155 /* SessionProgressView.swift */; };
DD2016681AE402B400DD8155 /* ViewUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2016661AE4029100DD8155 /* ViewUtils.framework */; };
DD2016691AE402B400DD8155 /* ViewUtils.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD2016661AE4029100DD8155 /* ViewUtils.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -36,7 +39,6 @@
DDC049D11AE564F20008D41A /* PDFWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDC049CF1AE564F20008D41A /* PDFWindowController.xib */; };
DDCC5D721AF1518A00F24F55 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDCC5D711AF1518A00F24F55 /* Crashlytics.framework */; };
DDCC5D761AF1532600F24F55 /* GRCrashlyticsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = DDCC5D751AF1532600F24F55 /* GRCrashlyticsHelper.m */; };
DDCC5D7C1AF156EF00F24F55 /* GRCrashlyticsCredentials.m in Sources */ = {isa = PBXBuildFile; fileRef = DDCC5D7B1AF156EF00F24F55 /* GRCrashlyticsCredentials.m */; };
DDD7A4331AE2DF14000A0102 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD7A4321AE2DF14000A0102 /* Theme.swift */; };
DDD7A4351AE2E02A000A0102 /* SeparatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD7A4341AE2E02A000A0102 /* SeparatorView.swift */; };
DDD7A4381AE2E265000A0102 /* Session.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD7A4371AE2E265000A0102 /* Session.swift */; };
Expand Down Expand Up @@ -97,6 +99,9 @@
1C967BA81AE7EB27003662B2 /* NSString+QualifierSearchParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+QualifierSearchParser.h"; sourceTree = "<group>"; };
1C967BA91AE7EB27003662B2 /* NSString+QualifierSearchParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+QualifierSearchParser.m"; sourceTree = "<group>"; };
1C967BAB1AE7EB5C003662B2 /* WWDC-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WWDC-Bridging-Header.h"; sourceTree = "<group>"; };
C913E9991AED1D2900EBC693 /* DownloadListWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DownloadListWindowController.xib; sourceTree = "<group>"; };
C913E99B1AED21FB00EBC693 /* DownloadListWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadListWindowController.swift; sourceTree = "<group>"; };
C913E9A11AED435800EBC693 /* DownloadListProgressCellView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadListProgressCellView.swift; sourceTree = "<group>"; };
DD2016051AE3FA6600DD8155 /* SessionProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SessionProgressView.swift; sourceTree = "<group>"; };
DD2016611AE4029100DD8155 /* ViewUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ViewUtils.xcodeproj; path = ViewUtils/ViewUtils.xcodeproj; sourceTree = "<group>"; };
DD20166D1AE40D0100DD8155 /* ContentBackgroundView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentBackgroundView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -127,8 +132,6 @@
DDCC5D711AF1518A00F24F55 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
DDCC5D741AF1532600F24F55 /* GRCrashlyticsHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRCrashlyticsHelper.h; sourceTree = "<group>"; };
DDCC5D751AF1532600F24F55 /* GRCrashlyticsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRCrashlyticsHelper.m; sourceTree = "<group>"; };
DDCC5D7A1AF156EF00F24F55 /* GRCrashlyticsCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRCrashlyticsCredentials.h; sourceTree = "<group>"; };
DDCC5D7B1AF156EF00F24F55 /* GRCrashlyticsCredentials.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRCrashlyticsCredentials.m; sourceTree = "<group>"; };
DDD7A4321AE2DF14000A0102 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
DDD7A4341AE2E02A000A0102 /* SeparatorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SeparatorView.swift; sourceTree = "<group>"; };
DDD7A4371AE2E265000A0102 /* Session.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Session.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -228,8 +231,6 @@
DDCC5D731AF1530800F24F55 /* Crashlytics */ = {
isa = PBXGroup;
children = (
DDCC5D7A1AF156EF00F24F55 /* GRCrashlyticsCredentials.h */,
DDCC5D7B1AF156EF00F24F55 /* GRCrashlyticsCredentials.m */,
DDCC5D741AF1532600F24F55 /* GRCrashlyticsHelper.h */,
DDCC5D751AF1532600F24F55 /* GRCrashlyticsHelper.m */,
DD829F1B1AF26D3C00B5977B /* Crashlytics.sh */,
Expand All @@ -240,6 +241,7 @@
DDD7A42D1AE2DECE000A0102 /* Views */ = {
isa = PBXGroup;
children = (
C913E9A11AED435800EBC693 /* DownloadListProgressCellView.swift */,
DD4F6E721AE2D5980099BEB5 /* VideoTableCellView.swift */,
DD4F6E781AE2D98F0099BEB5 /* HeaderView.swift */,
DDD7A4341AE2E02A000A0102 /* SeparatorView.swift */,
Expand All @@ -257,6 +259,7 @@
DD2016731AE411C800DD8155 /* VideoWindowController.swift */,
DDC049CE1AE564F20008D41A /* PDFWindowController.swift */,
DD92EAAA1AE9795900D503AE /* TranscriptWindowController.swift */,
C913E99B1AED21FB00EBC693 /* DownloadListWindowController.swift */,
);
name = "Main Controllers";
sourceTree = "<group>";
Expand All @@ -280,6 +283,7 @@
DD2016741AE411C800DD8155 /* VideoWindowController.xib */,
DD4F6E571AE2D11D0099BEB5 /* Main.storyboard */,
DD4F6E751AE2D82A0099BEB5 /* VideosHeaderViewController.xib */,
C913E9991AED1D2900EBC693 /* DownloadListWindowController.xib */,
);
name = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -404,6 +408,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C913E99A1AED1D2900EBC693 /* DownloadListWindowController.xib in Resources */,
DD4F6E561AE2D11D0099BEB5 /* Images.xcassets in Resources */,
DD2016761AE411C800DD8155 /* VideoWindowController.xib in Resources */,
DDC049D11AE564F20008D41A /* PDFWindowController.xib in Resources */,
Expand Down Expand Up @@ -438,21 +443,22 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C913E9A21AED435800EBC693 /* DownloadListProgressCellView.swift in Sources */,
DD20166E1AE40D0100DD8155 /* ContentBackgroundView.swift in Sources */,
DDD7A4351AE2E02A000A0102 /* SeparatorView.swift in Sources */,
DD4F6E761AE2D82A0099BEB5 /* VideosHeaderViewController.swift in Sources */,
DDF80A681AE8AC78004BE8E2 /* StringExtensions.swift in Sources */,
DD373A8A1AE871AB00DAC19B /* VideoStore.swift in Sources */,
DDD7A4331AE2DF14000A0102 /* Theme.swift in Sources */,
DDE6CFE61AED1F3700DC8D9E /* ActionButtonsViewController.swift in Sources */,
DDCC5D7C1AF156EF00F24F55 /* GRCrashlyticsCredentials.m in Sources */,
DD92EAAC1AE9795900D503AE /* TranscriptWindowController.swift in Sources */,
DDD7A43D1AE2E39A000A0102 /* SwiftyJSON.swift in Sources */,
DD2016751AE411C800DD8155 /* VideoWindowController.swift in Sources */,
DDCC5D761AF1532600F24F55 /* GRCrashlyticsHelper.m in Sources */,
DD4F6E541AE2D11D0099BEB5 /* VideosViewController.swift in Sources */,
DDD7A43A1AE2E305000A0102 /* DataStore.swift in Sources */,
DD2016061AE3FA6600DD8155 /* SessionProgressView.swift in Sources */,
C913E99C1AED21FB00EBC693 /* DownloadListWindowController.swift in Sources */,
DD4F6E521AE2D11D0099BEB5 /* AppDelegate.swift in Sources */,
DD4F6E731AE2D5980099BEB5 /* VideoTableCellView.swift in Sources */,
DD4F6E711AE2D1C60099BEB5 /* VideoDetailsViewController.swift in Sources */,
Expand Down Expand Up @@ -578,7 +584,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -597,7 +602,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand Down
10 changes: 8 additions & 2 deletions WWDC/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ import Crashlytics
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {



var window: NSWindow?
private var downloadListWindow: DownloadListWindowController?

func applicationOpenUntitledFile(sender: NSApplication) -> Bool {
window?.makeKeyAndOrderFront(nil)
Expand All @@ -36,6 +35,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// Insert code here to tear down your application
}

@IBAction func showDownloadListWindow(sender: NSMenuItem) {
if self.downloadListWindow == nil {
self.downloadListWindow = DownloadListWindowController()
}
self.downloadListWindow?.showWindow(self);
}


}

Loading