Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .vs/FMM2/v15/.suo
Binary file not shown.
Binary file added .vs/FMM2/v15/sqlite3/storage.ide
Binary file not shown.
22 changes: 11 additions & 11 deletions FMM2/FMM2.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,18 @@
<ApplicationIcon>FMM.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="INIFileParser, Version=2.4.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
<HintPath>..\packages\ini-parser.2.4.0\lib\net20\INIFileParser.dll</HintPath>
<Private>False</Private>
<Reference Include="INIFileParser, Version=2.5.2.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
<HintPath>..\packages\ini-parser.2.5.2\lib\net20\INIFileParser.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="SharpSvn, Version=1.9005.3940.224, Culture=neutral, PublicKeyToken=d729672594885a28, processorArchitecture=x86">
<HintPath>..\packages\SharpSvn.1.9-x86.1.9005.3940.224\lib\net40\SharpSvn.dll</HintPath>
<Private>False</Private>
<Reference Include="SharpSvn, Version=1.9007.3987.251, Culture=neutral, PublicKeyToken=d729672594885a28, processorArchitecture=x86">
<HintPath>..\packages\SharpSvn.1.9-x86.1.9007.3987.251\lib\net40\SharpSvn.dll</HintPath>
</Reference>
<Reference Include="SharpSvn.UI, Version=1.9005.3940.224, Culture=neutral, PublicKeyToken=33789aa53ca44aa9, processorArchitecture=MSIL">
<HintPath>..\packages\SharpSvn.1.9-x86.1.9005.3940.224\lib\net40\SharpSvn.UI.dll</HintPath>
<Private>False</Private>
<Reference Include="SharpSvn.UI, Version=1.9007.3987.251, Culture=neutral, PublicKeyToken=33789aa53ca44aa9, processorArchitecture=MSIL">
<HintPath>..\packages\SharpSvn.1.9-x86.1.9007.3987.251\lib\net40\SharpSvn.UI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -227,12 +224,15 @@
<ItemGroup>
<SplashScreen Include="FMM.png" />
</ItemGroup>
<ItemGroup>
<None Include="FodyWeavers.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Fody.2.0.0\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" />
<Import Project="..\packages\Fody.2.1.3\build\netstandard1.2\Fody.targets" Condition="Exists('..\packages\Fody.2.1.3\build\netstandard1.2\Fody.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Fody.2.0.0\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.0\build\dotnet\Fody.targets'))" />
<Error Condition="!Exists('..\packages\Fody.2.1.3\build\netstandard1.2\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.1.3\build\netstandard1.2\Fody.targets'))" />
</Target>
</Project>
File renamed without changes.
12 changes: 8 additions & 4 deletions FMM2/List_Sort.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,18 @@ private void listViewSort<T>(ListView list, object colOC, string sortBy, ListSor
{
uncheck = false;
}

}

