Skip to content

Commit c36de4c

Browse files
AbdesolAbdesol
committed
Done with ViewCode.xaml
1 parent 7f91aad commit c36de4c

19 files changed

Lines changed: 287 additions & 72 deletions

‎CutCode/App.xaml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,35 @@
1111

1212
<FontFamily x:Key="poppins_semibold">pack://CutCode:,,,Resources/Fonts/#Poppins SemiBold</FontFamily>
1313
<FontFamily x:Key="poppins_regular">pack://CutCode:,,,Resources/Fonts/#Poppins Regular</FontFamily>
14-
<FontFamily x:Key="firacode">pack://CutCode:,,,Resources/Fonts/#Fira Code</FontFamily>
14+
<FontFamily x:Key="firacode">pack://CutCode:,,,Resources/Fonts/#Fira Code</FontFamily>
15+
16+
<Style x:Key="ImgButtonStyle" TargetType="Button">
17+
<Setter Property="Template">
18+
<Setter.Value>
19+
<ControlTemplate TargetType="Button">
20+
<Border>
21+
<Border.Style>
22+
<Style TargetType="{x:Type Border}">
23+
<Style.Triggers>
24+
<Trigger Property="IsMouseOver" Value="True">
25+
<Setter Property="RenderTransformOrigin" Value="0.5, 0.5"/>
26+
<Setter Property="RenderTransform">
27+
<Setter.Value>
28+
<ScaleTransform ScaleX="1.1" ScaleY="1.1"/>
29+
</Setter.Value>
30+
</Setter>
31+
</Trigger>
32+
</Style.Triggers>
33+
</Style>
34+
</Border.Style>
35+
<Grid Background="{TemplateBinding Background}">
36+
<ContentPresenter></ContentPresenter>
37+
</Grid>
38+
</Border>
39+
</ControlTemplate>
40+
</Setter.Value>
41+
</Setter>
42+
</Style>
1543

1644
<!--Scrollbar Thumbs-->
1745
<Style x:Key="ScrollThumbs" TargetType="{x:Type Thumb}">

‎CutCode/Controllers/CodeBoxControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
Margin="0,5,0,0"/>
5555

5656

57-
<Image Grid.Column="1" x:Name="favImg" Source="../Resources/Images/Icons/favT.png"
57+
<Image Grid.Column="1" x:Name="favImg" Source="../Resources/Images/Icons/fav.png"
5858
Width="20" Height="20" VerticalAlignment="Center" Margin="5,5,15,5" HorizontalAlignment="Right"
5959
RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Aliased"/>
6060
</Grid>

‎CutCode/Controllers/CodeBoxControl.xaml.cs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@ public static class LangList
2424
{
2525
public static List<string> list = new List<string>()
2626
{
27-
"file", "c", "cpp", "csharp", "css", "dart", "golang", "html", "java",
28-
"javascript", "kotlin", "php", "python", "ruby", "rust","sql", "swift"
27+
"file", "python", "cpp", "csharp", "css", "dart", "golang", "html", "java",
28+
"javascript", "kotlin", "php", "c", "ruby", "rust","sql", "swift"
29+
};
30+
31+
public static List<string> Langs = new List<string>()
32+
{
33+
"All languages", "Python", "C++", "C#", "CSS", "Dart", "Golang", "Html", "Java",
34+
"Javascript", "Kotlin", "Php", "C", "Ruby", "Rust","Sql", "Swift"
2935
};
3036
}
3137

