add some comments
This commit is contained in:
parent
c4dbaec151
commit
91790e2164
|
@ -61,6 +61,7 @@ namespace SparkleShare {
|
||||||
RemoteUrlCombo.Entry.Completion.Model = Defaults;
|
RemoteUrlCombo.Entry.Completion.Model = Defaults;
|
||||||
RemoteUrlCombo.Entry.Completion.PackStart (CellRendererPixbuf, false);
|
RemoteUrlCombo.Entry.Completion.PackStart (CellRendererPixbuf, false);
|
||||||
RemoteUrlCombo.Entry.Completion.AddAttribute (CellRendererPixbuf, "pixbuf", 1);
|
RemoteUrlCombo.Entry.Completion.AddAttribute (CellRendererPixbuf, "pixbuf", 1);
|
||||||
|
// TODO: The combobox arrow should be clickable
|
||||||
RemoteUrlCombo.Entry.Completion.InlineCompletion = true;
|
RemoteUrlCombo.Entry.Completion.InlineCompletion = true;
|
||||||
RemoteUrlCombo.Entry.Completion.PopupCompletion = true;;
|
RemoteUrlCombo.Entry.Completion.PopupCompletion = true;;
|
||||||
RemoteUrlCombo.Entry.Completion.TextColumn = 0;
|
RemoteUrlCombo.Entry.Completion.TextColumn = 0;
|
||||||
|
@ -97,8 +98,9 @@ namespace SparkleShare {
|
||||||
RemoteUrlCombo.Entry.Changed += CheckFields;
|
RemoteUrlCombo.Entry.Changed += CheckFields;
|
||||||
RemoteUrlCombo.WidthRequest = 320;
|
RemoteUrlCombo.WidthRequest = 320;
|
||||||
|
|
||||||
AddButton.Sensitive = false;
|
// TODO: This freezes the UI
|
||||||
AddButton.Clicked += CloneRepo;
|
AddButton.Clicked += CloneRepo;
|
||||||
|
AddButton.Sensitive = false;
|
||||||
|
|
||||||
ButtonBox.Add (CancelButton);
|
ButtonBox.Add (CancelButton);
|
||||||
ButtonBox.Add (AddButton);
|
ButtonBox.Add (AddButton);
|
||||||
|
|
|
@ -277,15 +277,13 @@ namespace SparkleShare {
|
||||||
SparkleHelpers.GetIcon
|
SparkleHelpers.GetIcon
|
||||||
("folder-sparkleshare", 48),
|
("folder-sparkleshare", 48),
|
||||||
true);
|
true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Add ();
|
Add ();
|
||||||
|
|
||||||
Process.StartInfo.Arguments
|
Process.StartInfo.Arguments = "rebase --continue";
|
||||||
= "rebase --continue";
|
|
||||||
Process.WaitForExit ();
|
Process.WaitForExit ();
|
||||||
Process.Start();
|
Process.Start();
|
||||||
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
|
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
|
||||||
|
|
|
@ -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
|
// Watch the SparkleShare folder and pop up the
|
||||||
// Add dialog when a new folder is created
|
// Add dialog when a new folder is created
|
||||||
// TODO: This crashes
|
// TODO: This crashes
|
||||||
|
|
Loading…
Reference in a new issue