passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add button to copy debug log selection

This commit is contained in:
Davide De Rosa 2021-04-10 14:55:52 +02:00
parent 6e0a46a24c
commit 830b8d8a60
5 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Passepartout/App/macOS/Base.lproj/Preferences.storyboard
View File

@ -129,23 +129,33 @@
</connections> </connections>
</button> </button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m2Y-4s-bVk"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m2Y-4s-bVk">
<rect key="frame" x="277" y="-7" width="102" height="32"/> <rect key="frame" x="204" y="-7" width="102" height="32"/>
<buttonCell key="cell" type="push" title="&lt;previous&gt;" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="R4S-an-c68"> <buttonCell key="cell" type="push" title="&lt;copy&gt;" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="R4S-an-c68">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<action selector="previousSession:" target="ATy-TE-Vs0" id="m7K-Cl-xrh"/> <action selector="copySelection:" target="ATy-TE-Vs0" id="udJ-ph-ssv"/>
</connections> </connections>
</button> </button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rDF-K8-yFT"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rDF-K8-yFT">
<rect key="frame" x="375" y="-7" width="102" height="32"/> <rect key="frame" x="302" y="-7" width="102" height="32"/>
<buttonCell key="cell" type="push" title="&lt;next&gt;" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8jk-bu-DVf"> <buttonCell key="cell" type="push" title="&lt;previous&gt;" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8jk-bu-DVf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
</buttonCell> </buttonCell>
<connections> <connections>
<action selector="nextSession:" target="ATy-TE-Vs0" id="fz2-xr-Hd3"/> <action selector="previousSession:" target="ATy-TE-Vs0" id="sRd-dW-eWY"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ef1-P2-klj">
<rect key="frame" x="400" y="-7" width="77" height="32"/>
<buttonCell key="cell" type="push" title="&lt;next&gt;" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="UGO-Jx-wJl">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="nextSession:" target="ATy-TE-Vs0" id="TrH-qw-I4t"/>
</connections> </connections>
</button> </button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b8r-ZS-86k"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b8r-ZS-86k">
@ -162,12 +172,15 @@
<constraints> <constraints>
<constraint firstItem="b8r-ZS-86k" firstAttribute="top" secondItem="Ftb-C7-gDH" secondAttribute="top" id="9Nt-ab-quI"/> <constraint firstItem="b8r-ZS-86k" firstAttribute="top" secondItem="Ftb-C7-gDH" secondAttribute="top" id="9Nt-ab-quI"/>
<constraint firstAttribute="trailing" secondItem="b8r-ZS-86k" secondAttribute="trailing" id="FSb-cu-30n"/> <constraint firstAttribute="trailing" secondItem="b8r-ZS-86k" secondAttribute="trailing" id="FSb-cu-30n"/>
<constraint firstItem="b8r-ZS-86k" firstAttribute="leading" secondItem="rDF-K8-yFT" secondAttribute="trailing" constant="10" id="VzN-CR-tTV"/> <constraint firstAttribute="bottom" secondItem="ef1-P2-klj" secondAttribute="bottom" id="J2x-2o-qrK"/>
<constraint firstItem="ef1-P2-klj" firstAttribute="top" secondItem="Ftb-C7-gDH" secondAttribute="top" id="K1S-eO-q4t"/>
<constraint firstItem="rDF-K8-yFT" firstAttribute="leading" secondItem="m2Y-4s-bVk" secondAttribute="trailing" constant="10" id="bZt-Ge-Quw"/> <constraint firstItem="rDF-K8-yFT" firstAttribute="leading" secondItem="m2Y-4s-bVk" secondAttribute="trailing" constant="10" id="bZt-Ge-Quw"/>
<constraint firstItem="UTb-MT-GBZ" firstAttribute="centerY" secondItem="b8r-ZS-86k" secondAttribute="centerY" id="d10-KF-xsL"/> <constraint firstItem="UTb-MT-GBZ" firstAttribute="centerY" secondItem="b8r-ZS-86k" secondAttribute="centerY" id="d10-KF-xsL"/>
<constraint firstItem="rDF-K8-yFT" firstAttribute="centerY" secondItem="m2Y-4s-bVk" secondAttribute="centerY" id="d7N-tX-8q2"/> <constraint firstItem="rDF-K8-yFT" firstAttribute="centerY" secondItem="m2Y-4s-bVk" secondAttribute="centerY" id="d7N-tX-8q2"/>
<constraint firstItem="m2Y-4s-bVk" firstAttribute="width" secondItem="rDF-K8-yFT" secondAttribute="width" id="e9W-zM-AiX"/> <constraint firstItem="m2Y-4s-bVk" firstAttribute="width" secondItem="rDF-K8-yFT" secondAttribute="width" id="e9W-zM-AiX"/>
<constraint firstItem="ef1-P2-klj" firstAttribute="leading" secondItem="rDF-K8-yFT" secondAttribute="trailing" constant="10" id="fUp-Wa-bXT"/>
<constraint firstItem="m2Y-4s-bVk" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="UTb-MT-GBZ" secondAttribute="trailing" constant="10" id="iqR-lF-x76"/> <constraint firstItem="m2Y-4s-bVk" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="UTb-MT-GBZ" secondAttribute="trailing" constant="10" id="iqR-lF-x76"/>
<constraint firstItem="b8r-ZS-86k" firstAttribute="leading" secondItem="ef1-P2-klj" secondAttribute="trailing" constant="10" id="m6o-Kb-tjv"/>
<constraint firstItem="UTb-MT-GBZ" firstAttribute="leading" secondItem="Ftb-C7-gDH" secondAttribute="leading" id="ruL-eN-A7E"/> <constraint firstItem="UTb-MT-GBZ" firstAttribute="leading" secondItem="Ftb-C7-gDH" secondAttribute="leading" id="ruL-eN-A7E"/>
<constraint firstAttribute="bottom" secondItem="b8r-ZS-86k" secondAttribute="bottom" id="svr-ck-SJm"/> <constraint firstAttribute="bottom" secondItem="b8r-ZS-86k" secondAttribute="bottom" id="svr-ck-SJm"/>
<constraint firstItem="m2Y-4s-bVk" firstAttribute="centerY" secondItem="b8r-ZS-86k" secondAttribute="centerY" id="ycP-XO-sOy"/> <constraint firstItem="m2Y-4s-bVk" firstAttribute="centerY" secondItem="b8r-ZS-86k" secondAttribute="centerY" id="ycP-XO-sOy"/>
@ -196,8 +209,9 @@
</constraints> </constraints>
</view> </view>
<connections> <connections>
<outlet property="buttonNext" destination="rDF-K8-yFT" id="3Mh-go-meN"/> <outlet property="buttonCopy" destination="m2Y-4s-bVk" id="pfU-KS-9qr"/>
<outlet property="buttonPrevious" destination="m2Y-4s-bVk" id="2FQ-8G-1yH"/> <outlet property="buttonNext" destination="ef1-P2-klj" id="DnZ-4m-h0g"/>
<outlet property="buttonPrevious" destination="rDF-K8-yFT" id="puI-xW-bnF"/>
<outlet property="buttonShare" destination="b8r-ZS-86k" id="OU6-UQ-3As"/> <outlet property="buttonShare" destination="b8r-ZS-86k" id="OU6-UQ-3As"/>
<outlet property="checkMasking" destination="UTb-MT-GBZ" id="8rf-Oa-eGc"/> <outlet property="checkMasking" destination="UTb-MT-GBZ" id="8rf-Oa-eGc"/>
<outlet property="labelExchanged" destination="T1N-Aq-a2C" id="lqw-oi-lLK"/> <outlet property="labelExchanged" destination="T1N-Aq-a2C" id="lqw-oi-lLK"/>

