Skip to content

Commit ea9abdd

Browse files
WelterDevelopmentWelterDevelopment
committed
Code Cleanup
1 parent f536c89 commit ea9abdd

14 files changed

+831
-851
lines changed

‎ConTeXt-IDE.Shared/ConTeXt-IDE.Shared.projitems‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,14 +383,14 @@
383383
<Content Include="$(MSBuildThisFileDirectory)web\cmaps\V.bcmap" />
384384
<Content Include="$(MSBuildThisFileDirectory)web\cmaps\WP-Symbol.bcmap" />
385385
<Content Include="$(MSBuildThisFileDirectory)Templates\projthes\components\c_3_section3.tex" />
386-
<None Include="$(MSBuildThisFileDirectory)Templates\mwe\c_main.tex" />
386+
<Content Include="$(MSBuildThisFileDirectory)Templates\mwe\c_main.tex" />
387387
<Content Include="$(MSBuildThisFileDirectory)Templates\projpres\env_script.tex" />
388388
<Content Include="$(MSBuildThisFileDirectory)Templates\projpres\literature.lua" />
389389
<None Include="$(MSBuildThisFileDirectory)Templates\projthes\components\c_0_frontpart.tex" />
390390
<None Include="$(MSBuildThisFileDirectory)Templates\projthes\components\c_1_section1.tex" />
391391
<None Include="$(MSBuildThisFileDirectory)Templates\projthes\components\c_2_section2.tex" />
392392
<None Include="$(MSBuildThisFileDirectory)Templates\projthes\components\c_3_section3.tex" />
393-
<None Include="$(MSBuildThisFileDirectory)Templates\single\prd_main.tex" />
393+
<Content Include="$(MSBuildThisFileDirectory)Templates\single\prd_main.tex" />
394394
<None Include="$(MSBuildThisFileDirectory)web\cmaps\78-EUC-H.bcmap" />
395395
<None Include="$(MSBuildThisFileDirectory)web\cmaps\78-EUC-V.bcmap" />
396396
<None Include="$(MSBuildThisFileDirectory)web\cmaps\78-H.bcmap" />

‎ConTeXt-IDE.Shared/Templates/projpres/prd_presentation.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
\environment[env_script]
1010
\stopmode
1111

12-
\setvariables[meta][title={Title2}, subtitle={Subtitle}, author={Author}, date={\currentdate}]
12+
\setvariables[meta][title={Title}, subtitle={Subtitle}, author={Author}, date={\currentdate}]
1313

1414
\setupinteraction[title=\getvariable{meta}{title}, subtitle=\getvariable{meta}{subtitle}, author=\getvariable{meta}{author}, date=\getvariable{meta}{date},]
1515

‎ConTeXt-IDE.Shared/Views/MainPage.xaml‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:models="using:ConTeXt_IDE.Models"
1010
xmlns:helpers="using:ConTeXt_IDE.Helpers"
1111
xmlns:monaco="using:Monaco"
12-
mc:Ignorable="d" DataContext="{x:Bind VM}" Loaded="Info_Loaded" RequestedTheme="{Binding Default.Theme, Converter={StaticResource StringToTheme}}" Background="{ThemeResource AcrylicColor}" >
12+
mc:Ignorable="d" DataContext="{x:Bind VM}" Loaded="Page_Loaded" RequestedTheme="{Binding Default.Theme, Converter={StaticResource StringToTheme}}" Background="{ThemeResource AcrylicColor}" >
1313
<Page.Resources>
1414
<DataTemplate x:Key="FolderTemplate" x:DataType="models:FileItem">
1515
<models:MyTreeViewItem IsExpanded="{Binding IsExpanded, Mode=TwoWay}" CanDrag="False" ToolTipService.ToolTip="{Binding FileName}" HorizontalContentAlignment="Left" ItemsSource="{x:Bind Children}">
@@ -69,10 +69,10 @@
6969
</Grid.ColumnDefinitions>
7070
<FontIcon Grid.Column="0" Glyph="&#xE838;"></FontIcon>
7171
<TextBlock Grid.Column="1" HorizontalAlignment="Stretch" MaxLines="2" FontWeight="Bold" Text="{Binding FileName, Mode=OneWay}"/>
72-
<Button ToolTipService.ToolTip="Create file" VerticalAlignment="Center" IsEnabled="{Binding Source={StaticResource VM}, Path=IsProjectLoaded}" Grid.Column="2" Click="AddFile_Click">
72+
<Button ToolTipService.ToolTip="Create file" VerticalAlignment="Center" IsEnabled="{Binding Source={StaticResource VM}, Path=IsProjectLoaded}" Grid.Column="2" Click="AddFileRoot_Click">
7373
<SymbolIcon Symbol="Document"/>
7474
</Button>
75-
<Button ToolTipService.ToolTip="Create folder" VerticalAlignment="Center" IsEnabled="{Binding Source={StaticResource VM}, Path=IsProjectLoaded}" Grid.Column="3" Click="AddFolder_Click">
75+
<Button ToolTipService.ToolTip="Create folder" VerticalAlignment="Center" IsEnabled="{Binding Source={StaticResource VM}, Path=IsProjectLoaded}" Grid.Column="3" Click="AddFolderRoot_Click">
7676
<SymbolIcon Symbol="Folder"/>
7777
</Button>
7878
</Grid>
@@ -119,11 +119,11 @@
119119
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE734;" ></FontIcon>
120120
</MenuFlyoutItem.Icon>
121121
</MenuFlyoutItem>
122-
<!--<MenuFlyoutItem Text="View in GitHub" Click="Github_Click" ToolTipService.ToolTip="View the source code, commit changes and write feature requests and bug reports.">
122+
<MenuFlyoutItem Text="View in GitHub" Click="Github_Click" ToolTipService.ToolTip="View the source code, pull request changes and write feature requests and bug reports.">
123123
<MenuFlyoutItem.Icon>
124124
<BitmapIcon Foreground="{ThemeResource ForegroundColor}" UriSource="ms-appx:///Assets/GitHub.png" ></BitmapIcon>
125125
</MenuFlyoutItem.Icon>
126-
</MenuFlyoutItem>-->
126+
</MenuFlyoutItem>
127127
</MenuFlyout>
128128

