contact request: add list of blocked contacts.
In preferences add new tab for banned contact. The list contain
contact's bestID and button to perform unban.
Change-Id: I376f63420ec0573e47574a79923c798b50148a31
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
diff --git a/src/AccBannedContactsVC.h b/src/AccBannedContactsVC.h
new file mode 100644
index 0000000..5a646fc
--- /dev/null
+++ b/src/AccBannedContactsVC.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+ * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface AccBannedContactsVC : NSViewController
+
+@property (nonatomic) BOOL bannedListIsEmpty;
+
+@end
diff --git a/src/AccBannedContactsVC.mm b/src/AccBannedContactsVC.mm
new file mode 100644
index 0000000..94e51b3
--- /dev/null
+++ b/src/AccBannedContactsVC.mm
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+ * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+//Qt
+#import <QItemSelectionModel>
+
+//LRC
+#import <account.h>
+#import <availableAccountModel.h>
+#import <contactmethod.h>
+#import <bannedContactmodel.h>
+
+#import "AccBannedContactsVC.h"
+#import "QNSTreeController.h"
+
+@interface AccBannedContactsVC ()
+
+@property QNSTreeController* bannedContactsTreeController;
+@property (unsafe_unretained) IBOutlet NSOutlineView* banedContactsView;
+
+@end
+
+@implementation AccBannedContactsVC
+
+@synthesize bannedContactsTreeController;
+@synthesize banedContactsView;
+
+NSInteger const TAG_NAME = 100;
+NSInteger const TAG_RINGID = 200;
+
+- (void)awakeFromNib
+{
+ QObject::connect(AccountModel::instance().selectionModel(),
+ &QItemSelectionModel::currentChanged,
+ [=](const QModelIndex ¤t, const QModelIndex &previous) {
+ if(!current.isValid())
+ return;
+ [self loadAccount];
+ });
+}
+
+- (void)loadAccount
+{
+ auto account = AccountModel::instance().selectedAccount();
+ self.bannedContactsTreeController = [[QNSTreeController alloc] initWithQModel:(QAbstractItemModel*)account->bannedContactModel()];
+ [self.bannedContactsTreeController setAvoidsEmptySelection:NO];
+ [self.bannedContactsTreeController setChildrenKeyPath:@"children"];
+
+ [self.banedContactsView bind:@"content" toObject:self.bannedContactsTreeController withKeyPath:@"arrangedObjects" options:nil];
+ [self.banedContactsView bind:@"sortDescriptors" toObject:self.bannedContactsTreeController withKeyPath:@"sortDescriptors" options:nil];
+ [self.banedContactsView bind:@"selectionIndexPaths" toObject:self.bannedContactsTreeController withKeyPath:@"selectionIndexPaths" options:nil];
+ NSLog(@"numberofRowsBanned, %d", account->bannedContactModel()->rowCount());
+ self.bannedListIsEmpty = banedContactsView.numberOfRows == 0;
+}
+
+- (IBAction)unbanContact:(NSView*)sender
+{
+ NSInteger row = [self.banedContactsView rowForView:sender];
+ if(row < 0) {
+ return;
+ }
+ auto account = AccountModel::instance().selectedAccount();
+ id item = [self.banedContactsView itemAtRow:row];
+ QModelIndex qIdx = [self.bannedContactsTreeController toQIdx:((NSTreeNode*)item)];
+ if(!qIdx.isValid()) {
+ return;
+ }
+ auto cm = qIdx.data(static_cast<int>(ContactMethod::Role::Object)).value<ContactMethod*>();
+ if( account && cm) {
+ account->bannedContactModel()->remove(cm);
+ }
+ self.bannedListIsEmpty = banedContactsView.numberOfRows == 0;
+}
+
+#pragma mark - NSOutlineViewDelegate methods
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item
+{
+ return YES;
+}
+
+- (NSTableRowView *)outlineView:(NSOutlineView *)outlineView rowViewForItem:(id)item
+{
+ return [outlineView makeViewWithIdentifier:@"HoverRowView" owner:nil];
+}
+
+- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{
+ NSTableView* result = [outlineView makeViewWithIdentifier:@"BannedContactsCellView" owner:self];
+
+ QModelIndex qIdx = [self.bannedContactsTreeController toQIdx:((NSTreeNode*)item)];
+ if(!qIdx.isValid())
+ return result;
+
+ NSTextField* nameLabel = [result viewWithTag:TAG_NAME];
+ NSTextField* deviceIDLabel = [result viewWithTag:TAG_RINGID];
+
+ auto account = AccountModel::instance().selectedAccount();
+
+ NSString* stringID = account->bannedContactModel()->data(qIdx,Qt::DisplayRole).toString().toNSString();
+
+ [nameLabel setStringValue:stringID];
+ [deviceIDLabel setStringValue:stringID];
+
+ return result;
+}
+
+@end
diff --git a/src/AccountsVC.mm b/src/AccountsVC.mm
index 93fddec..d0d14d2 100644
--- a/src/AccountsVC.mm
+++ b/src/AccountsVC.mm
@@ -40,6 +40,7 @@
#import "BackupAccountWC.h"
#import "RestoreAccountWC.h"
#import "RingWizardWC.h"
+#import "AccBannedContactsVC.h"
@interface AccountsVC () <BackupAccountDelegate, RestoreAccountDelegate>
@@ -52,6 +53,7 @@
@property (retain) IBOutlet NSTabViewItem *securityTabItem;
@property (retain) IBOutlet NSTabViewItem *ringTabItem;
@property (retain) IBOutlet NSTabViewItem *ringDevicesTabItem;
+@property (retain) IBOutlet NSTabViewItem *bannedListTabItem;
@property QNSTreeController *treeController;
@property (assign) IBOutlet NSOutlineView *accountsListView;
@@ -63,6 +65,7 @@
@property AccGeneralVC* generalVC;
@property AccMediaVC* audioVC;
@property AccAdvancedVC* advancedVC;
+@property AccBannedContactsVC* bannedContactsVC;
@property AccSecurityVC* securityVC;
@property AbstractLoadingWC* accountModal;
@property RingWizardWC* wizard;
@@ -83,6 +86,7 @@
@synthesize treeController;
@synthesize accountModal;
@synthesize wizard;
+@synthesize bannedListTabItem;
NSInteger const TAG_CHECK = 100;
NSInteger const TAG_NAME = 200;
@@ -166,6 +170,11 @@
[[self.devicesVC view] setFrame:[self.ringDevicesTabItem.view frame]];
[[self.devicesVC view] setBounds:[self.ringDevicesTabItem.view bounds]];
[self.ringDevicesTabItem setView:self.devicesVC.view];
+
+ self.bannedContactsVC = [[AccBannedContactsVC alloc] initWithNibName:@"AccBannedContacts" bundle:nil];
+ [[self.bannedContactsVC view] setFrame:[self.bannedListTabItem.view frame]];
+ [[self.bannedContactsVC view] setBounds:[self.bannedListTabItem.view bounds]];
+ [self.bannedListTabItem setView:self.bannedContactsVC.view];
}
- (void) setupSIPPanels
@@ -191,6 +200,7 @@
[configPanels insertTabViewItem:ringDevicesTabItem atIndex:1];
[configPanels insertTabViewItem:mediaTabItem atIndex:2];
[configPanels insertTabViewItem:advancedTabItem atIndex:3];
+ [configPanels insertTabViewItem:bannedListTabItem atIndex:4];
}
- (IBAction)toggleAccount:(NSButton*)sender {