Skip to content

Commit

Permalink
Added Cursors
Browse files Browse the repository at this point in the history
  • Loading branch information
BigSpice committed Jan 23, 2024
1 parent 9d75006 commit a2c8914
Show file tree
Hide file tree
Showing 24 changed files with 87 additions and 30 deletions.
Binary file modified VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin
Binary file not shown.
Binary file modified VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin
Binary file not shown.
Binary file modified VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified VTOL_2.0.0/.vs/VTOL/v17/fileList.bin
Binary file not shown.
23 changes: 3 additions & 20 deletions VTOL_2.0.0/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,30 +194,13 @@


<Grid>
<Grid Margin="0,640,0,0" Background="Black"></Grid>

<Border
x:Name="mask"
CornerRadius="8" Background="#FF0E0E0E"
/>
<!--="#FF171717"-->
<!-- CornerRadius="8"-->

<!--<ui:Breadcrumb
Margin="10,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontSize="24"
Navigation="{Binding ElementName=RootNavigation}" Height="38" Width="169" Background="{x:Null}" Foreground="#E4FFFFFF" >
<ui:Breadcrumb.Effect>
<DropShadowEffect
ShadowDepth="2"
Direction="330"
Color="Black"
Opacity="0.5"
BlurRadius="4"/>
</ui:Breadcrumb.Effect>
</ui:Breadcrumb>-->

<!--This is the fat white thing you see-->

<Frame x:Name="RootFrame" GotFocus="RootFrame_GotFocus">
<Frame.OpacityMask>
<VisualBrush Visual="{Binding ElementName=mask}"/>
Expand Down
29 changes: 29 additions & 0 deletions VTOL_2.0.0/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
using System.Windows.Media;
using System.Windows.Media.Animation;
using VTOL.Pages;
using VTOL.Titanfall2_Requisite.WeaponData.Default.Titan;
using static VTOL.Pages.Page_Thunderstore;

