Bitl
/
Novetus_src
1
0
Fork 0
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

implemented basic stylish style switch

This commit is contained in:
Bitl 2021-09-20 18:33:09 -07:00
parent 5a85ccc150
commit 0504dbcb33
10 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Novetus/NovetusCore/Classes/FileFormat.cs
View File

@ -57,7 +57,7 @@ public class FileFormat
GraphicsMode = Settings.Mode.Automatic; GraphicsMode = Settings.Mode.Automatic;
ReShade = false; ReShade = false;
QualityLevel = Settings.Level.Automatic; QualityLevel = Settings.Level.Automatic;
LauncherStyle = Settings.Style.Extended; LauncherStyle = Settings.Style.Stylish;
ReShadeFPSDisplay = false; ReShadeFPSDisplay = false;
ReShadePerformanceMode = false; ReShadePerformanceMode = false;
AssetLocalizerSaveBackups = true; AssetLocalizerSaveBackups = true;

13
Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
View File

@ -784,7 +784,7 @@ public class GlobalFuncs
} }
#if LAUNCHER #if LAUNCHER
public static void ResetConfigValues(bool IsInCompact = false) public static void ResetConfigValues(Settings.Style style)
#else #else
public static void ResetConfigValues() public static void ResetConfigValues()
#endif #endif
@ -795,16 +795,9 @@ public class GlobalFuncs
GlobalVars.UserConfiguration.MapPath = GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap; GlobalVars.UserConfiguration.MapPath = GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap;
GlobalVars.UserConfiguration.MapPathSnip = GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap; GlobalVars.UserConfiguration.MapPathSnip = GlobalPaths.MapsDirBase + @"\\" + GlobalVars.ProgramInformation.DefaultMap;
#if LAUNCHER #if LAUNCHER
if (IsInCompact) GlobalVars.UserConfiguration.LauncherStyle = style;
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
}
else
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
}
#else #else
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended; GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish;
#endif #endif
GeneratePlayerID(); GeneratePlayerID();
GenerateTripcode(); GenerateTripcode();

3
Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs generated
View File

@ -954,7 +954,8 @@ namespace NovetusLauncher
this.comboBox3.FormattingEnabled = true; this.comboBox3.FormattingEnabled = true;
this.comboBox3.Items.AddRange(new object[] { this.comboBox3.Items.AddRange(new object[] {
"Extended", "Extended",
"Compact"}); "Compact",
"Stylish"});
this.comboBox3.Location = new System.Drawing.Point(296, 28); this.comboBox3.Location = new System.Drawing.Point(296, 28);
this.comboBox3.Name = "comboBox3"; this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(99, 21); this.comboBox3.Size = new System.Drawing.Size(99, 21);

3
Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs generated
View File

@ -1277,7 +1277,8 @@ namespace NovetusLauncher
this.comboBox3.FormattingEnabled = true; this.comboBox3.FormattingEnabled = true;
this.comboBox3.Items.AddRange(new object[] { this.comboBox3.Items.AddRange(new object[] {
"Extended", "Extended",
"Compact"}); "Compact",
"Stylish"});
this.comboBox3.Location = new System.Drawing.Point(457, 2); this.comboBox3.Location = new System.Drawing.Point(457, 2);
this.comboBox3.Name = "comboBox3"; this.comboBox3.Name = "comboBox3";
this.comboBox3.Size = new System.Drawing.Size(103, 21); this.comboBox3.Size = new System.Drawing.Size(103, 21);

22
Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
View File

@ -653,18 +653,27 @@ namespace NovetusLauncher
{ {
switch (StyleSelectorBox.SelectedIndex) switch (StyleSelectorBox.SelectedIndex)
{ {
case 0:
if (FormStyle != Settings.Style.Extended)
{
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended;
CloseEvent();
Application.Restart();
}
break;
case 1: case 1:
if (FormStyle == Settings.Style.Extended) if (FormStyle != Settings.Style.Compact)
{ {
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact; GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Compact;
CloseEvent(); CloseEvent();
Application.Restart(); Application.Restart();
} }
break; break;
case 2:
default: default:
if (FormStyle == Settings.Style.Compact) if (FormStyle != Settings.Style.Stylish)
{ {
GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Extended; GlobalVars.UserConfiguration.LauncherStyle = Settings.Style.Stylish;
CloseEvent(); CloseEvent();
Application.Restart(); Application.Restart();
} }
@ -701,9 +710,12 @@ namespace NovetusLauncher
StyleSelectorBox.SelectedIndex = 1; StyleSelectorBox.SelectedIndex = 1;
break; break;
case Settings.Style.Extended: case Settings.Style.Extended:
default:
StyleSelectorBox.SelectedIndex = 0; StyleSelectorBox.SelectedIndex = 0;
break; break;
case Settings.Style.Stylish:
default:
StyleSelectorBox.SelectedIndex = 2;
break;
} }
GlobalFuncs.ConsolePrint("Config loaded.", 3, ConsoleBox); GlobalFuncs.ConsolePrint("Config loaded.", 3, ConsoleBox);
@ -741,7 +753,7 @@ namespace NovetusLauncher
f.Close(); f.Close();
} }
GlobalFuncs.ResetConfigValues(); GlobalFuncs.ResetConfigValues(FormStyle);
WriteConfigValues(); WriteConfigValues();
ReadConfigValues(); ReadConfigValues();
if (ShowBox) if (ShowBox)

