Skip to content

Commit

Permalink
Merge pull request #29 from Snick0rz/RC3
Browse files Browse the repository at this point in the history 
RC3 Fixes
  • Loading branch information
Celene authored Nov 18, 2021
2 parents eec0730 + ab8d869 commit 7530c43
Show file tree
Hide file tree
Showing 6 changed files with 301 additions and 108 deletions.
Binary file added EZAction/EZ-Action-Icon-v1.ico
View file
Binary file not shown.
10 changes: 8 additions & 2 deletions EZAction/EZAction.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -25,8 +26,7 @@
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<ApplicationVersion>0.3.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
Expand All @@ -49,6 +49,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>EZ-Action-Icon-v1.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -133,5 +136,8 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Resource Include="EZ-Action-Icon-v1.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
29 changes: 19 additions & 10 deletions EZAction/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<CheckBox x:Name="progressCheck" Content="Progress Bar" HorizontalAlignment="Left" Height="20" Margin="10,183,0,0" VerticalAlignment="Top" Width="136" IsChecked="True" TabIndex="9" ToolTip="Whether a progress bar should be shown or not.&#x0a;Disabling this will cause the action to happen immediately."/>
<TextBlock HorizontalAlignment="Left" Height="16" Margin="10,242,0,0" TextWrapping="Wrap" Text="Duration" VerticalAlignment="Top" Width="136" IsEnabled="{Binding IsEnabled, ElementName=progressCheck}"/>
<TextBox x:Name="durationText" HorizontalAlignment="Left" Height="22" Margin="10,258,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="136" IsEnabled="{Binding IsChecked, ElementName=progressCheck}" Text="10" TabIndex="11" ToolTip="The duration of seconds the action will need to finish." AllowDrop="False" PreviewTextInput="NumberValidationTextBox"/>
<Button x:Name="RegEvent_Button" Content="Save Action" HorizontalAlignment="Left" Height="22" Margin="10,406,0,0" VerticalAlignment="Top" Width="136" TabIndex="12" Click="RegEvent_Button_Click"/>
<Button x:Name="RegEvent_Button" Content="Create Action" HorizontalAlignment="Left" Height="22" Margin="10,405,0,0" VerticalAlignment="Top" Width="136" TabIndex="12" Click="RegEvent_Button_Click"/>
<TextBlock HorizontalAlignment="Left" Height="17" Margin="151,33,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="237"><Run Text="Existing Actions"/><LineBreak/><Run/></TextBlock>
<Button x:Name="DelEvent_Button" Content="Delete selected Action" HorizontalAlignment="Left" Height="23" Margin="151,405,0,0" VerticalAlignment="Top" Width="237" TabIndex="13" Click="DelEvent_Button_Click"/>
<CheckBox x:Name="classCheck" Content="All of this class?" HorizontalAlignment="Left" Height="20" Margin="10,77,0,0" VerticalAlignment="Top" Width="136" TabIndex="6" ToolTip="Checking this will apply the action to all instances of this objects class, rather than just the object itself."/>
Expand All @@ -25,21 +25,30 @@
<ListBox x:Name="eventList" Height="350" Margin="151,50,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="237" MouseDoubleClick="EventList_MouseDoubleClick"/>
<TextBox x:Name="eventLabelText" HorizontalAlignment="Left" Height="21" Margin="10,157,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="136" TabIndex="8" ToolTip="This is the label that is shown in the interaction menu of the object the action is applied to."/>
<TextBlock HorizontalAlignment="Left" Height="16" Margin="10,141,0,0" TextWrapping="Wrap" Text="Event Label" VerticalAlignment="Top" Width="136"/>
<ToolBarTray Height="28" VerticalAlignment="Top">
<ToolBar HorizontalAlignment="Left" Height="28" VerticalAlignment="Top" Width="271" Margin="117,0,-364,-15" RenderTransformOrigin="0.5,0.5">
<Button x:Name="SettingsButton" Content="Settings" Height="22" VerticalAlignment="Top" Width="50" Click="SettingsButton_Click" ToolTip="Opens the settings page for the default saving directory and ArmA 3 profile"/>
<Button x:Name="ExportDir_Button" Content="Open Working Directory" Height="22" VerticalAlignment="Top" Width="135" Click="ExportDir_Button_Click" ToolTip="Opens the output directory.&#x0a;See the settings to change this directory."/>
<Button x:Name="ArmaDir_Button" Content="Open ArmA 3 Profile" Height="22" VerticalAlignment="Top" Width="135" Click="ArmaDir_Button_Click" ToolTip="Opens the selected profile directory.&#x0a;See the settings to change your profile."/>
<Button x:Name="OpenVarPage_Button" Content="Variable Generator" HorizontalAlignment="Left" VerticalAlignment="Top" Width="110" Click="OpenVarPage_Button_Click" Visibility="Hidden" />
</ToolBar>
<ToolBar HorizontalAlignment="Left" Height="28" VerticalAlignment="Top" Width="116" Margin="-24,0,-68,-15">
<ToolBarTray Height="28" VerticalAlignment="Top" IsLocked="true">
<ToolBar x:Name="FileOpToolbar" HorizontalAlignment="Left" Height="28" VerticalAlignment="Top" Width="388" Margin="0,0,-364,-15">
<Button x:Name="New_File" Height="23" VerticalAlignment="Top" Width="23" FontFamily="Segoe MDL2 Assets" Content="&#xE7c3;" ToolTip="New File" Click="New_File_Click"/>
<Button x:Name="OpenFile_Button" VerticalAlignment="Top" Width="23" FontFamily="Segoe MDL2 Assets" Content="&#xE8E5;" ToolTip="Open File" Height="23" Click="OpenFile_Button_Click"/>
<Button x:Name="Save_Button" VerticalAlignment="Top" Width="23" FontFamily="Segoe MDL2 Assets" Content="&#xE74E;" ToolTip="Save File" Height="23" Click="Save_Button_Click" />
<Button x:Name="SaveAs_Button" Height="23" VerticalAlignment="Top" Width="23" FontFamily="Segoe MDL2 Assets" Content="&#xE792;" ToolTip="Save as..." Click="SaveAs_Button_Click"/>
<Separator Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
<Button x:Name="SettingsButton" FontFamily="Segoe MDL2 Assets" Content="&#xE713;" Height="23" VerticalAlignment="Top" Width="23" Click="SettingsButton_Click" ToolTip="Opens the settings page for the working directory and ArmA 3 profile"/>
<Button x:Name="ExportDir_Button" Height="23" VerticalAlignment="Top" Width="90" Click="ExportDir_Button_Click" ToolTip="Opens the working directory.&#x0a;See the settings to change this directory." Margin="0,0,0,0">
<DockPanel>
<TextBlock FontFamily="Segoe MDL2 Assets" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,3,0,0">&#xE8b7;</TextBlock>
<TextBlock Height="24" Margin="2,0,0,0">Working Dir</TextBlock>
</DockPanel>
</Button>
<Button x:Name="ArmaDir_Button" Height="22" VerticalAlignment="Top" Width="100" Click="ArmaDir_Button_Click" ToolTip="Opens the selected profile directory.&#x0a;See the settings to change your profile.">
<DockPanel>
<TextBlock FontFamily="Segoe MDL2 Assets" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0,3,0,0">&#xE8b7;</TextBlock>
<TextBlock Height="24" Margin="2,0,0,0">ArmA 3 Profile</TextBlock>
</DockPanel>
</Button>
<!--<Button x:Name="OpenVarPage_Button" Content="Variable Generator" HorizontalAlignment="Left" VerticalAlignment="Top" Width="110" Click="OpenVarPage_Button_Click" Visibility="Hidden" />-->
</ToolBar>
</ToolBarTray>
<TextBlock x:Name="Editing_Label" HorizontalAlignment="Left" Margin="10,437,0,0" TextWrapping="Wrap" Text="Editing mode active" VerticalAlignment="Top" Width="136" TextAlignment="Center" Visibility="Hidden"/>
<TextBlock x:Name="Utility_Label" Text="Utility Label" HorizontalAlignment="Left" Margin="10,433,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="136" TextAlignment="Center" Height="23"/>

</Grid>
</Window>
Loading

0 comments on commit 7530c43

Please sign in to comment.