Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 3872d32

Browse files
Hexer10Hexer10
committed
Fix #11 + Fix Debug Console errors
1 parent d72e6f0 commit 3872d32

File tree

9 files changed

+86
-30
lines changed

9 files changed

+86
-30
lines changed

‎Spedit.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
C:\Windows\system32\xcopy ".\..\..\Resources\Misc\Configurations" ".\sourcepawn\configs" /e /y /q
520520
copy ".\..\..\Resources\lang_0_spedit.xml" ".\lang_0_spedit.xml" /y
521521
copy ".\..\..\Deploy\SPEdit.nsi" ".\SPEdit.nsi" /y
522-
copy ".\..\..\Deploy\Compress.ps1" ".\Compress.ps1" /y
522+
copy ".\..\..\Deploy\Compress.bat" ".\Compress.bat" /y
523523
copy ".\..\..\Deploy\DotNetChecker.nsh" ".\DotNetChecker.nsh" /y
524524
copy ".\..\..\Deploy\FileAssociation.nsh" ".\FileAssociation.nsh" /y
525525
copy ".\..\..\Deploy\GPLv3.txt" ".\GPLv3.txt" /y

‎UI/Components/EditorElement.xaml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,24 @@
9393
<Grid>
9494
<ListBox Name="AutoCompleteBox" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="0" Width="0"
9595
Height="175" Background="Transparent" Opacity="1" Foreground="{DynamicResource BlackColorBrush}"
96-
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" />
96+
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden">
97+
<ListBox.ItemContainerStyle>
98+
<Style TargetType="{x:Type ListBoxItem}">
99+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
100+
<Setter Property="VerticalContentAlignment" Value="Center"/>
101+
</Style>
102+
</ListBox.ItemContainerStyle>
103+
</ListBox>
97104
<ListBox Name="MethodAutoCompleteBox" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="0" Width="0"
98-
Height="175" Background="Transparent" Opacity="0" Foreground="{DynamicResource BlackColorBrush}"
99-
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" />
105+
Height="175" Background="Transparent" Opacity="0" Foreground="{DynamicResource BlackColorBrush}"
106+
ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden">
107+
<ListBox.ItemContainerStyle>
108+
<Style TargetType="{x:Type ListBoxItem}">
109+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
110+
<Setter Property="VerticalContentAlignment" Value="Center"/>
111+
</Style>
112+
</ListBox.ItemContainerStyle>
113+
</ListBox>
100114
</Grid>
101115
</Border>
102116
</Grid>

‎UI/Components/EditorElement.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
503503

504504
Program.MainWindow.EditorsReferences.Remove(this);
505505
var childs = Program.MainWindow.DockingPaneGroup.Children;
506-
foreach (var c in childs) (c as LayoutDocumentPane)?.Children.Remove(Parent);
506+
// foreach (var c in childs) (c as LayoutDocumentPane)?.Children.Remove(Parent);
507507

508508
Parent = null; //to prevent a ring depency which disables the GC from work
509509
Program.MainWindow.UpdateWindowTitle();

‎UI/MainWindow.xaml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
<controls:MetroWindow x:Class="Spedit.UI.MainWindow"
2-
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3-
xmlns:dock="http://schemas.xceed.com/wpf/xaml/avalondock"
4-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
5-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8-
xmlns:stheme="clr-namespace:Spedit.UI.STheme"
9-
mc:Ignorable="d"
10-
Title="Spedit" GlowBrush="{DynamicResource AccentColorBrush}" MinHeight="100" MinWidth="200" KeyDown="MainWindowEvent_KeyDown" Closing="MetroWindow_Closing"
1+
2+
<controls:MetroWindow x:Class="Spedit.UI.MainWindow"
3+
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
4+
xmlns:dock="http://schemas.xceed.com/wpf/xaml/avalondock"
5+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
6+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
7+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
9+
xmlns:stheme="clr-namespace:Spedit.UI.STheme"
10+
mc:Ignorable="d"
11+
Title="Spedit" GlowBrush="{DynamicResource AccentColorBrush}" MinHeight="100" MinWidth="200" KeyDown="MainWindowEvent_KeyDown" Closing="MetroWindow_Closing"
1112
AllowDrop="True" Drop="MetroWindow_Drop" ShowIconOnTitleBar="False" TitleCaps="False">
1213
<controls:MetroWindow.Resources>
14+
1315
<ResourceDictionary>
1416
<ResourceDictionary.MergedDictionaries>
1517
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />

