Skip to content

Adapt globalsettings, community and developer views to work correctly with the minimal width #295

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

Merged
Shivansps merged 2 commits into from
Feb 4, 2025
Merged

Adapt globalsettings, community and developer views to work correctly with the minimal width #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1586417
Adapt globalsettings and developer views to work correctly with the m…
Shivansps Feb 4, 2025
e523ef7
Adjust the community view too
Shivansps Feb 4, 2025
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
40 changes: 18 additions & 22 deletions Knossos.NET/Views/CommunityView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,58 +14,54 @@

<TabControl>
<TabItem Header="Resources">
<ScrollViewer HorizontalScrollBarVisibility="Visible">
<StackPanel Margin="40,20,20,10">
<Button Width="900" Command="{Binding JoinHLPDiscord}" ToolTip.Tip="Hard Light Productions Discord - Permanent Invitation: https://discord.gg/cyhMBhMHzK" Classes="CommunityLink">
<WrapPanel Margin="10,5,15,5">
<ScrollViewer>
<StackPanel HorizontalAlignment="Left" MinWidth="680" MaxWidth="900" Margin="40,20,20,10">
<Button HorizontalAlignment="Stretch" ToolTip.Tip="Hard Light Productions Discord - Permanent Invitation: https://discord.gg/cyhMBhMHzK" Classes="CommunityLink">
<WrapPanel Margin="10,10,15,10">
<Image Margin="0,3,0,0" Height="64" Width="64" Source="/Assets/general/discordicon.png"/>
<TextBlock FontSize="18" Margin="30,5,0,0" TextWrapping="Wrap">Join our discord! With more than two thousand members and the collective wisdom of the community's modders, mission designers and scripters, you'll have everything you need to bring your FSO vision to life!</TextBlock>
</WrapPanel>
</Button>
<Button Width="900" Command="{Binding VisitHLPWiki}" ToolTip.Tip="Hard-Light Productions wiki https://wiki.hard-light.net/index.php/Main_Page" Margin="0,20,0,0" Classes="CommunityLink">
<WrapPanel Margin="10,5,15,10">
<Button HorizontalAlignment="Stretch" Command="{Binding VisitHLPWiki}" ToolTip.Tip="Hard-Light Productions wiki https://wiki.hard-light.net/index.php/Main_Page" Margin="0,15,0,0" Classes="CommunityLink">
<WrapPanel Margin="10,10,15,10">
<Image Height="64" Width="64" Source="/Assets/knossos-icon.ico"/>
<TextBlock FontSize="18" Margin="30,15,0,0" TextWrapping="Wrap">Our wiki has documentation for modding the game, additional resources for creating your own missions, and details about the Freespace canon.</TextBlock>
</WrapPanel>
</Button>
<Button Width="900" Command="{Binding OpenFredTutorial}" ToolTip.Tip="Fred Tutorial Selection https://wiki.hard-light.net/index.php/FRED_tutorials" Margin="0,15,0,0" Classes="CommunityLink">
<Button HorizontalAlignment="Stretch" Command="{Binding OpenFredTutorial}" ToolTip.Tip="Fred Tutorial Selection https://wiki.hard-light.net/index.php/FRED_tutorials" Margin="0,15,0,0" Classes="CommunityLink">
<WrapPanel Margin="10,10,15,10">
<Image Height="64" Width="64" Source="/Assets/general/fred.png"/>
<TextBlock FontSize="18" Margin="30,15,0,0" TextWrapping="Wrap">Learn how to make your own custom missions for FSO with this tutorial for our mission editor, called FRED.</TextBlock>
</WrapPanel>
</Button>
<Button Width="900" Command="{Binding VisitScriptingRepo}" ToolTip.Tip="Scripting Repository https://github.com/FSO-Scripters/fso-scripts" Margin="0,15,0,0" Classes="CommunityLink">
<Button HorizontalAlignment="Stretch" Command="{Binding VisitScriptingRepo}" ToolTip.Tip="Scripting Repository https://github.com/FSO-Scripters/fso-scripts" Margin="0,15,0,0" Classes="CommunityLink">
<WrapPanel Margin="10,10,15,10">
<Image Height="64" Width="64" Source="/Assets/general/fsolua.png"/>
<TextBlock FontSize="18" Margin="30,15,0,0" TextWrapping="Wrap">For advanced users, you can download custom scripts to use in your mods and missions that enable new features.</TextBlock>
</WrapPanel>
</Button>
</StackPanel>
</ScrollViewer>
</ScrollViewer>
</TabItem>

<TabItem Header="FAQ">
<ScrollViewer HorizontalScrollBarVisibility="Visible">
<StackPanel Margin="30,0,20,10">
<ItemsControl ItemsSource="{Binding Categories}">
<ScrollViewer>
<StackPanel HorizontalAlignment="Left" MinWidth="680" Margin="30,0,20,10">
<ItemsControl HorizontalAlignment="Stretch" ItemsSource="{Binding Categories}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel HorizontalAlignment="Stretch" Margin="10,10,0,0">
<StackPanel Margin="10,10,0,0">
<Expander Classes="FAQ" Margin="10,0,0,0">
<Expander.Header>
<TextBlock Width="800" FontSize="24" Text="{Binding Name}"></TextBlock>
<TextBlock MinWidth="600" MaxWidth="800" FontSize="24" Text="{Binding Name}"></TextBlock>
</Expander.Header>
<TreeView ItemsSource="{Binding Questions}">
<TreeView.ItemTemplate>
<TreeDataTemplate>
<Button Margin="0,15,0,5" Classes="CommunityInfo">
<Button HorizontalAlignment="Stretch" Margin="0,15,0,5" Classes="CommunityInfo">
<StackPanel Margin="10,10,10,10">
<WrapPanel>
<TextBlock Width="800" FontSize="18" Text="{Binding question}" TextWrapping="Wrap"></TextBlock>
</WrapPanel>
<WrapPanel>
<TextBlock Width="800" Margin="0,10,0,5" FontSize="14" Text="{Binding Answer}" TextWrapping="Wrap"></TextBlock>
</WrapPanel>
<TextBlock Width="800" FontSize="18" Text="{Binding question}" TextWrapping="Wrap"></TextBlock>
<TextBlock Width="800" Margin="0,10,0,5" FontSize="14" Text="{Binding Answer}" TextWrapping="Wrap"></TextBlock>
</StackPanel>
</Button>
</TreeDataTemplate>
Expand All @@ -77,7 +73,7 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</ScrollViewer>
</ScrollViewer>
</TabItem>

