commit e4d61cb17b2189a402cf8bd21226bf7ca8341997
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Feb 10 09:26:24 2016 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Feb 19 14:01:14 2016 -0500
tree ad272deb777b4818348fd0a41775011b37cdd677
parent eccf8aedf41990e4907acdc14ffd1e366ceb3801

account: merge audio and video panel

AccVideoVC + AccAudioVC = AccMediaVC

Tuleap: #406
Change-Id: I757d66322975b9362e42cb313a6f50986591bef6

src/AccountsVC.mm

diff --git a/src/AccountsVC.mm b/src/AccountsVC.mm
index 84b4ca6..2c142e8 100644
--- a/src/AccountsVC.mm
+++ b/src/AccountsVC.mm
@@ -32,8 +32,7 @@
 
 #import "QNSTreeController.h"
 #import "AccGeneralVC.h"
-#import "AccAudioVC.h"
-#import "AccVideoVC.h"
+#import "AccMediaVC.h"
 #import "AccAdvancedVC.h"
 #import "AccSecurityVC.h"
 #import "AccRingVC.h"
@@ -57,8 +56,7 @@
 
 @property (assign) IBOutlet NSTabView *configPanels;
 @property (retain) IBOutlet NSTabViewItem *generalTabItem;
-@property (retain) IBOutlet NSTabViewItem *audioTabItem;
-@property (retain) IBOutlet NSTabViewItem *videoTabItem;
+@property (retain) IBOutlet NSTabViewItem *mediaTabItem;
 @property (retain) IBOutlet NSTabViewItem *advancedTabItem;
 @property (retain) IBOutlet NSTabViewItem *securityTabItem;
 @property (retain) IBOutlet NSTabViewItem *ringTabItem;
@@ -70,8 +68,7 @@
 
 @property AccRingVC* ringVC;
 @property AccGeneralVC* generalVC;
-@property AccAudioVC* audioVC;
-@property AccVideoVC* videoVC;
+@property AccMediaVC* audioVC;
 @property AccAdvancedVC* advancedVC;
 @property AccSecurityVC* securityVC;
 
@@ -81,8 +78,7 @@
 @synthesize protocolList;
 @synthesize configPanels;
 @synthesize generalTabItem;
-@synthesize audioTabItem;
-@synthesize videoTabItem;
+@synthesize mediaTabItem;
 @synthesize advancedTabItem;
 @synthesize securityTabItem;
 @synthesize ringTabItem;
@@ -122,15 +118,10 @@
     [[self.generalVC view] setBounds:[self.generalTabItem.view bounds]];
     [self.generalTabItem setView:self.generalVC.view];
 
-    self.audioVC = [[AccAudioVC alloc] initWithNibName:@"AccAudio" bundle:nil];
-    [[self.audioVC view] setFrame:[self.audioTabItem.view frame]];
-    [[self.audioVC view] setBounds:[self.audioTabItem.view bounds]];
-    [self.audioTabItem setView:self.audioVC.view];
-
-    self.videoVC = [[AccVideoVC alloc] initWithNibName:@"AccVideo" bundle:nil];
-    [[self.videoVC view] setFrame:[self.videoTabItem.view frame]];
-    [[self.videoVC view] setBounds:[self.videoTabItem.view bounds]];
-    [self.videoTabItem setView:self.videoVC.view];
+    self.audioVC = [[AccMediaVC alloc] initWithNibName:@"AccMedia" bundle:nil];
+    [[self.audioVC view] setFrame:[self.mediaTabItem.view frame]];
+    [[self.audioVC view] setBounds:[self.mediaTabItem.view bounds]];
+    [self.mediaTabItem setView:self.audioVC.view];
 
     self.advancedVC = [[AccAdvancedVC alloc] initWithNibName:@"AccAdvanced" bundle:nil];
     [[self.advancedVC view] setFrame:[self.advancedTabItem.view frame]];
@@ -196,10 +187,9 @@
     }
 
     [configPanels insertTabViewItem:generalTabItem atIndex:0];
-    [configPanels insertTabViewItem:audioTabItem atIndex:1];
-    [configPanels insertTabViewItem:videoTabItem atIndex:2];
-    [configPanels insertTabViewItem:advancedTabItem atIndex:3];
-    [configPanels insertTabViewItem:securityTabItem atIndex:4];
+    [configPanels insertTabViewItem:mediaTabItem atIndex:1];
+    [configPanels insertTabViewItem:advancedTabItem atIndex:2];
+    [configPanels insertTabViewItem:securityTabItem atIndex:3];
 }
 
 - (void) setupIAXPanels
@@ -210,8 +200,7 @@
     }
 
     [configPanels insertTabViewItem:generalTabItem atIndex:0];
-    [configPanels insertTabViewItem:audioTabItem atIndex:1];
-    [configPanels insertTabViewItem:videoTabItem atIndex:2];
+    [configPanels insertTabViewItem:mediaTabItem atIndex:1];
 }
 
 - (void) setupRINGPanels
@@ -222,9 +211,8 @@
     }
 
     [configPanels insertTabViewItem:ringTabItem atIndex:0];
-    [configPanels insertTabViewItem:audioTabItem atIndex:1];
-    [configPanels insertTabViewItem:videoTabItem atIndex:2];
-    [configPanels insertTabViewItem:advancedTabItem atIndex:3];
+    [configPanels insertTabViewItem:mediaTabItem atIndex:1];
+    [configPanels insertTabViewItem:advancedTabItem atIndex:2];
 
 }