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

add some comments

Browse source
This commit is contained in:
Hylke Bons 2010-05-29 16:37:07 +02:00
parent c4dbaec151
commit 91790e2164
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleShare/SparkleDialog.cs
View file

@ -61,6 +61,7 @@ namespace SparkleShare {
RemoteUrlCombo.Entry.Completion.Model = Defaults;
RemoteUrlCombo.Entry.Completion.PackStart (CellRendererPixbuf, false);
RemoteUrlCombo.Entry.Completion.AddAttribute (CellRendererPixbuf, "pixbuf", 1);
// TODO: The combobox arrow should be clickable
RemoteUrlCombo.Entry.Completion.InlineCompletion = true;
RemoteUrlCombo.Entry.Completion.PopupCompletion = true;;
RemoteUrlCombo.Entry.Completion.TextColumn = 0;
@ -97,8 +98,9 @@ namespace SparkleShare {
RemoteUrlCombo.Entry.Changed += CheckFields;
RemoteUrlCombo.WidthRequest = 320;
AddButton.Sensitive = false;
// TODO: This freezes the UI
AddButton.Clicked += CloneRepo;
AddButton.Sensitive = false;
ButtonBox.Add (CancelButton);
ButtonBox.Add (AddButton);

4
SparkleShare/SparkleRepo.cs
View file

@ -277,15 +277,13 @@ namespace SparkleShare {
SparkleHelpers.GetIcon
("folder-sparkleshare", 48),
true);
}
}
Add ();
Process.StartInfo.Arguments
= "rebase --continue";
Process.StartInfo.Arguments = "rebase --continue";
Process.WaitForExit ();
Process.Start();
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");

2
SparkleShare/SparkleUI.cs
View file

@ -135,6 +135,8 @@ namespace SparkleShare {
}
// TODO: When a repo folder is deleted, don't sync and update the UI
// Watch the SparkleShare folder and pop up the
// Add dialog when a new folder is created
// TODO: This crashes