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 Jan 10, 2023
2 parents 328a5ca + fb166cb commit 6f44170
Show file tree
Hide file tree
Showing 307 changed files with 17,648 additions and 56,296 deletions.
26 changes: 13 additions & 13 deletions Base.lproj/MainMenu.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
<menuItem title="Reload Page" keyEquivalent="r" id="887">
<connections>
<action selector="reload:" target="543" id="XEr-5J-eyD"/>
<binding destination="543" name="enabled" keyPath="self.dockButtonReload.enabled" id="FOS-yi-Kew"/>
<binding destination="543" name="enabled" keyPath="self.reloadPageUIElement.enabled" id="1pV-Iw-Bup"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="905"/>
Expand Down Expand Up @@ -451,7 +451,7 @@
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="340" y="419" width="550" height="300"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<view key="contentView" id="860" customClass="AboutView">
<rect key="frame" x="0.0" y="0.0" width="550" height="300"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -472,7 +472,7 @@
<rect key="frame" x="319" y="12" width="220" height="170"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="QVG-V8-8iz">
<rect key="frame" x="0.0" y="0.0" width="220" height="170"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="5oh-B4-DAg">
<rect key="frame" x="0.0" y="0.0" width="220" height="170"/>
Expand Down Expand Up @@ -621,7 +621,7 @@
<windowStyleMask key="styleMask" titled="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<rect key="contentRect" x="340" y="419" width="412" height="107"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<value key="minSize" type="size" width="412" height="107"/>
<view key="contentView" id="vWC-gd-xPh">
<rect key="frame" x="0.0" y="0.0" width="412" height="107"/>
Expand Down Expand Up @@ -717,7 +717,7 @@ Gw
<windowStyleMask key="styleMask" titled="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<rect key="contentRect" x="340" y="419" width="412" height="107"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<value key="minSize" type="size" width="412" height="107"/>
<view key="contentView" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ee8-wp-re5">
<rect key="frame" x="0.0" y="0.0" width="412" height="107"/>
Expand Down Expand Up @@ -876,7 +876,7 @@ DQ
<windowStyleMask key="styleMask" titled="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<rect key="contentRect" x="340" y="419" width="412" height="156"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<value key="minSize" type="size" width="412" height="108"/>
<view key="contentView" id="6KH-Lc-Pm5">
<rect key="frame" x="0.0" y="0.0" width="412" height="156"/>
Expand Down Expand Up @@ -1030,7 +1030,7 @@ Gw
<rect key="frame" x="20" y="87" width="460" height="292"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="poc-GF-ali">
<rect key="frame" x="1" y="1" width="458" height="290"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="bar" allowsNonContiguousLayout="YES" id="Yge-oE-zei">
<rect key="frame" x="0.0" y="0.0" width="458" height="290"/>
Expand All @@ -1057,7 +1057,7 @@ Gw
</scroller>
</scrollView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xZt-eP-PbW">
<rect key="frame" x="209" y="13" width="82" height="32"/>
<rect key="frame" x="210" y="13" width="81" height="32"/>
<buttonCell key="cell" type="push" title="Dismiss" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="SDp-oG-6Ia">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -1186,7 +1186,7 @@ DQ
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="366" id="GTM-ss-tIj"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Enter quit/unlock password/response to unlock SEB:" id="toT-ZU-d4i">
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Enter quit/unlock password to unlock SEB:" id="toT-ZU-d4i">
<font key="font" metaFont="system"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -1237,8 +1237,8 @@ DQ
</customSpacing>
</stackView>
<textField hidden="YES" verticalHuggingPriority="750" verifyAmbiguity="off" preferredMaxLayoutWidth="370" translatesAutoresizingMaskIntoConstraints="NO" id="5gu-rS-ItL">
<rect key="frame" x="-2" y="5" width="256" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Please enter correct password/response!" usesSingleLineMode="YES" id="2XV-dZ-8rd">
<rect key="frame" x="-2" y="5" width="197" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Please enter correct password!" usesSingleLineMode="YES" id="2XV-dZ-8rd">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -1262,7 +1262,7 @@ DQ
<rect key="frame" x="26" y="0.0" width="434" height="14"/>
<subviews>
<button hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bAu-4r-o8x">
<rect key="frame" x="347" y="-13" width="68" height="32"/>
<rect key="frame" x="348" y="-13" width="67" height="32"/>
<buttonCell key="cell" type="push" title="Retry" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="pZD-Yp-uUL">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Expand Down Expand Up @@ -1388,7 +1388,7 @@ DQ
<windowStyleMask key="styleMask" titled="YES" closable="YES" utility="YES" nonactivatingPanel="YES" HUD="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="274" width="500" height="44"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<view key="contentView" id="94S-Ha-RmY">
<rect key="frame" x="0.0" y="0.0" width="500" height="44"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
2 changes: 1 addition & 1 deletion Base.lproj/PreferencesAppearance.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
<binding destination="110" name="value" keyPath="values.org_safeexambrowser_SEB_showInputLanguage" id="F53-s5-Caw"/>
</connections>
</button>
<button toolTip="Shows the Quit SEB/Session (iOS) Dock button" translatesAutoresizingMaskIntoConstraints="NO" id="tSt-QD-jfK">
<button toolTip="Shows the Quit SEB/Session Dock button" translatesAutoresizingMaskIntoConstraints="NO" id="tSt-QD-jfK">
<rect key="frame" x="-2" y="21" width="130" height="18"/>
<buttonCell key="cell" type="check" title="Show quit button" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="rQZ-65-nx7">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
Expand Down
3 changes: 1 addition & 2 deletions Base.lproj/PreferencesExam.xib
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<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 @@ -747,7 +746,7 @@
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="86" id="h63-qm-O7D"/>
</constraints>
</box>
<box title="Exam Deep Linking (iOS)" translatesAutoresizingMaskIntoConstraints="NO" id="Vu0-G2-uN8">
<box title="Exam Deep Linking" translatesAutoresizingMaskIntoConstraints="NO" id="Vu0-G2-uN8">
<rect key="frame" x="17" y="11" width="616" height="90"/>
<view key="contentView" id="Oob-Qk-EkQ">
<rect key="frame" x="3" y="3" width="610" height="72"/>
Expand Down
6 changes: 3 additions & 3 deletions Base.lproj/PreferencesGeneral.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</customSpacing>
</stackView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="194">
<rect key="frame" x="419" y="0.0" width="148" height="21"/>
<rect key="frame" x="420" y="0.0" width="147" height="21"/>
<string key="toolTip">SEB saves the content of the clipboard (if it's a text string) when starting up and before clearing the clipboard. Use this link to paste the saved string to the Start URL field.</string>
<constraints>
<constraint firstAttribute="height" constant="21" id="410"/>
Expand Down Expand Up @@ -139,7 +139,7 @@
</matrix>
<button toolTip="SEB should connect to Start URL and use local settings in case it cannot connect to SEB Server" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="412">
<rect key="frame" x="315" y="11" width="295" height="18"/>
<buttonCell key="cell" type="check" title="SEB Server Fallback (Win)" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="413">
<buttonCell key="cell" type="check" title="SEB Server Fallback" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="413">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
Expand Down Expand Up @@ -222,7 +222,7 @@
</customSpacing>
</stackView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="WYv-t7-2PL">
<rect key="frame" x="457" y="0.0" width="148" height="21"/>
<rect key="frame" x="458" y="0.0" width="147" height="21"/>
<string key="toolTip">SEB saves the content of the clipboard (if it's a text string) when starting up and before clearing the clipboard. Use this link to paste the saved string to the SEB Server URL field</string>
<constraints>
<constraint firstAttribute="height" constant="21" id="eFK-57-o98"/>
Expand Down
4 changes: 2 additions & 2 deletions Base.lproj/PreferencesNetwork.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@
<rect key="frame" x="17" y="39" width="570" height="429"/>
<clipView key="contentView" id="bNG-6J-vDW">
<rect key="frame" x="1" y="1" width="568" height="427"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" autosaveName="" rowHeight="14" headerView="1834" id="1832" userLabel="Certificates Table View">
<rect key="frame" x="0.0" y="0.0" width="568" height="404"/>
Expand Down Expand Up @@ -2098,7 +2098,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="163" y="199" width="610" height="573"/>
<rect key="screenRect" x="0.0" y="0.0" width="3840" height="2135"/>
<rect key="screenRect" x="0.0" y="0.0" width="3360" height="1865"/>
<view key="contentView" id="Oww-cu-u71">
<rect key="frame" x="0.0" y="0.0" width="610" height="573"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down
Loading

0 comments on commit 6f44170

Please sign in to comment.