Skip to content

Commit e92b4f0

Browse files
author
Andrew
committed
UI clean up and improvments
Updated Avalonia UI
1 parent 1f13205 commit e92b4f0

22 files changed

+283
-241
lines changed

‎CommitEntry/CommitEntry.csproj

+22-22
Original file line numberDiff line numberDiff line change
@@ -37,87 +37,87 @@
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
40+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Base.dll</HintPath>
44+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Base.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Avalonia.Cairo, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Avalonia.Cairo.0.4.1-build2634-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
48+
<HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
5151
<Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
52+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
5555
<Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
56+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
60+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2634-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
64+
<HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
6767
<Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
68+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
6969
<Private>True</Private>
7070
</Reference>
71-
<Reference Include="Avalonia.Gtk, Version=1.0.6248.6664, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>..\packages\Avalonia.Gtk.0.4.1-build2634-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
71+
<Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
72+
<HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
76-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Input.dll</HintPath>
76+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
7777
<Private>True</Private>
7878
</Reference>
7979
<Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
80-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
80+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
8383
<Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
84-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
84+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
8585
<Private>True</Private>
8686
</Reference>
8787
<Reference Include="Avalonia.Logging.Serilog, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
88+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
8989
<Private>True</Private>
9090
</Reference>
9191
<Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
92-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
92+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
9393
<Private>True</Private>
9494
</Reference>
9595
<Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
96-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
96+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
9797
<Private>True</Private>
9898
</Reference>
9999
<Reference Include="Avalonia.ReactiveUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
100-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
100+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103103
<Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
104-
<HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2634-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
104+
<HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
105105
<Private>True</Private>
106106
</Reference>
107107
<Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
108-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
108+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
109109
<Private>True</Private>
110110
</Reference>
111111
<Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
112-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
112+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
113113
<Private>True</Private>
114114
</Reference>
115115
<Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
116-
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
116+
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
117117
<Private>True</Private>
118118
</Reference>
119119
<Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
120-
<HintPath>..\packages\Avalonia.Win32.0.4.1-build2634-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
120+
<HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
121121
<Private>True</Private>
122122
</Reference>
123123
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

‎CommitEntry/packages.config

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Avalonia" version="0.4.1-build2634-alpha" targetFramework="net462" />
4-
<package id="Avalonia.Cairo" version="0.4.1-build2634-alpha" targetFramework="net462" />
5-
<package id="Avalonia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
6-
<package id="Avalonia.Direct2D1" version="0.4.1-build2634-alpha" targetFramework="net462" />
7-
<package id="Avalonia.Gtk" version="0.4.1-build2634-alpha" targetFramework="net462" />
8-
<package id="Avalonia.Skia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
9-
<package id="Avalonia.Win32" version="0.4.1-build2634-alpha" targetFramework="net462" />
3+
<package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
4+
<package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
5+
<package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
6+
<package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
7+
<package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
8+
<package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
9+
<package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
1010
<package id="Serilog" version="1.5.14" targetFramework="net462" />
1111
<package id="SharpDX" version="3.1.1" targetFramework="net462" />
1212
<package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />

‎GitItGUI.Core/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737

3838
public static class VersionInfo
3939
{
40-
public const string version = "0.1.12";
40+
public const string version = "0.1.13";
4141
}

‎GitItGUI.Core/RepoManager.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static bool OpenRepo(string path)
8080

8181
// check for git lfs
8282
lfsEnabled = IsGitLFSRepo();
83-
83+
8484
// load settings
8585
settings = Settings.Load<XML.RepoSettings>(path + "\\" + Settings.repoSettingsFilename);
8686
userSettings = Settings.Load<XML.RepoUserSettings>(path + "\\" + Settings.repoUserSettingsFilename);
@@ -118,6 +118,12 @@ public static bool OpenRepo(string path)
118118

119119
BranchManager.OpenRepo(repo);
120120
AppManager.AddActiveRepoToHistory();
121+
122+
// warnings
123+
if (userSettings.signatureName.Contains("TODO: ") || userSettings.signatureEmail.Contains("TODO: ") || userSettings.username.Contains("TODO: "))
124+
{
125+
Debug.LogWarning("Credentials not set, please go to the settings tab!", true);
126+
}
121127
}
122128
catch (Exception e)
123129
{

‎GitItGUI.Core/Tools/Settings.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public class RepoSettings
3131
[XmlRoot("RepoUserSettings")]
3232
public class RepoUserSettings
3333
{
34-
[XmlAttribute("SignatureName")] public string signatureName = "First Last";
35-
[XmlAttribute("SignatureEmail")] public string signatureEmail = "username@email.com";
36-
[XmlAttribute("Username")] public string username = "Username";
37-
[XmlAttribute("Password")] public string password = "password";
34+
[XmlAttribute("SignatureName")] public string signatureName = "TODO: First Last";
35+
[XmlAttribute("SignatureEmail")] public string signatureEmail = "TODO: username@email.com";
36+
[XmlAttribute("Username")] public string username = "TODO: Username";
37+
[XmlAttribute("Password")] public string password = "";
3838
}
3939
}
4040

‎GitItGUI/AppSettingsPage.xaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<UserControl xmlns="https://github.com/avaloniaui" Design.Width="640" Design.Height="400" Background="LightGray">
22
<Grid>
3-
<TextBlock Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
4-
<ListBox Name="mergeDiffToolListBox" Margin="10,30,-10,-30" Width="256" HorizontalAlignment="Left" VerticalAlignment="Top" Background="White" SelectionMode="Single">
3+
<TextBlock Margin="10,10,10,-10" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Top">App Settings</TextBlock>
4+
<TextBlock Margin="10,60,10,-60" HorizontalAlignment="Center" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
5+
<ListBox Name="mergeDiffToolListBox" Margin="10,80,-10,-80" Width="256" HorizontalAlignment="Center" VerticalAlignment="Top" Background="White" SelectionMode="Single">
56
<ListBoxItem>Meld</ListBoxItem>
67
<ListBoxItem>kDiff3</ListBoxItem>
78
<ListBoxItem>P4Merge</ListBoxItem>
89
<ListBoxItem>DiffMerge</ListBoxItem>
910
</ListBox>
1011

11-
<CheckBox Name="autoRefreshChanges" Margin="10,120,-10,0" HorizontalAlignment="Left" VerticalAlignment="Top">Auto Refresh Changes</CheckBox>
12-
13-
<Button Name="doneButton" Margin="0,10,10,0" Width="128" HorizontalAlignment="Right" VerticalAlignment="Top">Done</Button>
12+
<CheckBox Name="autoRefreshChanges" Margin="10,-10,-10,10" HorizontalAlignment="Left" VerticalAlignment="Bottom">Auto Refresh Changes</CheckBox>
13+
<Button Name="doneButton" Margin="-10,-10,10,10" Width="128" HorizontalAlignment="Right" VerticalAlignment="Bottom">Done</Button>
1414
</Grid>
1515
</UserControl>

0 commit comments

Comments
 (0)