@@ -127,7 +133,7 @@ private static void LangTypePropertyChanged(DependencyObject d, DependencyProper
127133
var lang = (string)e.NewValue;
128134

129135
bool found = false;
130-
foreach(string i in LangList.list)
136+
foreach(string i in LangList.Langs)
131137
{
132138
if(lang == i)
133139
{
@@ -137,7 +143,7 @@ private static void LangTypePropertyChanged(DependencyObject d, DependencyProper
137143
}
138144

139145
if (!found) throw new NotImplementedException("Language type not recognised");
140-
ctrl.langImg.Source = new BitmapImage(new Uri(@$"../Resources/Images/LangLogo/{lang}.png", UriKind.Relative));
146+
ctrl.langImg.Source = new BitmapImage(new Uri(@$"../Resources/Images/LangLogo/{LangList.list[LangList.Langs.IndexOf(lang)]}.png", UriKind.Relative));
141147

142148
}
143149
#endregion

‎CutCode/CutCode.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
<None Remove="Resources\Images\Icons\exit_black.png" />
2323
<None Remove="Resources\Images\Icons\exit_white.png" />
2424
<None Remove="Resources\Images\Icons\fav.png" />
25-
<None Remove="Resources\Images\Icons\favF.png" />
26-
<None Remove="Resources\Images\Icons\favourite_black.png" />
27-
<None Remove="Resources\Images\Icons\favourite_white.png" />
28-
<None Remove="Resources\Images\Icons\favT.png" />
25+
<None Remove="Resources\Images\Icons\fav_black.png" />
26+
<None Remove="Resources\Images\Icons\fav_white.png" />
2927
<None Remove="Resources\Images\Icons\home_black.png" />
3028
<None Remove="Resources\Images\Icons\home_white.png" />
3129
<None Remove="Resources\Images\Icons\max_black.png" />
3230
<None Remove="Resources\Images\Icons\max_white.png" />
3331
<None Remove="Resources\Images\Icons\min_black.png" />
3432
<None Remove="Resources\Images\Icons\min_white.png" />
33+
<None Remove="Resources\Images\Icons\save_black.png" />
34+
<None Remove="Resources\Images\Icons\save_white.png" />
3535
<None Remove="Resources\Images\Icons\settings_black.png" />
3636
<None Remove="Resources\Images\Icons\settings_white.png" />
3737
<None Remove="Resources\Images\Icons\toggle_off_black.png" />
@@ -65,16 +65,16 @@
6565
<Resource Include="Resources\Images\Icons\exit_black.png" />
6666
<Resource Include="Resources\Images\Icons\exit_white.png" />
6767
<Resource Include="Resources\Images\Icons\fav.png" />
68-
<Resource Include="Resources\Images\Icons\favF.png" />
69-
<Resource Include="Resources\Images\Icons\favourite_black.png" />
70-
<Resource Include="Resources\Images\Icons\favourite_white.png" />
71-
<Resource Include="Resources\Images\Icons\favT.png" />
68+
<Resource Include="Resources\Images\Icons\fav_black.png" />
69+
<Resource Include="Resources\Images\Icons\fav_white.png" />
7270
<Resource Include="Resources\Images\Icons\home_black.png" />
7371
<Resource Include="Resources\Images\Icons\home_white.png" />
7472
<Resource Include="Resources\Images\Icons\max_black.png" />
7573
<Resource Include="Resources\Images\Icons\max_white.png" />
7674
<Resource Include="Resources\Images\Icons\min_black.png" />
7775
<Resource Include="Resources\Images\Icons\min_white.png" />
76+
<Resource Include="Resources\Images\Icons\save_black.png" />
77+
<Resource Include="Resources\Images\Icons\save_white.png" />
7878
<Resource Include="Resources\Images\Icons\settings_black.png" />
7979
<Resource Include="Resources\Images\Icons\settings_white.png" />
8080
<Resource Include="Resources\Images\Icons\toggle_off_black.png" />

‎CutCode/Interfaces/IPageService.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Diagnostics;
34
using System.Linq;
45
using System.Text;
56
using System.Threading.Tasks;

‎CutCode/Models/SideBarBtnModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ namespace CutCode
1111
public static class SideBarBtns
1212
{
1313
public static List<string> AllSideBarBtns = new List<string>() { "Home", "Add", "Favourite", "Settings"};
14-
public static List<string> SideBarBtnsDarkTheme = new List<string>() { "home_white.png", "add_white.png", "favourite_white.png", "settings_white.png" };
15-
public static List<string> SideBarBtnsLightTheme = new List<string>() { "home_black.png", "add_black.png", "favourite_black.png", "settings_black.png" };
14+
public static List<string> SideBarBtnsDarkTheme = new List<string>() { "home_white.png", "add_white.png", "fav_white.png", "settings_white.png" };
15+
public static List<string> SideBarBtnsLightTheme = new List<string>() { "home_black.png", "add_black.png", "fav_black.png", "settings_black.png" };
1616

1717
}
1818
public class SideBarBtnModel : Screen

‎CutCode/Resources/Images/Icons/copy_white.png‎

-19 Bytes
Loading

‎CutCode/Resources/Images/Icons/edit_white.png‎

-32 Bytes
Loading

‎CutCode/Resources/Images/Icons/favF.png‎

-7.98 KB
Binary file not shown.

‎CutCode/Resources/Images/Icons/favT.png‎

-4.29 KB
Binary file not shown.

0 commit comments

Comments
 (0)