Skip to content

Commit 60dd592

Browse files
committed
Progress Indicator
1 parent 4036e0e commit 60dd592

File tree

12 files changed

+268
-37
lines changed

12 files changed

+268
-37
lines changed

AdversaryLabSwift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
46175B7A202D466A009311D6 /* Timing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46175B79202D466A009311D6 /* Timing.swift */; };
2121
46175B7C202D46AF009311D6 /* Sequences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46175B7B202D46AF009311D6 /* Sequences.swift */; };
2222
462271F72049021A00F21D08 /* DataHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462271F62049021A00F21D08 /* DataHelper.swift */; };
23+
462E73A72091421400C59B80 /* ProgressBot.swift in Sources */ = {isa = PBXBuildFile; fileRef = 462E73A62091421400C59B80 /* ProgressBot.swift */; };
2324
4651A15120083BF700037D31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4651A15020083BF700037D31 /* AppDelegate.swift */; };
2425
4651A15320083BF700037D31 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4651A15220083BF700037D31 /* ViewController.swift */; };
2526
4651A15520083BF700037D31 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4651A15420083BF700037D31 /* Assets.xcassets */; };
@@ -147,6 +148,7 @@
147148
46175B79202D466A009311D6 /* Timing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Timing.swift; sourceTree = "<group>"; };
148149
46175B7B202D46AF009311D6 /* Sequences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sequences.swift; sourceTree = "<group>"; };
149150
462271F62049021A00F21D08 /* DataHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataHelper.swift; sourceTree = "<group>"; };
151+
462E73A62091421400C59B80 /* ProgressBot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBot.swift; sourceTree = "<group>"; };
150152
4651A14D20083BF700037D31 /* AdversaryLabSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AdversaryLabSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
151153
4651A15020083BF700037D31 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
152154
4651A15220083BF700037D31 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -308,6 +310,7 @@
308310
5343B3A7208FC4AC00AD5D72 /* PauseBot.swift */,
309311
468B26512023D016000A2B5D /* ObservedConnections.swift */,
310312
5343B39E208FB1F100AD5D72 /* ProcessingConfigurationModel.swift */,
313+
462E73A62091421400C59B80 /* ProgressBot.swift */,
311314
);
312315
path = Models;
313316
sourceTree = "<group>";
@@ -522,6 +525,7 @@
522525
isa = PBXSourcesBuildPhase;
523526
buildActionMask = 2147483647;
524527
files = (
528+
462E73A72091421400C59B80 /* ProgressBot.swift in Sources */,
525529
4651A15320083BF700037D31 /* ViewController.swift in Sources */,
526530
46175B75202D2CDE009311D6 /* ConnectionInspector.swift in Sources */,
527531
46175B6C202CE3DB009311D6 /* Entropy.swift in Sources */,

AdversaryLabSwift/Base.lproj/Main.storyboard

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,17 @@
802802
<binding destination="XfG-lQ-9wD" name="value" keyPath="self.blockedPacketsAnalyzed" id="8qL-uh-Y3Y"/>
803803
</connections>
804804
</textField>
805+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jR8-1j-flg">
806+
<rect key="frame" x="413" y="73" width="132" height="19"/>
807+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
808+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Optional Settings" id="inq-Xy-mpx">
809+
<font key="font" metaFont="systemBold"/>
810+
<color key="textColor" white="0.70499061210000002" alpha="1" colorSpace="calibratedWhite"/>
811+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
812+
</textFieldCell>
813+
</textField>
805814
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ygH-l3-SnY">
806-
<rect key="frame" x="429" y="29" width="181" height="18"/>
815+
<rect key="frame" x="425" y="53" width="181" height="18"/>
807816
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
808817
<buttonCell key="cell" type="check" title="Enable Sequence Analysis" bezelStyle="regularSquare" imagePosition="left" inset="2" id="njV-0D-nD0">
809818
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -814,7 +823,7 @@
814823
</connections>
815824
</button>
816825
<button hidden="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l29-wR-vQY">
817-
<rect key="frame" x="429" y="50" width="209" height="18"/>
826+
<rect key="frame" x="425" y="14" width="209" height="18"/>
818827
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
819828
<buttonCell key="cell" type="check" title="Remove Packets After Analysis" bezelStyle="regularSquare" imagePosition="left" inset="2" id="oLi-vs-yls">
820829
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -825,7 +834,7 @@
825834
</connections>
826835
</button>
827836
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qWY-FO-Xfj">
828-
<rect key="frame" x="429" y="8" width="144" height="18"/>
837+
<rect key="frame" x="425" y="34" width="144" height="18"/>
829838
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
830839
<buttonCell key="cell" type="check" title="Enable TLS Analysis" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="m3M-iX-HUs">
831840
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -835,15 +844,6 @@
835844
<action selector="enableTLSAnslysisClicked:" target="XfG-lQ-9wD" id="lvP-wz-OBV"/>
836845
</connections>
837846
</button>
838-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jR8-1j-flg">
839-
<rect key="frame" x="420" y="70" width="132" height="19"/>
840-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
841-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Optional Settings" id="inq-Xy-mpx">
842-
<font key="font" metaFont="systemBold"/>
843-
<color key="textColor" white="0.70499061210000002" alpha="1" colorSpace="calibratedWhite"/>
844-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
845-
</textFieldCell>
846-
</textField>
847847
</subviews>
848848
</view>
849849
<color key="fillColor" red="0.25098039215686274" green="0.38039215686274508" blue="0.50196078431372548" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1386,7 +1386,7 @@
13861386
</connections>
13871387
</button>
13881388
<button hidden="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DZy-kb-ZFq">
1389-
<rect key="frame" x="14" y="13" width="135" height="32"/>
1389+
<rect key="frame" x="14" y="53" width="135" height="32"/>
13901390
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
13911391
<buttonCell key="cell" type="push" title="Stream Packets" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0Hf-4f-Xfq">
13921392
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
@@ -2831,6 +2831,22 @@
28312831
<real value="3.4028234663852886e+38"/>
28322832
</customSpacing>
28332833
</stackView>
2834+
<progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="SuX-tc-4bk">
2835+
<rect key="frame" x="18" y="-1" width="764" height="20"/>
2836+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2837+
</progressIndicator>
2838+
<textField horizontalHuggingPriority="1000" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OYu-D3-1sv">
2839+
<rect key="frame" x="16" y="20" width="616" height="17"/>
2840+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
2841+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Loading message...." id="MUp-XL-wa4">
2842+
<font key="font" metaFont="system"/>
2843+
<color key="textColor" red="0.090196078430000007" green="0.1764705882" blue="0.21960784310000001" alpha="0.84999999999999998" colorSpace="calibratedRGB"/>
2844+
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
2845+
</textFieldCell>
2846+
<connections>
2847+
<binding destination="XfG-lQ-9wD" name="value" keyPath="self.processingMessage" id="9Fm-g7-IqM"/>
2848+
</connections>
2849+
</textField>
28342850
</subviews>
28352851
<constraints>
28362852
<constraint firstItem="FbD-V0-Jft" firstAttribute="leading" secondItem="tdj-ZI-A0X" secondAttribute="leading" id="0iP-vk-JGH"/>
@@ -2940,6 +2956,7 @@
29402956
<outlet property="enableSequencesCheck" destination="ygH-l3-SnY" id="xVv-jo-Ld1"/>
29412957
<outlet property="enableTLSCheck" destination="qWY-FO-Xfj" id="lsC-YF-YZ5"/>
29422958
<outlet property="processPacketsButton" destination="PUo-Tn-R9n" id="3MA-Oc-mj9"/>
2959+
<outlet property="progressIndicator" destination="SuX-tc-4bk" id="3wB-0k-5b0"/>
29432960
<outlet property="removePacketsCheck" destination="l29-wR-vQY" id="tZw-T4-v0X"/>
29442961
</connections>
29452962
</viewController>

0 commit comments

Comments
 (0)