‎UI/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private void DockingManager_DocumentClosing(object sender, Xceed.Wpf.AvalonDock.
207207

208208
private void layoutDocument_Closing(object sender, CancelEventArgs e)
209209
{
210-
e.Cancel = true;
210+
// e.Cancel = true;
211211
}
212212

213213
private void MetroWindow_Closing(object sender, CancelEventArgs e)

‎UI/STheme/STheme.xaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,6 +1463,12 @@
14631463
Background="Transparent"
14641464
BorderThickness="0"
14651465
MaxHeight="400">
1466+
<!--<ListBox.ItemContainerStyle>
1467+
<Style TargetType="{x:Type ListBoxItem}">
1468+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
1469+
<Setter Property="VerticalContentAlignment" Value="Center"/>
1470+
</Style>
1471+
</ListBox.ItemContainerStyle>-->
14661472
<ListBox.ItemTemplate>
14671473
<DataTemplate>
14681474
<Grid>
@@ -1491,6 +1497,12 @@
14911497
Background="Transparent"
14921498
BorderThickness="0"
14931499
MaxHeight="400">
1500+
<!--<ListBox.ItemContainerStyle>
1501+
<Style TargetType="{x:Type ListBoxItem}">
1502+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
1503+
<Setter Property="VerticalContentAlignment" Value="Center"/>
1504+
</Style>
1505+
</ListBox.ItemContainerStyle>-->
14941506
<ListBox.ItemTemplate>
14951507
<DataTemplate>
14961508
<Grid>

‎UI/Windows/ConfigWindow.xaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@
1919
<Grid Margin="0,0,0,0">
2020
<Button Name="NewButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="5,5,0,0" Width="75" Content="New" Click="NewButton_Clicked" />
2121
<Button Name="DeleteButton" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="120,5,0,0" Width="75" Content="Delete" Click="DeleteButton_Clicked" />
22-
<ListBox Name="ConfigListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0,35,0,0" Width="200" SelectionChanged="ConfigListBox_SelectionChanged" />
22+
<ListBox Name="ConfigListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Margin="0,35,0,0" Width="200" SelectionChanged="ConfigListBox_SelectionChanged">
23+
<ListBox.ItemContainerStyle>
24+
<Style TargetType="{x:Type ListBoxItem}">
25+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
26+
<Setter Property="VerticalContentAlignment" Value="Center"/>
27+
</Style>
28+
</ListBox.ItemContainerStyle>
29+
</ListBox>
30+
2331
<Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="200,30,0,0" Height="5" IsHitTestVisible="False">
2432
<Rectangle.Fill>
2533
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">

‎UI/Windows/NewFileWindow.xaml‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,41 @@
11
<controls:MetroWindow x:Class="Spedit.UI.Windows.NewFileWindow"
2-
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
Width="800" Height="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner" GlowBrush="{DynamicResource AccentColorBrush}"
2+
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
Width="800" Height="500" ResizeMode="NoResize" WindowStartupLocation="CenterOwner"
7+
GlowBrush="{DynamicResource AccentColorBrush}"
78
Title="New" ShowTitleBar="False">
89
<controls:MetroWindow.Resources>
910
<ResourceDictionary>
1011
<ResourceDictionary.MergedDictionaries>
1112
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
1213
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
1314
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colors.xaml" />
14-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
15+
<ResourceDictionary
16+
Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
1517
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Red.xaml" />
1618
</ResourceDictionary.MergedDictionaries>
1719
</ResourceDictionary>
1820
</controls:MetroWindow.Resources>
1921
<Grid>
20-
<ListBox Name="TemplateListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250" Margin="0,0,0,50" SelectionChanged="TemplateListBox_SelectionChanged" />
21-
<TextBlock Name="PreviewBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="260,10,0,0" Text="Preview:" IsHitTestVisible="False" />
22-
<TextBox Name="PrevieBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="260,30,5,50" IsReadOnly="True" />
23-
<TextBox Name="PathBox" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,0,120,5"
22+
<ListBox Name="TemplateListBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="250"
23+
Margin="0,0,0,50" SelectionChanged="TemplateListBox_SelectionChanged">
24+
<ListBox.ItemContainerStyle>
25+
<Style TargetType="{x:Type ListBoxItem}">
26+
<Setter Property="HorizontalContentAlignment" Value="Left" />
27+
<Setter Property="VerticalContentAlignment" Value="Center" />
28+
</Style>
29+
</ListBox.ItemContainerStyle>
30+
</ListBox>
31+
<TextBlock Name="PreviewBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="260,10,0,0"
32+
Text="Preview:" IsHitTestVisible="False" />
33+
<TextBox Name="PrevieBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="260,30,5,50"
34+
IsReadOnly="True" />
35+
<TextBox Name="PathBox" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,0,120,5"
2436
Style="{StaticResource SearchMetroTextBox}"
2537
controls:TextBoxHelper.ButtonCommand="{Binding TextBoxButtonFileCmd, Mode=OneWay, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
26-
<Button Name="SaveButton" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,5" Content="Save" Width="100" Click="Button_Click" />
38+
<Button Name="SaveButton" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,5"
39+
Content="Save" Width="100" Click="Button_Click" />
2740
</Grid>
28-
</controls:MetroWindow>
41+
</controls:MetroWindow>

‎UI/Windows/SPDefinitionWindow.xaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,14 @@
1919
<Grid>
2020
<TextBox Name="SPSearchBox" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300" TextChanged="TextBox_TextChanged" />
2121
<controls:MetroProgressBar Name="SPProgress" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300" Margin="0,26,0,0" IsIndeterminate="False" IsHitTestVisible="False" Height="4" Foreground="{DynamicResource AccentColorBrush}" Background="{DynamicResource WhiteColorBrush}" />
22-
<ListBox Name="SPBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="300" Margin="1,30,0,5" SelectionChanged="SPFunctionsListBox_SelectionChanged" />
22+
<ListBox Name="SPBox" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="300" Margin="1,30,0,5" SelectionChanged="SPFunctionsListBox_SelectionChanged">
23+
<ListBox.ItemContainerStyle>
24+
<Style TargetType="{x:Type ListBoxItem}">
25+
<Setter Property="HorizontalContentAlignment" Value="Left"/>
26+
<Setter Property="VerticalContentAlignment" Value="Center"/>
27+
</Style>
28+
</ListBox.ItemContainerStyle>
29+
</ListBox>
2330
<TextBlock Name="SPNameBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,15,0,0" FontSize="20" Foreground="{DynamicResource AccentColorBrush}" IsHitTestVisible="False" />
2431
<TextBlock Name="SPFullNameBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,45,0,0" FontSize="18" IsHitTestVisible="False" />
2532
<TextBlock Name="SPFileBlock" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="305,75,0,0" FontSize="16" IsHitTestVisible="False" Foreground="Gray" />

0 commit comments

Comments
 (0)