Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from Sparrows413:master #1

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

[pull] master from Sparrows413:master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aed537c
Added Culture/Language support (on the works)
Khyrou Nov 2, 2019
33b4036
Item sheet should throw if there is exception.
Khyrou Nov 2, 2019
9c2b012
Moved most of the Tooltip/content(Actordata)in resx
Khyrou Nov 2, 2019
d29784c
Put Mainwindow Content/Tooltip in resx. Also fixed up the strings.
Khyrou Nov 2, 2019
50a2398
Update OffsetSettings.xml
Khyrou Nov 2, 2019
4a4428c
More language stuff to resx (Actor Propeties + Equipment)
Khyrou Nov 2, 2019
d153401
Oops..Forgot to remove run text.
Khyrou Nov 2, 2019
0f46ebf
EditMode button is now only enabled in GPose.
Nov 2, 2019
64e1acb
Fixed Actor Refresh being greyed out (and stuck that way) when toggli…
Nov 2, 2019
a44ea0a
Updated SC to the latest commit.
Khyrou Nov 2, 2019
8faa7df
Rebase SC to certain Commit.
Khyrou Nov 2, 2019
10f60a9
Added the new Sneak VFX to the GPose Status dropdown menu.
Nov 3, 2019
897bfcd
Added the Shadow of the Dragon VFX to the GPose Status dropdown menu.
Nov 3, 2019
fcfd7d2
More localization, added Matirx Pose strings into resx.
Khyrou Nov 3, 2019
a84f4df
Merge branch 'master' of https://github.com/imchillin/CMTool
Khyrou Nov 3, 2019
cf60ad1
More localization- Added World+Actor Properties content into resx
Khyrou Nov 3, 2019
415ae93
Fixed an issue where the entity type of your target would change when…
Nov 3, 2019
d679185
Minor tweaks to Language Select window sizing.
Nov 3, 2019
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
17 changes: 17 additions & 0 deletions ConceptMatrix/ConceptMatrix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Resx\UIStringsContent.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>UIStringsContent.resx</DependentUpon>
</Compile>
<Compile Include="Utility\QuaternionConverter.cs" />
<Compile Include="Utility\CmpReader.cs" />
<Compile Include="Utility\DatSaves.cs" />
Expand Down Expand Up @@ -182,6 +187,9 @@
<Compile Include="Windows\GearsetChooseWindow.xaml.cs">
<DependentUpon>GearsetChooseWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\LanguageSelect.xaml.cs">
<DependentUpon>LanguageSelect.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\LoadWindow.xaml.cs">
<DependentUpon>LoadWindow.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -263,6 +271,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\LanguageSelect.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\LoadWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -290,6 +302,11 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resx\UIStringsContent.ja.resx" />
<EmbeddedResource Include="Resx\UIStringsContent.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>UIStringsContent.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand Down
46 changes: 21 additions & 25 deletions ConceptMatrix/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,33 @@
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:Views="clr-namespace:ConceptMatrix.Views"
mc:Ignorable="d"
xmlns:resx="clr-namespace:ConceptMatrix.Resx"
Height="650" Width="1115" Loaded="MetroWindow_Loaded" Icon="cmtool-icon.ico" ResizeMode="CanMinimize">
<Grid>
<TabControl TabStripPlacement="Top" Margin="0,48,0,0" Background="{DynamicResource MaterialDesignPaper}" DataContext="{Binding Path=CharacterDetails}">
<TabItem Header="Actor Data">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.ActorData}}">
<Views:CharacterDetailsView Margin="0,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Height="530"/>
</TabItem>
<TabItem Header="Actor Properties">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.ActorProperties}}">
<Views:CharacterDetailsView4 Margin="0,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Height="530"/>
</TabItem>
<TabItem Header="Equipment">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.Equipment}}">
<Views:CharacterDetailsView2 Margin="0,4,-1,0" VerticalAlignment="Top" HorizontalAlignment="Left" Height="530"/>
</TabItem>
<TabItem Header="Posing Matrix">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.PosingMatrix}}">
<Views:CharacterDetailsView5 Margin="0,4,-1,0" VerticalAlignment="Top" HorizontalAlignment="Left" Height="530"/>
</TabItem>
<TabItem Header="World">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.World}}">
<Views:CharacterDetailsView3 Margin="0,4,-1,0" VerticalAlignment="Top" HorizontalAlignment="Left" Height="530"/>
</TabItem>
<TabItem Header="About">
<TabItem Header="{Binding Source={x:Static resx:UIStringsContent.About}}">
<Views:AboutView Margin="0" HorizontalAlignment="Left" Width="1102" Height="530"/>
</TabItem>
<TabItem Header="&#x1F3A8;">
<Views:PaletteView Margin="0" HorizontalAlignment="Left" Width="1102" Height="530"/>
</TabItem>
</TabControl>
<ComboBox ToolTip="Displays the list of targetable entities in the area around you.&#xD;&#xA;&#x2022; This list is populated based on distance from the player, and can potentially shift if any entities change positions, including minions." HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="131" ItemsSource="{Binding Path=CharacterDetails.CharacterDetails.Names}" SelectedIndex="{Binding Path=CharacterDetails.CharacterDetails.SelectedIndex}" IsTabStop="False"/>
<ComboBox ToolTip="{Binding Source={x:Static resx:UIStringsContent.ActorEntityListToolTip}}" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="131" ItemsSource="{Binding Path=CharacterDetails.CharacterDetails.Names}" SelectedIndex="{Binding Path=CharacterDetails.CharacterDetails.SelectedIndex}" IsTabStop="False"/>
<Button HorizontalAlignment="Left" Style="{StaticResource MaterialDesignRaisedAccentButton}" ToolTip="Reload the entity list, refreshing the available entries to select from." materialDesign:ShadowAssist.ShadowDepth="Depth3" Margin="146,7,0,0" VerticalAlignment="Top" Width="74" Command="{Binding Path=CharacterDetails.RefreshEntitiesCommand}" IsTabStop="False">
<DockPanel>
<Image Source="Resources/Refresh.png" RenderTransformOrigin="0.5,0.5">
Expand All @@ -54,40 +55,35 @@
</Image>
</DockPanel>
</Button>
<Button x:Name="CharacterRefreshButton" ToolTip="Refresh the selected actor, reloading it based on the changes you've made." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Actor Refresh" HorizontalAlignment="Left" Margin="225,7,0,0" VerticalAlignment="Top" Width="125" Click="CharacterRefreshButton_Click" IsTabStop="False"/>
<Button x:Name="FindProcess" ToolTip="Reload the Final Fantasy XIV process." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Reload Process" HorizontalAlignment="Left" Margin="953,7,0,0" VerticalAlignment="Top" Width="151" Click="FindProcess_Click" IsTabStop="False"/>
<Button x:Name="CharacterRefreshButton" ToolTip="{Binding Source={x:Static resx:UIStringsContent.ActorRefreshToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.ActorRefreshButton}}" HorizontalAlignment="Left" Margin="225,7,0,0" VerticalAlignment="Top" Width="125" Click="CharacterRefreshButton_Click" IsTabStop="False"/>
<Button x:Name="FindProcess" ToolTip="{Binding Source={x:Static resx:UIStringsContent.FindProcessToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.FindProcessButton}}" HorizontalAlignment="Left" Margin="953,7,0,0" VerticalAlignment="Top" Width="151" Click="FindProcess_Click" IsTabStop="False"/>
<ToggleButton x:Name="GposeButton" Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding Path=CharacterDetails.CharacterDetails.GposeMode}" Margin="455,3,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Height="21" Checked="GposeButton_Checked" Unchecked="GposeButton_Unchecked" IsTabStop="False" />
<Label Content="GPose Mode:" ToolTip="Allows for certain values such as XYZ Position, Rotation and Animation to be changed for your currently selected entity in GPose.&#xD;&#xA;&#x2022; GPose mode and Target Mode both toggle on at the same time. Make sure not to have Target Mode already toggled on, or it will toggle off instead." HorizontalAlignment="Left" Margin="360,0,0,0" VerticalAlignment="Top" FontSize="14"/>
<Label Content="{Binding Source={x:Static resx:UIStringsContent.GPoseMode}}" ToolTip="{Binding Source={x:Static resx:UIStringsContent.GposeModeToolTip}}" HorizontalAlignment="Left" Margin="360,0,0,0" VerticalAlignment="Top" FontSize="14"/>
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" VerticalAlignment="Top" x:Name="TwitterButton" Margin="910,-45,0,0" Width="131" Click="TwitterButton_Click" Height="45" Foreground="White" BorderBrush="#7F000000" BorderThickness="1,0" Padding="16,20,16,4" IsTabStop="False">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Twitter" Padding="0" />
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0"><Run Text="Twitter"/></TextBlock>
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0" Text="{Binding Source={x:Static resx:UIStringsContent.Twitter}}"/>
</StackPanel>
</Button>
<Button x:Name="Save" ToolTip="Save Appearance to a JSON file." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Save Appearance" HorizontalAlignment="Left" Margin="755,7,0,0" VerticalAlignment="Top" Width="145" Click="Save_Click" IsTabStop="False"/>
<Button x:Name="Load" ToolTip="Load Appearance from a user-generated JSON file.&#xD;&#xA;&#x2022; You can load data you have saved from the Character Creator in-game using the 'Load .DAT' option." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Load Appearance" HorizontalAlignment="Left" Margin="605,7,0,0" VerticalAlignment="Top" Width="145" Click="Load_Click" IsTabStop="False"/>
<Button x:Name="Uncheck" ToolTip="Uncheck and unfreeze all selections." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Unfreeze All" HorizontalAlignment="Left" Margin="500,7,0,0" VerticalAlignment="Top" Width="100" Click="Uncheck_Click" Padding="15,4,16,4" FontSize="12" IsTabStop="False"/>
<Button x:Name="Save" ToolTip="{Binding Source={x:Static resx:UIStringsContent.SaveMainWindowToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.SaveMainWindow}}" HorizontalAlignment="Left" Margin="755,7,0,0" VerticalAlignment="Top" Width="145" Click="Save_Click" IsTabStop="False"/>
<Button x:Name="Load" ToolTip="{Binding Source={x:Static resx:UIStringsContent.LoadMainWindowToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.LoadMainWindow}}" HorizontalAlignment="Left" Margin="605,7,0,0" VerticalAlignment="Top" Width="145" Click="Load_Click" IsTabStop="False"/>
<Button x:Name="Uncheck" ToolTip="{Binding Source={x:Static resx:UIStringsContent.UncheckButtonToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.UncheckButton}}" HorizontalAlignment="Left" Margin="500,7,0,0" VerticalAlignment="Top" Width="100" Click="Uncheck_Click" Padding="15,4,16,4" FontSize="12" IsTabStop="False"/>
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" VerticalAlignment="Top" x:Name="AlwaysOnTop" Margin="626,-45,0,0" Width="153" Click="AlwaysOnTop_Click" Height="45" Foreground="White" BorderBrush="#7F000000" BorderThickness="1,0" Padding="16,20,16,4" IsTabStop="False">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="{Binding Path=AOTToggleStatus, FallbackValue=ToggleSwitchOffOutline}" Padding="0" Foreground="{Binding ToggleForeground, FallbackValue=#7FFFFFFF}" />
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0">Always on Top</TextBlock>
</StackPanel>
</Button>
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" VerticalAlignment="Top" x:Name="UpdateButton" Margin="520,-45,0,0" Width="107" Click="UpdateButton_Click" Height="45" Foreground="White" BorderBrush="#7F000000" BorderThickness="1,0" Padding="16,20,16,4" IsTabStop="False">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Update" Padding="0" />
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0"><Run Text="Update"/></TextBlock>
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0" Text="{Binding Source={x:Static resx:UIStringsContent.AlwaysOnTopButton}}" />
</StackPanel>
</Button>
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" VerticalAlignment="Top" x:Name="DiscordButton" Margin="778,-45,0,0" Width="133" Click="DiscordButton_Click" Height="45" Foreground="White" BorderBrush="#7F000000" BorderThickness="1,0" Padding="16,20,16,4" IsTabStop="False">
<StackPanel Orientation="Horizontal">
<materialDesign:PackIcon Kind="Discord" Padding="0" />
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0" Text="Discord"/>
<TextBlock Margin="8 0 0 0" VerticalAlignment="Center" Padding="0" Text="{Binding Source={x:Static resx:UIStringsContent.Discord}}"/>
</StackPanel>
</Button>
<ToggleButton x:Name="TargetButton" Style="{StaticResource MaterialDesignSwitchToggleButton}" IsChecked="{Binding CharacterDetails.CharacterDetails.TargetModeActive}" Margin="455,25,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Height="21" Checked="TargetButton_Checked" Unchecked="TargetButton_Unchecked" IsTabStop="False" />
<Label Content="Target Mode:" ToolTip="Allows you to change values for your selected target without using the Entity List&#xD;&#xA;&#x2022; This is handy for busy areas where the Entity List constantly shifting. You will need to uncheck this and use the normal method to apply the changes you make, though." HorizontalAlignment="Left" Margin="360,23,0,0" VerticalAlignment="Top" FontSize="14"/>
<Button x:Name="SavePoint" ToolTip="Creates a 'Backup' state that you can load later." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Save State" HorizontalAlignment="Left" Margin="1005,50,0,0" VerticalAlignment="Top" Width="100" IsTabStop="False" Click="SavePoint_Click"/>
<Button x:Name="LoadSavePoint" ToolTip="Reverts back to your 'Backup' state." Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="Load State" HorizontalAlignment="Left" Margin="900,50,0,0" VerticalAlignment="Top" Width="100" IsTabStop="False" Click="LoadSavePoint_Click"/>
<Label Content="Target Mode:" ToolTip="{Binding Source={x:Static resx:UIStringsContent.TargetModeToolTip}}" HorizontalAlignment="Left" Margin="360,23,0,0" VerticalAlignment="Top" FontSize="14"/>
<Button x:Name="SavePoint" ToolTip="{Binding Source={x:Static resx:UIStringsContent.SavePointToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.SavePointButton}}" HorizontalAlignment="Left" Margin="1005,50,0,0" VerticalAlignment="Top" Width="100" IsTabStop="False" Click="SavePoint_Click"/>
<Button x:Name="LoadSavePoint" ToolTip="{Binding Source={x:Static resx:UIStringsContent.LoadPointToolTip}}" Style="{StaticResource MaterialDesignRaisedAccentButton}" materialDesign:ShadowAssist.ShadowDepth="Depth3" Content="{Binding Source={x:Static resx:UIStringsContent.LoadPointButton}}" HorizontalAlignment="Left" Margin="900,50,0,0" VerticalAlignment="Top" Width="100" IsTabStop="False" Click="LoadSavePoint_Click"/>
<Button HorizontalAlignment="Left" Content="{Binding Source={x:Static resx:UIStringsContent.Language}}" Style="{DynamicResource MaterialDesignFlatButton}" VerticalAlignment="Top" x:Name="LangButton" Margin="573,-45,0,0" Width="54" Click="LangButton_Click" Height="45" Foreground="White" BorderBrush="#7F000000" BorderThickness="1,0" Padding="0,20,0,4" IsTabStop="False"/>
</Grid>
</controls:MetroWindow>
Loading