diff --git a/Novetus/NovetusCore/Classes/FileFormat.cs b/Novetus/NovetusCore/Classes/FileFormat.cs
index ac3ffb0..16395ab 100644
--- a/Novetus/NovetusCore/Classes/FileFormat.cs
+++ b/Novetus/NovetusCore/Classes/FileFormat.cs
@@ -57,7 +57,7 @@ public class FileFormat
GraphicsMode = Settings.Mode.Automatic;
ReShade = false;
QualityLevel = Settings.Level.Automatic;
- LauncherStyle = Settings.Style.Extended;
+ LauncherStyle = Settings.Style.Stylish;
ReShadeFPSDisplay = false;
ReShadePerformanceMode = false;
AssetLocalizerSaveBackups = true;
diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
index d904a0d..00a8666 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
@@ -784,7 +784,7 @@ public class GlobalFuncs
}
#if LAUNCHER
- public static void ResetConfigValues(bool IsInCompact = false)
+ public static void ResetConfigValues(Settings.Style style)
#else
public static void ResetConfigValues()
#endif
@@ -795,16 +795,9 @@ public class GlobalFuncs
GlobalVars.UserConfiguration.MapPath = GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap;
GlobalVars.UserConfiguration.MapPathSnip = GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap;
#if LAUNCHER
- if (IsInCompact)
- {
- GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
- }
- else
- {
- GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
- }
+ GlobalVars.UserConfiguration.LauncherStyle = style;
#else
- GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
+ GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish;
#endif
GeneratePlayerID();
GenerateTripcode();
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs
index 938b3c4..78b8dbd 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs
@@ -954,7 +954,8 @@ namespace NovetusLauncher
this.comboBox3.FormattingEnabled = true;
this.comboBox3.Items.AddRange(new object[] {
"Extended",
- "Compact"});
+ "Compact",
+ "Stylish"});
this.comboBox3.Location = new System.Drawing.Point(296, 28);
this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(99, 21);
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs
index d9a8c3c..ca374d1 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs
@@ -1277,7 +1277,8 @@ namespace NovetusLauncher
this.comboBox3.FormattingEnabled = true;
this.comboBox3.Items.AddRange(new object[] {
"Extended",
- "Compact"});
+ "Compact",
+ "Stylish"});
this.comboBox3.Location = new System.Drawing.Point(457, 2);
this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(103, 21);
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
index db7867b..6d11df3 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
@@ -653,18 +653,27 @@ namespace NovetusLauncher
{
switch (StyleSelectorBox.SelectedIndex)
{
+ case 0:
+ if (FormStyle != Settings.Style.Extended)
+ {
+ GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
+ CloseEvent();
+ Application.Restart();
+ }
+ break;
case 1:
- if (FormStyle == Settings.Style.Extended)
+ if (FormStyle != Settings.Style.Compact)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
CloseEvent();
Application.Restart();
}
break;
+ case 2:
default:
- if (FormStyle == Settings.Style.Compact)
+ if (FormStyle != Settings.Style.Stylish)
{
- GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
+ GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish;
CloseEvent();
Application.Restart();
}
@@ -701,9 +710,12 @@ namespace NovetusLauncher
StyleSelectorBox.SelectedIndex = 1;
break;
case Settings.Style.Extended:
- default:
StyleSelectorBox.SelectedIndex = 0;
break;
+ case Settings.Style.Stylish:
+ default:
+ StyleSelectorBox.SelectedIndex = 2;
+ break;
}
GlobalFuncs.ConsolePrint("Config loaded.", 3, ConsoleBox);
@@ -741,7 +753,7 @@ namespace NovetusLauncher
f.Close();
}
- GlobalFuncs.ResetConfigValues();
+ GlobalFuncs.ResetConfigValues(FormStyle);
WriteConfigValues();
ReadConfigValues();
if (ShowBox)
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
index b686ff9..28874dd 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
@@ -571,7 +571,7 @@
-
+
@@ -579,9 +579,9 @@
-
-
-
+
+
+
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
index ca4f9ce..ac37d06 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
@@ -179,6 +179,12 @@ namespace NovetusLauncher
}
}
}
+
+ private void customizeButton_Click(object sender, RoutedEventArgs e)
+ {
+ CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
+ ccustom.Show();
+ }
}
public class ClientListItem
diff --git a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs
index b2f31ba..1ae91ab 100644
--- a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs
+++ b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs
@@ -297,6 +297,7 @@ public partial class ItemCreationSDK : Form
switch (GlobalVars.UserConfiguration.LauncherStyle)
{
case Settings.Style.Extended:
+ case Settings.Style.Stylish:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show();
break;
diff --git a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
index 488690b..a7c6f34 100644
--- a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
+++ b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
@@ -32,20 +32,18 @@ namespace NovetusLauncher
System.Windows.Forms.Application.Run(new LauncherFormCompact());
break;
case Settings.Style.Extended:
- default:
System.Windows.Forms.Application.Run(new LauncherFormExtended());
break;
+ case Settings.Style.Stylish:
+ default:
+ System.Windows.Forms.Application.Run(new LauncherFormStylish());
+ break;
}
}
else
{
CommandLineArguments.Arguments CommandLine = new CommandLineArguments.Arguments(args);
- if (CommandLine["StylishTest"] != null)
- {
- System.Windows.Forms.Application.Run(new LauncherFormStylish());
- }
-
if (CommandLine["sdk"] != null)
{
System.Windows.Forms.Application.Run(new NovetusSDK());
diff --git a/Novetus/NovetusURI/Forms/QuickConfigure.cs b/Novetus/NovetusURI/Forms/QuickConfigure.cs
index c7c17bb..bea7ff6 100644
--- a/Novetus/NovetusURI/Forms/QuickConfigure.cs
+++ b/Novetus/NovetusURI/Forms/QuickConfigure.cs
@@ -76,6 +76,7 @@ namespace NovetusURI
ccustom2.Show();
break;
case Settings.Style.Extended:
+ case Settings.Style.Stylish:
default:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show();