Skip to content

Commit 809be92

Browse files
mulotmulot
authored
Merge pull request #11 from mulot/developpement
Developpement
2 parents 1f03efc + 36270fe commit 809be92

File tree

9 files changed

+471
-162
lines changed

9 files changed

+471
-162
lines changed

‎AddrHistory+CoreDataClass.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// AddrHistory+CoreDataClass.swift
3+
// SubnetCalc
4+
//
5+
// Created by Julien Mulot on 11/03/2022.
6+
//
7+
//
8+
9+
import Foundation
10+
import CoreData
11+
12+
13+
public class AddrHistory: NSManagedObject {
14+
15+
}

‎AddrHistory+CoreDataProperties.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// AddrHistory+CoreDataProperties.swift
3+
// SubnetCalc
4+
//
5+
// Created by Julien Mulot on 11/03/2022.
6+
//
7+
//
8+
9+
import Foundation
10+
import CoreData
11+
12+
13+
extension AddrHistory {
14+
15+
@nonobjc public class func fetchRequest() -> NSFetchRequest<AddrHistory> {
16+
return NSFetchRequest<AddrHistory>(entityName: "AddrHistory")
17+
}
18+
19+
@NSManaged public var address: String
20+
21+
}

‎Base.lproj/MainMenu.xib‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -142,6 +142,12 @@
142142
<action selector="darkMode:" target="b7w-M5-ti7" id="Nhc-rM-HhP"/>
143143
</connections>
144144
</menuItem>
145+
<menuItem title="Clear history" id="s1d-Yz-qSq">
146+
<modifierMask key="keyEquivalentModifierMask"/>
147+
<connections>
148+
<action selector="clearHistory:" target="b7w-M5-ti7" id="H57-v0-WWN"/>
149+
</connections>
150+
</menuItem>
145151
</items>
146152
</menu>
147153
</menuItem>
@@ -164,7 +170,7 @@
164170
<customObject id="b7w-M5-ti7" userLabel="SubnetCalcAppDelegate" customClass="SubnetCalcAppDelegate" customModule="SubnetCalc" customModuleProvider="target">
165171
<connections>
166172
<outlet property="NSApp" destination="-2" id="wQ1-cQ-1kg"/>
167-
<outlet property="addrField" destination="614" id="TxW-DB-fIi"/>
173+
<outlet property="addrField" destination="Sgp-Di-Z4I" id="ayV-n5-gTg"/>
168174
<outlet property="bitsOnSlide" destination="710" id="N5K-tl-7ZU"/>
169175
<outlet property="classBinaryMap" destination="cg2-6d-5fs" id="KmO-au-Z39"/>
170176
<outlet property="classBitMap" destination="Okj-gg-NHb" id="pzE-Be-9mI"/>
@@ -222,7 +228,7 @@
222228
<window title="SubnetCalc" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
223229
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
224230
<rect key="contentRect" x="0.0" y="0.0" width="670" height="694"/>
225-
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
231+
<rect key="screenRect" x="0.0" y="0.0" width="1512" height="950"/>
226232
<value key="minSize" type="size" width="670" height="694"/>
227233
<view key="contentView" id="372">
228234
<rect key="frame" x="0.0" y="0.0" width="670" height="694"/>
@@ -1018,10 +1024,10 @@
10181024
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10191025
<clipView key="contentView" id="Ay9-o5-UH1">
10201026
<rect key="frame" x="1" y="1" width="567" height="485"/>
1021-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1027+
<autoresizingMask key="autoresizingMask"/>
10221028
<subviews>
10231029
<tableView identifier="tabViewVLSM" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="SoM-fw-J5F" id="Xp5-Sj-frC">
1024-
<rect key="frame" x="0.0" y="0.0" width="884" height="457"/>
1030+
<rect key="frame" x="0.0" y="0.0" width="883.5" height="457"/>
10251031
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10261032
<size key="intercellSpacing" width="3" height="2"/>
10271033
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1127,7 +1133,7 @@
11271133
<autoresizingMask key="autoresizingMask"/>
11281134
</scroller>
11291135
<tableHeaderView key="headerView" wantsLayer="YES" id="SoM-fw-J5F">
1130-
<rect key="frame" x="0.0" y="0.0" width="884" height="28"/>
1136+
<rect key="frame" x="0.0" y="0.0" width="883.5" height="28"/>
11311137
<autoresizingMask key="autoresizingMask"/>
11321138
</tableHeaderView>
11331139
</scrollView>
@@ -1467,18 +1473,6 @@ CA
14671473
</tabViewItem>
14681474
</tabViewItems>
14691475
</tabView>
1470-
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="614">
1471-
<rect key="frame" x="171" y="654" width="329" height="22"/>
1472-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
1473-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" state="on" borderStyle="bezel" alignment="left" identifier="ipaddrfield" drawsBackground="YES" id="619">
1474-
<font key="font" metaFont="system"/>
1475-
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
1476-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
1477-
</textFieldCell>
1478-
<connections>
1479-
<action selector="ipAddrEdit:" target="b7w-M5-ti7" id="FFd-Op-005"/>
1480-
</connections>
1481-
</textField>
14821476
<popUpButton identifier="exportbutton" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="737">
14831477
<rect key="frame" x="604" y="652" width="46" height="25"/>
14841478
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
@@ -1520,7 +1514,7 @@ CA
15201514
<font key="font" metaFont="system"/>
15211515
</buttonCell>
15221516
<connections>
1523-
<action selector="calc:" target="b7w-M5-ti7" id="gsi-fk-GkQ"/>
1517+
<action selector="calc:" target="b7w-M5-ti7" id="H7m-mU-2rm"/>
15241518
</connections>
15251519
</button>
15261520
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="615">
@@ -1532,11 +1526,23 @@ CA
15321526
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
15331527
</textFieldCell>
15341528
</textField>
1529+
<comboBox identifier="ipaddrfield" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sgp-Di-Z4I">
1530+
<rect key="frame" x="171" y="651" width="332" height="25"/>
1531+
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
1532+
<comboBoxCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" numberOfVisibleItems="10" id="Xfl-Op-pqt">
1533+
<font key="font" metaFont="system"/>
1534+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
1535+
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
1536+
</comboBoxCell>
1537+
<connections>
1538+
<action selector="ipAddrEdit:" target="b7w-M5-ti7" id="xbF-0k-hpj"/>
1539+
</connections>
1540+
</comboBox>
15351541
</subviews>
15361542
</view>
15371543
<connections>
15381544
<outlet property="delegate" destination="b7w-M5-ti7" id="Y5C-zg-Ze5"/>
1539-
<outlet property="initialFirstResponder" destination="614" id="620"/>
1545+
<outlet property="initialFirstResponder" destination="Sgp-Di-Z4I" id="Dbp-Au-IpS"/>
15401546
</connections>
15411547
<point key="canvasLocation" x="84" y="281"/>
15421548
</window>

0 commit comments

Comments
 (0)