Skip to content

Commit eb8a74a

Browse files
dirkwhoffmanndirkwhoffmann
committed
This is vAmiga 4.4b3
1 parent ae02e28 commit eb8a74a

File tree

6 files changed

+542
-544
lines changed

6 files changed

+542
-544
lines changed

‎Core/config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
static constexpr int VER_MAJOR = 4;
1818
static constexpr int VER_MINOR = 4;
1919
static constexpr int VER_SUBMINOR = 0;
20-
static constexpr int VER_BETA = 2;
20+
static constexpr int VER_BETA = 3;
2121

2222
// Snapshot version number
2323
static constexpr int SNP_MAJOR = 4;
2424
static constexpr int SNP_MINOR = 4;
2525
static constexpr int SNP_SUBMINOR = 0;
26-
static constexpr int SNP_BETA = 2;
26+
static constexpr int SNP_BETA = 3;
2727

2828

2929
//

‎GUI/Dialogs/Settings/ViewControllers/DevicesSettings.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ class DevicesSettingsViewController: SettingsViewController {
4949
// Methods from SettingsViewController
5050
//
5151

52+
override func activate() {
53+
54+
action.stringValue = ""
55+
action2.stringValue = ""
56+
hidEvent.stringValue = ""
57+
58+
refresh()
59+
}
60+
5261
override func refresh() {
5362

5463
super.refresh()

‎GUI/XIB files/Dashboard.storyboard‎

Lines changed: 21 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.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="24128" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24128"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<scenes>
@@ -140,151 +140,151 @@
140140
<rect key="frame" x="17" y="574" width="139" height="140"/>
141141
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
142142
<view key="contentView" id="pNg-zG-TmF">
143-
<rect key="frame" x="4" y="5" width="131" height="132"/>
143+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
144144
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
145145
</view>
146146
</box>
147147
<box title="Copper DMA" titlePosition="noTitle" id="bqD-Fs-mwE">
148148
<rect key="frame" x="17" y="432" width="139" height="140"/>
149149
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
150150
<view key="contentView" id="XBp-I0-bj0">
151-
<rect key="frame" x="4" y="5" width="131" height="132"/>
151+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
152152
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
153153
</view>
154154
</box>
155155
<box title="Sprite DMA" titlePosition="noTitle" id="526-d3-EYm">
156156
<rect key="frame" x="163" y="290" width="140" height="140"/>
157157
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
158158
<view key="contentView" id="ccZ-3O-IPg">
159-
<rect key="frame" x="4" y="5" width="132" height="132"/>
159+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
160160
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
161161
</view>
162162
</box>
163163
<box title="Left Audio" titlePosition="noTitle" id="tE2-sv-uv5">
164164
<rect key="frame" x="17" y="6" width="210" height="140"/>
165165
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
166166
<view key="contentView" id="JXP-Fl-uqL">
167-
<rect key="frame" x="4" y="5" width="202" height="132"/>
167+
<rect key="frame" x="0.0" y="0.0" width="210" height="140"/>
168168
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
169169
</view>
170170
</box>
171171
<box title="CPU Load" titlePosition="noTitle" id="1zg-D2-euo">
172172
<rect key="frame" x="17" y="148" width="139" height="140"/>
173173
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
174174
<view key="contentView" id="1AM-LT-rZC">
175-
<rect key="frame" x="4" y="5" width="131" height="132"/>
175+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
176176
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
177177
</view>
178178
</box>
179179
<box title="GPU Refresh Rate" titlePosition="noTitle" id="JCG-SR-d1D">
180180
<rect key="frame" x="163" y="148" width="140" height="140"/>
181181
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
182182
<view key="contentView" id="fdd-01-KgB">
183-
<rect key="frame" x="4" y="5" width="132" height="132"/>
183+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
184184
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
185185
</view>
186186
</box>
187187
<box title="Amiga Fps" titlePosition="noTitle" id="0EH-8Q-7Xx">
188188
<rect key="frame" x="309" y="148" width="139" height="140"/>
189189
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
190190
<view key="contentView" id="J36-Sy-5in">
191-
<rect key="frame" x="4" y="5" width="131" height="132"/>
191+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
192192
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
193193
</view>
194194
</box>
195195
<box title="Amiga Frequency" titlePosition="noTitle" id="WA7-t2-0E0">
196196
<rect key="frame" x="453" y="148" width="140" height="140"/>
197197
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
198198
<view key="contentView" id="V3n-ET-52I">
199-
<rect key="frame" x="4" y="5" width="132" height="132"/>
199+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
200200
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
201201
</view>
202202
</box>
203203
<box title="CIA A" titlePosition="noTitle" id="X1c-GL-keF">
204204
<rect key="frame" x="453" y="432" width="140" height="140"/>
205205
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
206206
<view key="contentView" id="QQK-gk-U2g">
207-
<rect key="frame" x="4" y="5" width="132" height="132"/>
207+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
208208
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
209209
</view>
210210
</box>
211211
<box title="CIA B" titlePosition="noTitle" id="8HM-XP-PFO">
212212
<rect key="frame" x="453" y="290" width="140" height="140"/>
213213
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
214214
<view key="contentView" id="2dC-kP-E6m">
215-
<rect key="frame" x="4" y="5" width="132" height="132"/>
215+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
216216
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
217217
</view>
218218
</box>
219219
<box title="Disk DMA" titlePosition="noTitle" id="oWu-zc-NTo">
220220
<rect key="frame" x="309" y="432" width="139" height="140"/>
221221
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
222222
<view key="contentView" id="JMy-b6-zou">
223-
<rect key="frame" x="4" y="5" width="131" height="132"/>
223+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
224224
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
225225
</view>
226226
</box>
227227
<box title="Blitter DMA" titlePosition="noTitle" id="heh-zs-HK4">
228228
<rect key="frame" x="163" y="432" width="140" height="140"/>
229229
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
230230
<view key="contentView" id="4i3-3f-NdW">
231-
<rect key="frame" x="4" y="5" width="132" height="132"/>
231+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
232232
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
233233
</view>
234234
</box>
235235
<box title="Bitplane DMA" titlePosition="noTitle" id="4pe-Uu-9D7">
236236
<rect key="frame" x="309" y="290" width="139" height="140"/>
237237
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
238238
<view key="contentView" id="S10-GP-8jA">
239-
<rect key="frame" x="4" y="5" width="131" height="132"/>
239+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
240240
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
241241
</view>
242242
</box>
243243
<box title="Audio DMA" titlePosition="noTitle" id="0dx-dX-1pT">
244244
<rect key="frame" x="17" y="290" width="139" height="140"/>
245245
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
246246
<view key="contentView" id="YU5-7E-vH6">
247-
<rect key="frame" x="4" y="5" width="131" height="132"/>
247+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
248248
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
249249
</view>
250250
</box>
251251
<box title="Rom" titlePosition="noTitle" id="sQi-ap-NM5">
252252
<rect key="frame" x="453" y="574" width="140" height="140"/>
253253
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
254254
<view key="contentView" id="cSD-zt-GTN">
255-
<rect key="frame" x="4" y="5" width="132" height="132"/>
255+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
256256
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
257257
</view>
258258
</box>
259259
<box title="Fast Ram" titlePosition="noTitle" id="fQ6-Xx-F1s">
260260
<rect key="frame" x="309" y="574" width="139" height="140"/>
261261
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
262262
<view key="contentView" id="MqN-CI-2pg">
263-
<rect key="frame" x="4" y="5" width="131" height="132"/>
263+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
264264
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
265265
</view>
266266
</box>
267267
<box title="Slow Ram" titlePosition="noTitle" id="0Sb-gU-Omc">
268268
<rect key="frame" x="163" y="574" width="140" height="140"/>
269269
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
270270
<view key="contentView" id="sfq-Gw-rPH">
271-
<rect key="frame" x="4" y="5" width="132" height="132"/>
271+
<rect key="frame" x="0.0" y="0.0" width="140" height="140"/>
272272
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
273273
</view>
274274
</box>
275275
<box title="Audio Fill Level" titlePosition="noTitle" id="Mnj-c8-l0d">
276276
<rect key="frame" x="235" y="6" width="139" height="140"/>
277277
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
278278
<view key="contentView" id="Gr3-n1-6rE">
279-
<rect key="frame" x="4" y="5" width="131" height="132"/>
279+
<rect key="frame" x="0.0" y="0.0" width="139" height="140"/>
280280
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
281281
</view>
282282
</box>
283283
<box title="Right Audio" titlePosition="noTitle" id="gBm-bS-Onh">
284284
<rect key="frame" x="381" y="6" width="213" height="140"/>
285285
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
286286
<view key="contentView" id="ZHh-2I-X61">
287-
<rect key="frame" x="4" y="5" width="205" height="132"/>
287+
<rect key="frame" x="0.0" y="0.0" width="213" height="140"/>
288288
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
289289
</view>
290290
</box>

0 commit comments

Comments
 (0)