6
Passepartout/App/macOS/Global/SwiftGen+Strings.swift
View File

@ -27,6 +27,12 @@ internal enum L10n {
} }
} }
} }
internal enum DebugLog {
internal enum Buttons {
/// Copy
internal static let copy = L10n.tr("App", "debug_log.buttons.copy")
}
}
internal enum Endpoint { internal enum Endpoint {
internal enum Cells { internal enum Cells {
/// Address /// Address

16
Passepartout/App/macOS/Scenes/Preferences/DebugLogViewController.swift
View File

@ -42,6 +42,8 @@ class DebugLogViewController: NSViewController {
@IBOutlet private weak var buttonNext: NSButton! @IBOutlet private weak var buttonNext: NSButton!
@IBOutlet private weak var buttonCopy: NSButton!
@IBOutlet private weak var buttonShare: NSButton! @IBOutlet private weak var buttonShare: NSButton!
private let service = TransientStore.shared.service private let service = TransientStore.shared.service
@ -66,6 +68,7 @@ class DebugLogViewController: NSViewController {
labelExchangedCaption.stringValue = L10n.Core.Service.Cells.DataCount.caption.asCaption labelExchangedCaption.stringValue = L10n.Core.Service.Cells.DataCount.caption.asCaption
labelLog.stringValue = L10n.Core.Service.Cells.DebugLog.caption.asCaption labelLog.stringValue = L10n.Core.Service.Cells.DebugLog.caption.asCaption
buttonCopy.title = L10n.App.DebugLog.Buttons.copy
buttonPrevious.image = NSImage(named: NSImage.touchBarRewindTemplateName) buttonPrevious.image = NSImage(named: NSImage.touchBarRewindTemplateName)
buttonNext.image = NSImage(named: NSImage.touchBarFastForwardTemplateName) buttonNext.image = NSImage(named: NSImage.touchBarFastForwardTemplateName)
buttonShare.image = NSImage(named: NSImage.shareTemplateName) buttonShare.image = NSImage(named: NSImage.shareTemplateName)
@ -112,6 +115,19 @@ class DebugLogViewController: NSViewController {
shouldDeleteLogOnDisconnection = false shouldDeleteLogOnDisconnection = false
} }
@IBAction private func copySelection(_ sender: Any?) {
let rows = tableTextLog.selectedRowIndexes
let content = logLines.enumerated().filter {
rows.contains($0.offset)
}.map {
$0.element
}.joined(separator: "\n")
let pb = NSPasteboard.general
pb.clearContents()
pb.setString(content, forType: .string)
}
@IBAction private func share(_ sender: Any?) { @IBAction private func share(_ sender: Any?) {
let text = logLines.joined(separator: "\n") let text = logLines.joined(separator: "\n")
guard !text.isEmpty else { guard !text.isEmpty else {

2
Passepartout/App/macOS/en.lproj/App.strings
View File

@ -57,6 +57,8 @@
"preferences.cells.confirm_quit.caption" = "Confirm quit"; "preferences.cells.confirm_quit.caption" = "Confirm quit";
"preferences.cells.confirm_quit.footer" = "Check to present a quit confirmation alert."; "preferences.cells.confirm_quit.footer" = "Check to present a quit confirmation alert.";
"debug_log.buttons.copy" = "Copy";
"trusted.columns.trust.title" = "Trust"; "trusted.columns.trust.title" = "Trust";
"trusted.ethernet.title" = "Trust wired connections"; "trusted.ethernet.title" = "Trust wired connections";
"trusted.ethernet.description" = "Check to trust any wired cable connection."; "trusted.ethernet.description" = "Check to trust any wired cable connection.";

2
Passepartout/App/macOS/it.lproj/App.strings
View File

@ -57,6 +57,8 @@
"preferences.cells.confirm_quit.caption" = "Conferma uscita"; "preferences.cells.confirm_quit.caption" = "Conferma uscita";
"preferences.cells.confirm_quit.footer" = "Seleziona per confermare l'uscita dall'applicazione."; "preferences.cells.confirm_quit.footer" = "Seleziona per confermare l'uscita dall'applicazione.";
"debug_log.buttons.copy" = "Copia";
"trusted.columns.trust.title" = "Sicura"; "trusted.columns.trust.title" = "Sicura";
"trusted.ethernet.title" = "Connessioni cablate sicure"; "trusted.ethernet.title" = "Connessioni cablate sicure";
"trusted.ethernet.description" = "Seleziona per considerare sicura qualsiasi rete cablata."; "trusted.ethernet.description" = "Seleziona per considerare sicura qualsiasi rete cablata.";