namespace VTOL
Expand Down Expand Up @@ -369,6 +370,34 @@ public MainWindow()



}
Cursor LeadWall, Ronin;
public void SwitchCursor(string cur)
{
string CursorDir = Directory.GetParent(System.Reflection.Assembly.GetExecutingAssembly().Location.ToString()).FullName + @"\Resources\Resources_Static\Cursors\";
LeadWall = new Cursor(CursorDir + "Leadwallcur.cur");
Ronin = new Cursor(CursorDir + "NormalCurTf2.cur");
if(Ronin == null || LeadWall == null) {
return;
}
switch (cur)
{
case "Defualt":
this.Cursor = null;

break;
case "LeadWall":
this.Cursor = LeadWall;

break;
case "Ronin":
this.Cursor = Ronin;

break;
default:
this.Cursor = null;
break;
}
}
void Restart()
{
Expand Down
18 changes: 16 additions & 2 deletions VTOL_2.0.0/Pages/Page_Settings.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ public class PropertyGridDemoModel
[Category("Github")]

public string Master_Server_Url { get; set; }
[Category("Cursor")]
public cur Cursor { get; set; }

[Category("Themes")]
//public Theme Theme { get; set; }
//[Category("Themes")]

public Theme Theme { get; set; }
//public Theme Theme { get; set; }

}
public enum Theme
Expand All @@ -87,6 +90,12 @@ public enum Theme
Final_Grey,
Redstone_Red
}
public enum cur
{
Defualt,
LeadWall,
Ronin
}
public Page_Settings()
{
InitializeComponent();
Expand Down Expand Up @@ -259,6 +268,11 @@ private void Settings_LostFocus(object sender, RoutedEventArgs e)
}
DispatchIfNecessary(async () =>
{
if(Settings_.Cursor != cur.Defualt)
{
Main.SwitchCursor(Settings_.Cursor.ToString());

}

if (curr_lang.ToString() != Settings_.Language.ToString())
{
Expand Down
5 changes: 2 additions & 3 deletions VTOL_2.0.0/Pages/Page_Thunderstore.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@
<ui:Button x:Name="padd" Content="" VerticalAlignment="Top" Height="35" Padding="0,0,0,0" Icon="ArrowSortDownLines20" BorderBrush="{x:Null}" Width="40" HorizontalAlignment="Right" Margin="0,135,278.3,0" Click="padd_Click" Background="#07FFFFFF" ToolTip="{x:Static properties:Language.Page_Mods_ReverseFilterOrder}" MouseOverBackground="#4CFFFFFF"/>

<hc:CheckComboBox x:Name="Search_Filters" ItemsSource="{Binding Final_List}" Height="28" VerticalAlignment="Top" SelectedIndex="-1" ShowClearButton="True" Cursor="Hand" Padding="7,0,7,5" BorderThickness="0,0,0,1" BorderBrush="#FF999999" Background="#00000000" SelectionChanged="Search_Filters_SelectionChanged" hc:InfoElement.Placeholder="Filters" ToolTip="Filter Thunderstore List" ScrollViewer.CanContentScroll="False" Margin="0,138,35,0" HorizontalAlignment="Right" Width="243" VerticalContentAlignment="Bottom" HorizontalContentAlignment="Center" />
<hc:Badge x:Name="Mod_Updates_Available" Content="Mod Updates Available" Margin="0,632,37,0" VerticalAlignment="Top" BadgeMargin="0,0,0,0" Height="19" Background="#FF45EC57" BorderBrush="#FF45EC57" Status="Processing" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Foreground="#FF8A8A8A" FontFamily="Nirmala UI" HorizontalAlignment="Right" Width="139" Visibility="Hidden"/>
<Label x:Name="Store_Mod_Label" Content="Store Mod Count:" Foreground="#FF8A8A8A" FontFamily="Nirmala UI" HorizontalAlignment="Right" Width="139" Margin="0,632,975,0" Padding="0,0,0,0" MinHeight="19" Height="19" VerticalAlignment="Top" VerticalContentAlignment="Center"/>
<Label x:Name="Couunter_Mods" Content="########" Foreground="#FF8A8A8A" FontFamily="Nirmala UI" HorizontalAlignment="Right" Width="116" Margin="0,632,903,0" Padding="0,0,0,0" MinHeight="19" Height="19" VerticalAlignment="Top" VerticalContentAlignment="Center"/>
<hc:Badge x:Name="Mod_Updates_Available" Content="{x:Static properties:Language.ModUpdatesAvailable}" Margin="0,632,37,0" VerticalAlignment="Top" BadgeMargin="0,0,0,0" Height="19" Background="#FF45EC57" BorderBrush="#FF45EC57" Status="Processing" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Foreground="#FF8A8A8A" FontFamily="Nirmala UI" HorizontalAlignment="Right" Width="147"/>
<Label x:Name="Couunter_Mods" Content="Store Mod Count:" Foreground="#FF8A8A8A" FontFamily="Nirmala UI" HorizontalAlignment="Left" Width="270" Margin="48,632,0,0" Padding="0,0,0,0" MinHeight="19" Height="19" VerticalAlignment="Top" VerticalContentAlignment="Center"/>

<Label x:Name="Category_Label" Margin="0,142,193,0" Background="{x:Null}" Foreground="#34FFFFFF" Content="{x:Static properties:Language.Page_Thunderstore_Category}" VerticalContentAlignment="Center" VerticalAlignment="Top" FontSize="14" IsHitTestVisible="False" Height="20" Padding="0,0,0,0" IsEnabled="False" HorizontalAlignment="Right" Width="75" HorizontalContentAlignment="Left"/>
<Label x:Name="Sort_Label" Margin="0,144,460,0" Background="{x:Null}" Foreground="#34FFFFFF" Content="{x:Static properties:Language.Page_Thunderstore_Sort}" VerticalContentAlignment="Center" VerticalAlignment="Top" FontSize="14" IsHitTestVisible="False" Height="20" Padding="0,0,0,0" IsEnabled="False" HorizontalAlignment="Right" Width="75" HorizontalContentAlignment="Left"/>
Expand Down
2 changes: 1 addition & 1 deletion VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ public Page_Thunderstore()
{
if(_updater != null)
{
Couunter_Mods.Content = _updater.Thunderstore.Count().ToString();
Couunter_Mods.Content = VTOL.Resources.Languages.Language.ThunderstoreModCount +":"+ _updater.Thunderstore.Count().ToString();

}

Expand Down
18 changes: 18 additions & 0 deletions VTOL_2.0.0/Resources/Languages/Language.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions VTOL_2.0.0/Resources/Languages/Language.resx
Original file line number Diff line number Diff line change
Expand Up @@ -750,4 +750,10 @@
<data name="TheModIsNotRegisteredProperlyInTheBackendListPleaseFixTheM2odFormattingOrUpdateYourTF2ModList__" xml:space="preserve">
<value>The Mod Is not Registered Properly in the Backend List, Please Fix the M2od formatting or update your TF2 Mod List";</value>
</data>
<data name="ThunderstoreModCount" xml:space="preserve">
<value>Thunderstore Mod Count</value>
</data>
<data name="ModUpdatesAvailable" xml:space="preserve">
<value>Mod Updates Available - </value>
</data>
</root>
Binary file not shown.
Binary file not shown.
16 changes: 12 additions & 4 deletions VTOL_2.0.0/VTOL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<RepositoryUrl>https://github.com/BigSpice/VTOL</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>mod;installer;modmanager;northstar-client;titanfall2</PackageTags>
<AssemblyVersion>3.0.2</AssemblyVersion>
<FileVersion>3.0.2</FileVersion>
<Version>3.0.2</Version>
<AssemblyVersion>3.0.3</AssemblyVersion>
<FileVersion>3.0.3</FileVersion>
<Version>3.0.3</Version>
<EnableNETAnalyzers>False</EnableNETAnalyzers>
<ErrorReport>none</ErrorReport>
<Title>VTOL</Title>
Expand Down Expand Up @@ -311,6 +311,8 @@
<None Remove="Resources\Resource_Static\Advocate_banner.png" />
<None Remove="Resources\Resource_Static\better_frog.png" />
<None Remove="Resources\Resource_Static\Crowbar.png" />
<None Remove="Resources\Resource_Static\Cursors\Leadwallcur.cur" />
<None Remove="Resources\Resource_Static\Cursors\NormalCurTf2.cur" />
<None Remove="Resources\Resource_Static\harmony.png" />
<None Remove="Resources\Resource_Static\Leigon+.jpg" />
<None Remove="Resources\Resource_Static\MDL_SHIT_Banner.png" />
Expand Down Expand Up @@ -423,7 +425,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<Resource Include="Resources\Backgrounds\405e3ab0-2648-4e8b-a4cc-51a008666e75.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Content Include="Resources\Backgrounds\Backgrounds_Home_Page\1008810.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -788,6 +790,12 @@
<Resource Include="Resources\Resource_Static\better_frog.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Resource_Static\Cursors\Leadwallcur.cur">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Resource_Static\Cursors\NormalCurTf2.cur">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
<Resource Include="Resources\Resource_Static\Leigon+.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Resource>
Expand Down

0 comments on commit a2c8914

Please sign in to comment.