diff --git a/src/UI/CherryPick.xaml b/src/UI/CherryPick.xaml
index c22fd9b7..67da0283 100644
--- a/src/UI/CherryPick.xaml
+++ b/src/UI/CherryPick.xaml
@@ -1,4 +1,4 @@
-
-
+
diff --git a/src/UI/CherryPick.xaml.cs b/src/UI/CherryPick.xaml.cs
index 0d315529..d633f0ab 100644
--- a/src/UI/CherryPick.xaml.cs
+++ b/src/UI/CherryPick.xaml.cs
@@ -20,7 +20,7 @@ namespace SourceGit.UI {
repo = opened;
commitSHA = commit.SHA;
- desc.Content = $"{commit.ShortSHA} {commit.Subject}";
+ desc.Text = $"{commit.ShortSHA} {commit.Subject}";
}
///
diff --git a/src/UI/CreateBranch.xaml b/src/UI/CreateBranch.xaml
index 7f71f6ff..b98223cd 100644
--- a/src/UI/CreateBranch.xaml
+++ b/src/UI/CreateBranch.xaml
@@ -34,7 +34,7 @@
-
+
diff --git a/src/UI/CreateBranch.xaml.cs b/src/UI/CreateBranch.xaml.cs
index 4e08fc41..7917db27 100644
--- a/src/UI/CreateBranch.xaml.cs
+++ b/src/UI/CreateBranch.xaml.cs
@@ -55,7 +55,7 @@ namespace SourceGit.UI {
var dialog = new CreateBranch(repo);
dialog.based = branch.Name;
dialog.basedOnType.Data = dialog.FindResource("Icon.Branch") as Geometry;
- dialog.basedOnDesc.Content = branch.Name;
+ dialog.basedOnDesc.Text = branch.Name;
if (!branch.IsLocal) dialog.txtName.Text = branch.Name.Substring(branch.Remote.Length + 1);
repo.GetPopupManager()?.Show(dialog);
@@ -70,7 +70,7 @@ namespace SourceGit.UI {
var dialog = new CreateBranch(repo);
dialog.based = tag.Name;
dialog.basedOnType.Data = dialog.FindResource("Icon.Tag") as Geometry;
- dialog.basedOnDesc.Content = tag.Name;
+ dialog.basedOnDesc.Text = tag.Name;
repo.GetPopupManager()?.Show(dialog);
}
@@ -84,7 +84,7 @@ namespace SourceGit.UI {
var dialog = new CreateBranch(repo);
dialog.based = commit.SHA;
dialog.basedOnType.Data = dialog.FindResource("Icon.Commit") as Geometry;
- dialog.basedOnDesc.Content = $"{commit.ShortSHA} {commit.Subject}";
+ dialog.basedOnDesc.Text = $"{commit.ShortSHA} {commit.Subject}";
repo.GetPopupManager()?.Show(dialog);
}
diff --git a/src/UI/CreateTag.xaml b/src/UI/CreateTag.xaml
index 3d701ec6..3f48e17a 100644
--- a/src/UI/CreateTag.xaml
+++ b/src/UI/CreateTag.xaml
@@ -28,7 +28,7 @@
-
+
diff --git a/src/UI/CreateTag.xaml.cs b/src/UI/CreateTag.xaml.cs
index ffbf0b07..36f2eaef 100644
--- a/src/UI/CreateTag.xaml.cs
+++ b/src/UI/CreateTag.xaml.cs
@@ -50,7 +50,7 @@ namespace SourceGit.UI {
var dialog = new CreateTag(repo);
dialog.based = branch.Head;
dialog.basedOnType.Data = dialog.FindResource("Icon.Branch") as Geometry;
- dialog.basedOnDesc.Content = branch.Name;
+ dialog.basedOnDesc.Text = branch.Name;
repo.GetPopupManager()?.Show(dialog);
}
@@ -64,7 +64,7 @@ namespace SourceGit.UI {
var dialog = new CreateTag(repo);
dialog.based = commit.SHA;
dialog.basedOnType.Data = dialog.FindResource("Icon.Commit") as Geometry;
- dialog.basedOnDesc.Content = $"{commit.ShortSHA} {commit.Subject}";
+ dialog.basedOnDesc.Text = $"{commit.ShortSHA} {commit.Subject}";
repo.GetPopupManager()?.Show(dialog);
}
diff --git a/src/UI/DeleteBranch.xaml b/src/UI/DeleteBranch.xaml
index 79080a55..0af72dea 100644
--- a/src/UI/DeleteBranch.xaml
+++ b/src/UI/DeleteBranch.xaml
@@ -25,7 +25,7 @@
-
+
diff --git a/src/UI/DeleteBranch.xaml.cs b/src/UI/DeleteBranch.xaml.cs
index 8ae826fc..26e06d8e 100644
--- a/src/UI/DeleteBranch.xaml.cs
+++ b/src/UI/DeleteBranch.xaml.cs
@@ -19,7 +19,7 @@ namespace SourceGit.UI {
InitializeComponent();
repo = opened;
branch = target;
- branchName.Content = target.Name;
+ branchName.Text = target.Name;
}
///
diff --git a/src/UI/DeleteRemote.xaml b/src/UI/DeleteRemote.xaml
index 69c06d5b..8ad1d607 100644
--- a/src/UI/DeleteRemote.xaml
+++ b/src/UI/DeleteRemote.xaml
@@ -24,7 +24,7 @@
-
+
diff --git a/src/UI/DeleteRemote.xaml.cs b/src/UI/DeleteRemote.xaml.cs
index 76c05c15..a76bfa63 100644
--- a/src/UI/DeleteRemote.xaml.cs
+++ b/src/UI/DeleteRemote.xaml.cs
@@ -20,7 +20,7 @@ namespace SourceGit.UI {
InitializeComponent();
repo = opened;
remote = target;
- remoteName.Content = target;
+ remoteName.Text = target;
}
///
diff --git a/src/UI/DeleteTag.xaml b/src/UI/DeleteTag.xaml
index e4b73198..c4effbcc 100644
--- a/src/UI/DeleteTag.xaml
+++ b/src/UI/DeleteTag.xaml
@@ -25,7 +25,7 @@
-
+
diff --git a/src/UI/DeleteTag.xaml.cs b/src/UI/DeleteTag.xaml.cs
index 8233c016..8b107682 100644
--- a/src/UI/DeleteTag.xaml.cs
+++ b/src/UI/DeleteTag.xaml.cs
@@ -21,7 +21,7 @@ namespace SourceGit.UI {
this.tag = tag;
InitializeComponent();
- tagName.Content = tag.Name;
+ tagName.Text = tag.Name;
}
///
diff --git a/src/UI/Discard.xaml b/src/UI/Discard.xaml
index b725e4c4..b7c42a7b 100644
--- a/src/UI/Discard.xaml
+++ b/src/UI/Discard.xaml
@@ -26,7 +26,7 @@
-
+
diff --git a/src/UI/Discard.xaml.cs b/src/UI/Discard.xaml.cs
index 752f5e57..5404bd94 100644
--- a/src/UI/Discard.xaml.cs
+++ b/src/UI/Discard.xaml.cs
@@ -25,12 +25,12 @@ namespace SourceGit.UI {
InitializeComponent();
if (changes == null || changes.Count == 0) {
- txtPath.Content = "All local changes in working copy.";
+ txtPath.Text = "All local changes in working copy.";
icon.Data = FindResource("Icon.Folder") as Geometry;
} else if (changes.Count == 1) {
- txtPath.Content = changes[0].Path;
+ txtPath.Text = changes[0].Path;
} else {
- txtPath.Content = $"Total {changes.Count} changes ...";
+ txtPath.Text = $"Total {changes.Count} changes ...";
}
}
diff --git a/src/UI/Fetch.xaml b/src/UI/Fetch.xaml
index 550ed554..633ccbe5 100644
--- a/src/UI/Fetch.xaml
+++ b/src/UI/Fetch.xaml
@@ -35,7 +35,7 @@
-
+
diff --git a/src/UI/GitFlowFinishBranch.xaml b/src/UI/GitFlowFinishBranch.xaml
index 07f7db6c..4b1c1745 100644
--- a/src/UI/GitFlowFinishBranch.xaml
+++ b/src/UI/GitFlowFinishBranch.xaml
@@ -24,7 +24,7 @@
-
+
diff --git a/src/UI/GitFlowFinishBranch.xaml.cs b/src/UI/GitFlowFinishBranch.xaml.cs
index 83bf6047..cfbab6d1 100644
--- a/src/UI/GitFlowFinishBranch.xaml.cs
+++ b/src/UI/GitFlowFinishBranch.xaml.cs
@@ -40,7 +40,7 @@ namespace SourceGit.UI {
return;
}
- txtBranchName.Content = branch.Name;
+ txtBranchName.Text = branch.Name;
}
///
diff --git a/src/UI/Merge.xaml b/src/UI/Merge.xaml
index 5caa8b09..3eb1c32b 100644
--- a/src/UI/Merge.xaml
+++ b/src/UI/Merge.xaml
@@ -27,13 +27,13 @@
-
+
-
+
diff --git a/src/UI/Merge.xaml.cs b/src/UI/Merge.xaml.cs
index ea9fbc02..31d4e86d 100644
--- a/src/UI/Merge.xaml.cs
+++ b/src/UI/Merge.xaml.cs
@@ -35,8 +35,8 @@ namespace SourceGit.UI {
InitializeComponent();
repo = opened;
- sourceBranch.Content = source;
- targetBranch.Content = dest;
+ sourceBranch.Text = source;
+ targetBranch.Text = dest;
combOptions.ItemsSource = new Option[] {
new Option("Default", "Fast-forward if possible", ""),
new Option("No Fast-forward", "Always create a merge commit", "--no-ff"),
@@ -85,7 +85,7 @@ namespace SourceGit.UI {
var popup = repo.GetPopupManager();
popup?.Lock();
- var branch = sourceBranch.Content as string;
+ var branch = sourceBranch.Text;
var opt = combOptions.SelectedItem as Option;
await Task.Run(() => repo.Merge(branch, opt.Arg));
diff --git a/src/UI/Pull.xaml b/src/UI/Pull.xaml
index 57c0e072..bfaeb88c 100644
--- a/src/UI/Pull.xaml
+++ b/src/UI/Pull.xaml
@@ -34,7 +34,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
-
+
@@ -50,7 +50,7 @@
-
+
@@ -64,7 +64,7 @@
-
+
diff --git a/src/UI/PushTag.xaml b/src/UI/PushTag.xaml
index a78183c6..56b90cc8 100644
--- a/src/UI/PushTag.xaml
+++ b/src/UI/PushTag.xaml
@@ -25,7 +25,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/src/UI/PushTag.xaml.cs b/src/UI/PushTag.xaml.cs
index ca8a06d6..89d86cfd 100644
--- a/src/UI/PushTag.xaml.cs
+++ b/src/UI/PushTag.xaml.cs
@@ -21,7 +21,7 @@ namespace SourceGit.UI {
this.tag = tag;
InitializeComponent();
- tagName.Content = tag.Name;
+ tagName.Text = tag.Name;
combRemotes.ItemsSource = repo.Remotes();
combRemotes.SelectedIndex = 0;
}
diff --git a/src/UI/Rebase.xaml b/src/UI/Rebase.xaml
index f46f1193..104db77b 100644
--- a/src/UI/Rebase.xaml
+++ b/src/UI/Rebase.xaml
@@ -26,13 +26,13 @@
-
+
-
+
-
+
diff --git a/src/UI/RenameBranch.xaml.cs b/src/UI/RenameBranch.xaml.cs
index 76e1d2bf..8835cce5 100644
--- a/src/UI/RenameBranch.xaml.cs
+++ b/src/UI/RenameBranch.xaml.cs
@@ -29,7 +29,7 @@ namespace SourceGit.UI {
InitializeComponent();
nameValidator.Repo = opened;
- txtOldName.Content = target.Name;
+ txtOldName.Text = target.Name;
}
///
diff --git a/src/UI/Reset.xaml b/src/UI/Reset.xaml
index 6ae66237..c2908085 100644
--- a/src/UI/Reset.xaml
+++ b/src/UI/Reset.xaml
@@ -26,13 +26,13 @@
-
+
-
+
diff --git a/src/UI/Reset.xaml.cs b/src/UI/Reset.xaml.cs
index 0de69642..1dd95676 100644
--- a/src/UI/Reset.xaml.cs
+++ b/src/UI/Reset.xaml.cs
@@ -40,8 +40,8 @@ namespace SourceGit.UI {
repo = opened;
revision = commit.SHA;
- branch.Content = current.Name;
- desc.Content = $"{commit.ShortSHA} {commit.Subject}";
+ branch.Text = current.Name;
+ desc.Text = $"{commit.ShortSHA} {commit.Subject}";
combMode.ItemsSource = new Mode[] {
new Mode(Brushes.Green, "Soft", "Keep all changes. Stage differences", "--soft"),
new Mode(Brushes.Yellow, "Mixed", "Keep all changes. Unstage differences", "--mixed"),
diff --git a/src/UI/Revert.xaml b/src/UI/Revert.xaml
index 5eb0a24a..d719c3ea 100644
--- a/src/UI/Revert.xaml
+++ b/src/UI/Revert.xaml
@@ -25,7 +25,7 @@
-
+
diff --git a/src/UI/Revert.xaml.cs b/src/UI/Revert.xaml.cs
index 2012104b..2a02f90d 100644
--- a/src/UI/Revert.xaml.cs
+++ b/src/UI/Revert.xaml.cs
@@ -21,7 +21,7 @@ namespace SourceGit.UI {
sha = commit.SHA;
InitializeComponent();
- txtDesc.Content = $"{commit.ShortSHA} {commit.Subject}";
+ txtDesc.Text = $"{commit.ShortSHA} {commit.Subject}";
}
///