mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-03 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wizard

Browse source
This commit is contained in:
Yann Diorcet 2012-09-18 12:30:30 +02:00
parent 8811989220
commit c83b75f4ba
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Classes/PhoneMainView.m
View file

@ -409,7 +409,10 @@ static PhoneMainView* phoneMainViewInstance=nil;
if(list != NULL) { if(list != NULL) {
[self changeCurrentView: [DialerViewController compositeViewDescription]]; [self changeCurrentView: [DialerViewController compositeViewDescription]];
} else { } else {
[self changeCurrentView: [WizardViewController compositeViewDescription]]; WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
if(controller != nil) {
[controller reset];
}
} }
} }

5
Classes/SettingsViewController.m
View file

@ -564,7 +564,10 @@ static UICompositeViewDescription *compositeDescription = nil;
if([key isEqual:@"console_button"]) { if([key isEqual:@"console_button"]) {
[[PhoneMainView instance] changeCurrentView:[ConsoleViewController compositeViewDescription] push:TRUE]; [[PhoneMainView instance] changeCurrentView:[ConsoleViewController compositeViewDescription] push:TRUE];
} else if([key isEqual:@"wizard_button"]) { } else if([key isEqual:@"wizard_button"]) {
[[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]]; WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
if(controller != nil) {
[controller reset];
}
} }
} }
@end @end

2
Classes/WizardViewController.h
View file

@ -42,6 +42,8 @@
@property (nonatomic, retain) IBOutlet UIButton *backButton; @property (nonatomic, retain) IBOutlet UIButton *backButton;
@property (nonatomic, retain) IBOutlet UIButton *startButton; @property (nonatomic, retain) IBOutlet UIButton *startButton;
- (void)reset;
- (IBAction)onStartClick:(id)sender; - (IBAction)onStartClick:(id)sender;
- (IBAction)onBackClick:(id)sender; - (IBAction)onBackClick:(id)sender;
- (IBAction)onCancelClick:(id)sender; - (IBAction)onCancelClick:(id)sender;

8
Classes/WizardViewController.m
View file

@ -109,12 +109,6 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark - ViewController Functions #pragma mark - ViewController Functions
- (void)viewDidLoad {
[super viewDidLoad];
[self resetWizard];
}
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
@ -161,7 +155,7 @@ static UICompositeViewDescription *compositeDescription = nil;
} }
} }
- (void)resetWizard { - (void)reset {
[self clearProxyConfig]; [self clearProxyConfig];
[WizardViewController cleanTextField:welcomeView]; [WizardViewController cleanTextField:welcomeView];
[WizardViewController cleanTextField:choiceView]; [WizardViewController cleanTextField:choiceView];