Commit 51ff149a authored by Alexandre Lision's avatar Alexandre Lision

i18n: fix strings

- fix typos
- use placeholder title values to prevent export of some dev-strings
- bump sources strings
- update tx config to reflect the merge of audio and video account
settings (formerly AccAudio and AccVideo, now AccMedia)

Change-Id: Ia397c74d4d29fd27688a8dd099644b353b8fc456
Tuleap: #500
parent 87c06c93
...@@ -13,9 +13,9 @@ source_file = ui/Base.lproj/AccAdvanced.strings ...@@ -13,9 +13,9 @@ source_file = ui/Base.lproj/AccAdvanced.strings
source_lang = en source_lang = en
type = STRINGS type = STRINGS
[ring.osxAccAudio] [ring.osxAccMedia]
file_filter = ui/<lang>.lproj/AccAudio.strings file_filter = ui/<lang>.lproj/AccMedia.strings
source_file = ui/Base.lproj/AccAudio.strings source_file = ui/Base.lproj/AccMedia.strings
source_lang = en source_lang = en
type = STRINGS type = STRINGS
...@@ -43,12 +43,6 @@ source_file = ui/Base.lproj/AccSecurity.strings ...@@ -43,12 +43,6 @@ source_file = ui/Base.lproj/AccSecurity.strings
source_lang = en source_lang = en
type = STRINGS type = STRINGS
[ring.osxAccVideo]
file_filter = ui/<lang>.lproj/AccVideo.strings
source_file = ui/Base.lproj/AccVideo.strings
source_lang = en
type = STRINGS
[ring.osxAudioPrefs] [ring.osxAudioPrefs]
file_filter = ui/<lang>.lproj/AudioPrefs.strings file_filter = ui/<lang>.lproj/AudioPrefs.strings
source_file = ui/Base.lproj/AudioPrefs.strings source_file = ui/Base.lproj/AudioPrefs.strings
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#import "QNSTreeController.h" #import "QNSTreeController.h"
#import "CertificateWC.h" #import "CertificateWC.h"
// Tags for views
#define PVK_PASSWORD_TAG 0
#define OUTGOING_TLS_SRV_NAME 1
#define TLS_NEGOTIATION_TAG 2
#define COLUMNID_NAME @"CipherNameColumn" #define COLUMNID_NAME @"CipherNameColumn"
#define COLUMNID_STATE @"CipherStateColumn" #define COLUMNID_STATE @"CipherStateColumn"
...@@ -71,13 +66,20 @@ ...@@ -71,13 +66,20 @@
@synthesize treeController; @synthesize treeController;
@synthesize certificateWC; @synthesize certificateWC;
// Tags for views
NS_ENUM(NSInteger, TagViews) {
PVK_PASSWORD = 0,
OUTGOING_TLS_SRV_NAME = 1,
TLS_NEGOTIATION = 2
};
- (void)awakeFromNib - (void)awakeFromNib
{ {
NSLog(@"INIT Security VC"); NSLog(@"INIT Security VC");
[pvkPasswordField setTag:PVK_PASSWORD_TAG]; [pvkPasswordField setTag:TagViews::PVK_PASSWORD];
[outgoingTlsServerName setTag:OUTGOING_TLS_SRV_NAME]; [outgoingTlsServerName setTag:TagViews::OUTGOING_TLS_SRV_NAME];
[tlsNegotiationTimeoutStepper setTag:TLS_NEGOTIATION_TAG]; [tlsNegotiationTimeoutStepper setTag:TagViews::TLS_NEGOTIATION];
[tlsNegotiationTimeout setTag:TLS_NEGOTIATION_TAG]; [tlsNegotiationTimeout setTag:TagViews::TLS_NEGOTIATION];
QObject::connect(AccountModel::instance().selectionModel(), QObject::connect(AccountModel::instance().selectionModel(),
&QItemSelectionModel::currentChanged, &QItemSelectionModel::currentChanged,
...@@ -98,9 +100,9 @@ ...@@ -98,9 +100,9 @@
{ {
auto account = [self currentAccount]; auto account = [self currentAccount];
[self updateControlsWithTag:PVK_PASSWORD_TAG]; [self updateControlsWithTag:TagViews::PVK_PASSWORD];
[self updateControlsWithTag:OUTGOING_TLS_SRV_NAME]; [self updateControlsWithTag:OUTGOING_TLS_SRV_NAME];
[self updateControlsWithTag:TLS_NEGOTIATION_TAG]; [self updateControlsWithTag:TagViews::TLS_NEGOTIATION];
QModelIndex qTlsMethodIdx = account->tlsMethodModel()->selectionModel()->currentIndex(); QModelIndex qTlsMethodIdx = account->tlsMethodModel()->selectionModel()->currentIndex();
[tlsMethodList removeAllItems]; [tlsMethodList removeAllItems];
...@@ -202,17 +204,17 @@ ...@@ -202,17 +204,17 @@
- (void) updateControlsWithTag:(NSInteger) tag - (void) updateControlsWithTag:(NSInteger) tag
{ {
switch (tag) { switch (tag) {
case PVK_PASSWORD_TAG: { case TagViews::PVK_PASSWORD: {
[pvkPasswordField setStringValue:[self currentAccount]->tlsPassword().toNSString()]; [pvkPasswordField setStringValue:[self currentAccount]->tlsPassword().toNSString()];
BOOL passMatch = [self currentAccount]->tlsCertificate() && BOOL passMatch = [self currentAccount]->tlsCertificate() &&
[self currentAccount]->tlsCertificate()->privateKeyMatch() == Certificate::CheckValues::PASSED; [self currentAccount]->tlsCertificate()->privateKeyMatch() == Certificate::CheckValues::PASSED;
[pvkPasswordValidation setImage:[NSImage imageNamed:passMatch?@"ic_action_accept":@"ic_action_cancel"]]; [pvkPasswordValidation setImage:[NSImage imageNamed:passMatch?@"ic_action_accept":@"ic_action_cancel"]];
} }
break; break;
case OUTGOING_TLS_SRV_NAME: case TagViews::OUTGOING_TLS_SRV_NAME:
[outgoingTlsServerName setStringValue:[self currentAccount]->tlsServerName().toNSString()]; [outgoingTlsServerName setStringValue:[self currentAccount]->tlsServerName().toNSString()];
break; break;
case TLS_NEGOTIATION_TAG: case TagViews::TLS_NEGOTIATION:
[tlsNegotiationTimeout setIntegerValue:[self currentAccount]->tlsNegotiationTimeoutSec()]; [tlsNegotiationTimeout setIntegerValue:[self currentAccount]->tlsNegotiationTimeoutSec()];
[tlsNegotiationTimeoutStepper setIntegerValue:[self currentAccount]->tlsNegotiationTimeoutSec()]; [tlsNegotiationTimeoutStepper setIntegerValue:[self currentAccount]->tlsNegotiationTimeoutSec()];
break; break;
...@@ -237,13 +239,13 @@ ...@@ -237,13 +239,13 @@
- (IBAction) valueDidChange: (id) sender - (IBAction) valueDidChange: (id) sender
{ {
switch ([sender tag]) { switch ([sender tag]) {
case PVK_PASSWORD_TAG: case TagViews::PVK_PASSWORD:
[self currentAccount]->setTlsPassword([[sender stringValue] UTF8String]); [self currentAccount]->setTlsPassword([[sender stringValue] UTF8String]);
break; break;
case OUTGOING_TLS_SRV_NAME: case TagViews::OUTGOING_TLS_SRV_NAME:
[self currentAccount]->setTlsServerName([[sender stringValue] UTF8String]); [self currentAccount]->setTlsServerName([[sender stringValue] UTF8String]);
break; break;
case TLS_NEGOTIATION_TAG: case TagViews::TLS_NEGOTIATION:
[self currentAccount]->setTlsNegotiationTimeoutSec([sender integerValue]); [self currentAccount]->setTlsNegotiationTimeoutSec([sender integerValue]);
break; break;
default: default:
...@@ -340,9 +342,8 @@ ...@@ -340,9 +342,8 @@
#endif #endif
} }
/* #pragma mark - NSPathControlDelegate methods
Delegate method of NSPathControl to determine how the NSOpenPanel will look/behave.
*/
- (void)pathControl:(NSPathControl *)pathControl willDisplayOpenPanel:(NSOpenPanel *)openPanel - (void)pathControl:(NSPathControl *)pathControl willDisplayOpenPanel:(NSOpenPanel *)openPanel
{ {
NSLog(@"willDisplayOpenPanel"); NSLog(@"willDisplayOpenPanel");
...@@ -381,24 +382,8 @@ ...@@ -381,24 +382,8 @@
#pragma mark - NSOpenSavePanelDelegate delegate methods #pragma mark - NSOpenSavePanelDelegate delegate methods
- (void)panel:(id)sender willExpand:(BOOL)expanding
{
//NSLog(@"willExpand");
}
- (NSString *)panel:(id)sender userEnteredFilename:(NSString *)filename confirmed:(BOOL)okFlag
{
//NSLog(@"userEnteredFilename");
}
- (void)panelSelectionDidChange:(id)sender
{
//NSLog(@"panelSelectionDidChange");
}
- (BOOL)panel:(id)sender validateURL:(NSURL *)url error:(NSError **)outError - (BOOL)panel:(id)sender validateURL:(NSURL *)url error:(NSError **)outError
{ {
NSLog(@"validateURL");
return YES; return YES;
} }
...@@ -406,91 +391,53 @@ ...@@ -406,91 +391,53 @@
- (BOOL)menu:(NSMenu *)menu updateItem:(NSMenuItem *)item atIndex:(NSInteger)index shouldCancel:(BOOL)shouldCancel - (BOOL)menu:(NSMenu *)menu updateItem:(NSMenuItem *)item atIndex:(NSInteger)index shouldCancel:(BOOL)shouldCancel
{ {
QModelIndex qIdx; auto qIdx = [self currentAccount]->tlsMethodModel()->index(index);
[item setTitle:qIdx.data(Qt::DisplayRole).toString().toNSString()];
if([menu.title isEqualToString:@"tlsmethodlist"])
{
qIdx = [self currentAccount]->tlsMethodModel()->index(index);
[item setTitle:qIdx.data(Qt::DisplayRole).toString().toNSString()];
}
return YES; return YES;
} }
- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu - (NSInteger)numberOfItemsInMenu:(NSMenu *)menu
{ {
if([menu.title isEqualToString:@"tlsmethodlist"]) return [self currentAccount]->tlsMethodModel()->rowCount();
return [self currentAccount]->tlsMethodModel()->rowCount();
} }
#pragma mark - NSOutlineViewDelegate methods #pragma mark - NSOutlineViewDelegate methods
// -------------------------------------------------------------------------------
// shouldSelectItem:item
// -------------------------------------------------------------------------------
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item; - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item;
{ {
return YES; return YES;
} }
// -------------------------------------------------------------------------------
// dataCellForTableColumn:tableColumn:item
// -------------------------------------------------------------------------------
- (NSCell *)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item - (NSCell *)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item
{ {
NSCell *returnCell = [tableColumn dataCell]; NSCell *returnCell = [tableColumn dataCell];
return returnCell; return returnCell;
} }
// -------------------------------------------------------------------------------
// textShouldEndEditing:fieldEditor
// -------------------------------------------------------------------------------
- (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor
{ {
if ([[fieldEditor string] length] == 0) if ([[fieldEditor string] length] == 0) {
{
// don't allow empty node names // don't allow empty node names
return NO; return NO;
} } else {
else
{
return YES; return YES;
} }
} }
// -------------------------------------------------------------------------------
// shouldEditTableColumn:tableColumn:item
//
// Decide to allow the edit of the given outline view "item".
// -------------------------------------------------------------------------------
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
{ {
return NO; return NO;
} }
// -------------------------------------------------------------------------------
// outlineView:willDisplayCell:forTableColumn:item
// -------------------------------------------------------------------------------
- (void)outlineView:(NSOutlineView *)olv willDisplayCell:(NSCell*)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item - (void)outlineView:(NSOutlineView *)olv willDisplayCell:(NSCell*)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
{ {
QModelIndex qIdx = [treeController toQIdx:((NSTreeNode*)item)]; QModelIndex qIdx = [treeController toQIdx:((NSTreeNode*)item)];
if(!qIdx.isValid()) if(!qIdx.isValid())
return; return;
if ([[tableColumn identifier] isEqualToString:COLUMNID_NAME]) if ([[tableColumn identifier] isEqualToString:COLUMNID_NAME]) {
{
cell.title = qIdx.data(Qt::DisplayRole).toString().toNSString(); cell.title = qIdx.data(Qt::DisplayRole).toString().toNSString();
} }
} }
// -------------------------------------------------------------------------------
// outlineViewSelectionDidChange:notification
// -------------------------------------------------------------------------------
- (void)outlineViewSelectionDidChange:(NSNotification *)notification
{
// ask the tree controller for the current selection
if([[treeController selectedNodes] count] > 0) {
}
}
@end @end
...@@ -179,12 +179,10 @@ ...@@ -179,12 +179,10 @@
{ {
QModelIndex qIdx; QModelIndex qIdx;
if([menu.title isEqualToString:@"inputlist"]) if (inputDeviceList.menu == menu) {
{
qIdx = Audio::Settings::instance().inputDeviceModel()->index(index); qIdx = Audio::Settings::instance().inputDeviceModel()->index(index);
[item setTitle:Audio::Settings::instance().inputDeviceModel()->data(qIdx, Qt::DisplayRole).toString().toNSString()]; [item setTitle:Audio::Settings::instance().inputDeviceModel()->data(qIdx, Qt::DisplayRole).toString().toNSString()];
} else } else {
{
qIdx = Audio::Settings::instance().outputDeviceModel()->index(index); qIdx = Audio::Settings::instance().outputDeviceModel()->index(index);
[item setTitle:Audio::Settings::instance().outputDeviceModel()->data(qIdx, Qt::DisplayRole).toString().toNSString()]; [item setTitle:Audio::Settings::instance().outputDeviceModel()->data(qIdx, Qt::DisplayRole).toString().toNSString()];
} }
...@@ -194,7 +192,7 @@ ...@@ -194,7 +192,7 @@
- (NSInteger)numberOfItemsInMenu:(NSMenu *)menu - (NSInteger)numberOfItemsInMenu:(NSMenu *)menu
{ {
if([menu.title isEqualToString:@"inputlist"]) if (inputDeviceList.menu == menu)
return Audio::Settings::instance().inputDeviceModel()->rowCount(); return Audio::Settings::instance().inputDeviceModel()->rowCount();
else else
return Audio::Settings::instance().outputDeviceModel()->rowCount(); return Audio::Settings::instance().outputDeviceModel()->rowCount();
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?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" customObjectInstantitationMethod="direct"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccAdvancedVC"> <customObject id="-2" userLabel="File's Owner" customClass="AccAdvancedVC">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
<matrix verticalHuggingPriority="750" fixedFrame="YES" allowsEmptySelection="NO" autorecalculatesCellSize="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2yz-X7-dVm"> <matrix verticalHuggingPriority="750" fixedFrame="YES" allowsEmptySelection="NO" autorecalculatesCellSize="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2yz-X7-dVm">
<rect key="frame" x="64" y="283" width="320" height="38"/> <rect key="frame" x="64" y="283" width="320" height="38"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="216" height="18"/> <size key="cellSize" width="212" height="18"/>
<size key="intercellSpacing" width="4" height="2"/> <size key="intercellSpacing" width="4" height="2"/>
<buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="fB0-X8-GXk"> <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="fB0-X8-GXk">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/> <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
......
/* Class = "NSButtonCell"; title = "Play"; ObjectID = "8jq-XH-nJV"; */
"8jq-XH-nJV.title" = "Play";
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
"Bbz-hd-1CE.title" = "Down";
/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
"KkI-i1-mfY.title" = "Enable ringtones";
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
"MbZ-7X-K5I.title" = "Up";
/* Class = "NSTableColumn"; headerCell.title = "Codecs"; ObjectID = "PGV-RF-f13"; */
"PGV-RF-f13.headerCell.title" = "Codecs";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "PYp-JZ-g1v"; */
"PYp-JZ-g1v.title" = "Text Cell";
/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "RBO-p6-Wej"; */
"RBO-p6-Wej.title" = "Text";
/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
"aMg-uJ-Krx.title" = "Ringtones";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "bZK-L6-HSm"; */
"bZK-L6-HSm.title" = "Text Cell";
/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
"biN-bX-qM1.title" = "Codecs";
/* Class = "NSTableColumn"; headerCell.title = "Frequency"; ObjectID = "hjc-hd-CQe"; */
"hjc-hd-CQe.headerCell.title" = "Frequency";
/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "sd4-Co-8hS"; */
"sd4-Co-8hS.headerCell.title" = "Bitrate";
/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "txE-JZ-54H"; */
"txE-JZ-54H.headerCell.title" = "Enabled";
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "Bbz-hd-1CE"; */
"Bbz-hd-1CE.title" = "Down";
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "CO7-VF-04Q"; */
"CO7-VF-04Q.title" = "Up";
/* Class = "NSButtonCell"; title = "Enable ringtones"; ObjectID = "KkI-i1-mfY"; */
"KkI-i1-mfY.title" = "Enable ringtones";
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "MbZ-7X-K5I"; */
"MbZ-7X-K5I.title" = "Up";
/* Class = "NSButtonCell"; title = "Video"; ObjectID = "OSC-eG-2kt"; */
"OSC-eG-2kt.title" = "Video";
/* Class = "NSTextFieldCell"; title = "Ringtones"; ObjectID = "aMg-uJ-Krx"; */
"aMg-uJ-Krx.title" = "Ringtones";
/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "biN-bX-qM1"; */
"biN-bX-qM1.title" = "Codecs";
/* Class = "NSTextFieldCell"; placeholderString = "Frequency"; ObjectID = "dwG-Ro-bIS"; */
"dwG-Ro-bIS.placeholderString" = "Frequency";
/* Class = "NSTextFieldCell"; title = "details"; ObjectID = "dwG-Ro-bIS"; */
"dwG-Ro-bIS.title" = "details";
/* Class = "NSTextFieldCell"; title = "Audio"; ObjectID = "gzX-Wc-S6g"; */
"gzX-Wc-S6g.title" = "Audio";
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "gza-RF-yKF"; */
"gza-RF-yKF.title" = "Down";
/* Class = "NSButtonCell"; title = "Play"; ObjectID = "hHf-uc-NlW"; */
"hHf-uc-NlW.title" = "Play";
/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "pvl-9U-X4l"; */
"pvl-9U-X4l.placeholderString" = "Name";
/* Class = "NSTextFieldCell"; title = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)"; ObjectID = "rRr-la-G9L"; */
"rRr-la-G9L.title" = "Codecs are used when establishing a communication with someone. They are activable and reorderable (first enabled in list preferred)";
/* Class = "NSTextFieldCell"; placeholderString = "Name"; ObjectID = "rU5-XQ-Ixc"; */
"rU5-XQ-Ixc.placeholderString" = "Name";
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell> </tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="s2y-pc-JzP"> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="s2y-pc-JzP">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell> </tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="9GC-2s-75b"> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="9GC-2s-75b">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
......
/* Class = "NSTextFieldCell"; title = "This will be displayed to unknow peers"; ObjectID = "0Yt-xC-OWa"; */ /* Class = "NSTextFieldCell"; title = "This will be displayed to unknown peers"; ObjectID = "0Yt-xC-OWa"; */
"0Yt-xC-OWa.title" = "This will be displayed to unknow peers"; "0Yt-xC-OWa.title" = "This will be displayed to unknown peers";
/* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */ /* Class = "NSTextFieldCell"; title = "Account"; ObjectID = "1Sx-Et-CDM"; */
"1Sx-Et-CDM.title" = "Account"; "1Sx-Et-CDM.title" = "Account";
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccRingVC"> <customObject id="-2" userLabel="File's Owner" customClass="AccRingVC">
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</textField> </textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EVi-Oa-N9k">
<rect key="frame" x="295" y="401" width="243" height="14"/> <rect key="frame" x="295" y="401" width="243" height="14"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="This will be displayed to unknow peers" id="0Yt-xC-OWa"> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="This will be displayed to unknown peers" id="0Yt-xC-OWa">
<font key="font" metaFont="smallSystem"/> <font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
......
...@@ -8,14 +8,14 @@ ...@@ -8,14 +8,14 @@
/* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */ /* Class = "NSButtonCell"; title = "Use custom cipher list"; ObjectID = "2e5-zS-ghg"; */
"2e5-zS-ghg.title" = "Use custom cipher list"; "2e5-zS-ghg.title" = "Use custom cipher list";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "5LC-T6-hpk"; */ /* Class = "NSTextFieldCell"; placeholderString = "cipher cell"; ObjectID = "5LC-T6-hpk"; */
"5LC-T6-hpk.title" = "Text Cell"; "5LC-T6-hpk.placeholderString" = "cipher cell";
/* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */ /* Class = "NSSecureTextFieldCell"; placeholderString = "Password..."; ObjectID = "7c2-kF-dcs"; */
"7c2-kF-dcs.placeholderString" = "Password..."; "7c2-kF-dcs.placeholderString" = "Password...";
/* Class = "NSTextFieldCell"; title = "Negociation timeout"; ObjectID = "9Q3-1W-Lh3"; */ /* Class = "NSTextFieldCell"; title = "Negotiation timeout"; ObjectID = "9Q3-1W-Lh3"; */
"9Q3-1W-Lh3.title" = "Negociation timeout"; "9Q3-1W-Lh3.title" = "Negotiation timeout";
/* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */ /* Class = "NSButtonCell"; title = "Fallback on RTP"; ObjectID = "Ig9-B1-7N3"; */
"Ig9-B1-7N3.title" = "Fallback on RTP"; "Ig9-B1-7N3.title" = "Fallback on RTP";
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
/* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */ /* Class = "NSButtonCell"; title = "Use SRTP"; ObjectID = "YtQ-hx-hih"; */
"YtQ-hx-hih.title" = "Use SRTP"; "YtQ-hx-hih.title" = "Use SRTP";
/* Class = "NSMenu"; title = "tlsmethodlist"; ObjectID = "hOG-SW-CBI"; */
"hOG-SW-CBI.title" = "tlsmethodlist";
/* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */ /* Class = "NSButtonCell"; title = "Use TLS transport"; ObjectID = "oTT-gO-fqM"; */
"oTT-gO-fqM.title" = "Use TLS transport"; "oTT-gO-fqM.title" = "Use TLS transport";
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
</dependencies> </dependencies>
<objects> <objects>
<customObject id="-2" userLabel="File's Owner" customClass="AccSecurityVC"> <customObject id="-2" userLabel="File's Owner" customClass="AccSecurityVC">
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="XAT-9Y-9e0"> <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="XAT-9Y-9e0">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/> <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/> <font key="font" metaFont="menu"/>
<menu key="menu" title="tlsmethodlist" id="hOG-SW-CBI"> <menu key="menu" id="hOG-SW-CBI">
<connections> <connections>
<outlet property="delegate" destination="-2" id="ri6-UD-0cj"/> <outlet property="delegate" destination="-2" id="ri6-UD-0cj"/>
</connections> </connections>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
</textField> </textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Nq-Sf-LSO"> <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Nq-Sf-LSO">
<rect key="frame" x="215" y="12" width="129" height="17"/> <rect key="frame" x="215" y="12" width="129" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Negociation timeout" id="9Q3-1W-Lh3"> <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Negotiation timeout" id="9Q3-1W-Lh3">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
...@@ -269,11 +269,11 @@ ...@@ -269,11 +269,11 @@
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rf5-DP-g8u"> <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"/> <rect key="frame" x="230" y="113" width="287" height="149"/>
<clipView key="contentView" ambiguous="YES" id="5qx-CS-RZZ"> <clipView key="contentView" ambiguous="YES" id="5qx-CS-RZZ">
<rect key="frame" x="1" y="17" width="285" height="131"/> <rect key="frame" x="1" y="0.0" width="285" height="148"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <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"> <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="285" height="131"/> <rect key="frame" x="0.0" y="0.0" width="285" height="125"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/> <size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell> </tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="5LC-T6-hpk"> <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" placeholderString="cipher cell" id="5LC-T6-hpk">
<font key="font" metaFont="system"/> <font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
...@@ -316,15 +316,15 @@ ...@@ -316,15 +316,15 @@
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</clipView> </clipView>
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="IPW-7g-Ykq"> <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="IPW-7g-Ykq">
<rect key="frame" x="1" y="1" width="0.0" height="16"/> <rect key="frame" x="1" y="7" width="0.0" height="16"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="P9Y-fn-MnT"> <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="P9Y-fn-MnT">
<rect key="frame" x="-15" y="17" width="16" height="0.0"/> <rect key="frame" x="-15" y="23" width="16" height="0.0"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</scroller> </scroller>
<tableHeaderView key="headerView" id="d0e-h3-O5f"> <tableHeaderView key="headerView" id="d0e-h3-O5f">
<rect key="frame" x="0.0" y="0.0" width="285" height="17"/> <rect key="frame" x="0.0" y="0.0" width="285" height="23"/>
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
</tableHeaderView> </tableHeaderView>
</scrollView> </scrollView>
......
/* Class = "NSTableColumn"; headerCell.title = "Codecs"; ObjectID = "DSk-Vi-l91"; */
"DSk-Vi-l91.headerCell.title" = "Codecs";
/* Class = "NSTextFieldCell"; title = "Codecs"; ObjectID = "DlW-RF-2xv"; */
"DlW-RF-2xv.title" = "Codecs";
/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "DmR-7J-s8s"; */
"DmR-7J-s8s.title" = "Text";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "HcP-F1-RiZ"; */
"HcP-F1-RiZ.title" = "Text Cell";
/* Class = "NSTableColumn"; headerCell.title = "Frequency"; ObjectID = "WAr-DG-2aa"; */
"WAr-DG-2aa.headerCell.title" = "Frequency";
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "YYh-3p-JG5"; */
"YYh-3p-JG5.title" = "Down";
/* Class = "NSButtonCell"; title = "Enable video"; ObjectID = "ZYO-6G-DC2"; */
"ZYO-6G-DC2.title" = "Enable video";
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "ZYZ-Vd-MXi"; */
"ZYZ-Vd-MXi.title" = "Up";
/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "dRe-pp-ok2"; */
"dRe-pp-ok2.title" = "Text Cell";
/* Class = "NSTableColumn"; headerCell.title = "Enabled"; ObjectID = "eGS-FS-4hO"; */
"eGS-FS-4hO.headerCell.title" = "Enabled";
/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "jvv-dK-jMu"; */
"jvv-dK-jMu.headerCell.title" = "Bitrate";
...@@ -5,38 +5,29 @@ ...@@ -5,38 +5,29 @@
/* Class = "NSButtonCell"; title = "Down"; ObjectID = "6Co-ei-tUA"; */ /* Class = "NSButtonCell"; title = "Down"; ObjectID = "6Co-ei-tUA"; */
"6Co-ei-tUA.title" = "Down"; "6Co-ei-tUA.title" = "Down";
/* Class = "NSTableColumn"; headerCell.title = "Status"; ObjectID = "GB3-Dr-Fey"; */
"GB3-Dr-Fey.headerCell.title" = "Status";
/* Class = "NSTabViewItem"; label = "Video"; ObjectID = "GIU-kn-D57"; */
"GIU-kn-D57.label" = "Video";
/* Class = "NSButtonCell"; title = "Up"; ObjectID = "HoA-BH-xam"; */