Skip to content

Commit fadc32f

Browse files
RealMeddsamRealMeddsam
committed
unnecessery stuff
1 parent 14a225e commit fadc32f

28 files changed

Lines changed: 122 additions & 918 deletions

‎Bloxstrap/Enums/BootstrapperStyle.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ public enum BootstrapperStyle
99
ClassicFluentDialog,
1010
ByfronDialog,
1111
FluentDialog,
12-
[EnumName(StaticName = "Froststrap Official")]
13-
CustomFluentDialog,
12+
FroststrapDialog,
1413
FluentAeroDialog,
1514
CustomDialog
1615
}

‎Bloxstrap/Enums/CookieState.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
7-
namespace Bloxstrap.Enums
1+
namespace Bloxstrap.Enums
82
{
93
public enum CookieState
104
{

‎Bloxstrap/Enums/CopyFormatMode.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Bloxstrap/Enums/SaveAndLaunch.cs‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Bloxstrap/Extensions/BootstrapperStyleEx.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ static class BootstrapperStyleEx
66

77
public static IReadOnlyCollection<BootstrapperStyle> Selections => new BootstrapperStyle[]
88
{
9-
BootstrapperStyle.CustomFluentDialog,
10-
BootstrapperStyle.FluentDialog,
9+
BootstrapperStyle.FroststrapDialog,
1110
BootstrapperStyle.FluentAeroDialog,
11+
BootstrapperStyle.FluentDialog,
1212
BootstrapperStyle.ClassicFluentDialog,
1313
BootstrapperStyle.ByfronDialog,
1414
BootstrapperStyle.ProgressDialog,
@@ -18,4 +18,4 @@ static class BootstrapperStyleEx
1818
BootstrapperStyle.CustomDialog
1919
};
2020
}
21-
}
21+
}

‎Bloxstrap/Models/FontManager.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
using System;
2-
using System.IO;
3-
using System.Linq;
4-
using System.Windows;
5-
using System.Windows.Media;
6-
using SWM = System.Windows.Media; // did this so i dont have to keep writing system.Windows.Media
1+
using System.Windows;
72

83
namespace Bloxstrap.Models
94
{
105
public static class FontManager
116
{
127
public static bool IsCustomFontApplied { get; private set; }
138

14-
public static SWM.FontFamily? LoadFontFromFile(string fontFilePath)
9+
public static System.Windows.Media.FontFamily? LoadFontFromFile(string fontFilePath)
1510
{
1611
if (!File.Exists(fontFilePath))
1712
return null;
1813

19-
string tempFontsRoot = Path.Combine(Path.GetTempPath(), "BloxstrapFonts");
14+
string tempFontsRoot = Path.Combine(Path.GetTempPath(), "Froststrap", "Fonts");
2015

2116
string uniqueFontFolder = Path.Combine(tempFontsRoot, Guid.NewGuid().ToString());
2217
Directory.CreateDirectory(uniqueFontFolder);
@@ -25,7 +20,7 @@ public static class FontManager
2520
File.Copy(fontFilePath, destFontPath, overwrite: true);
2621

2722
var fontDirectoryUri = new Uri(uniqueFontFolder + Path.DirectorySeparatorChar);
28-
var fontFamilies = Fonts.GetFontFamilies(fontDirectoryUri);
23+
var fontFamilies = System.Windows.Media.Fonts.GetFontFamilies(fontDirectoryUri);
2924

3025
return fontFamilies.FirstOrDefault();
3126
}
@@ -55,7 +50,7 @@ public static bool ApplySavedCustomFont()
5550
return false;
5651
}
5752

58-
public static void ApplyFontGlobally(SWM.FontFamily fontFamily)
53+
public static void ApplyFontGlobally(System.Windows.Media.FontFamily fontFamily)
5954
{
6055
Application.Current.Resources[SystemFonts.MessageFontFamilyKey] = fontFamily;
6156

@@ -67,11 +62,11 @@ public static void ApplyFontGlobally(SWM.FontFamily fontFamily)
6762

6863
public static void RemoveCustomFont()
6964
{
70-
var defaultFont = new SWM.FontFamily("Segoe UI");
65+
var defaultFont = new System.Windows.Media.FontFamily("Segoe UI");
7166
ApplyFontGlobally(defaultFont);
7267
IsCustomFontApplied = false;
7368
App.Settings.Prop.CustomFontPath = null;
7469
App.Settings.Save();
7570
}
7671
}
77-
}
72+
}