8
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
View File

@ -571,7 +571,7 @@
<Button x:Name="searchButton" Style="{DynamicResource SearchButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="315.166,43,0,0" VerticalAlignment="Top" Width="19" Height="19"/> <Button x:Name="searchButton" Style="{DynamicResource SearchButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="315.166,43,0,0" VerticalAlignment="Top" Width="19" Height="19"/>
<Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="339.166,45,0,0" VerticalAlignment="Top" Width="16" Height="16"/> <Button x:Name="refreshButton" Style="{DynamicResource RefreshButton}" Content="" Grid.Column="2" HorizontalAlignment="Left" Margin="339.166,45,0,0" VerticalAlignment="Top" Width="16" Height="16"/>
<Button x:Name="addMapButton" Content="Add Place" Grid.Column="2" HorizontalAlignment="Left" Margin="360.166,45,0,0" VerticalAlignment="Top" Width="72"/> <Button x:Name="addMapButton" Content="Add Place" Grid.Column="2" HorizontalAlignment="Left" Margin="360.166,45,0,0" VerticalAlignment="Top" Width="72"/>
<Button x:Name="customizeButton" Style="{DynamicResource ImportantButtonSmall}" Content="Customize Character" HorizontalAlignment="Left" Margin="16,105,0,0" VerticalAlignment="Top" Width="145" Grid.ColumnSpan="2"/> <Button x:Name="customizeButton" Style="{DynamicResource ImportantButtonSmall}" Content="Customize Character" HorizontalAlignment="Left" Margin="16,105,0,0" VerticalAlignment="Top" Width="145" Grid.ColumnSpan="2" Click="customizeButton_Click"/>
<Label x:Name="serverPortLabel" Content="Host Port:" Grid.Column="1" HorizontalAlignment="Left" Margin="78,43,0,0" VerticalAlignment="Top" Width="68" Grid.ColumnSpan="2"/> <Label x:Name="serverPortLabel" Content="Host Port:" Grid.Column="1" HorizontalAlignment="Left" Margin="78,43,0,0" VerticalAlignment="Top" Width="68" Grid.ColumnSpan="2"/>
<TextBox x:Name="serverPortBox" HorizontalAlignment="Left" Height="20" Margin="16.166,47,0,0" TextWrapping="Wrap" Text="53640" VerticalAlignment="Top" Width="65" Grid.Column="2"/> <TextBox x:Name="serverPortBox" HorizontalAlignment="Left" Height="20" Margin="16.166,47,0,0" TextWrapping="Wrap" Text="53640" VerticalAlignment="Top" Width="65" Grid.Column="2"/>
<Label x:Name="maxPlayersLabel" Content="Max Players:" Grid.Column="1" HorizontalAlignment="Left" Margin="68,64,0,0" VerticalAlignment="Top" Width="86" Grid.ColumnSpan="2"/> <Label x:Name="maxPlayersLabel" Content="Max Players:" Grid.Column="1" HorizontalAlignment="Left" Margin="68,64,0,0" VerticalAlignment="Top" Width="86" Grid.ColumnSpan="2"/>
@ -579,9 +579,9 @@
<CheckBox x:Name="uPnPBox" Content="uPnP" Grid.Column="1" HorizontalAlignment="Left" Margin="78,93,0,0" VerticalAlignment="Top"/> <CheckBox x:Name="uPnPBox" Content="uPnP" Grid.Column="1" HorizontalAlignment="Left" Margin="78,93,0,0" VerticalAlignment="Top"/>
<CheckBox x:Name="NotifBox" Content="Join Alerts" Grid.Column="1" HorizontalAlignment="Left" Margin="134,93,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> <CheckBox x:Name="NotifBox" Content="Join Alerts" Grid.Column="1" HorizontalAlignment="Left" Margin="134,93,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/>
<Button x:Name="serverInfoButton" Content="Server Information" Grid.Column="1" HorizontalAlignment="Left" Margin="78,113,0,0" VerticalAlignment="Top" Width="139" Grid.ColumnSpan="2"/> <Button x:Name="serverInfoButton" Content="Server Information" Grid.Column="1" HorizontalAlignment="Left" Margin="78,113,0,0" VerticalAlignment="Top" Width="139" Grid.ColumnSpan="2"/>
<Rectangle x:Name="hostServerBrowserGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="110" Margin="74,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/> <Rectangle x:Name="hostServerBrowserGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="110" Margin="72,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
<Rectangle x:Name="hostServerBrowserLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="74,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/> <Rectangle x:Name="hostServerBrowserLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="72,145,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1" Grid.ColumnSpan="2"/>
<Label x:Name="hostServerBrowserLabel" Content="Optional Hosting Settings" HorizontalAlignment="Left" Margin="77,148,0,0" VerticalAlignment="Top" Width="145" Grid.Column="1" RenderTransformOrigin="0.561,0.175" FontSize="11" Grid.ColumnSpan="2"/> <Label x:Name="hostServerBrowserLabel" Content="Optional Hosting Settings" HorizontalAlignment="Left" Margin="69,147,0,0" VerticalAlignment="Top" Width="156" Grid.Column="1" RenderTransformOrigin="0.561,0.175" FontSize="12" Grid.ColumnSpan="2"/>
<Label x:Name="browserNameLabel" Content="Server Name:" Grid.Column="1" HorizontalAlignment="Left" Margin="101,171,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> <Label x:Name="browserNameLabel" Content="Server Name:" Grid.Column="1" HorizontalAlignment="Left" Margin="101,171,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/>
<TextBox x:Name="browserNameBox" HorizontalAlignment="Left" Height="20" Margin="82,192,0,0" TextWrapping="Wrap" Text="Novetus" VerticalAlignment="Top" Width="135" Grid.Column="1" Grid.ColumnSpan="2"/> <TextBox x:Name="browserNameBox" HorizontalAlignment="Left" Height="20" Margin="82,192,0,0" TextWrapping="Wrap" Text="Novetus" VerticalAlignment="Top" Width="135" Grid.Column="1" Grid.ColumnSpan="2"/>
<Label x:Name="browserAddressLabel" Content="Browser Master Server:" Grid.Column="1" HorizontalAlignment="Left" Margin="77,206,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/> <Label x:Name="browserAddressLabel" Content="Browser Master Server:" Grid.Column="1" HorizontalAlignment="Left" Margin="77,206,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/>

6
Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs
View File

@ -179,6 +179,12 @@ namespace NovetusLauncher
} }
} }
} }
private void customizeButton_Click(object sender, RoutedEventArgs e)
{
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show();
}
} }
public class ClientListItem public class ClientListItem

