Skip to content

Commit 7efd198

Browse files
dirkwhoffmanndirkwhoffmann
committed
Work on new settings
1 parent 38a046e commit 7efd198

File tree

17 files changed

+317
-323
lines changed

17 files changed

+317
-323
lines changed

‎GUI/Defaults.swift‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,15 @@ struct Keys {
307307
static let keepAspectRatio = "General.FullscreenKeepAspectRatio"
308308
static let exitOnEsc = "General.FullscreenExitOnEsc"
309309

310+
// Mouse
311+
static let retainMouseKeyComb = "General.RetainMouseKeyComb"
312+
static let retainMouseWithKeys = "General.RetainMouseWithKeys"
313+
static let retainMouseByClick = "General.RetainMouseByClick"
314+
static let retainMouseByEntering = "General.RetainMouseByEntering"
315+
static let releaseMouseKeyComb = "General.ReleaseMouseKeyComb"
316+
static let releaseMouseWithKeys = "General.ReleaseMouseWithKeys"
317+
static let releaseMouseByShaking = "General.ReleaseMouseByShaking"
318+
310319
// Miscellaneous
311320
static let ejectWithoutAsking = "General.EjectWithoutAsking"
312321
static let detachWithoutAsking = "General.DetachWithoutAsking"
@@ -326,6 +335,15 @@ extension DefaultsProxy {
326335
register(Keys.Gen.keepAspectRatio, false)
327336
register(Keys.Gen.exitOnEsc, true)
328337

338+
// Mouse
339+
register(Keys.Gen.retainMouseKeyComb, 0)
340+
register(Keys.Gen.retainMouseWithKeys, true)
341+
register(Keys.Gen.retainMouseByClick, true)
342+
register(Keys.Gen.retainMouseByEntering, false)
343+
register(Keys.Gen.releaseMouseKeyComb, 0)
344+
register(Keys.Gen.releaseMouseWithKeys, true)
345+
register(Keys.Gen.releaseMouseByShaking, true)
346+
329347
// Misc
330348
register(Keys.Gen.ejectWithoutAsking, false)
331349
register(Keys.Gen.detachWithoutAsking, false)
@@ -340,6 +358,14 @@ extension DefaultsProxy {
340358
let keys = [ Keys.Gen.keepAspectRatio,
341359
Keys.Gen.exitOnEsc,
342360

361+
Keys.Gen.retainMouseKeyComb,
362+
Keys.Gen.retainMouseWithKeys,
363+
Keys.Gen.retainMouseByClick,
364+
Keys.Gen.retainMouseByEntering,
365+
Keys.Gen.releaseMouseKeyComb,
366+
Keys.Gen.releaseMouseWithKeys,
367+
Keys.Gen.releaseMouseByShaking,
368+
343369
Keys.Gen.ejectWithoutAsking,
344370
Keys.Gen.detachWithoutAsking,
345371
Keys.Gen.closeWithoutAsking,
@@ -361,6 +387,14 @@ extension Preferences {
361387
defaults.set(Keys.Gen.keepAspectRatio, keepAspectRatio)
362388
defaults.set(Keys.Gen.exitOnEsc, exitOnEsc)
363389

390+
defaults.set(Keys.Gen.retainMouseKeyComb, retainMouseKeyComb)
391+
defaults.set(Keys.Gen.retainMouseWithKeys, retainMouseWithKeys)
392+
defaults.set(Keys.Gen.retainMouseByClick, retainMouseByClick)
393+
defaults.set(Keys.Gen.retainMouseByEntering, retainMouseByEntering)
394+
defaults.set(Keys.Gen.releaseMouseKeyComb, releaseMouseKeyComb)
395+
defaults.set(Keys.Gen.releaseMouseWithKeys, releaseMouseWithKeys)
396+
defaults.set(Keys.Gen.releaseMouseByShaking, releaseMouseByShaking)
397+
364398
defaults.set(Keys.Gen.ejectWithoutAsking, ejectWithoutAsking)
365399
defaults.set(Keys.Gen.detachWithoutAsking, detachWithoutAsking)
366400
defaults.set(Keys.Gen.closeWithoutAsking, closeWithoutAsking)
@@ -377,6 +411,14 @@ extension Preferences {
377411
keepAspectRatio = defaults.bool(Keys.Gen.keepAspectRatio)
378412
exitOnEsc = defaults.bool(Keys.Gen.exitOnEsc)
379413

414+
retainMouseKeyComb = defaults.int(Keys.Gen.retainMouseKeyComb)
415+
retainMouseWithKeys = defaults.bool(Keys.Gen.retainMouseWithKeys)
416+
retainMouseByClick = defaults.bool(Keys.Gen.retainMouseByClick)
417+
retainMouseByEntering = defaults.bool(Keys.Gen.retainMouseByEntering)
418+
releaseMouseKeyComb = defaults.int(Keys.Gen.releaseMouseKeyComb)
419+
releaseMouseWithKeys = defaults.bool(Keys.Gen.releaseMouseWithKeys)
420+
releaseMouseByShaking = defaults.bool(Keys.Gen.releaseMouseByShaking)
421+
380422
ejectWithoutAsking = defaults.bool(Keys.Gen.ejectWithoutAsking)
381423
detachWithoutAsking = defaults.bool(Keys.Gen.detachWithoutAsking)
382424
closeWithoutAsking = defaults.bool(Keys.Gen.closeWithoutAsking)
@@ -504,15 +546,6 @@ extension Keys {
504546
static let autofireBursts = "Controls.AutofireBursts"
505547
static let autofireBullets = "Controls.AutofireBullets"
506548
static let autofireFrequency = "Controls.AutofireFrequency"
507-
508-
// Mouse
509-
static let retainMouseKeyComb = "Controls.RetainMouseKeyComb"
510-
static let retainMouseWithKeys = "Controls.RetainMouseWithKeys"
511-
static let retainMouseByClick = "Controls.RetainMouseByClick"
512-
static let retainMouseByEntering = "Controls.RetainMouseByEntering"
513-
static let releaseMouseKeyComb = "Controls.ReleaseMouseKeyComb"
514-
static let releaseMouseWithKeys = "Controls.ReleaseMouseWithKeys"
515-
static let releaseMouseByShaking = "Controls.ReleaseMouseByShaking"
516549
}
517550
}
518551

@@ -554,15 +587,6 @@ extension DefaultsProxy {
554587
register(Keys.Con.autofireBursts, false)
555588
register(Keys.Con.autofireBullets, 3)
556589
register(Keys.Con.autofireFrequency, 25)
557-
558-
// Mouse
559-
register(Keys.Con.retainMouseKeyComb, 0)
560-
register(Keys.Con.retainMouseWithKeys, true)
561-
register(Keys.Con.retainMouseByClick, true)
562-
register(Keys.Con.retainMouseByEntering, false)
563-
register(Keys.Con.releaseMouseKeyComb, 0)
564-
register(Keys.Con.releaseMouseWithKeys, true)
565-
register(Keys.Con.releaseMouseByShaking, true)
566590
}
567591

568592
func removeControlsUserDefaults() {
@@ -576,15 +600,7 @@ extension DefaultsProxy {
576600

577601
Keys.Con.autofire,
578602
Keys.Con.autofireBullets,
579-
Keys.Con.autofireFrequency,
580-
581-
Keys.Con.retainMouseKeyComb,
582-
Keys.Con.retainMouseWithKeys,
583-
Keys.Con.retainMouseByClick,
584-
Keys.Con.retainMouseByEntering,
585-
Keys.Con.releaseMouseKeyComb,
586-
Keys.Con.releaseMouseWithKeys,
587-
Keys.Con.releaseMouseByShaking ]
603+
Keys.Con.autofireFrequency ]
588604

589605
for key in keys { removeKey(key) }
590606
}
@@ -608,14 +624,6 @@ extension Preferences {
608624
defaults.set(Keys.Con.autofireBullets, autofireBullets)
609625
defaults.set(Keys.Con.autofireFrequency, autofireFrequency)
610626

611-
defaults.set(Keys.Con.retainMouseKeyComb, retainMouseKeyComb)
612-
defaults.set(Keys.Con.retainMouseWithKeys, retainMouseWithKeys)
613-
defaults.set(Keys.Con.retainMouseByClick, retainMouseByClick)
614-
defaults.set(Keys.Con.retainMouseByEntering, retainMouseByEntering)
615-
defaults.set(Keys.Con.releaseMouseKeyComb, releaseMouseKeyComb)
616-
defaults.set(Keys.Con.releaseMouseWithKeys, releaseMouseWithKeys)
617-
defaults.set(Keys.Con.releaseMouseByShaking, releaseMouseByShaking)
618-
619627
defaults.save()
620628
}
621629

@@ -633,14 +641,6 @@ extension Preferences {
633641
autofireBursts = defaults.bool(Keys.Con.autofireBursts)
634642
autofireBullets = defaults.int(Keys.Con.autofireBullets)
635643
autofireFrequency = defaults.int(Keys.Con.autofireFrequency)
636-
637-
retainMouseKeyComb = defaults.int(Keys.Con.retainMouseKeyComb)
638-
retainMouseWithKeys = defaults.bool(Keys.Con.retainMouseWithKeys)
639-
retainMouseByClick = defaults.bool(Keys.Con.retainMouseByClick)
640-
retainMouseByEntering = defaults.bool(Keys.Con.retainMouseByEntering)
641-
releaseMouseKeyComb = defaults.int(Keys.Con.releaseMouseKeyComb)
642-
releaseMouseWithKeys = defaults.bool(Keys.Con.releaseMouseWithKeys)
643-
releaseMouseByShaking = defaults.bool(Keys.Con.releaseMouseByShaking)
644644
}
645645
}
646646

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,23 @@ class AudioSettingsViewController: SettingsViewController {
5454

5555
override func viewDidLoad() {
5656

57-
print("AudioSettingsViewController::viewDidLoad")
57+
log(.lifetime)
5858
}
5959

6060
//
61-
// Refresh
61+
// Methods from SettingsViewController
6262
//
6363

6464
override func refresh() {
6565

6666
super.refresh()
6767
}
6868

69-
//
70-
// Action methods
71-
//
72-
7369
override func preset(tag: Int) {
7470

75-
print("AudioSettingsViewController::preset")
7671
}
7772

7873
override func save() {
7974

80-
print("AudioSettingsViewController::preset")
8175
}
8276
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class CapturesSettingsViewController: SettingsViewController {
2727

2828
override func viewDidLoad() {
2929

30-
print("CapturesSettingsViewController::viewDidLoad")
30+
log(.lifetime)
3131
}
3232

3333
//
34-
// Refresh
34+
// Methods from SettingsViewController
3535
//
3636

3737
override func refresh() {

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,23 @@ class CompatibilitySettingsViewController: SettingsViewController {
4343

4444
override func viewDidLoad() {
4545

46-
print("CompatibilitySettingsViewController::viewDidLoad")
46+
log(.lifetime)
4747
}
4848

4949
//
50-
// Refresh
50+
// Methods from SettingsViewController
5151
//
5252

5353
override func refresh() {
5454

5555
super.refresh()
5656
}
5757

58-
//
59-
// Action methods
60-
//
61-
6258
override func preset(tag: Int) {
6359

64-
print("CompatibilitySettingsViewController::preset")
6560
}
6661

6762
override func save() {
6863

69-
print("CompatibilitySettingsViewController::preset")
7064
}
7165
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ControlsSettingsViewController: SettingsViewController {
4747
@IBOutlet weak var disconnectKeys: NSButton!
4848

4949
//
50-
// Refresh
50+
// Methods from SettingsViewController
5151
//
5252

5353
override func refresh() {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ class DevicesSettingsViewController: SettingsViewController {
4545
return pad?.device?.usageDescription ?? property(kIOHIDPrimaryUsageKey)
4646
}
4747

48+
//
49+
// Methods from SettingsViewController
50+
//
51+
4852
override func refresh() {
4953

5054
super.refresh()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class GeneralSettingsViewController: SettingsViewController {
3030

3131
override func viewDidLoad() {
3232

33-
print("GeneralSettingsViewController::viewDidLoad")
33+
log(.lifetime)
3434
}
3535

3636
//

0 commit comments

Comments
 (0)