diff --git a/Classes/CallHistoryTableViewController.m b/Classes/CallHistoryTableViewController.m
index 3e248bd8a..674bdda6f 100644
--- a/Classes/CallHistoryTableViewController.m
+++ b/Classes/CallHistoryTableViewController.m
@@ -33,15 +33,16 @@
}
*/
-/*
+
- (void)viewDidLoad {
[super viewDidLoad];
-
- // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
- // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+ UIBarButtonItem* clear = [[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemTrash
+ target:self
+ action:@selector(doAction:)];
+ [self.navigationItem setRightBarButtonItem:clear];
}
-*/
/*
- (void)viewWillAppear:(BOOL)animated {
@@ -87,10 +88,8 @@
-(void) doAction:(id)sender {
- if (sender==clear) {
- linphone_core_clear_call_logs(myLinphoneCore);
- [self.tableView reloadData];
- }
+ linphone_core_clear_call_logs(myLinphoneCore);
+ [self.tableView reloadData];
}
#pragma mark Table view methods
diff --git a/Classes/CallHistoryTableViewController.xib b/Classes/CallHistoryTableViewController.xib
index 816d687b2..ceb06857e 100644
--- a/Classes/CallHistoryTableViewController.xib
+++ b/Classes/CallHistoryTableViewController.xib
@@ -9,7 +9,6 @@
-
-
-
diff --git a/Classes/ConsoleViewController.h b/Classes/ConsoleViewController.h
new file mode 100644
index 000000000..090604fb0
--- /dev/null
+++ b/Classes/ConsoleViewController.h
@@ -0,0 +1,32 @@
+/*
+ * ConsoleViewController.h
+ *
+ * Description:
+ *
+ *
+ * Belledonne Communications (C) 2010
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
+
+#import
+
+@protocol LogView
++(void) addLog:(NSString*) log;
+
+@end
+
+@interface ConsoleViewController : UIViewController {
+ UITextView* logs;
+ UIView* logsView;
+
+
+}
+-(void) doAction;
+@property (nonatomic, retain) IBOutlet UITextView* logs;
+@property (nonatomic, retain) IBOutlet UIView* logsView;
+
+
+@end
diff --git a/Classes/ConsoleViewController.m b/Classes/ConsoleViewController.m
new file mode 100644
index 000000000..722b08289
--- /dev/null
+++ b/Classes/ConsoleViewController.m
@@ -0,0 +1,98 @@
+/*
+ * ConsoleViewController.h
+ *
+ * Description:
+ *
+ *
+ * Belledonne Communications (C) 2010
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
+
+#import "ConsoleViewController.h"
+
+
+@implementation ConsoleViewController
+NSMutableString* MoreViewController_logs;
+
+@synthesize logs;
+@synthesize logsView;
+
+/*
+ // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+ if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
+ // Custom initialization
+ }
+ return self;
+}
+*/
+
+
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ UIBarButtonItem* clear = [[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemTrash
+ target:self
+ action:@selector(doAction)];
+ [self.navigationItem setRightBarButtonItem:clear];
+}
+
+
+/*
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+*/
+
+-(void) viewWillAppear:(BOOL)animated {
+ [logs setText:MoreViewController_logs];
+}
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ // Release any retained subviews of the main view.
+ // e.g. self.myOutlet = nil;
+}
+
+
++(void) addLog:(NSString*) log {
+ @synchronized(self) {
+ if (!MoreViewController_logs) {
+ MoreViewController_logs = [[NSMutableString alloc] init];
+ }
+ [MoreViewController_logs appendString:log];
+ if (MoreViewController_logs.length > 50000) {
+ NSRange range = {0,log.length};
+ [MoreViewController_logs deleteCharactersInRange:range];
+ }
+ }
+}
+-(void) doAction{
+ @synchronized(self) {
+ NSMutableString* oldString = MoreViewController_logs;
+ MoreViewController_logs = [[NSMutableString alloc] init];
+ [oldString release];
+ [logs setText:@""];
+ }
+}
+
+
+
+- (void)dealloc {
+ [super dealloc];
+}
+
+
+@end
diff --git a/Classes/ConsoleViewController.xib b/Classes/ConsoleViewController.xib
new file mode 100644
index 000000000..16846dae6
--- /dev/null
+++ b/Classes/ConsoleViewController.xib
@@ -0,0 +1,228 @@
+
+
+
+ 784
+ 9L31a
+ 680
+ 949.54
+ 353.00
+
+
+
+
+
+
+ 0
+ ../linphone.xcodeproj
+ 3
+ 3.1
+
+
diff --git a/Classes/MoreViewController.h b/Classes/MoreViewController.h
new file mode 100644
index 000000000..6ee379440
--- /dev/null
+++ b/Classes/MoreViewController.h
@@ -0,0 +1,46 @@
+/* MoreViewController.h
+ *
+ * Copyright (C) 2009 Belledonne Comunications, Grenoble, France
+ *
+ * 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 2 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import
+#include "linphoneAppDelegate.h"
+
+
+
+
+@class ConsoleViewController;
+@interface MoreViewController : UITableViewController {
+
+ bool isLogViewEnabled;
+
+ UITableViewCell *credit;
+ UITextView *creditText;
+
+ UITableViewCell *web;
+ UITableViewCell *console;
+
+ ConsoleViewController *consoleViewController;
+ bool isDebug;
+}
+
+@property (nonatomic, retain) IBOutlet UITableViewCell* web;
+@property (nonatomic, retain) IBOutlet UITableViewCell* credit;
+@property (nonatomic, retain) IBOutlet UITableViewCell* console;
+@property (nonatomic, retain) IBOutlet UITextView *creditText;
+
+@end
diff --git a/Classes/MoreViewController.m b/Classes/MoreViewController.m
new file mode 100644
index 000000000..70acb4cf4
--- /dev/null
+++ b/Classes/MoreViewController.m
@@ -0,0 +1,140 @@
+/* MoreViewController.m
+ *
+ * Copyright (C) 2009 Belledonne Comunications, Grenoble, France
+ *
+ * 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 2 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "MoreViewController.h"
+#include "ConsoleViewController.h"
+
+
+
+@implementation MoreViewController
+@synthesize web;
+@synthesize credit;
+@synthesize console;
+@synthesize creditText;
+
+
+//Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+ [super viewDidLoad];
+ [creditText setText: [NSString stringWithFormat:creditText.text,@"3.1.2"]];
+ consoleViewController = [[ConsoleViewController alloc] initWithNibName:@"ConsoleViewController" bundle:[NSBundle mainBundle]];
+ isDebug = [[NSUserDefaults standardUserDefaults] boolForKey:@"debugenable_preference"];
+
+}
+
+
+
+/*
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+*/
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ // Release any retained subviews of the main view.
+ // e.g. self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+ [super dealloc];
+}
+
+
+
+-(void) enableLogView {
+ isLogViewEnabled = true;
+
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 2;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if (indexPath.section == 0) {
+ return 230;
+ } else {
+ return 44;
+ }
+}
+
+// Customize the number of rows in the table view.
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if (section == 0) {
+ return 1;
+ } else {
+ if (isDebug) {
+ return 2;
+ } else {
+ return 1;
+ }
+ }
+}
+
+
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ if (indexPath.section == 0) {
+ return credit;
+ } else {
+ switch (indexPath.row) {
+ case 0: return web;
+ case 1: return console;
+ }
+ }
+ return nil;
+}
+
+- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath {
+
+ [self tableView:tableView didSelectRowAtIndexPath:indexPath];
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+
+
+ [tableView deselectRowAtIndexPath:indexPath animated:NO];
+
+ switch (indexPath.row) {
+ case 0: {
+ NSString *stringURL = @"http://www.linphone.org";
+ NSURL *url = [NSURL URLWithString:stringURL];
+ [[UIApplication sharedApplication] openURL:url];
+ break;
+ };
+ case 1: {
+ [self.navigationController pushViewController:consoleViewController animated:true];
+ break;
+ }
+ }
+
+}
+
+@end
diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib
new file mode 100644
index 000000000..134dcf6d8
--- /dev/null
+++ b/Classes/MoreViewController.xib
@@ -0,0 +1,445 @@
+
+
+
+ 784
+ 9L31a
+ 680
+ 949.54
+ 353.00
+
+
+
+
+
+
+ 0
+ ../linphone.xcodeproj
+ 3
+ 3.1
+
+
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index faee724f2..aff6bf662 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -308,6 +308,7 @@
switch (state->new_state) {
case GSTATE_CALL_IN_INVITE:
case GSTATE_CALL_OUT_INVITE: {
+ [hangup setEnabled:true];
break;
}
@@ -358,6 +359,7 @@
[address setHidden:false];
[incallView setHidden:true];
[call setEnabled:true];
+ [hangup setEnabled:false];
if (durationRefreasher != nil) {
[ durationRefreasher invalidate];
diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib
index 3812cea78..bfcacf847 100644
--- a/Classes/PhoneViewController.xib
+++ b/Classes/PhoneViewController.xib
@@ -8,7 +8,7 @@
353.00
YES
1.700000e+01
-
+
3
diff --git a/Classes/linphoneAppDelegate.m b/Classes/linphoneAppDelegate.m
index 7dfa67470..3f79607fa 100644
--- a/Classes/linphoneAppDelegate.m
+++ b/Classes/linphoneAppDelegate.m
@@ -24,18 +24,27 @@
#import
#import
#import "osip2/osip.h"
+#import "ConsoleViewController.h"
+#import "MoreViewController.h"
+
extern void ms_au_register_card();
//generic log handler for debug version
-void linphone_iphone_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
+void linphone_iphone_log_handler(int lev, const char *fmt, va_list args){
NSString* format = [[NSString alloc] initWithCString:fmt encoding:[NSString defaultCStringEncoding]];
NSLogv(format,args);
+ NSString* formatedString = [[NSString alloc] initWithFormat:format arguments:args];
+ [ConsoleViewController addLog:formatedString];
[format release];
+ [formatedString release];
}
//Error/warning log handler
void linphone_iphone_log(struct _LinphoneCore * lc, const char * message) {
- NSLog([NSString stringWithCString:message length:strlen(message)]);
+ NSString* log = [NSString stringWithCString:message length:strlen(message)];
+ NSLog(log);
+ [ConsoleViewController addLog:log];
}
+
//status
void linphone_iphone_display_status(struct _LinphoneCore * lc, const char * message) {
PhoneViewController* lPhone = ((linphoneAppDelegate*) linphone_core_get_user_data(lc)).myPhoneViewController;
@@ -96,7 +105,10 @@ LinphoneCoreVTable linphonec_vtable = {
myPhoneViewController = (PhoneViewController*) [myTabBarController.viewControllers objectAtIndex: DIALER_TAB_INDEX];
- myCallHistoryTableViewController = (CallHistoryTableViewController*)[myTabBarController.viewControllers objectAtIndex: HISTORY_TAB_INDEX];
+ //Call history
+ myCallHistoryTableViewController = [[CallHistoryTableViewController alloc] initWithNibName:@"CallHistoryTableViewController" bundle:[NSBundle mainBundle]];
+ UINavigationController *aCallHistNavigationController = [[UINavigationController alloc] initWithRootViewController:myCallHistoryTableViewController];
+ aCallHistNavigationController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:HISTORY_TAB_INDEX] tabBarItem];
[myCallHistoryTableViewController setPhoneControllerDelegate:myPhoneViewController];
[myCallHistoryTableViewController setLinphoneDelegate:self];
@@ -111,9 +123,20 @@ LinphoneCoreVTable linphonec_vtable = {
[myPeoplePickerController setPeoplePickerDelegate:myContactPickerDelegate];
//copy tab bar item
myPeoplePickerController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:CONTACTS_TAB_INDEX] tabBarItem];
+
+ //more tab
+ MoreViewController *moreViewController = [[MoreViewController alloc] initWithNibName:@"MoreViewController" bundle:[NSBundle mainBundle]];
+ UINavigationController *aNavigationController = [[UINavigationController alloc] initWithRootViewController:moreViewController];
+ //copy tab bar item
+ aNavigationController.tabBarItem = [(UIViewController*)[myTabBarController.viewControllers objectAtIndex:MORE_TAB_INDEX] tabBarItem];
+
+
+
//insert contact controller
NSMutableArray* newArray = [NSMutableArray arrayWithArray:self.myTabBarController.viewControllers];
[newArray replaceObjectAtIndex:CONTACTS_TAB_INDEX withObject:myPeoplePickerController];
+ [newArray replaceObjectAtIndex:MORE_TAB_INDEX withObject:aNavigationController];
+ [newArray replaceObjectAtIndex:HISTORY_TAB_INDEX withObject:aCallHistNavigationController];
[myTabBarController setSelectedIndex:DIALER_TAB_INDEX];
[myTabBarController setViewControllers:newArray animated:NO];
diff --git a/PhoneMainView.xib b/PhoneMainView.xib
index 7f9a4bd9a..d894009cd 100644
--- a/PhoneMainView.xib
+++ b/PhoneMainView.xib
@@ -8,7 +8,7 @@
353.00
+