<TabItem Header="Bug Reporting">
Expand Down
69 changes: 35 additions & 34 deletions Knossos.NET/Views/DeveloperModsView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,46 +12,47 @@
<vm:DeveloperModsViewModel/>
</Design.DataContext>

<TabControl SelectedIndex="{Binding TabIndex}">
<TabItem Header="Mods">
<SplitView Margin="0,0,0,5" IsPaneOpen="True" DisplayMode="Inline" OpenPaneLength="350">
<SplitView.Pane>
<Grid RowDefinitions="Auto,*,Auto,Auto,Auto">
<ScrollViewer HorizontalScrollBarVisibility="Visible">
<TabControl Margin="10" MinWidth="1000" SelectedIndex="{Binding TabIndex}">
<TabItem Header="Mods">
<SplitView Margin="0,0,0,5" IsPaneOpen="True" DisplayMode="Inline" OpenPaneLength="350">
<SplitView.Pane>
<Grid RowDefinitions="Auto,*,Auto,Auto,Auto">

<Button Command="{Binding CreateMod}" Grid.Row="0" Margin="5,5,0,5" HorizontalAlignment="Left">Create New Mod</Button>
<ComboBox SelectedIndex="{Binding SortSelectedIndex}" ItemsSource="{Binding SortBoxItems}" Grid.Row="0" Margin="0,5,5,5" Width="150" HorizontalAlignment="Right" ToolTip.Tip="Sort Type"></ComboBox>
<Button Command="{Binding CreateMod}" Grid.Row="0" Margin="5,5,0,5" HorizontalAlignment="Left">Create New Mod</Button>
<ComboBox SelectedIndex="{Binding SortSelectedIndex}" ItemsSource="{Binding SortBoxItems}" Grid.Row="0" Margin="0,5,5,5" Width="150" HorizontalAlignment="Right" ToolTip.Tip="Sort Type"></ComboBox>

<ListBox Grid.Row="1" ItemsSource="{Binding Mods}" SelectedIndex="{Binding SelectedIndex}">
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Label FontWeight="Bold" Content="["/>
<Label FontWeight="Bold" Content="{Binding type}"/>
<Label FontWeight="Bold" Content="]"/>
<Label Content="{Binding title, Converter={StaticResource escapeUnderscoresConverter}}"/>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<ListBox Grid.Row="1" ItemsSource="{Binding Mods}" SelectedIndex="{Binding SelectedIndex}">
<ListBox.ItemTemplate>
<DataTemplate>
<WrapPanel>
<Label FontWeight="Bold" Content="["/>
<Label FontWeight="Bold" Content="{Binding type}"/>
<Label FontWeight="Bold" Content="]"/>
<Label Content="{Binding title, Converter={StaticResource escapeUnderscoresConverter}}"/>
</WrapPanel>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>

<Button Command="{Binding InstallLatestStable}" Grid.Row="3" Margin="0,10,0,10" HorizontalAlignment="Center" IsEnabled="{Binding !StableInstalled}" IsVisible="{Binding !StableInstalled}" >Get Latest Stable Build</Button>
<Button Command="{Binding InstallLatestNightly}" Grid.Row="4" Margin="0,0,0,10" HorizontalAlignment="Center" IsEnabled="{Binding !NightlyInstalled}" IsVisible="{Binding !NightlyInstalled}" >Get Latest Nightly Build</Button>
<Button Command="{Binding InstallLatestStable}" Grid.Row="3" Margin="0,10,0,10" HorizontalAlignment="Center" IsEnabled="{Binding !StableInstalled}" IsVisible="{Binding !StableInstalled}" >Get Latest Stable Build</Button>
<Button Command="{Binding InstallLatestNightly}" Grid.Row="4" Margin="0,0,0,10" HorizontalAlignment="Center" IsEnabled="{Binding !NightlyInstalled}" IsVisible="{Binding !NightlyInstalled}" >Get Latest Nightly Build</Button>

</Grid>
</SplitView.Pane>
</Grid>
</SplitView.Pane>

<v:DevModEditorView Content="{Binding ModEditor}"/>
<v:DevModEditorView Content="{Binding ModEditor}"/>

</SplitView>
</TabItem>
</SplitView>
</TabItem>

<TabItem Header="Modding Tools">
<v:DevToolManagerView Content="{Binding DevToolManager}"/>
</TabItem>

<TabItem Header="Nebula">
<v:NebulaLoginView Content="{Binding NebulaLoginVM}"/>
</TabItem>
</TabControl>
<TabItem Header="Modding Tools">
<v:DevToolManagerView Content="{Binding DevToolManager}"/>
</TabItem>

<TabItem Header="Nebula">
<v:NebulaLoginView Content="{Binding NebulaLoginVM}"/>
</TabItem>
</TabControl>
</ScrollViewer>
</UserControl>
Loading