diff --git a/RTCLauncher/MainForm.Designer.cs b/RTCLauncher/MainForm.Designer.cs index 4b0ea8b..aecc928 100644 --- a/RTCLauncher/MainForm.Designer.cs +++ b/RTCLauncher/MainForm.Designer.cs @@ -33,9 +33,9 @@ private void InitializeComponent() this.lbMOTD = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.pnLeftSide = new System.Windows.Forms.Panel(); - this.pbNewVersionNotification = new System.Windows.Forms.PictureBox(); this.btnVersionDownloader = new System.Windows.Forms.Button(); this.pnAnchorRight = new System.Windows.Forms.Panel(); + this.pbNewVersionNotification = new System.Windows.Forms.PictureBox(); this.pnTopPanel = new System.Windows.Forms.Panel(); this.btnUpdate = new System.Windows.Forms.Button(); this.btnMaximize = new System.Windows.Forms.Button(); @@ -101,18 +101,6 @@ private void InitializeComponent() this.pnLeftSide.Size = new System.Drawing.Size(170, 625); this.pnLeftSide.TabIndex = 134; // - // pbNewVersionNotification - // - this.pbNewVersionNotification.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.pbNewVersionNotification.Image = global::RTCV.Launcher.Properties.Resources.notificationBadge; - this.pbNewVersionNotification.InitialImage = global::RTCV.Launcher.Properties.Resources.notificationBadge; - this.pbNewVersionNotification.Location = new System.Drawing.Point(142, 585); - this.pbNewVersionNotification.Name = "pbNewVersionNotification"; - this.pbNewVersionNotification.Size = new System.Drawing.Size(14, 14); - this.pbNewVersionNotification.TabIndex = 131; - this.pbNewVersionNotification.TabStop = false; - this.pbNewVersionNotification.Visible = false; - // // btnVersionDownloader // this.btnVersionDownloader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(32)))), ((int)(((byte)(32))))); @@ -144,6 +132,18 @@ private void InitializeComponent() this.pnAnchorRight.Size = new System.Drawing.Size(999, 580); this.pnAnchorRight.TabIndex = 133; // + // pbNewVersionNotification + // + this.pbNewVersionNotification.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.pbNewVersionNotification.Image = global::RTCV.Launcher.Properties.Resources.notificationBadge; + this.pbNewVersionNotification.InitialImage = global::RTCV.Launcher.Properties.Resources.notificationBadge; + this.pbNewVersionNotification.Location = new System.Drawing.Point(142, 585); + this.pbNewVersionNotification.Name = "pbNewVersionNotification"; + this.pbNewVersionNotification.Size = new System.Drawing.Size(14, 14); + this.pbNewVersionNotification.TabIndex = 131; + this.pbNewVersionNotification.TabStop = false; + this.pbNewVersionNotification.Visible = false; + // // pnTopPanel // this.pnTopPanel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(16)))), ((int)(((byte)(16)))), ((int)(((byte)(16))))); @@ -172,7 +172,7 @@ private void InitializeComponent() this.btnUpdate.Location = new System.Drawing.Point(921, 8); this.btnUpdate.Margin = new System.Windows.Forms.Padding(0); this.btnUpdate.Name = "btnUpdate"; - this.btnUpdate.Size = new System.Drawing.Size(121, 24); + this.btnUpdate.Size = new System.Drawing.Size(139, 24); this.btnUpdate.TabIndex = 135; this.btnUpdate.TabStop = false; this.btnUpdate.Tag = ""; diff --git a/RTCLauncher/MainForm.cs b/RTCLauncher/MainForm.cs index 2faaa12..45b9673 100644 --- a/RTCLauncher/MainForm.cs +++ b/RTCLauncher/MainForm.cs @@ -84,7 +84,7 @@ internal void SuggestInstallZip(object sender, MouseEventArgs e) internal static DownloadForm dForm = null; internal static Form lpForm = null; - public const int launcherVer = 34; + public const int launcherVer = 36; internal static string SelectedVersion = null; internal static string lastSelectedVersion = null; @@ -188,6 +188,15 @@ private void MainForm_Load(object sender, EventArgs e) if (sideversionForm.lbVersions.Items.Count > 0) { sideversionForm.lbVersions.SelectedIndex = 0; + + if (MainForm.webResourceDomain == MainForm.stepbackServer) + { + if (File.Exists(MainForm.launcherDir + Path.DirectorySeparatorChar + "PACKAGES\\stepback.txt")) + File.Delete(MainForm.launcherDir + Path.DirectorySeparatorChar + "PACKAGES\\stepback.txt"); + + MainForm.webResourceDomain = MainForm.releaseServer; + MainForm.mf.RefreshMotd(); + } } else { diff --git a/RTCLauncher/Properties/Resources.Designer.cs b/RTCLauncher/Properties/Resources.Designer.cs index f0003c6..921f61d 100644 --- a/RTCLauncher/Properties/Resources.Designer.cs +++ b/RTCLauncher/Properties/Resources.Designer.cs @@ -90,26 +90,6 @@ internal static System.Drawing.Bitmap LauncherBack { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap MusicBack { - get { - object obj = ResourceManager.GetObject("MusicBack", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap MusicBack1 { - get { - object obj = ResourceManager.GetObject("MusicBack1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/RTCLauncher/Properties/Resources.resx b/RTCLauncher/Properties/Resources.resx index 79e7edb..3fd500c 100644 --- a/RTCLauncher/Properties/Resources.resx +++ b/RTCLauncher/Properties/Resources.resx @@ -124,9 +124,6 @@ ..\RESOURCES\paradox ED32-6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\RESOURCES\MusicBack1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\discord.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,9 +145,6 @@ ..\Resources\corruptwiki.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\RESOURCES\MusicBack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\youtube.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/RTCLauncher/Properties/Settings.Designer.cs b/RTCLauncher/Properties/Settings.Designer.cs index c0c4c15..a14f904 100644 --- a/RTCLauncher/Properties/Settings.Designer.cs +++ b/RTCLauncher/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace RTCV.Launcher.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/RTCLauncher/RTCLauncher.csproj b/RTCLauncher/RTCLauncher.csproj index 5c4e32c..f871187 100644 --- a/RTCLauncher/RTCLauncher.csproj +++ b/RTCLauncher/RTCLauncher.csproj @@ -32,12 +32,24 @@ false + RTC Launcher + AnyCPU + False + none + Redscientist Labs + Redscientist Labs + RTC Launcher + Application Launcher and Downloader by Redscientist Labs + Redscientist Labs + http://redscientist.com bin\ + False bin\ + False @@ -69,6 +81,11 @@ True Resources.resx + + True + True + Settings.settings + Form @@ -112,4 +129,10 @@ Resources.Designer.cs + + + SettingsSingleFileGenerator + Settings.Designer.cs + + diff --git a/RTCLauncher/SidebarVersionsPanel.cs b/RTCLauncher/SidebarVersionsPanel.cs index 0e92dd7..0710cd7 100644 --- a/RTCLauncher/SidebarVersionsPanel.cs +++ b/RTCLauncher/SidebarVersionsPanel.cs @@ -78,6 +78,16 @@ void hide() if (lbVersions.Items.Count > 0) lbVersions.SelectedIndex = 0; + + if (MainForm.webResourceDomain == MainForm.stepbackServer) + { + if (File.Exists(MainForm.launcherDir + Path.DirectorySeparatorChar + "PACKAGES\\stepback.txt")) + File.Delete(MainForm.launcherDir + Path.DirectorySeparatorChar + "PACKAGES\\stepback.txt"); + + MainForm.webResourceDomain = MainForm.releaseServer; + MainForm.mf.RefreshMotd(); + } + } else {