Skip to content

Commit

Permalink
UI clean up and improvments
Browse files Browse the repository at this point in the history 
Updated Avalonia UI
  • Loading branch information
Andrew committed Feb 27, 2017
1 parent 1f13205 commit e92b4f0
Show file tree
Hide file tree
Showing 22 changed files with 283 additions and 241 deletions.
44 changes: 22 additions & 22 deletions CommitEntry/CommitEntry.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,87 +37,87 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Avalonia.Animation, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Animation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Base, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Base.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Base.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Cairo, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.Cairo.0.4.1-build2634-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
<HintPath>..\packages\Avalonia.Cairo.0.4.1-build2693-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Controls, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Controls.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.DesignerSupport, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DesignerSupport.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Diagnostics, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Diagnostics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Direct2D1, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2634-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
<HintPath>..\packages\Avalonia.Direct2D1.0.4.1-build2693-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.DotNetFrameworkRuntime, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.DotNetFrameworkRuntime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Gtk, Version=1.0.6248.6664, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.Gtk.0.4.1-build2634-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
<Reference Include="Avalonia.Gtk, Version=1.0.6263.2538, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.Gtk.0.4.1-build2693-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Input, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Input.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Input.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Interactivity, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Interactivity.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Layout, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Layout.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Logging.Serilog, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Logging.Serilog.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Markup, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Markup.Xaml, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Markup.Xaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.ReactiveUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.ReactiveUI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Skia.Desktop, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2634-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
<HintPath>..\packages\Avalonia.Skia.Desktop.0.4.1-build2693-alpha\lib\net45\Avalonia.Skia.Desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Styling, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Styling.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Themes.Default, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Themes.Default.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Visuals, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.0.4.1-build2634-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
<HintPath>..\packages\Avalonia.0.4.1-build2693-alpha\lib\net45\Avalonia.Visuals.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Avalonia.Win32, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Avalonia.Win32.0.4.1-build2634-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
<HintPath>..\packages\Avalonia.Win32.0.4.1-build2693-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
Expand Down
14 changes: 7 additions & 7 deletions CommitEntry/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Avalonia" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Cairo" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Direct2D1" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Gtk" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Skia.Desktop" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia.Win32" version="0.4.1-build2634-alpha" targetFramework="net462" />
<package id="Avalonia" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Cairo" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Direct2D1" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Gtk" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Skia.Desktop" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Avalonia.Win32" version="0.4.1-build2693-alpha" targetFramework="net462" />
<package id="Serilog" version="1.5.14" targetFramework="net462" />
<package id="SharpDX" version="3.1.1" targetFramework="net462" />
<package id="SharpDX.Direct2D1" version="3.1.1" targetFramework="net462" />
Expand Down
2 changes: 1 addition & 1 deletion GitItGUI.Core/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@

public static class VersionInfo
{
public const string version = "0.1.12";
public const string version = "0.1.13";
}
8 changes: 7 additions & 1 deletion GitItGUI.Core/RepoManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static bool OpenRepo(string path)

// check for git lfs
lfsEnabled = IsGitLFSRepo();

// load settings
settings = Settings.Load<XML.RepoSettings>(path + "\\" + Settings.repoSettingsFilename);
userSettings = Settings.Load<XML.RepoUserSettings>(path + "\\" + Settings.repoUserSettingsFilename);
Expand Down Expand Up @@ -118,6 +118,12 @@ public static bool OpenRepo(string path)

BranchManager.OpenRepo(repo);
AppManager.AddActiveRepoToHistory();

// warnings
if (userSettings.signatureName.Contains("TODO: ") || userSettings.signatureEmail.Contains("TODO: ") || userSettings.username.Contains("TODO: "))
{
Debug.LogWarning("Credentials not set, please go to the settings tab!", true);
}
}
catch (Exception e)
{
Expand Down
8 changes: 4 additions & 4 deletions GitItGUI.Core/Tools/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public class RepoSettings
[XmlRoot("RepoUserSettings")]
public class RepoUserSettings
{
[XmlAttribute("SignatureName")] public string signatureName = "First Last";
[XmlAttribute("SignatureEmail")] public string signatureEmail = "username@email.com";
[XmlAttribute("Username")] public string username = "Username";
[XmlAttribute("Password")] public string password = "password";
[XmlAttribute("SignatureName")] public string signatureName = "TODO: First Last";
[XmlAttribute("SignatureEmail")] public string signatureEmail = "TODO: username@email.com";
[XmlAttribute("Username")] public string username = "TODO: Username";
[XmlAttribute("Password")] public string password = "";
}
}

Expand Down
10 changes: 5 additions & 5 deletions GitItGUI/AppSettingsPage.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<UserControl xmlns="https://github.com/avaloniaui" Design.Width="640" Design.Height="400" Background="LightGray">
<Grid>
<TextBlock Margin="10,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
<ListBox Name="mergeDiffToolListBox" Margin="10,30,-10,-30" Width="256" HorizontalAlignment="Left" VerticalAlignment="Top" Background="White" SelectionMode="Single">
<TextBlock Margin="10,10,10,-10" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Top">App Settings</TextBlock>
<TextBlock Margin="10,60,10,-60" HorizontalAlignment="Center" VerticalAlignment="Top">Merge / Diff tool</TextBlock>
<ListBox Name="mergeDiffToolListBox" Margin="10,80,-10,-80" Width="256" HorizontalAlignment="Center" VerticalAlignment="Top" Background="White" SelectionMode="Single">
<ListBoxItem>Meld</ListBoxItem>
<ListBoxItem>kDiff3</ListBoxItem>
<ListBoxItem>P4Merge</ListBoxItem>
<ListBoxItem>DiffMerge</ListBoxItem>
</ListBox>

<CheckBox Name="autoRefreshChanges" Margin="10,120,-10,0" HorizontalAlignment="Left" VerticalAlignment="Top">Auto Refresh Changes</CheckBox>

<Button Name="doneButton" Margin="0,10,10,0" Width="128" HorizontalAlignment="Right" VerticalAlignment="Top">Done</Button>
<CheckBox Name="autoRefreshChanges" Margin="10,-10,-10,10" HorizontalAlignment="Left" VerticalAlignment="Bottom">Auto Refresh Changes</CheckBox>
<Button Name="doneButton" Margin="-10,-10,10,10" Width="128" HorizontalAlignment="Right" VerticalAlignment="Bottom">Done</Button>
</Grid>
</UserControl>
Loading

0 comments on commit e92b4f0

Please sign in to comment.