mac: some fixes for the ui with new configuration
This commit is contained in:
parent
109f75aee9
commit
15073bb5b3
|
@ -71,13 +71,7 @@ namespace SparkleShare {
|
||||||
UserInfoForm.CellSize = new SizeF (280, 22);
|
UserInfoForm.CellSize = new SizeF (280, 22);
|
||||||
UserInfoForm.IntercellSpacing = new SizeF (4, 4);
|
UserInfoForm.IntercellSpacing = new SizeF (4, 4);
|
||||||
|
|
||||||
|
UserInfoForm.Cells [0].StringValue = SparkleShare.Controller.UserName;
|
||||||
// TODO: Move to Controller.WriteDefaultConfig
|
|
||||||
string full_name = new UnixUserInfo (UnixEnvironment.UserName).RealName;
|
|
||||||
if (string.IsNullOrEmpty (full_name))
|
|
||||||
full_name = "";
|
|
||||||
|
|
||||||
UserInfoForm.Cells [0].StringValue = full_name.TrimEnd (",".ToCharArray());;
|
|
||||||
UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail;
|
UserInfoForm.Cells [1].StringValue = SparkleShare.Controller.UserEmail;
|
||||||
|
|
||||||
ContinueButton = new NSButton () {
|
ContinueButton = new NSButton () {
|
||||||
|
@ -89,7 +83,6 @@ namespace SparkleShare {
|
||||||
SparkleShare.Controller.UserName = UserInfoForm.Cells [0].StringValue.Trim ();
|
SparkleShare.Controller.UserName = UserInfoForm.Cells [0].StringValue.Trim ();
|
||||||
SparkleShare.Controller.UserEmail = UserInfoForm.Cells [1].StringValue.Trim ();
|
SparkleShare.Controller.UserEmail = UserInfoForm.Cells [1].StringValue.Trim ();
|
||||||
SparkleShare.Controller.GenerateKeyPair ();
|
SparkleShare.Controller.GenerateKeyPair ();
|
||||||
SparkleShare.Controller.FirstRun = false;
|
|
||||||
SparkleUI.StatusIcon.CreateMenu ();
|
SparkleUI.StatusIcon.CreateMenu ();
|
||||||
|
|
||||||
InvokeOnMainThread (delegate {
|
InvokeOnMainThread (delegate {
|
||||||
|
|
|
@ -475,7 +475,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
SparkleRepoBase repo = null;
|
SparkleRepoBase repo = null;
|
||||||
|
|
||||||
if (backend.Equals ("Git")) { Console.WriteLine ("Git: " + folder_path);
|
if (backend.Equals ("Git")) {
|
||||||
repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend);
|
repo = new SparkleRepoGit (folder_path, SparkleBackend.DefaultBackend);
|
||||||
|
|
||||||
} else if (backend.Equals ("Hg")) {
|
} else if (backend.Equals ("Hg")) {
|
||||||
|
|
Loading…
Reference in a new issue