Kilian/DOCSIS-Toolkit
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.hofmannnet.myhome-server.de/Kilian/DOCSIS-Toolkit

Browse Source 
# Conflicts:
#	Docsis Toolkit.xcodeproj/project.pbxproj
#	Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
#	Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
#	Graphic Analysis 2/Info.plist
#	Graphic Analysis 2/buildnum.ver
This commit is contained in:
Kilian Hofmann 2020-11-02 12:19:50 +01:00
commit 3964c0978e
10 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Docsis Toolkit.xcodeproj/project.pbxproj
View File

@ -577,19 +577,23 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
<<<<<<< HEAD
LastUpgradeCheck = 1020;
=======
LastUpgradeCheck = 1150;
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
ORGANIZATIONNAME = "Kilian Hofmann";
TargetAttributes = {
E220BF9B1EFB22D400DF5A97 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 795KPDV76S;
LastSwiftMigration = 0900;
LastSwiftMigration = 1150;
ProvisioningStyle = Automatic;
};
E2218C971EF2D345004298F6 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 795KPDV76S;
LastSwiftMigration = 0900;
LastSwiftMigration = 1150;
ProvisioningStyle = Automatic;
};
E2218CE51EF2D577004298F6 = {
@ -600,7 +604,11 @@
E2218D281EF3271F004298F6 = {
CreatedOnToolsVersion = 8.3.3;
DevelopmentTeam = 795KPDV76S;
<<<<<<< HEAD
LastSwiftMigration = 1020;
=======
LastSwiftMigration = 1150;
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
ProvisioningStyle = Automatic;
};
E2218D3D1EF32803004298F6 = {
@ -615,6 +623,7 @@
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
@ -751,6 +760,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Converter/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
@ -758,7 +768,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@ -768,6 +778,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Converter/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.12;
@ -775,7 +786,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
@ -901,6 +912,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Logger4/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4;
@ -909,7 +921,7 @@
SWIFT_OBJC_BRIDGING_HEADER = "Logger4/Logger4-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
@ -921,6 +933,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Logger4/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4;
@ -928,7 +941,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Logger4/Logger4-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
@ -964,12 +977,17 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "Graphic Analysis 2/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Graphic-Analysis-2";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_DISABLE_SAFETY_CHECKS = NO;
<<<<<<< HEAD
=======
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
SWIFT_VERSION = 5.0;
};
name = Debug;
@ -981,6 +999,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 795KPDV76S;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "Graphic Analysis 2/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Graphic-Analysis-2";
@ -988,6 +1007,10 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_DISABLE_SAFETY_CHECKS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
<<<<<<< HEAD
=======
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
SWIFT_VERSION = 5.0;
};
name = Release;

12
Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<<<<<<< HEAD
LastUpgradeVersion = "1020"
=======
LastUpgradeVersion = "1150"
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -55,8 +59,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -66,8 +68,8 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -88,8 +90,6 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

12
Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<<<<<<< HEAD
LastUpgradeVersion = "1020"
=======
LastUpgradeVersion = "1150"
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -27,8 +31,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -38,8 +40,8 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -61,8 +63,6 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

12
Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<<<<<<< HEAD
LastUpgradeVersion = "1020"
=======
LastUpgradeVersion = "1150"
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -27,8 +31,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -38,8 +40,8 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -68,8 +70,6 @@
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

12
Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
<<<<<<< HEAD
LastUpgradeVersion = "1020"
=======
LastUpgradeVersion = "1150"
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -27,8 +31,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -38,8 +40,8 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -61,8 +63,6 @@
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"

4
Graphic Analysis 2/Info.plist
View File

@ -44,7 +44,11 @@
<key>CFBundleShortVersionString</key>
<string>2.1</string>
<key>CFBundleVersion</key>
<<<<<<< HEAD
<string>500</string>
=======
<string>499</string>
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>

4
Graphic Analysis 2/buildnum.ver
View File

@ -1,2 +1,6 @@
version 2.1
<<<<<<< HEAD
build 500
=======
build 499
>>>>>>> fe13d1c73951c5cae7f44dd2147bdbe028163299

4
Logger4/AppDelegate.swift
View File

@ -24,7 +24,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
// URL Session for DOCSIS data and Internet check
let urlSession: URLSession = URLSession(configuration: .default)
// Preferences
let pref: NSWindowController = NSWindowController(windowNibName: NSNib.Name(rawValue: "SettingsWindowController"))
let pref: NSWindowController = NSWindowController(windowNibName: "SettingsWindowController")
// Timers
var timerFreqs: Timer = Timer()
var timerFails: Timer = Timer()
@ -60,7 +60,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
let menuAbout: NSMenuItem = NSMenuItem(title: "About Logger", action: #selector(NSApp.orderFrontStandardAboutPanel(_:)), keyEquivalent: "")
let menuQuit: NSMenuItem = NSMenuItem.init(title: "Quit", action: #selector(NSApp.terminate(_:)), keyEquivalent: "q")
let menuPref: NSMenuItem = NSMenuItem(title: "Preferences", action: #selector(self.preferences(_:)), keyEquivalent: "")
menuPref.image = NSImage(named: NSImage.Name.actionTemplate)
menuPref.image = NSImage(named: NSImage.actionTemplateName)
// Layout menu
menu.addItem(menuAbout)
menu.addItem(NSMenuItem.separator())

2
Logger4/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>4.2</string>
<key>CFBundleVersion</key>
<string>50</string>
<string>51</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>

2
Logger4/buildnum.ver
View File

@ -1,2 +1,2 @@
version 4.2
build 50
build 51