1
Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs
View File

@ -297,6 +297,7 @@ public partial class ItemCreationSDK : Form
switch (GlobalVars.UserConfiguration.LauncherStyle) switch (GlobalVars.UserConfiguration.LauncherStyle)
{ {
case Settings.Style.Extended: case Settings.Style.Extended:
case Settings.Style.Stylish:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended(); CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show(); ccustom.Show();
break; break;

10
Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs
View File

@ -32,20 +32,18 @@ namespace NovetusLauncher
System.Windows.Forms.Application.Run(new LauncherFormCompact()); System.Windows.Forms.Application.Run(new LauncherFormCompact());
break; break;
case Settings.Style.Extended: case Settings.Style.Extended:
default:
System.Windows.Forms.Application.Run(new LauncherFormExtended()); System.Windows.Forms.Application.Run(new LauncherFormExtended());
break; break;
case Settings.Style.Stylish:
default:
System.Windows.Forms.Application.Run(new LauncherFormStylish());
break;
} }
} }
else else
{ {
CommandLineArguments.Arguments CommandLine = new CommandLineArguments.Arguments(args); CommandLineArguments.Arguments CommandLine = new CommandLineArguments.Arguments(args);
if (CommandLine["StylishTest"] != null)
{
System.Windows.Forms.Application.Run(new LauncherFormStylish());
}
if (CommandLine["sdk"] != null) if (CommandLine["sdk"] != null)
{ {
System.Windows.Forms.Application.Run(new NovetusSDK()); System.Windows.Forms.Application.Run(new NovetusSDK());

1
Novetus/NovetusURI/Forms/QuickConfigure.cs
View File

@ -76,6 +76,7 @@ namespace NovetusURI
ccustom2.Show(); ccustom2.Show();
break; break;
case Settings.Style.Extended: case Settings.Style.Extended:
case Settings.Style.Stylish:
default: default:
CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended(); CharacterCustomizationExtended ccustom = new CharacterCustomizationExtended();
ccustom.Show(); ccustom.Show();