‎Bloxstrap/Models/Persistable/Settings.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ public class Settings
5050

5151
// FastFlag Editor/Settings Related
5252
public bool UseFastFlagManager { get; set; } = true;
53-
public CopyFormatMode SelectedCopyFormat { get; set; } = CopyFormatMode.Format1;
54-
public bool CtrlCJsonFormat { get; set; } = false;
5553
public bool ShowPresetColumn { get; set; } = false;
5654
public bool ShowFlagCount { get; set; } = true;
5755
public bool UseAltManually { get; set; } = true;
5856

5957
// Appearance Page
60-
public BootstrapperStyle BootstrapperStyle { get; set; } = BootstrapperStyle.CustomFluentDialog;
58+
public BootstrapperStyle BootstrapperStyle { get; set; } = BootstrapperStyle.FroststrapDialog;
6159
public BootstrapperIcon BootstrapperIcon { get; set; } = BootstrapperIcon.IconBloxstrap;
6260
public WindowsBackdrops SelectedBackdrop { get; set; } = WindowsBackdrops.Mica;
6361
public string? SelectedCustomTheme { get; set; } = null;

‎Bloxstrap/Resources/Strings.Designer.cs‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Bloxstrap/Resources/Strings.pt-BR.resx‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,6 @@
553553
<data name="Common.Custom">
554554
<value>Personalizado</value>
555555
</data>
556-
<data name="Enums.BootstrapperIcon.IconEarly2015">
557-
<value></value>
558-
</data>
559556
<data name="Enums.BootstrapperIcon.IconLate2015">
560557
<value>Antes de 2015</value>
561558
</data>
@@ -565,7 +562,7 @@
565562
<data name="Enums.BootstrapperStyle.FluentDialog">
566563
<value>Froststrap (Opaque)</value>
567564
</data>
568-
<data name="Enums.BootstrapperStyle.CustomFluentDialog">
565+
<data name="Enums.BootstrapperStyle.FroststrapDialog">
569566
<value>Froststrap</value>
570567
</data>
571568
<data name="Bootstrapper.ExtractionFailed.Title">
@@ -2056,12 +2053,6 @@
20562053
<data name="Common.Export">
20572054
<value>Export</value>
20582055
</data>
2059-
<data name="Dialog.Connectivity.Preventing">
2060-
<value></value>
2061-
</data>
2062-
<data name="Dialog.Connectivity.TimedOut">
2063-
<value></value>
2064-
</data>
20652056
<data name="Menu.Channel.Description">
20662057
<value>Change deployment and installation settings for Roblox &amp; Froststrap.</value>
20672058
</data>

‎Bloxstrap/Resources/Strings.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ If not, then please report this exception through a [GitHub issue]({1}) along wi
376376
<data name="Enums.BootstrapperStyle.FluentDialog" xml:space="preserve">
377377
<value>Froststrap (Opaque)</value>
378378
</data>
379-
<data name="Enums.BootstrapperStyle.CustomFluentDialog" xml:space="preserve">
379+
<data name="Enums.BootstrapperStyle.FroststrapDialog" xml:space="preserve">
380380
<value>Froststrap</value>
381381
</data>
382382
<data name="Enums.BootstrapperStyle.ClassicFluentDialog" xml:space="preserve">

0 commit comments

Comments
 (0)