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

windows setup: Reverse button order

Browse source
This commit is contained in:
Hylke Bons 2012-03-17 01:44:27 +00:00
parent 869fd1e238
commit 12b27f3eb2
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -491,7 +491,7 @@ namespace SparkleLib.Git {
// Append a timestamp to local version.
// Windows doesn't allow colons in the file name, so
// we use "h" between the hours and minutes instead.
string timestamp = DateTime.Now.ToString ("HH\\hmm MMM d");
string timestamp = DateTime.Now.ToString ("MMM d H\\hmm");
string their_path = conflicting_path + " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")";
string abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
string abs_their_path = Path.Combine (LocalPath, their_path);

3
SparkleShare/Windows/SparkleSetupWindow.cs
View file

@ -133,9 +133,10 @@ namespace SparkleShare {
Canvas.SetLeft (description_label, 185);
Canvas.SetTop (description_label, 60);
if (Buttons.Count > 0) {
Buttons [0].IsDefault = true;
Buttons.Reverse ();
int right = 9;