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

Some UI beauty fixes

Browse source
This commit is contained in:
Hylke Bons 2011-09-22 19:54:28 +01:00
parent b1d84eff53
commit 138c55ba91
5 changed files with 33 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SparkleShare/Mac/SparkleMacController.cs
View file

@ -111,13 +111,13 @@ namespace SparkleShare {
{
this.watcher = new SparkleMacWatcher (SparkleConfig.DefaultConfig.FoldersPath);
if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
return true;
if (!Directory.Exists (SparkleConfig.DefaultConfig.FoldersPath)) {
Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath);
return true;
} else {
return false;
}
} else {
return false;
}
}

12
SparkleShare/Mac/SparkleSetup.cs
View file

@ -70,7 +70,7 @@ namespace SparkleShare {
Description = "Before we can create a SparkleShare folder on this " +
"computer, we need some information from you.";
UserInfoForm = new NSForm (new RectangleF (250, 115, 350, 64));
UserInfoForm = new NSForm (new RectangleF (250, Frame.Height - 280, 350, 64));
UserInfoForm.AddEntry ("Full Name:");
UserInfoForm.AddEntry ("Email Address:");
@ -80,8 +80,8 @@ namespace SparkleShare {
UserInfoForm.Cells [0].LineBreakMode = NSLineBreakMode.TruncatingTail;
UserInfoForm.Cells [1].LineBreakMode = NSLineBreakMode.TruncatingTail;
UserInfoForm.Cells [0].StringValue = Program.Controller.UserName;
UserInfoForm.Cells [1].StringValue = Program.Controller.UserEmail;
UserInfoForm.Cells [0].StringValue = Controller.GuessedUserName;
UserInfoForm.Cells [1].StringValue = Controller.GuessedUserEmail;
// TODO: Ugly hack, do properly with events
timer = new Timer () {
@ -124,7 +124,7 @@ namespace SparkleShare {
case PageType.Add: {
Header = "Where is your remote folder?";
Header = "Where is your project?";
Description = "";
ServerTypeLabel = new NSTextField () {
@ -133,7 +133,7 @@ namespace SparkleShare {
Bordered = false,
Editable = false,
Frame = new RectangleF (150, Frame.Height - 159 , 160, 17),
StringValue = "Server Type:",
StringValue = "Host Type:",
Font = SparkleUI.Font
};
@ -263,7 +263,7 @@ namespace SparkleShare {
ContentView.AddSubview (FolderNameHelpLabel);
SyncButton = new NSButton () {
Title = "Sync",
Title = "Add",
Enabled = false
};

2
SparkleShare/Mac/SparkleStatusIcon.cs
View file

@ -189,7 +189,7 @@ namespace SparkleShare {
Menu.AddItem (NSMenuItem.SeparatorItem);
SyncMenuItem = new NSMenuItem () {
Title = "Add Remote Folder…"
Title = "Add Project…"
};
if (!Program.Controller.FirstRun) {

4
SparkleShare/SparkleSetup.cs
View file

@ -77,12 +77,12 @@ namespace SparkleShare {
Xalign = 0
};
NameEntry = new Entry (Program.Controller.UserName);
NameEntry = new Entry (Controller.GuessedUserName);
NameEntry.Changed += delegate {
CheckSetupPage ();
};
EmailEntry = new Entry ();
EmailEntry = new Entry (Controller.GuessedUserEmail);
EmailEntry.Changed += delegate {
CheckSetupPage ();
};

27
SparkleShare/SparkleSetupController.cs
View file

@ -75,6 +75,21 @@ namespace SparkleShare {
}
}
public string GuessedUserName {
get {
return Program.Controller.UserName;
}
}
public string GuessedUserEmail {
get {
if (Program.Controller.UserEmail.Equals ("Unknown"))
return "";
else
return Program.Controller.UserEmail;
}
}
private string previous_server = "";
private string previous_folder = "";
@ -121,16 +136,10 @@ namespace SparkleShare {
public void TutorialPageCompleted ()
{
if (this.tutorial_page_number == 4) {
if (ChangePageEvent != null)
ChangePageEvent (PageType.Add);
this.tutorial_page_number++;
} else {
this.tutorial_page_number++;
if (ChangePageEvent != null)
ChangePageEvent (PageType.Tutorial);
}
if (ChangePageEvent != null)
ChangePageEvent (PageType.Tutorial);
}