Commit 7f01b07d authored by Alexandre Lision's avatar Alexandre Lision

ui: adjustements for french translations

French is more verbose than English. This implies refactoring some UIs to ease
constraints on text widths and adjust some strings.

Issue: #80347
Change-Id: I50c419416ab7e2263487679746d2bcba7ed35ac7
parent d6e32255
/*
* Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Copyright (C) 2015 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -15,25 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef ACCSECURITYVC_H
#define ACCSECURITYVC_H
#import <Cocoa/Cocoa.h>
@interface AccSecurityVC : NSViewController<NSMenuDelegate, NSPathControlDelegate, NSOpenSavePanelDelegate>
@end
#endif // ACCSECURITYVC_H
/*
* Copyright (C) 2004-2015 Savoir-Faire Linux Inc.
* Copyright (C) 2015 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
......@@ -15,17 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Additional permission under GNU GPL version 3 section 7:
*
* If you modify this program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc.
* grants you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#import "AccSecurityVC.h"
......@@ -361,11 +350,14 @@
{
NSMenuItem *item;
if(pathControl == caListPathControl) {
item = [menu addItemWithTitle:@"Remove value" action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
} else if (pathControl == certificatePathControl) {
item = [menu addItemWithTitle:@"Remove value" action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
} else {
item = [menu addItemWithTitle:@"Remove value" action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
}
[item setTarget:self]; // or whatever target you want
}
......
......@@ -278,11 +278,14 @@ NSInteger const NICKNAME_TAG = 1;
{
NSMenuItem *item;
if(pathControl == caListPathControl) {
item = [menu addItemWithTitle:@"Remove value" action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(caListPathControlSingleClick:) keyEquivalent:@""];
} else if (pathControl == certificatePathControl) {
item = [menu addItemWithTitle:@"Remove value" action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(certificatePathControlSingleClick:) keyEquivalent:@""];
} else {
item = [menu addItemWithTitle:@"Remove value" action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
item = [menu addItemWithTitle:NSLocalizedString(@"Remove value", @"Contextual menu entry")
action:@selector(pvkFilePathControlSingleClick:) keyEquivalent:@""];
}
[item setTarget:self]; // or whatever target you want
}
......
......@@ -184,7 +184,10 @@
}
[contextualMenu addItem:[NSMenuItem separatorItem]];
[contextualMenu insertItemWithTitle:@"Choose file" action:@selector(chooseFile:) keyEquivalent:@"" atIndex:contextualMenu.itemArray.count];
[contextualMenu insertItemWithTitle:NSLocalizedString(@"Choose file", @"Contextual menu entry")
action:@selector(chooseFile:)
keyEquivalent:@""
atIndex:contextualMenu.itemArray.count];
[NSMenu popUpContextMenu:contextualMenu withEvent:theEvent forView:self];
}
......
......@@ -44,8 +44,8 @@
/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "fB0-X8-GXk"; */
"fB0-X8-GXk.title" = "Radio";
/* Class = "NSTextFieldCell"; title = "Registration expire:"; ObjectID = "fCd-4d-sP0"; */
"fCd-4d-sP0.title" = "Registration expire:";
/* Class = "NSTextFieldCell"; title = "Registration expire"; ObjectID = "fCd-4d-sP0"; */
"fCd-4d-sP0.title" = "Registration expire";
/* Class = "NSButtonCell"; title = "Using STUN"; ObjectID = "gVd-Dw-1B4"; */
"gVd-Dw-1B4.title" = "Using STUN";
......@@ -56,8 +56,8 @@
/* Class = "NSTextFieldCell"; title = "Address"; ObjectID = "sTk-1C-1KO"; */
"sTk-1C-1KO.title" = "Address";
/* Class = "NSTextFieldCell"; title = "Local port:"; ObjectID = "shs-Xm-qnY"; */
"shs-Xm-qnY.title" = "Local port:";
/* Class = "NSTextFieldCell"; title = "Local port"; ObjectID = "shs-Xm-qnY"; */
"shs-Xm-qnY.title" = "Local port";
/* Class = "NSTextFieldCell"; placeholderString = "Server url..."; ObjectID = "uzg-09-8vi"; */
"uzg-09-8vi.placeholderString" = "Server url...";
......
......@@ -59,7 +59,7 @@
</stepper>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5MD-Oa-odZ">
<rect key="frame" x="30" y="72" width="127" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Registration expire:" id="fCd-4d-sP0">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Registration expire" id="fCd-4d-sP0">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......@@ -74,8 +74,8 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fG9-DY-4e7">
<rect key="frame" x="86" y="8" width="71" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Local port:" id="shs-Xm-qnY">
<rect key="frame" x="86" y="8" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Local port" id="shs-Xm-qnY">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......
......@@ -17,14 +17,14 @@
/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "iDL-4x-HD7"; */
"iDL-4x-HD7.title" = "Account";
/* Class = "NSTextFieldCell"; title = "Username:"; ObjectID = "iP9-Y8-f6g"; */
"iP9-Y8-f6g.title" = "Username:";
/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "iP9-Y8-f6g"; */
"iP9-Y8-f6g.title" = "Username";
/* Class = "NSButtonCell"; title = "Try Registration"; ObjectID = "j6w-ZG-17T"; */
"j6w-ZG-17T.title" = "Try Registration";
/* Class = "NSTextFieldCell"; title = "Server hostname:"; ObjectID = "jfA-bh-FEA"; */
"jfA-bh-FEA.title" = "Server hostname:";
/* Class = "NSTextFieldCell"; title = "Server hostname"; ObjectID = "jfA-bh-FEA"; */
"jfA-bh-FEA.title" = "Server hostname";
/* Class = "NSTextFieldCell"; title = "Type:"; ObjectID = "kBP-se-g6m"; */
"kBP-se-g6m.title" = "Type:";
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccGeneralVC">
......@@ -24,11 +24,11 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="c22-O7-iKe">
<rect key="frame" x="0.0" y="0.0" width="481" height="413"/>
<rect key="frame" x="0.0" y="0.0" width="582" height="413"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="glf-lD-9Ek">
<rect key="frame" x="0.0" y="297" width="481" height="96"/>
<rect key="frame" x="0.0" y="297" width="582" height="96"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nfh-LJ-1Ua">
<rect key="frame" x="18" y="70" width="56" height="17"/>
......@@ -76,9 +76,9 @@
</subviews>
</customView>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="q3B-PO-gof">
<rect key="frame" x="0.0" y="159" width="481" height="130"/>
<rect key="frame" x="0.0" y="159" width="582" height="130"/>
<subviews>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="buY-tc-FzT">
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="buY-tc-FzT">
<rect key="frame" x="171" y="43" width="150" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="BZ0-CK-ZiB">
<font key="font" metaFont="system"/>
......@@ -89,7 +89,7 @@
<outlet property="delegate" destination="-2" id="caT-Ue-Eqc"/>
</connections>
</textField>
<secureTextField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z6E-MS-XO4">
<secureTextField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z6E-MS-XO4">
<rect key="frame" x="171" y="3" width="150" height="22"/>
<secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="j5K-aY-7a7">
<font key="font" metaFont="system"/>
......@@ -103,15 +103,7 @@
<outlet property="delegate" destination="-2" id="VWB-U6-6cX"/>
</connections>
</secureTextField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="okm-Pr-cQr">
<rect key="frame" x="96" y="46" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Username:" id="iP9-Y8-f6g">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VQ7-fk-qZo">
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VQ7-fk-qZo">
<rect key="frame" x="171" y="83" width="150" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="f2O-9o-s6f">
<font key="font" metaFont="system"/>
......@@ -122,7 +114,7 @@
<outlet property="delegate" destination="-2" id="X87-TV-z3J"/>
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XLL-uL-tGL">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XLL-uL-tGL">
<rect key="frame" x="103" y="8" width="62" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password:" id="rbi-vX-SIf">
<font key="font" metaFont="system"/>
......@@ -130,9 +122,9 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H6b-V3-Fr1">
<rect key="frame" x="52" y="86" width="113" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Server hostname:" id="jfA-bh-FEA">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H6b-V3-Fr1">
<rect key="frame" x="56" y="86" width="109" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Server hostname" id="jfA-bh-FEA">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......@@ -146,8 +138,11 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SEc-jZ-TUE">
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SEc-jZ-TUE">
<rect key="frame" x="327" y="5" width="129" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="dhE-bz-plO"/>
</constraints>
<buttonCell key="cell" type="check" title="Show password" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="Ue3-ai-FBV">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
......@@ -156,8 +151,11 @@
<action selector="showPassword:" target="-2" id="5zI-is-yfV"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jgg-ZS-LyJ">
<button verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jgg-ZS-LyJ">
<rect key="frame" x="323" y="37" width="137" height="32"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="125" id="h6K-P1-7Bb"/>
</constraints>
<buttonCell key="cell" type="push" title="Try Registration" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="j6w-ZG-17T">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
......@@ -166,13 +164,28 @@
<action selector="tryRegistration:" target="-2" id="KIF-Ps-esl"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="okm-Pr-cQr">
<rect key="frame" x="98" y="46" width="67" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Username" id="iP9-Y8-f6g">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<constraints>
<constraint firstItem="VQ7-fk-qZo" firstAttribute="leading" secondItem="H6b-V3-Fr1" secondAttribute="trailing" constant="8" id="1ME-PL-QDh"/>
<constraint firstItem="buY-tc-FzT" firstAttribute="leading" secondItem="VQ7-fk-qZo" secondAttribute="leading" id="O4r-TE-Vcy"/>
<constraint firstItem="buY-tc-FzT" firstAttribute="leading" secondItem="okm-Pr-cQr" secondAttribute="trailing" constant="8" id="e6P-kc-gQF"/>
<constraint firstItem="z6E-MS-XO4" firstAttribute="leading" secondItem="XLL-uL-tGL" secondAttribute="trailing" constant="8" id="ojy-Ar-9WL"/>
<constraint firstItem="z6E-MS-XO4" firstAttribute="leading" secondItem="VQ7-fk-qZo" secondAttribute="leading" id="sL3-RA-hPm"/>
</constraints>
</customView>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7NY-Hh-Icd">
<rect key="frame" x="0.0" y="22" width="481" height="129"/>
<rect key="frame" x="0.0" y="22" width="582" height="129"/>
<subviews>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FTy-Hl-7T5">
<rect key="frame" x="18" y="63" width="135" height="18"/>
<rect key="frame" x="18" y="63" width="394" height="18"/>
<buttonCell key="cell" type="check" title="Auto-answer calls" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="bMM-fn-lDE">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
......@@ -181,8 +194,11 @@
<action selector="toggleAutoAnswer:" target="-2" id="kPB-je-Xwq"/>
</connections>
</button>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P32-TS-Ny3">
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P32-TS-Ny3">
<rect key="frame" x="18" y="32" width="168" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="164" id="9Yp-1O-eZU"/>
</constraints>
<buttonCell key="cell" type="check" title="Use custom user-agent" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="G7B-Zc-Ssi">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
......@@ -191,8 +207,8 @@
<action selector="toggleCustomAgent:" target="-2" id="rRm-Uw-ytS"/>
</connections>
</button>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kYw-wK-QQ3">
<rect key="frame" x="192" y="30" width="224" height="22"/>
<textField verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kYw-wK-QQ3">
<rect key="frame" x="192" y="30" width="131" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="eZQ-nF-umK">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
......@@ -213,9 +229,12 @@
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="kYw-wK-QQ3" firstAttribute="leading" secondItem="P32-TS-Ny3" secondAttribute="trailing" constant="8" id="jnR-6k-aLr"/>
</constraints>
</customView>
</subviews>
<point key="canvasLocation" x="-37.5" y="53.5"/>
<point key="canvasLocation" x="13" y="53.5"/>
</customView>
</objects>
</document>
......@@ -26,14 +26,11 @@
/* Class = "NSTextFieldCell"; title = "Alias"; ObjectID = "Wzq-V2-YLU"; */
"Wzq-V2-YLU.title" = "Alias";
/* Class = "NSTextFieldCell"; title = "This is the hash you need to communicate to pass calls with a RING account"; ObjectID = "bca-Wv-Xul"; */
"bca-Wv-Xul.title" = "This is the hash you need to communicate to pass calls with a RING account";
/* Class = "NSTextFieldCell"; title = "This is your RingID. Copy and share it with your friends!"; ObjectID = "bca-Wv-Xul"; */
"bca-Wv-Xul.title" = "This is your RingID. Copy and share it with your friends!";
/* Class = "NSTextFieldCell"; title = "hash"; ObjectID = "cf0-xD-2WZ"; */
"cf0-xD-2WZ.title" = "hash";
/* Class = "NSTextFieldCell"; title = "Hash DHT"; ObjectID = "dPO-b1-o58"; */
"dPO-b1-o58.title" = "Hash DHT";
/* Class = "NSTextFieldCell"; title = "Ring Identifier"; ObjectID = "dPO-b1-o58"; */
"dPO-b1-o58.title" = "Ring Identifier";
/* Class = "NSButtonCell"; title = "Use custom user-agent"; ObjectID = "ddk-1G-0jU"; */
"ddk-1G-0jU.title" = "Use custom user-agent";
......@@ -47,5 +44,5 @@
/* Class = "NSButtonCell"; title = "Upnp enabled"; ObjectID = "lHI-bz-ddQ"; */
"lHI-bz-ddQ.title" = "Upnp enabled";
/* Class = "NSTextFieldCell"; title = "Type:"; ObjectID = "ubB-AZ-nAm"; */
"ubB-AZ-nAm.title" = "Type:";
/* Class = "NSTextFieldCell"; title = "Type"; ObjectID = "ubB-AZ-nAm"; */
"ubB-AZ-nAm.title" = "Type";
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7706" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccSecurityVC">
......@@ -32,7 +32,7 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="Hz6-mo-xeY">
<rect key="frame" x="0.0" y="5" width="694" height="568"/>
<rect key="frame" x="0.0" y="0.0" width="694" height="568"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KkG-2O-ExR">
......@@ -268,12 +268,12 @@
</button>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rf5-DP-g8u">
<rect key="frame" x="230" y="113" width="287" height="149"/>
<clipView key="contentView" misplaced="YES" id="5qx-CS-RZZ">
<rect key="frame" x="1" y="17" width="238" height="117"/>
<clipView key="contentView" ambiguous="YES" id="5qx-CS-RZZ">
<rect key="frame" x="1" y="17" width="285" height="131"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="d0e-h3-O5f" indentationPerLevel="16" outlineTableColumn="n3A-3A-ad2" id="J53-ev-CMr">
<rect key="frame" x="0.0" y="0.0" width="393" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="285" height="131"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
......@@ -316,15 +316,15 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="IPW-7g-Ykq">
<rect key="frame" x="1" y="119" width="223" height="15"/>
<rect key="frame" x="1" y="1" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="P9Y-fn-MnT">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<rect key="frame" x="-15" y="17" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="d0e-h3-O5f">
<rect key="frame" x="0.0" y="0.0" width="238" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="285" height="17"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1077" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccVideoVC">
......@@ -18,8 +18,11 @@
<rect key="frame" x="0.0" y="0.0" width="432" height="342"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cmS-cV-mVo">
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cmS-cV-mVo">
<rect key="frame" x="18" y="306" width="102" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="98" id="cjj-gb-QeP"/>
</constraints>
<buttonCell key="cell" type="check" title="Enable video" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ZYO-6G-DC2">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
......@@ -33,15 +36,15 @@
<subviews>
<scrollView focusRingType="none" fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Xq-Du-JwG">
<rect key="frame" x="0.0" y="46" width="315" height="170"/>
<clipView key="contentView" focusRingType="none" misplaced="YES" id="rmO-Zw-KC1">
<rect key="frame" x="1" y="17" width="238" height="117"/>
<clipView key="contentView" focusRingType="none" ambiguous="YES" id="rmO-Zw-KC1">
<rect key="frame" x="1" y="17" width="313" height="152"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" headerView="bYO-LR-nVo" indentationPerLevel="16" outlineTableColumn="DSk-Vi-l91" id="H2b-i2-whr">
<rect key="frame" x="0.0" y="0.0" width="366" height="19"/>
<rect key="frame" x="0.0" y="0.0" width="366" height="152"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="VideoStateColumn" width="50" minWidth="10" maxWidth="100" id="eGS-FS-4hO" userLabel="State">
......@@ -107,15 +110,15 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView>
<scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="TDX-wc-woT">
<rect key="frame" x="1" y="119" width="223" height="15"/>
<rect key="frame" x="1" y="153" width="313" height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="d7s-2o-Oxb">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<rect key="frame" x="-15" y="17" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="bYO-LR-nVo">
<rect key="frame" x="0.0" y="0.0" width="238" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="366" height="17"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
......
/* Class = "NSTextFieldCell"; title = "Output:"; ObjectID = "2gZ-Ab-XHf"; */
"2gZ-Ab-XHf.title" = "Output:";
/* Class = "NSTextFieldCell"; title = "Output"; ObjectID = "2gZ-Ab-XHf"; */
"2gZ-Ab-XHf.title" = "Output";
/* Class = "NSTextFieldCell"; title = "Recordings"; ObjectID = "9HH-Pa-4Aq"; */
"9HH-Pa-4Aq.title" = "Recordings";
......@@ -8,9 +8,6 @@
/* Class = "NSTextFieldCell"; title = "Audio devices"; ObjectID = "B0r-wh-wc3"; */
"B0r-wh-wc3.title" = "Audio devices";
/* Class = "NSTextFieldCell"; title = "Tone settings:"; ObjectID = "NvN-ip-svk"; */
"NvN-ip-svk.title" = "Tone settings:";
/* Class = "NSMenu"; title = "outputlist"; ObjectID = "eao-Bf-buc"; */
"eao-Bf-buc.title" = "outputlist";
......@@ -26,5 +23,5 @@
/* Class = "NSMenu"; title = "inputlist"; ObjectID = "szZ-RR-Ewo"; */
"szZ-RR-Ewo.title" = "inputlist";
/* Class = "NSTextFieldCell"; title = "Input:"; ObjectID = "x1o-rT-jy6"; */
"x1o-rT-jy6.title" = "Input:";
/* Class = "NSTextFieldCell"; title = "Input"; ObjectID = "x1o-rT-jy6"; */
"x1o-rT-jy6.title" = "Input";
......@@ -17,35 +17,47 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="deY-JV-Rfe">
<rect key="frame" x="0.0" y="1" width="322" height="267"/>
<rect key="frame" x="0.0" y="-5" width="465" height="255"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
<rect key="frame" x="19" y="230" width="80" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ftI-JV-7cE">
<rect key="frame" x="19" y="218" width="80" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="76" id="U53-p2-FKw"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Recordings" id="9HH-Pa-4Aq">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
<rect key="frame" x="44" y="109" width="53" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Output:" id="2gZ-Ab-XHf">
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y73-M5-wnx">
<rect key="frame" x="121" y="97" width="53" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="49" id="YoW-Fo-dqV"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Output" id="2gZ-Ab-XHf">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
<rect key="frame" x="46" y="205" width="49" height="17"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="She-fN-vzD">
<rect key="frame" x="103" y="194" width="49" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="45" id="rZa-0V-Bnx"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Save in" id="ksV-r2-EVJ">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
<rect key="frame" x="46" y="170" width="130" height="18"/>
<button ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kOg-hX-1Q5">
<rect key="frame" x="103" y="162" width="130" height="18"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="126" id="0X5-Ea-aDR"/>
</constraints>
<buttonCell key="cell" type="check" title="Always recording" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="jeD-Nk-KHA">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
......@@ -54,8 +66,8 @@
<action selector="toggleAlwaysRecording:" target="-2" id="sOq-tA-ZBV"/>
</connections>
</button>
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
<rect key="frame" x="96" y="104" width="209" height="26"/>
<popUpButton verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9SA-9E-IzQ" userLabel="Outputs">
<rect key="frame" x="178" y="92" width="206" height="26"/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="4Fp-hR-KdJ">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
......@@ -69,24 +81,22 @@
<action selector="chooseOutput:" target="-2" id="SIh-kG-rV5"/>