Skip to content

Commit 7f91aad

Browse files
committed
Gone start designing the codeview.xaml
1 parent 350ec1d commit 7f91aad

22 files changed

Lines changed: 171 additions & 87 deletions

CutCode/Controllers/BindableAvalonEditor.cs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ public class BindableAvalonEditor : ICSharpCode.AvalonEdit.TextEditor, INotifyPr
1616

1717
public new string Text
1818
{
19-
get
20-
{
21-
return (string)GetValue(TextProperty);
22-
}
19+
get => (string)GetValue(TextProperty);
2320
set
2421
{
2522
SetValue(TextProperty, value);
@@ -62,26 +59,6 @@ protected static void OnDependencyPropertyChanged(DependencyObject obj, Dependen
6259
}
6360
}
6461

65-
private List<char> uniqueChars = new List<char>()
66-
{
67-
"'"[0], '"', '(', '[', '{', '<'
68-
};
69-
70-
private List<char> uniqueExtChars = new List<char>()
71-
{
72-
"'"[0], '"', ')', ']', '}', '>'
73-
};
74-
private int oldText = 0;
75-
76-
protected override void OnTextChanged(EventArgs e)
77-
{
78-
if (this.Document != null)
79-
{
80-
Text = Document.Text;
81-
}
82-
base.OnTextChanged(e);
83-
}
84-
8562
/// <summary>
8663
/// Raises a property changed event
8764
/// </summary>

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/fav.png"
57+
<Image Grid.Column="1" x:Name="favImg" Source="../Resources/Images/Icons/favT.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/CutCode.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,20 @@
1212
<None Remove="Resources\Fonts\Poppins-SemiBold.ttf" />
1313
<None Remove="Resources\Images\Icons\add_black.png" />
1414
<None Remove="Resources\Images\Icons\add_white.png" />
15+
<None Remove="Resources\Images\Icons\back_black.png" />
16+
<None Remove="Resources\Images\Icons\back_white.png" />
17+
<None Remove="Resources\Images\Icons\copy_black.png" />
18+
<None Remove="Resources\Images\Icons\copy_white.png" />
19+
<None Remove="Resources\Images\Icons\delete.png" />
20+
<None Remove="Resources\Images\Icons\edit_black.png" />
21+
<None Remove="Resources\Images\Icons\edit_white.png" />
1522
<None Remove="Resources\Images\Icons\exit_black.png" />
1623
<None Remove="Resources\Images\Icons\exit_white.png" />
1724
<None Remove="Resources\Images\Icons\fav.png" />
25+
<None Remove="Resources\Images\Icons\favF.png" />
1826
<None Remove="Resources\Images\Icons\favourite_black.png" />
1927
<None Remove="Resources\Images\Icons\favourite_white.png" />
28+
<None Remove="Resources\Images\Icons\favT.png" />
2029
<None Remove="Resources\Images\Icons\home_black.png" />
2130
<None Remove="Resources\Images\Icons\home_white.png" />
2231
<None Remove="Resources\Images\Icons\max_black.png" />
@@ -46,11 +55,20 @@
4655
<Resource Include="Resources\Fonts\Poppins-SemiBold.ttf" />
4756
<Resource Include="Resources\Images\Icons\add_black.png" />
4857
<Resource Include="Resources\Images\Icons\add_white.png" />
58+
<Resource Include="Resources\Images\Icons\back_black.png" />
59+
<Resource Include="Resources\Images\Icons\back_white.png" />
60+
<Resource Include="Resources\Images\Icons\copy_black.png" />
61+
<Resource Include="Resources\Images\Icons\copy_white.png" />
62+
<Resource Include="Resources\Images\Icons\delete.png" />
63+
<Resource Include="Resources\Images\Icons\edit_black.png" />
64+
<Resource Include="Resources\Images\Icons\edit_white.png" />
4965
<Resource Include="Resources\Images\Icons\exit_black.png" />
5066
<Resource Include="Resources\Images\Icons\exit_white.png" />
5167
<Resource Include="Resources\Images\Icons\fav.png" />
68+
<Resource Include="Resources\Images\Icons\favF.png" />
5269
<Resource Include="Resources\Images\Icons\favourite_black.png" />
5370
<Resource Include="Resources\Images\Icons\favourite_white.png" />
71+
<Resource Include="Resources\Images\Icons\favT.png" />
5472
<Resource Include="Resources\Images\Icons\home_black.png" />
5573
<Resource Include="Resources\Images\Icons\home_white.png" />
5674
<Resource Include="Resources\Images\Icons\max_black.png" />

CutCode/DataBase/DBManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
namespace CutCode
88
{
9-
public class DBManager
9+
public class DbManager
1010
{
1111
public List<CodeBoxModel> AllCodes { get; set; }
1212
private readonly IThemeService themeService;
13-
public DBManager(IThemeService _themeService)
13+
public DbManager(IThemeService _themeService)
1414
{
1515
themeService = _themeService;
1616
}

CutCode/Interfaces/IPageService.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@ public Object Page
2424
get => _Page;
2525
set
2626
{
27-
_Page = value;
27+
if(_Page is null || value.GetType() != _Page.GetType())
28+
{
29+
_Page = value;
30+
}
2831
PageChanged?.Invoke(this, EventArgs.Empty);
2932
}
3033
}
34+
3135
public event EventHandler PageRemoteChanged;
3236
private string _remoteChange;
3337
public string remoteChange

CutCode/Models/SideBarBtnModel.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ private void SetAppearance()
4141
{
4242
imageSource = themeService.IsLightTheme ? $"../Resources/Images/Icons/{btnBothimages[0]}" : $"../Resources/Images/Icons/{btnBothimages[1]}";
4343

44-
buttonHoverColor = themeService.IsLightTheme ? ColorCon.Convert("#D6D7DA") : ColorCon.Convert("#46494E");
45-
4644
toolTipBackground = themeService.IsLightTheme ? ColorCon.Convert("#CBD0D5") : ColorCon.Convert("#1E1E1E");
4745
toolTipForeground = themeService.IsLightTheme ? ColorCon.Convert("#060607") : ColorCon.Convert("#94969A");
4846

@@ -93,13 +91,5 @@ public SolidColorBrush toolTipForeground
9391
get => _toolTipForeground;
9492
set { SetAndNotify(ref _toolTipForeground, value); }
9593
}
96-
97-
98-
private SolidColorBrush _buttonHoverColor;
99-
public SolidColorBrush buttonHoverColor
100-
{
101-
get => _buttonHoverColor;
102-
set { SetAndNotify(ref _buttonHoverColor, value); }
103-
}
10494
}
10595
}
3.67 KB
Loading
4.11 KB
Loading
2.63 KB
Loading
2.37 KB
Loading

0 commit comments

Comments
 (0)