foreach (T item in ((ObservableCollection<T>)colOC))
{
if (uncheck)
item.IsChecked = false;
else
item.IsChecked = true;
//added logic to only check shown items
if (list.Items.Contains(item)) {
if (uncheck)
item.IsChecked = false;
else
item.IsChecked = true;
}
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions FMM2/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,13 @@
</Grid>
<Grid x:Name="myModsGrid" UseLayoutRounding="False" Margin="0" Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="115*"/>
<ColumnDefinition Width="28*"/>
<ColumnDefinition Width="388*"/>
<ColumnDefinition Width="5"/>
<ColumnDefinition Width="250"/>
</Grid.ColumnDefinitions>
<ListView x:Name="myModsList" BorderThickness="0" SelectionMode="Single" Background="{x:Null}" AllowDrop="True" SelectionChanged="myModsList_SelectionChanged" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" GridViewColumnHeader.Click="myModsList_HeaderClicked" GotFocus="modsList_GotFocus">
<ListView x:Name="myModsList" BorderThickness="0" SelectionMode="Single" Background="{x:Null}" AllowDrop="True" SelectionChanged="myModsList_SelectionChanged" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" GridViewColumnHeader.Click="myModsList_HeaderClicked" GotFocus="modsList_GotFocus" Grid.ColumnSpan="3">
<ListView.Resources>
<ContextMenu x:Key="ItemContextMenu">
<MenuItem Header="Mark/Unmark for Installation" Click="itemMark_Click" />
Expand Down Expand Up @@ -78,8 +80,8 @@
</GridView>
</ListView.View>
</ListView>
<GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" Background="WhiteSmoke" />
<Grid x:Name="infobar" Grid.Column="2" Margin="0,0,0,0">
<GridSplitter Grid.Column="3" Width="5" HorizontalAlignment="Stretch" Background="WhiteSmoke" />
<Grid x:Name="infobar" Grid.Column="4" Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="40"/>
Expand Down
2 changes: 1 addition & 1 deletion FMM2/obj/x86/Debug/CoreCompileInputs.cache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
664d149d4b57602b8556076f2ad6c42f56cdb169
8e687053785643ec8b735679b78dcf6b677ee3b8
Binary file modified FMM2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary file not shown.
Binary file modified FMM2/obj/x86/Debug/FMM.exe
Binary file not shown.
Binary file modified FMM2/obj/x86/Debug/FMM.g.resources
Binary file not shown.
Binary file modified FMM2/obj/x86/Debug/FMM.pdb
Binary file not shown.
27 changes: 27 additions & 0 deletions FMM2/obj/x86/Debug/FMM2.csproj.FileListAbsolute.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,30 @@ C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM.pdb
C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM2.csprojResolveAssemblyReference.cache
C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\About.g.cs
C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\About.baml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\FMM.exe.config
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\FMM.exe
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\FMM.pdb
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\INIFileParser.dll
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.dll
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.UI.dll
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\INIFileParser.xml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.pdb
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.xml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.UI.pdb
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpSvn.UI.xml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\bin\x86\Debug\SharpPlink-Win32.svnExe
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM2.csprojResolveAssemblyReference.cache
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\About.g.cs
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\MainWindow.g.cs
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\App.g.cs
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\GeneratedInternalTypeHelper.g.cs
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM_MarkupCompile.cache
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM_MarkupCompile.lref
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\About.baml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\MainWindow.baml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM.g.resources
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM2.Properties.Resources.resources
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM2.csproj.GenerateResource.Cache
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM.exe
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM.pdb
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\FMM2.csproj.CoreCompileInputs.cache
Binary file modified FMM2/obj/x86/Debug/FMM2.csproj.GenerateResource.Cache
Binary file not shown.
6 changes: 3 additions & 3 deletions FMM2/obj/x86/Debug/FMM_MarkupCompile.cache
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
winexe
C#
.cs
C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\
FMM2
none
false
DEBUG;TRACE
C:\Users\Niall\Source\Repos\FMM2\FMM2\App.xaml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\App.xaml
2540622995

29-2053215080
17-309188237
171142955494
About.xaml;MainWindow.xaml;
fmm.png
False
Expand Down
10 changes: 5 additions & 5 deletions FMM2/obj/x86/Debug/FMM_MarkupCompile.i.cache
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
winexe
C#
.cs
C:\Users\Niall\Source\Repos\FMM2\FMM2\obj\x86\Debug\
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\obj\x86\Debug\
FMM2
none
false
DEBUG;TRACE
C:\Users\Niall\Source\Repos\FMM2\FMM2\App.xaml
C:\Users\jacallahan\Source\Repos\FMM2\FMM2\App.xaml
2540622995

331196347011
17-309188237
33432176596
171142955494
About.xaml;MainWindow.xaml;
fmm.png
True
False

4 changes: 2 additions & 2 deletions FMM2/obj/x86/Debug/FMM_MarkupCompile.lref
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@


FC:\Users\Niall\Source\Repos\FMM2\FMM2\MainWindow.xaml;;
FC:\Users\Niall\Source\Repos\FMM2\FMM2\About.xaml;;
FC:\Users\jacallahan\Source\Repos\FMM2\FMM2\About.xaml;;
FC:\Users\jacallahan\Source\Repos\FMM2\FMM2\MainWindow.xaml;;

Binary file modified FMM2/obj/x86/Debug/MainWindow.baml
Binary file not shown.
Loading