From 651202e346e62f62898c6fcdcbd8557ff98f47df Mon Sep 17 00:00:00 2001 From: Dennis Kao Date: Tue, 25 Apr 2017 12:06:20 +1000 Subject: [PATCH 1/3] move letsmove to helper/ --- SpaceId.xcodeproj/project.pbxproj | 12 ++++-------- SpaceId/{ => Helper}/PFMoveApplication.h | 0 SpaceId/{ => Helper}/PFMoveApplication.m | 0 SpaceId/SpaceId-Bridging-Header.h | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) rename SpaceId/{ => Helper}/PFMoveApplication.h (100%) rename SpaceId/{ => Helper}/PFMoveApplication.m (100%) diff --git a/SpaceId.xcodeproj/project.pbxproj b/SpaceId.xcodeproj/project.pbxproj index 7c0ecab..451bfc3 100644 --- a/SpaceId.xcodeproj/project.pbxproj +++ b/SpaceId.xcodeproj/project.pbxproj @@ -11,8 +11,7 @@ 1906705F1E4B36F700D3A7A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1906705D1E4B36F700D3A7A4 /* MainMenu.xib */; }; 190670611E4B3B6A00D3A7A4 /* StatusItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 190670601E4B3B6A00D3A7A4 /* StatusItem.swift */; }; 190670631E4C84B100D3A7A4 /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 190670621E4C84B100D3A7A4 /* Preference.swift */; }; - 1972EE901EAEE1CF00658284 /* PFMoveApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 1972EE8E1EAEE1CF00658284 /* PFMoveApplication.h */; }; - 1972EE911EAEE1CF00658284 /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1972EE8F1EAEE1CF00658284 /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 1972EE991EAEE61A00658284 /* Helper in Resources */ = {isa = PBXBuildFile; fileRef = 1972EE981EAEE61A00658284 /* Helper */; }; 19A7AC7D1E44D493004FBE39 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */; }; 19A7AC9A1E44D4C0004FBE39 /* Space.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC971E44D4C0004FBE39 /* Space.swift */; }; 19A7AC9C1E44D4C0004FBE39 /* SpaceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC991E44D4C0004FBE39 /* SpaceInfo.swift */; }; @@ -49,8 +48,7 @@ 1906705E1E4B36F700D3A7A4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 190670601E4B3B6A00D3A7A4 /* StatusItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusItem.swift; sourceTree = ""; }; 190670621E4C84B100D3A7A4 /* Preference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preference.swift; sourceTree = ""; }; - 1972EE8E1EAEE1CF00658284 /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = ""; }; - 1972EE8F1EAEE1CF00658284 /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = ""; }; + 1972EE981EAEE61A00658284 /* Helper */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Helper; sourceTree = ""; }; 19A7AC791E44D493004FBE39 /* SpaceId.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SpaceId.app; sourceTree = BUILT_PRODUCTS_DIR; }; 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 19A7AC831E44D493004FBE39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -101,9 +99,8 @@ 19A7AC7B1E44D493004FBE39 /* SpaceId */ = { isa = PBXGroup; children = ( + 1972EE981EAEE61A00658284 /* Helper */, 19A7ACD21E46D4BF004FBE39 /* SpaceId-Bridging-Header.h */, - 1972EE8E1EAEE1CF00658284 /* PFMoveApplication.h */, - 1972EE8F1EAEE1CF00658284 /* PFMoveApplication.m */, 19A7AC831E44D493004FBE39 /* Info.plist */, 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */, 19A7ACC91E46225E004FBE39 /* ButtonImage.swift */, @@ -126,7 +123,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1972EE901EAEE1CF00658284 /* PFMoveApplication.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -220,6 +216,7 @@ files = ( 19A7ACC41E459839004FBE39 /* Assets.xcassets in Resources */, 1906705F1E4B36F700D3A7A4 /* MainMenu.xib in Resources */, + 1972EE991EAEE61A00658284 /* Helper in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -239,7 +236,6 @@ files = ( 19A7AC9A1E44D4C0004FBE39 /* Space.swift in Sources */, 19A7ACCA1E46225E004FBE39 /* ButtonImage.swift in Sources */, - 1972EE911EAEE1CF00658284 /* PFMoveApplication.m in Sources */, 190670631E4C84B100D3A7A4 /* Preference.swift in Sources */, 190670611E4B3B6A00D3A7A4 /* StatusItem.swift in Sources */, 19A7AC7D1E44D493004FBE39 /* AppDelegate.swift in Sources */, diff --git a/SpaceId/PFMoveApplication.h b/SpaceId/Helper/PFMoveApplication.h similarity index 100% rename from SpaceId/PFMoveApplication.h rename to SpaceId/Helper/PFMoveApplication.h diff --git a/SpaceId/PFMoveApplication.m b/SpaceId/Helper/PFMoveApplication.m similarity index 100% rename from SpaceId/PFMoveApplication.m rename to SpaceId/Helper/PFMoveApplication.m diff --git a/SpaceId/SpaceId-Bridging-Header.h b/SpaceId/SpaceId-Bridging-Header.h index 4994609..2e94344 100644 --- a/SpaceId/SpaceId-Bridging-Header.h +++ b/SpaceId/SpaceId-Bridging-Header.h @@ -2,7 +2,7 @@ #ifndef SpaceId_Bridging_Header_h #define SpaceId_Bridging_Header_h -#import "PFMoveApplication.h" +#import "Helper/PFMoveApplication.h" id CGSCopyManagedDisplaySpaces(int conn); int _CGSDefaultConnection(); From 2dcfafe66d2e5e25cb91ca0b2f4e6abd9f35ebe5 Mon Sep 17 00:00:00 2001 From: Dennis Kao Date: Tue, 25 Apr 2017 12:10:06 +1000 Subject: [PATCH 2/3] move src to /Application --- SpaceId.xcodeproj/project.pbxproj | 98 ++++++++++++------- SpaceId/{ => Application}/AppDelegate.swift | 0 SpaceId/{ => Application}/ButtonImage.swift | 0 SpaceId/{ => Application}/Observer.swift | 0 SpaceId/{ => Application}/Preference.swift | 0 SpaceId/{ => Application}/Space.swift | 0 .../{ => Application}/SpaceIdentifier.swift | 0 SpaceId/{ => Application}/SpaceInfo.swift | 0 SpaceId/{ => Application}/StatusItem.swift | 0 9 files changed, 60 insertions(+), 38 deletions(-) rename SpaceId/{ => Application}/AppDelegate.swift (100%) rename SpaceId/{ => Application}/ButtonImage.swift (100%) rename SpaceId/{ => Application}/Observer.swift (100%) rename SpaceId/{ => Application}/Preference.swift (100%) rename SpaceId/{ => Application}/Space.swift (100%) rename SpaceId/{ => Application}/SpaceIdentifier.swift (100%) rename SpaceId/{ => Application}/SpaceInfo.swift (100%) rename SpaceId/{ => Application}/StatusItem.swift (100%) diff --git a/SpaceId.xcodeproj/project.pbxproj b/SpaceId.xcodeproj/project.pbxproj index 451bfc3..5fc69b4 100644 --- a/SpaceId.xcodeproj/project.pbxproj +++ b/SpaceId.xcodeproj/project.pbxproj @@ -7,17 +7,19 @@ objects = { /* Begin PBXBuildFile section */ - 1906705C1E4B352100D3A7A4 /* Observer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1906705B1E4B352100D3A7A4 /* Observer.swift */; }; 1906705F1E4B36F700D3A7A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1906705D1E4B36F700D3A7A4 /* MainMenu.xib */; }; - 190670611E4B3B6A00D3A7A4 /* StatusItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 190670601E4B3B6A00D3A7A4 /* StatusItem.swift */; }; - 190670631E4C84B100D3A7A4 /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 190670621E4C84B100D3A7A4 /* Preference.swift */; }; - 1972EE991EAEE61A00658284 /* Helper in Resources */ = {isa = PBXBuildFile; fileRef = 1972EE981EAEE61A00658284 /* Helper */; }; - 19A7AC7D1E44D493004FBE39 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */; }; - 19A7AC9A1E44D4C0004FBE39 /* Space.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC971E44D4C0004FBE39 /* Space.swift */; }; - 19A7AC9C1E44D4C0004FBE39 /* SpaceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7AC991E44D4C0004FBE39 /* SpaceInfo.swift */; }; + 1972EE9E1EAEE70100658284 /* PFMoveApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 1972EE9C1EAEE70100658284 /* PFMoveApplication.h */; }; + 1972EE9F1EAEE70100658284 /* PFMoveApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1972EE9D1EAEE70100658284 /* PFMoveApplication.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 1972EEAA1EAEE75A00658284 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA11EAEE75A00658284 /* AppDelegate.swift */; }; + 1972EEAB1EAEE75A00658284 /* ButtonImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA21EAEE75A00658284 /* ButtonImage.swift */; }; + 1972EEAC1EAEE75A00658284 /* Observer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA31EAEE75A00658284 /* Observer.swift */; }; + 1972EEAD1EAEE75A00658284 /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA41EAEE75A00658284 /* Preference.swift */; }; + 1972EEAE1EAEE75A00658284 /* Space.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA51EAEE75A00658284 /* Space.swift */; }; + 1972EEAF1EAEE75A00658284 /* SpaceId-Bridging-Header.h in Headers */ = {isa = PBXBuildFile; fileRef = 1972EEA61EAEE75A00658284 /* SpaceId-Bridging-Header.h */; }; + 1972EEB01EAEE75A00658284 /* SpaceIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA71EAEE75A00658284 /* SpaceIdentifier.swift */; }; + 1972EEB11EAEE75A00658284 /* SpaceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA81EAEE75A00658284 /* SpaceInfo.swift */; }; + 1972EEB21EAEE75A00658284 /* StatusItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1972EEA91EAEE75A00658284 /* StatusItem.swift */; }; 19A7ACC41E459839004FBE39 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 19A7ACC31E459839004FBE39 /* Assets.xcassets */; }; - 19A7ACCA1E46225E004FBE39 /* ButtonImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7ACC91E46225E004FBE39 /* ButtonImage.swift */; }; - 19A7ACCE1E46CEC6004FBE39 /* SpaceIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A7ACCD1E46CEC6004FBE39 /* SpaceIdentifier.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,21 +46,22 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1906705B1E4B352100D3A7A4 /* Observer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observer.swift; sourceTree = ""; }; 1906705E1E4B36F700D3A7A4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; - 190670601E4B3B6A00D3A7A4 /* StatusItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusItem.swift; sourceTree = ""; }; - 190670621E4C84B100D3A7A4 /* Preference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preference.swift; sourceTree = ""; }; - 1972EE981EAEE61A00658284 /* Helper */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Helper; sourceTree = ""; }; + 1972EE9C1EAEE70100658284 /* PFMoveApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFMoveApplication.h; sourceTree = ""; }; + 1972EE9D1EAEE70100658284 /* PFMoveApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFMoveApplication.m; sourceTree = ""; }; + 1972EEA11EAEE75A00658284 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 1972EEA21EAEE75A00658284 /* ButtonImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonImage.swift; sourceTree = ""; }; + 1972EEA31EAEE75A00658284 /* Observer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Observer.swift; sourceTree = ""; }; + 1972EEA41EAEE75A00658284 /* Preference.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preference.swift; sourceTree = ""; }; + 1972EEA51EAEE75A00658284 /* Space.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Space.swift; sourceTree = ""; }; + 1972EEA61EAEE75A00658284 /* SpaceId-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SpaceId-Bridging-Header.h"; sourceTree = ""; }; + 1972EEA71EAEE75A00658284 /* SpaceIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpaceIdentifier.swift; sourceTree = ""; }; + 1972EEA81EAEE75A00658284 /* SpaceInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpaceInfo.swift; sourceTree = ""; }; + 1972EEA91EAEE75A00658284 /* StatusItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusItem.swift; sourceTree = ""; }; 19A7AC791E44D493004FBE39 /* SpaceId.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SpaceId.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 19A7AC831E44D493004FBE39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 19A7AC881E44D493004FBE39 /* SpaceIdTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SpaceIdTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 19A7AC971E44D4C0004FBE39 /* Space.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Space.swift; sourceTree = ""; }; - 19A7AC991E44D4C0004FBE39 /* SpaceInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpaceInfo.swift; sourceTree = ""; }; 19A7ACC31E459839004FBE39 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 19A7ACC91E46225E004FBE39 /* ButtonImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ButtonImage.swift; sourceTree = ""; }; - 19A7ACCD1E46CEC6004FBE39 /* SpaceIdentifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpaceIdentifier.swift; sourceTree = ""; }; - 19A7ACD21E46D4BF004FBE39 /* SpaceId-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SpaceId-Bridging-Header.h"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,6 +82,30 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1972EE9B1EAEE70100658284 /* Helper */ = { + isa = PBXGroup; + children = ( + 1972EE9C1EAEE70100658284 /* PFMoveApplication.h */, + 1972EE9D1EAEE70100658284 /* PFMoveApplication.m */, + ); + path = Helper; + sourceTree = ""; + }; + 1972EEA01EAEE75A00658284 /* Application */ = { + isa = PBXGroup; + children = ( + 1972EEA11EAEE75A00658284 /* AppDelegate.swift */, + 1972EEA21EAEE75A00658284 /* ButtonImage.swift */, + 1972EEA31EAEE75A00658284 /* Observer.swift */, + 1972EEA41EAEE75A00658284 /* Preference.swift */, + 1972EEA51EAEE75A00658284 /* Space.swift */, + 1972EEA71EAEE75A00658284 /* SpaceIdentifier.swift */, + 1972EEA81EAEE75A00658284 /* SpaceInfo.swift */, + 1972EEA91EAEE75A00658284 /* StatusItem.swift */, + ); + path = Application; + sourceTree = ""; + }; 19A7AC701E44D493004FBE39 = { isa = PBXGroup; children = ( @@ -99,17 +126,10 @@ 19A7AC7B1E44D493004FBE39 /* SpaceId */ = { isa = PBXGroup; children = ( - 1972EE981EAEE61A00658284 /* Helper */, - 19A7ACD21E46D4BF004FBE39 /* SpaceId-Bridging-Header.h */, + 1972EEA61EAEE75A00658284 /* SpaceId-Bridging-Header.h */, + 1972EEA01EAEE75A00658284 /* Application */, + 1972EE9B1EAEE70100658284 /* Helper */, 19A7AC831E44D493004FBE39 /* Info.plist */, - 19A7AC7C1E44D493004FBE39 /* AppDelegate.swift */, - 19A7ACC91E46225E004FBE39 /* ButtonImage.swift */, - 190670601E4B3B6A00D3A7A4 /* StatusItem.swift */, - 1906705B1E4B352100D3A7A4 /* Observer.swift */, - 19A7AC971E44D4C0004FBE39 /* Space.swift */, - 19A7ACCD1E46CEC6004FBE39 /* SpaceIdentifier.swift */, - 19A7AC991E44D4C0004FBE39 /* SpaceInfo.swift */, - 190670621E4C84B100D3A7A4 /* Preference.swift */, 19A7ACC31E459839004FBE39 /* Assets.xcassets */, 1906705D1E4B36F700D3A7A4 /* MainMenu.xib */, ); @@ -123,6 +143,8 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 1972EE9E1EAEE70100658284 /* PFMoveApplication.h in Headers */, + 1972EEAF1EAEE75A00658284 /* SpaceId-Bridging-Header.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -216,7 +238,6 @@ files = ( 19A7ACC41E459839004FBE39 /* Assets.xcassets in Resources */, 1906705F1E4B36F700D3A7A4 /* MainMenu.xib in Resources */, - 1972EE991EAEE61A00658284 /* Helper in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -234,14 +255,15 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 19A7AC9A1E44D4C0004FBE39 /* Space.swift in Sources */, - 19A7ACCA1E46225E004FBE39 /* ButtonImage.swift in Sources */, - 190670631E4C84B100D3A7A4 /* Preference.swift in Sources */, - 190670611E4B3B6A00D3A7A4 /* StatusItem.swift in Sources */, - 19A7AC7D1E44D493004FBE39 /* AppDelegate.swift in Sources */, - 19A7AC9C1E44D4C0004FBE39 /* SpaceInfo.swift in Sources */, - 1906705C1E4B352100D3A7A4 /* Observer.swift in Sources */, - 19A7ACCE1E46CEC6004FBE39 /* SpaceIdentifier.swift in Sources */, + 1972EEAD1EAEE75A00658284 /* Preference.swift in Sources */, + 1972EEB21EAEE75A00658284 /* StatusItem.swift in Sources */, + 1972EEB11EAEE75A00658284 /* SpaceInfo.swift in Sources */, + 1972EEAE1EAEE75A00658284 /* Space.swift in Sources */, + 1972EEAC1EAEE75A00658284 /* Observer.swift in Sources */, + 1972EEAB1EAEE75A00658284 /* ButtonImage.swift in Sources */, + 1972EE9F1EAEE70100658284 /* PFMoveApplication.m in Sources */, + 1972EEB01EAEE75A00658284 /* SpaceIdentifier.swift in Sources */, + 1972EEAA1EAEE75A00658284 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SpaceId/AppDelegate.swift b/SpaceId/Application/AppDelegate.swift similarity index 100% rename from SpaceId/AppDelegate.swift rename to SpaceId/Application/AppDelegate.swift diff --git a/SpaceId/ButtonImage.swift b/SpaceId/Application/ButtonImage.swift similarity index 100% rename from SpaceId/ButtonImage.swift rename to SpaceId/Application/ButtonImage.swift diff --git a/SpaceId/Observer.swift b/SpaceId/Application/Observer.swift similarity index 100% rename from SpaceId/Observer.swift rename to SpaceId/Application/Observer.swift diff --git a/SpaceId/Preference.swift b/SpaceId/Application/Preference.swift similarity index 100% rename from SpaceId/Preference.swift rename to SpaceId/Application/Preference.swift diff --git a/SpaceId/Space.swift b/SpaceId/Application/Space.swift similarity index 100% rename from SpaceId/Space.swift rename to SpaceId/Application/Space.swift diff --git a/SpaceId/SpaceIdentifier.swift b/SpaceId/Application/SpaceIdentifier.swift similarity index 100% rename from SpaceId/SpaceIdentifier.swift rename to SpaceId/Application/SpaceIdentifier.swift diff --git a/SpaceId/SpaceInfo.swift b/SpaceId/Application/SpaceInfo.swift similarity index 100% rename from SpaceId/SpaceInfo.swift rename to SpaceId/Application/SpaceInfo.swift diff --git a/SpaceId/StatusItem.swift b/SpaceId/Application/StatusItem.swift similarity index 100% rename from SpaceId/StatusItem.swift rename to SpaceId/Application/StatusItem.swift From 426d4ecf782ef4acc5e883cea8a36aeae00dc9ad Mon Sep 17 00:00:00 2001 From: Dennis Kao Date: Tue, 25 Apr 2017 12:34:29 +1000 Subject: [PATCH 3/3] version - update app version to v1.3 - add version indicator --- SpaceId/Application/StatusItem.swift | 3 +++ SpaceId/Info.plist | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SpaceId/Application/StatusItem.swift b/SpaceId/Application/StatusItem.swift index f288387..ad8f902 100644 --- a/SpaceId/Application/StatusItem.swift +++ b/SpaceId/Application/StatusItem.swift @@ -26,6 +26,9 @@ class StatusItem: NSObject, NSMenuDelegate { let opt = NSMenuItem(title: "Options", action: nil, keyEquivalent: "") let quit = NSMenuItem(title: "Quit", action: #selector(quit(_:)), keyEquivalent: "") quit.target = self + let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") ?? "0" + menu.addItem(NSMenuItem(title: "v\(version)", action: nil, keyEquivalent: "")) + menu.addItem(NSMenuItem.separator()) menu.addItem(pref) menu.setSubmenu(preferenceMenu(), for: pref) menu.addItem(opt) diff --git a/SpaceId/Info.plist b/SpaceId/Info.plist index 457c7a3..2dffe55 100644 --- a/SpaceId/Info.plist +++ b/SpaceId/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2 + 1.3 CFBundleVersion - 3 + 4 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright