mirrors/Novetus_src
1
0
Fork 0
mirror of https://github.com/Novetus/Novetus_src.git synced 2025-01-31 09:41:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

address pop ups (temp)

Browse Source
This commit is contained in:
Bitl 2024-01-18 19:20:35 -07:00
parent 55b7f05a1b
commit 44c550eb0c
7 changed files with 105 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ namespace NovetusLauncher
public class LauncherFormShared
{
#region Variables
public List<TreeNode> CurrentNodeMatches = new List<TreeNode>();
public int LastNodeIndex = 0;
public string LastSearchText;
@ -128,18 +129,92 @@ namespace NovetusLauncher
{
LocalVars.launcherInitState = false;
}
}
public void CheckDependencies()
{
bool VC2005 = CheckClientDependency(VCPPRedist.VCPP2005);
bool VC2008 = CheckClientDependency(VCPPRedist.VCPP2008);
bool VC2012 = CheckClientDependency(VCPPRedist.VCPP2012);
bool isAllInstalled = VC2005 && VC2008 && VC2012;
bool isAllInstalled = VC2005 && VC2008 && (VC2012 || !VC2012);
if (isAllInstalled)
{
Util.ConsolePrint("All client dependencies are installed.", 4);
}
}
GlobalVars.Proxy.DoSetup();
public void TurnProxyOn()
{
if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyInitialSetupRequired"))
{
// this is wierd and really dumb if we are just using console mode.....
GlobalVars.Proxy.DoSetup();
}
else
{
// fast start it.
if (!GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
GlobalVars.UserConfiguration.SaveSettingBool("WebProxyEnabled", true);
}
GlobalVars.Proxy.Start();
}
}
public void TurnProxyOff()
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
Util.ConsolePrint("The web proxy is disabled. Please turn it on in order to use this command.", 2);
return;
}
GlobalVars.Proxy.Stop();
}
public void DisableProxy()
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
Util.ConsolePrint("The web proxy is already disabled.", 2);
return;
}
if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
GlobalVars.UserConfiguration.SaveSettingBool("WebProxyEnabled", false);
}
GlobalVars.Proxy.Stop();
Util.ConsolePrint("The web proxy has been disabled. To re-enable it, use the 'proxy on' command.", 2);
}
public void ProxyExtensions(int mode)
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
Util.ConsolePrint("The web proxy is disabled. Please turn it on in order to use this command.", 2);
return;
}
try
{
if (mode == 0)
{
GlobalVars.Proxy.Manager.ReloadExtensions();
}
else if (mode == 1)
{
Util.ConsolePrintMultiLine(GlobalVars.Proxy.Manager.GenerateExtensionList(), 3);
}
}
catch (Exception)
{
Util.ConsolePrint("Please specify 'reload', or 'list'.", 2);
}
}
public string GetProductVersion()

63
Novetus/NovetusLauncher/Forms/NovetusConsole.cs
View File

@ -386,71 +386,25 @@ namespace NovetusLauncher
if (vals[1].Equals("on", StringComparison.InvariantCultureIgnoreCase))
{
if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyInitialSetupRequired"))
{
// this is wierd and really dumb if we are just using console mode.....
GlobalVars.Proxy.DoSetup();
}
else
{
// fast start it.
if (!GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
GlobalVars.UserConfiguration.SaveSettingBool("WebProxyEnabled", true);
}
GlobalVars.Proxy.Start();
}
ConsoleForm.TurnProxyOn();
}
else if (vals[1].Equals("off", StringComparison.InvariantCultureIgnoreCase))
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
Util.ConsolePrint("The web proxy is disabled. Please turn it on in order to use this command.", 2);
return;
}
GlobalVars.Proxy.Stop();
ConsoleForm.TurnProxyOff();
}
else if (vals[1].Equals("disable", StringComparison.InvariantCultureIgnoreCase))
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
Util.ConsolePrint("The web proxy is already disabled.", 2);
return;
}
if (GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
{
GlobalVars.UserConfiguration.SaveSettingBool("WebProxyEnabled", false);
}
GlobalVars.Proxy.Stop();
Util.ConsolePrint("The web proxy has been disabled. To re-enable it, use the 'proxy on' command.", 2);
ConsoleForm.DisableProxy();
}
else if (vals[1].Equals("extensions", StringComparison.InvariantCultureIgnoreCase))
{
if (!GlobalVars.Proxy.Started && !GlobalVars.UserConfiguration.ReadSettingBool("WebProxyEnabled"))
if (vals[2].Equals("reload", StringComparison.InvariantCultureIgnoreCase))
{
Util.ConsolePrint("The web proxy is disabled. Please turn it on in order to use this command.", 2);
return;
ConsoleForm.ProxyExtensions(0);
}
try
else if (vals[2].Equals("list", StringComparison.InvariantCultureIgnoreCase))
{
if (vals[2].Equals("reload", StringComparison.InvariantCultureIgnoreCase))
{
GlobalVars.Proxy.Manager.ReloadExtensions();
}
else if (vals[2].Equals("list", StringComparison.InvariantCultureIgnoreCase))
{
Util.ConsolePrintMultiLine(GlobalVars.Proxy.Manager.GenerateExtensionList(), 3);
}
}
catch (Exception)
{
Util.ConsolePrint("Please specify 'reload', or 'list'.", 2);
ConsoleForm.ProxyExtensions(1);
}
}
else
@ -467,6 +421,9 @@ namespace NovetusLauncher
case string cmdArgs when cmdArgs.Contains("commandline", StringComparison.InvariantCultureIgnoreCase) == true:
Util.ConsolePrint(LocalVars.cmdLineString, 3);
break;
case string depend when (string.Compare(depend, "dependencies", true, CultureInfo.InvariantCulture) == 0):
ConsoleForm.CheckDependencies();
break;
default:
Util.ConsolePrint("Command is either not registered or valid", 2);
ScrollToEnd();

8
changelog.txt
View File

@ -1,3 +1,11 @@
EDGE Snapshot v23.8783.34531.1
Notes:
- This release was put out to address concerns from the itch.io forums about the pop-ups upon launching Novetus. As a result, this was posted as an article in the news posting for those interested in this update. The way these two features are handled will be streamlined in a later snapshot.
Enhancements:
- Novetus will no longer ask about the web proxy unless the user runs "proxy on" in the Novetus Console.
- Novetus will no longer ask about dependencies unless the user runs "dependencies" in the Novetus Console.
----------------------------------------------------------------------------
EDGE Snapshot v23.8770.30764.2
Fixes:
- Fixed the "Regen ID" buttons not working in the Stylish style.

1
consolehelp.txt
View File

@ -13,6 +13,7 @@ Commands:|3
+ help - Clears all text and shows this list.|4
+ documentation - Clears all text and shows the ClientScript documentation.|4
+ commandline - Prints all the command line variables passed to the launcher. Good for debugging.|4
+ dependencies - Checks if we should install any dependencies. Will get refactored at some point.|4
+ config save - Saves the config file|4
+ config load - Reloads the config file|4
+ config reset - Resets the config file|4

13
scripts/NovetusInstaller.nsi
View File

@ -2,11 +2,10 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Novetus"
!define PRODUCT_VERSION "2.0"
;!define PRODUCT_VERSION "2.0"
!define PRODUCT_VERSION "EDGE Snapshot v23.8770.30764.2"
!define PRODUCT_PUBLISHER "Bitl Development Studio"
!define PRODUCT_WEB_SITE "http://home.bitl.dev/"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\NovetusBootstrapper.exe"
!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
; MUI 1.67 compatible ------
!include "MUI.nsh"
@ -14,6 +13,7 @@
; MUI Settings
!define MUI_ABORTWARNING
!define MUI_ICON "G:\Projects\GitHub\Novetus\Novetus_src\Graphics\NovetusIcon.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "G:\Projects\GitHub\Novetus\Novetus_src\Graphics\Novetus_Installer_WizardImage.bmp"
; Welcome page
!insertmacro MUI_PAGE_WELCOME
@ -25,7 +25,6 @@
var ICONS_GROUP
!define MUI_STARTMENUPAGE_NODISABLE
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Novetus"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
; Instfiles page
!insertmacro MUI_PAGE_INSTFILES
@ -40,13 +39,13 @@ var ICONS_GROUP
; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "Novetus_Setup.exe"
InstallDir "$PROGRAMFILES\Novetus"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
OutFile "${PRODUCT_NAME}Setup_${PRODUCT_VERSION}.exe"
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
ShowInstDetails show
Section "Novetus" SEC01
SetOutPath $INSTDIR
DetailPrint "Copying Novetus files...."
File /r "Novetus\*"

2
scripts/launcher/info.ini
View File

@ -9,6 +9,6 @@ ExtendedVersionNumber=True
//ExtendedVersionTemplate=%version% vX.23.%extended-revision% (%version-name%)
//ExtendedVersionTemplate=%version% Snapshot v23.%build%.%revision%.%extended-revision%
ExtendedVersionTemplate=EDGE Snapshot v23.%build%.%revision%.%extended-revision%
ExtendedVersionRevision=2
ExtendedVersionRevision=1
InitialBootup=False
IsLite=False

3
scripts/launcher/splashes.txt
View File

@ -273,4 +273,5 @@ It's the new wave of the future!
In the face of extermination, say "FUCK YOU"!|Dedicated to Pepper
roblox for steam deck when|Just fuckin play novetus
you're still standing here, despite everything|Dedicated to Pepper
when in doubt, shoot someone|Dedicated to Pepper
when in doubt, shoot someone|Dedicated to Pepper
oh my pkcell