beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

setup: Add cancel buttons to Linux and Mac too

Browse source
This commit is contained in:
Hylke Bons 2012-03-07 02:40:21 +00:00
parent d2cb17a4b3
commit eeb52d3979
4 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SparkleShare/Linux/SparkleSetup.cs
View file

@ -106,7 +106,13 @@ namespace SparkleShare {
VBox wrapper = new VBox (false, 9); VBox wrapper = new VBox (false, 9);
wrapper.PackStart (table, true, false, 0); wrapper.PackStart (table, true, false, 0);
Button cancel_button = new Button (_("Cancel"));
cancel_button.Clicked += delegate {
Controller.SetupPageCancelled ();
};
Button continue_button = new Button (_("Continue")) { Button continue_button = new Button (_("Continue")) {
Sensitive = false Sensitive = false
}; };
@ -117,7 +123,8 @@ namespace SparkleShare {
Controller.SetupPageCompleted (full_name, email); Controller.SetupPageCompleted (full_name, email);
}; };
AddButton (cancel_button);
AddButton (continue_button); AddButton (continue_button);
Add (wrapper); Add (wrapper);
@ -472,7 +479,12 @@ namespace SparkleShare {
points.PackStart (new Label (""), true, true, 0); points.PackStart (new Label (""), true, true, 0);
Button cancel_button = new Button (_("Cancel"));
cancel_button.Clicked += delegate {
Controller.PageCancelled ();
};
Button try_again_button = new Button (_("Try Again…")) { Button try_again_button = new Button (_("Try Again…")) {
Sensitive = true Sensitive = true
}; };
@ -480,7 +492,8 @@ namespace SparkleShare {
try_again_button.Clicked += delegate { try_again_button.Clicked += delegate {
Controller.ErrorPageCompleted (); Controller.ErrorPageCompleted ();
}; };
AddButton (cancel_button);
AddButton (try_again_button); AddButton (try_again_button);
Add (points); Add (points);

2
SparkleShare/Linux/SparkleStatusIcon.cs
View file

@ -298,7 +298,7 @@ namespace SparkleShare {
}; };
this.quit_item.Activated += delegate { this.quit_item.Activated += delegate {
Program.Controller.Quit (); Controller.QuitClicked ();
}; };
this.menu.Add (this.quit_item); this.menu.Add (this.quit_item);

19
SparkleShare/Mac/SparkleSetup.cs
View file

@ -150,6 +150,15 @@ namespace SparkleShare {
Controller.SetupPageCompleted (full_name, email); Controller.SetupPageCompleted (full_name, email);
}; };
CancelButton = new NSButton () {
Title = "Cancel"
};
CancelButton.Activated += delegate {
Controller.SetupPageCancelled ();
};
Controller.UpdateSetupContinueButtonEvent += delegate (bool button_enabled) { Controller.UpdateSetupContinueButtonEvent += delegate (bool button_enabled) {
InvokeOnMainThread (delegate { InvokeOnMainThread (delegate {
@ -164,6 +173,7 @@ namespace SparkleShare {
ContentView.AddSubview (EmailTextField); ContentView.AddSubview (EmailTextField);
Buttons.Add (ContinueButton); Buttons.Add (ContinueButton);
Buttons.Add (CancelButton);
Controller.CheckSetupPage ( Controller.CheckSetupPage (
FullNameTextField.StringValue, FullNameTextField.StringValue,
@ -553,8 +563,17 @@ namespace SparkleShare {
TryAgainButton.Activated += delegate { TryAgainButton.Activated += delegate {
Controller.ErrorPageCompleted (); Controller.ErrorPageCompleted ();
}; };
CancelButton = new NSButton () {
Title = "Cancel"
};
CancelButton.Activated += delegate {
Controller.PageCancelled ();
};
Buttons.Add (TryAgainButton); Buttons.Add (TryAgainButton);
Buttons.Add (CancelButton);
break; break;
} }

2
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -302,7 +302,7 @@ namespace SparkleShare {
}; };
QuitMenuItem.Activated += delegate { QuitMenuItem.Activated += delegate {
Program.Controller.Quit (); Controller.QuitClicked ();
}; };
Menu.AddItem (QuitMenuItem); Menu.AddItem (QuitMenuItem);