129129
</Button.Flyout>
@@ -211,7 +211,7 @@
211211
<ListView SelectionMode="None" ItemsSource="{Binding CurrentProject.Modes}" >
212212
<ListView.ItemTemplate>
213213
<DataTemplate>
214-
<CheckBox Content="{Binding Name}" IsChecked="{Binding IsSelected, Mode=TwoWay}" Checked="CheckBox_Checked">
214+
<CheckBox Content="{Binding Name}" IsChecked="{Binding IsSelected, Mode=TwoWay}">
215215
<CheckBox.ContextFlyout>
216216
<MenuFlyout>
217217
<MenuFlyoutItem x:Name="RemoveMode" Icon="Delete" Click="RemoveMode_Click" Text="Remove mode"></MenuFlyoutItem>
@@ -285,8 +285,8 @@
285285
</ToggleButton.Content>
286286
</ToggleButton>
287287

288-
<DropDownButton Content="Suggestions" ToolTipService.ToolTip="Enable code compleation and snippets" >
289-
<DropDownButton.Flyout>
288+
<Button ToolTipService.ToolTip="Enable code compleation and snippets" >
289+
<Button.Flyout>
290290
<Flyout Placement="Bottom">
291291
<StackPanel Orientation="Vertical" >
292292
<CheckBox Content="ConTeXt sart-stop environments" IsChecked="{Binding Default.SuggestStartStop, Mode=TwoWay}"/>
@@ -296,8 +296,14 @@
296296
<CheckBox Content="TeX primitives" IsChecked="{Binding Default.SuggestPrimitives, Mode=TwoWay}"/>
297297
</StackPanel>
298298
</Flyout>
299-
</DropDownButton.Flyout>
300-
</DropDownButton>
299+
</Button.Flyout>
300+
<Button.Content>
301+
<StackPanel Orientation="Horizontal">
302+
<TextBlock Text="Suggestions"></TextBlock>
303+
<FontIcon Glyph="&#xE70D;"></FontIcon>
304+
</StackPanel>
305+
</Button.Content>
306+
</Button>
301307

302308
<Border Style="{StaticResource Separator}" ></Border>
303309

@@ -719,7 +725,7 @@
719725
CloseButtonOverlayMode="Auto"
720726
TabCloseRequested="Tabs_TabCloseRequested" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch"
721727
CanDragTabs="True" Background="Transparent"
722-
CanReorderTabs="True" TabItemsSource="{Binding FileItems}" SelectedItem="{Binding CurrentFileItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" SelectionChanged="Tabs_SelectionChanged"
728+
CanReorderTabs="True" TabItemsSource="{Binding FileItems}" SelectedItem="{Binding CurrentFileItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
723729
AllowDrop="True" TabStripDragOver="EditorTabViewDrag" TabStripDrop="EditorTabViewDrop" DragOver="EditorTabViewDrag" Drop="EditorTabViewDrop" FontFamily="Segoe">
724730

725731
<TabView.TabItemTemplate>

0 commit comments

Comments
 (0)