commit fcb4ca63d363f819c7e0f6079139e160bfd8c505
author Loïc Siret <loic.siret@savoirfairelinux.com> Wed Sep 21 17:12:09 2016 -0400
committer Loïc Siret <loic.siret@savoirfairelinux.com> Fri Oct 14 15:14:29 2016 -0400
tree b667132a2730cb3f1d7c9e5caa9d6fc3476f7253
parent 624b1a8e3e5cc4839e1c7726da28fcc330b5a2b5

multi-device: update Ring account creation wizard

This patch implements multi-device support

- The account creation wizzard has now two options "Existing Ring
  account" and "New Ring account".

  "Existing Ring account": Allows for fetching a Ring account archive
  from the DHT. Requires pin and password.

  "New Ring account": This is the previously existing wizard. It was
  modified to ask for a password which will be used to encrypt the
  account archive. This password is then required for exporting the
  account on the Ring.

- Creating a new Ring account with the "+" button now triggers the
  account creation wizard.

Change-Id: I6840d968e52de014ab0aa9dd6f5bc1ab31f9e9ec
Tuleap: #958

src/AccountsVC.mm

diff --git a/src/AccountsVC.mm b/src/AccountsVC.mm
index 1557915..b62b623 100644
--- a/src/AccountsVC.mm
+++ b/src/AccountsVC.mm
@@ -38,6 +38,7 @@
 #import "AccRingVC.h"
 #import "AccDevicesVC.h"
 #import "PathPasswordWC.h"
+#import "RingWizardWC.h"
 
 @interface AccountsVC () <PathPasswordDelegate>
 
@@ -63,6 +64,7 @@
 @property AccAdvancedVC* advancedVC;
 @property AccSecurityVC* securityVC;
 @property PathPasswordWC* passwordWC;
+@property RingWizardWC* wizard;
 
 @end
 
@@ -79,6 +81,7 @@
 @synthesize accountDetailsView;
 @synthesize treeController;
 @synthesize passwordWC;
+@synthesize wizard;
 
 NSInteger const TAG_CHECK       =   100;
 NSInteger const TAG_NAME        =   200;
@@ -164,18 +167,52 @@
     [self.ringDevicesTabItem setView:self.devicesVC.view];
 }
 
-- (IBAction)addAccount:(id)sender {
+- (void)createSIPAccount
+{
     QModelIndex qIdx =  AccountModel::instance().protocolModel()->selectionModel()->currentIndex();
 
     auto newAccName = [[NSString alloc] initWithFormat:@"%@ account",
-                AccountModel::instance().protocolModel()->data(qIdx, Qt::DisplayRole).toString().toNSString(), nil];
+                                          AccountModel::instance().protocolModel()->data(qIdx, Qt::DisplayRole).toString().toNSString(), nil];
     auto acc = AccountModel::instance().add([newAccName UTF8String], qIdx);
     acc->setDisplayName(acc->alias());
     AccountModel::instance().save();
 }
 
-- (IBAction)protocolSelectedChanged:(id)sender {
+- (void)createRingAccount
+{
+    wizard = [[RingWizardWC alloc] initWithWindowNibName:@"RingWizard"];
+    [wizard showChooseWithCancelButton: YES];
+    // [wizard.window makeKeyAndOrderFront:self];
+#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_9
+    [self.view.window beginSheet:wizard.window completionHandler:nil];
+#else
+    [NSApp beginSheet: wizard.window
+       modalForWindow: self.view.window
+        modalDelegate: self
+       didEndSelector: nil
+          contextInfo: nil];
+#endif
+    [wizard showWindow:self];
+}
 
+- (IBAction)addAccount:(id)sender
+{
+    QModelIndex qProtocolIdx = AccountModel::instance().protocolModel()->selectionModel()->currentIndex();
+    auto protocol = qvariant_cast<Account::Protocol> (AccountModel::instance().protocolModel()->data( qProtocolIdx, Qt::UserRole));
+    switch (protocol){
+        case Account::Protocol::SIP:{
+            [self createSIPAccount];
+            break;
+        }
+        case Account::Protocol::RING:{
+            [self createRingAccount];
+            break;
+        }
+    }
+}
+
+- (IBAction)protocolSelectedChanged:(id)sender
+{
     int index = [sender indexOfSelectedItem];
     auto qIdx = AccountModel::instance().protocolModel()->index(index, 0);
     AccountModel::instance().protocolModel()->selectionModel()->setCurrentIndex(qIdx, QItemSelectionModel::ClearAndSelect);
@@ -187,7 +224,6 @@
     for(NSTabViewItem* item in configPanels.tabViewItems) {
         [configPanels removeTabViewItem:item];
     }
-
     [configPanels insertTabViewItem:generalTabItem atIndex:0];
     [configPanels insertTabViewItem:mediaTabItem atIndex:1];
     [configPanels insertTabViewItem:advancedTabItem atIndex:2];