Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/SafeExamBrowser/seb-mac
Browse files Browse the repository at this point in the history
  • Loading branch information
@danschlet
danschlet committed Aug 31, 2022
2 parents 21d7757 + 9126752 commit 328a5ca
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
7 changes: 4 additions & 3 deletions SEBVerificator/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -222,7 +223,7 @@
<rect key="frame" x="0.0" y="340" width="1338" height="200"/>
<clipView key="contentView" id="k7O-lq-i7m">
<rect key="frame" x="1" y="1" width="1336" height="198"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="vV8-JJ-2fX" id="ZMx-gA-u2W">
<rect key="frame" x="0.0" y="0.0" width="1336" height="170"/>
Expand Down Expand Up @@ -417,7 +418,7 @@
<rect key="frame" x="0.0" y="120" width="1338" height="200"/>
<clipView key="contentView" id="xZw-cH-zmv">
<rect key="frame" x="1" y="1" width="1336" height="198"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="0K2-hZ-wDD" id="IEh-cS-UDg">
<rect key="frame" x="0.0" y="0.0" width="1336" height="170"/>
Expand Down Expand Up @@ -470,7 +471,7 @@
<rect key="frame" x="0.0" y="40" width="1338" height="60"/>
<clipView key="contentView" drawsBackground="NO" id="4jv-PP-ZfR">
<rect key="frame" x="0.0" y="0.0" width="1323" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" spellingCorrection="YES" smartInsertDelete="YES" id="NEW-mA-dfB">
<rect key="frame" x="0.0" y="0.0" width="1323" height="60"/>
Expand Down
2 changes: 1 addition & 1 deletion SEBVerificator/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class ViewController: NSViewController, ProcessListViewControllerDelegate, NSApp
#endif
for runningApplication in runningApplications {
if runningApplication.bundleIdentifier != "org.safeexambrowser.SEBVerificator" &&
(debug && runningApplication.bundleIdentifier != "com.apple.dt.Xcode") {
!(debug && runningApplication.bundleIdentifier == "com.apple.dt.Xcode") {
if runningApplication.activationPolicy == .regular {
DDLogInfo("Running app \(runningApplication.bundleIdentifier ?? "no BundleID") (\(runningApplication.executableURL?.absoluteString ?? "no executable URL")) is visible in the Dock and should be quit.")
let success = runningApplication.terminate()
Expand Down
28 changes: 14 additions & 14 deletions SafeExamBrowser.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5238,7 +5238,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 9Z623UDZ5L;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5337,7 +5337,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 9Z623UDZ5L;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -5609,7 +5609,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 6F38DNSC7X;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -5670,7 +5670,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 6F38DNSC7X;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -5726,7 +5726,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 62DXYN3744;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5770,7 +5770,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 62DXYN3744;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5807,7 +5807,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 62DXYN3744;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5850,7 +5850,7 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 62DXYN3744;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand Down Expand Up @@ -5885,7 +5885,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEVELOPMENT_TEAM = 9Z623UDZ5L;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -5942,7 +5942,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Daniel Schneider (6F38DNSC7X)";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = " 9Z623UDZ5L";
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -6003,7 +6003,7 @@
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEVELOPMENT_TEAM = 6F38DNSC7X;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -6060,7 +6060,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Daniel Schneider (6F38DNSC7X)";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 6F38DNSC7X;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -6131,7 +6131,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: Fondation de l'Ecole hôtelière de Lausanne, EHL";
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down Expand Up @@ -6187,7 +6187,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution: Fondation de l'Ecole hôtelière de Lausanne, EHL";
CURRENT_PROJECT_VERSION = 14206;
CURRENT_PROJECT_VERSION = 14207;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand Down
2 changes: 1 addition & 1 deletion SafeExamBrowserETH-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>14206</string>
<string>14207</string>
<key>ClickToFlashOptOut</key>
<true/>
<key>LSApplicationCategoryType</key>
Expand Down

0 comments on commit 328a5ca

Please sign in to comment.