From f105533c6478ee82d00a1e506871fe1a652dfd78 Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 30 Jul 2021 13:00:53 -0700 Subject: [PATCH] icons, better messages, map loading --- .../Compact/CharacterCustomizationCompact.cs | 4 +- .../CharacterCustomizationExtended.cs | 4 +- .../CharCustom/Forms/Resources/BC.png | Bin 0 -> 2332 bytes .../CharCustom/Forms/Resources/OBC.png | Bin 0 -> 2422 bytes .../CharCustom/Forms/Resources/TBC.png | Bin 0 -> 2710 bytes .../StorageAndFunctions/GlobalFuncs.cs | 13 +- .../StorageAndFunctions/GlobalPaths.cs | 1 + .../StorageAndFunctions/ScriptFuncs.cs | 2 +- .../NovetusLauncher/Classes/SDK/SDKFuncs.cs | 20 +- .../Forms/CustomGraphicsOptions.cs | 6 +- .../Compact/LauncherFormCompact.Designer.cs | 99 +++++---- .../Compact/LauncherFormCompact.cs | 5 + .../Compact/LauncherFormCompact.resx | 51 +++++ .../Compact/LauncherFormCompactSettings.cs | 2 +- .../Extended/LauncherFormExtended.Designer.cs | 201 ++++++++++-------- .../Extended/LauncherFormExtended.cs | 7 +- .../Extended/LauncherFormExtended.resx | 51 +++++ .../Forms/LauncherForm/LauncherFormShared.cs | 57 ++++- Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs | 6 +- .../Forms/SDK/ClientinfoCreator.cs | 10 +- .../Forms/SDK/ItemCreationSDK.cs | 10 +- .../NovetusLauncher/Forms/SDK/NovetusSDK.cs | 2 +- .../NovetusLauncher/Forms/ServerBrowser.cs | 6 +- .../NovetusLauncher/Novetus.Launcher.csproj | 1 + Novetus/NovetusLauncher/Resources/refresh.png | Bin 0 -> 504 bytes Novetus/NovetusLauncher/Resources/search.png | Bin 0 -> 412 bytes 26 files changed, 387 insertions(+), 171 deletions(-) create mode 100644 Novetus/NovetusCore/CharCustom/Forms/Resources/BC.png create mode 100644 Novetus/NovetusCore/CharCustom/Forms/Resources/OBC.png create mode 100644 Novetus/NovetusCore/CharCustom/Forms/Resources/TBC.png create mode 100644 Novetus/NovetusLauncher/Resources/refresh.png create mode 100644 Novetus/NovetusLauncher/Resources/search.png diff --git a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs index 79978a4..6f883ef 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Compact/CharacterCustomizationCompact.cs @@ -994,7 +994,7 @@ public partial class CharacterCustomizationCompact : Form if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome())) { - MessageBox.Show(icon.getInstallOutcome()); + MessageBox.Show(icon.getInstallOutcome(), "Novetus - Icon Installed", MessageBoxButtons.OK, MessageBoxIcon.Information); } Image icon1 = GlobalFuncs.LoadImage(GlobalPaths.extradirIcons + "\\" + GlobalVars.UserConfiguration.PlayerName + ".png", GlobalPaths.extradir + "\\NoExtra.png"); @@ -1010,7 +1010,7 @@ public partial class CharacterCustomizationCompact : Form private void button71_Click(object sender, EventArgs e) { GlobalFuncs.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true); - MessageBox.Show("Outfit Saved!"); + MessageBox.Show("Outfit Saved!", "Novetus - Outfit Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); } void TextBox1TextChanged(object sender, EventArgs e) diff --git a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs index 75c0af5..60dd898 100644 --- a/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs +++ b/Novetus/NovetusCore/CharCustom/Forms/Extended/CharacterCustomizationExtended.cs @@ -997,7 +997,7 @@ public partial class CharacterCustomizationExtended : Form if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome())) { - MessageBox.Show(icon.getInstallOutcome()); + MessageBox.Show(icon.getInstallOutcome(), "Novetus - Icon Installed", MessageBoxButtons.OK, MessageBoxIcon.Information); } Image icon1 = GlobalFuncs.LoadImage(GlobalPaths.extradirIcons + "\\" + GlobalVars.UserConfiguration.PlayerName + ".png", GlobalPaths.extradir + "\\NoExtra.png"); @@ -1075,7 +1075,7 @@ public partial class CharacterCustomizationExtended : Form private void button71_Click(object sender, EventArgs e) { GlobalFuncs.Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true); - MessageBox.Show("Outfit Saved!"); + MessageBox.Show("Outfit Saved!", "Novetus - Outfit Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); } void TextBox1TextChanged(object sender, EventArgs e) diff --git a/Novetus/NovetusCore/CharCustom/Forms/Resources/BC.png b/Novetus/NovetusCore/CharCustom/Forms/Resources/BC.png new file mode 100644 index 0000000000000000000000000000000000000000..497bb34eec44093a480717e9e4aa11ed6d7d8cce GIT binary patch literal 2332 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 literal 0 HcmV?d00001 diff --git a/Novetus/NovetusCore/CharCustom/Forms/Resources/TBC.png b/Novetus/NovetusCore/CharCustom/Forms/Resources/TBC.png new file mode 100644 index 0000000000000000000000000000000000000000..69820e779f4de8312eebd87c3f002395b7640809 GIT binary patch literal 2710 zcmV;H3TgF;P)pPI7vi7R9HvNR|iy-R~CLVLmisHPy|9# zkRSpgRbT-jju?;*QWOvoaRd@TFhN17f<|nB3a(-o6fkPQf@?vE0auN>25ZblNj4|3 z7s|}HcLq*&-6dvA_MH9B`OZHx|NZBF@7?n5&;B35A*vBa5!H!Y;x9pJ%OCpq8-T;% zDBIcD6^PQ(zFPEA-u;wR(d`Mg_SHN&IfG%7Hy|e`7w7Ek+@YzdIpY0)3tTQ&;r)Ps z+VkC)#GO}fqP_DHPG7i;^IcaEJ3FycQBm=oVbhXiIE@vc_c`8 z>aF0InwsUEJbiZH^J}+ow4)n)4;{yv%{x)Ct`0l)HN(Se%30bWZL(D)suHCk66opa zm3w=8_u1IkWY8jhM?wOWm6c=EH8fJR1%g~%ef@F+L!&BffzHP~9@l}M88M_BT4CTM z2Zus;clSN6Zf-}99&Z;{Z{3F_C6!41U@?}JluO21T6WnvIGmg8;d#|}s_;%wSa@$- z;+#iekx>#C7ni}fIm!KHl^X`v)zyo)H6D~SA3KF(=eu$0;#C|zbsl-eWsgnG$7GN{ z-jLgo!Qt|F)|+bUUT)mhfb1ouND^gY=iUPd3<{xeB;ezMLaf`k1>5#EVRv&YR;;ao zuAV+Jv$L^kT{Z1oJxbTqkoZ-|T2h4Qgyex(64!F#463&6dabIa7BTE=Wbk;r@tbP5 zyxdT?3+XupSW>tG?WfKnATS6~(Xl8fD#7NhJFu_i2pTC=b-S9dWN88V`}@(<)Qm|k z?x?PBz{VX1P*Pb9O)c$>d_F&KMdkXz&u`p?rImHvu&cj;;`fx1bEQ^}BHO`VAzfE|jEY=1@3RqPlK7_B4Nn!|msA zHe>&xqgYnH4wY54=;-W1b#={8Dk>`T_4P-mn~xb=YHed%@9a9cO*lQEduHtHyEe9V zPu11cC611cu&}Uzp1wZTZ`qD7?>)qg2S4D--3O@K-SGN%-ah4264FF|0~{+WtB?at zO^;4~ei<8g9-z3^V%7RO9Be&-{mm_pZEbC1q;^B*KSP>K%0vyK9fj_Kj*bojLjvIw z-~&;bNMdPa)#c{l(KddeIS5Z%vej zL@aP)EBene;5nb1ClUAJ_3PW{*pu)o+leb86X^l>i{Q&~*rj!$$`Bu$3*0>dJiQA^ z-;a2B?IfDkWFRh(;u{@njc8gc&c#OlTv4Tc-1K2vqa#=9^lC>K>UIP^waez9(=JI9qZ$f66%VGh$v)b zWg$8)9xWk!Y;wigEl{E{?QS;@OKAs9P3;B@5%fF)+}# z81^dzk6K}aJ)e(5J|v(}fkHPGIJbN_40mWnKLD?KA$fWmH(LsDdUX_{r#mAiHV!GG zbnK1Q#ED>bPfd;)HY-Yw`SsLLl97@g|k$C zRFZD=e;miroY_}T1ivgUj)H)?qcm6A+e^`MXgTG>PpCrrCTTqL=g zW7~8+?5Ie^(HP2y)s&Q*EP?GVz-})RG-c?zZ4$8FfObm`Ai-;08O${_Km$#$Kp=>V zcag7tc1Isa8o5|o%#gXz1jQ@MusmVn^F#+uy`L%b9`-GRv)X+K0-xnL*$4=pKda)m(-E6D81ShLDgD`1<-jH`n6V zJUljWK>UJ({9G<3xlTqxs54R>ITbw4$X!u^Sfs6^)8{?L6s=lvNLJ+F%P7Qa(>kO8RQ4pJ3opt%9Vsd^DmH6X5G=E{++`>P*!CJLmrhMG|67BiM2^HMM4I zYwI9-JF-(%;2DhkB1$?rJM_7AsJcRo4FuS|nmFIc%og=pY^@RSW5N0Z|&VUjbu(1?QqZ&eM#B Q5dZ)H07*qoM6N<$g1>PcyZ`_I literal 0 HcmV?d00001 diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs index 0e9e377..9fb88d7 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs @@ -559,10 +559,21 @@ public class GlobalFuncs ChangeGameSettings(ClientName); } - public static void FixedFileCopy(string src, string dest, bool overwrite) + public static void FixedFileCopy(string src, string dest, bool overwrite, bool overwritewarning = false) { if (File.Exists(dest)) { + if (overwrite && overwritewarning) + { + DialogResult box = MessageBox.Show("A file with a similar name was detected in the directory as '" + dest + + "'.\n\nWould you like to override it?", "Novetus - Override Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + + if (box == DialogResult.No) + { + return; + } + } + File.SetAttributes(dest, FileAttributes.Normal); } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs index 55daa88..56e190f 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs @@ -19,6 +19,7 @@ public class GlobalPaths public static readonly string ConfigDirData = BasePathLauncher + @"\\data"; public static readonly string ClientDir = BasePath + @"\\clients"; public static readonly string MapsDir = BasePath + @"\\maps"; + public static readonly string MapsDirCustom = MapsDir + @"\\Custom"; public static readonly string MapsDirBase = "maps"; public static readonly string BaseGameDir = "rbxasset://../../../"; public static readonly string AltBaseGameDir = "rbxasset://"; diff --git a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs index b1b3412..672d142 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs @@ -372,7 +372,7 @@ public class ScriptFuncs if (compiled.Contains("%disabled%")) { - MessageBox.Show("This option has been disabled for this client."); + MessageBox.Show("This option has been disabled for this client.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); return ""; } diff --git a/Novetus/NovetusLauncher/Classes/SDK/SDKFuncs.cs b/Novetus/NovetusLauncher/Classes/SDK/SDKFuncs.cs index 7a3148b..7bd524e 100644 --- a/Novetus/NovetusLauncher/Classes/SDK/SDKFuncs.cs +++ b/Novetus/NovetusLauncher/Classes/SDK/SDKFuncs.cs @@ -40,7 +40,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset Localizer", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -156,7 +156,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset Localizer", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } finally { @@ -206,7 +206,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset Localizer", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } finally { @@ -238,7 +238,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset Localizer", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The download has experienced an error: " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } finally { @@ -798,7 +798,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("Error: Unable to localize the asset. " + ex.Message, "Novetus Asset Localizer", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Error: Unable to localize the asset. " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } #endregion @@ -1069,7 +1069,7 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("The Item Creation SDK has experienced an error: " + ex.Message, "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); success = false; } finally @@ -1111,12 +1111,12 @@ class SDKFuncs } catch (Exception ex) { - MessageBox.Show("Error: Unable to download the file. " + ex.Message, "Novetus Item SDK | Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Error: Unable to download the file. " + ex.Message, "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } if (!string.IsNullOrWhiteSpace(download.getDownloadOutcome())) { - MessageBox.Show(download.getDownloadOutcome(), "Novetus Item SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(download.getDownloadOutcome(), "Novetus Asset SDK - Download Completed", MessageBoxButtons.OK, MessageBoxIcon.Information); } } else @@ -1126,13 +1126,13 @@ class SDKFuncs if (!GlobalVars.UserConfiguration.DisabledItemMakerHelp) { string helptext = "In order for the item to work in Novetus, you'll need to find an icon for your item (it must be a .png file), then name it the same name as your item.\n\nIf you want to create a local (offline) item, you'll have to download the meshes/textures from the links in the rbxm file, then replace the links in the file pointing to where they are using rbxasset://. Look at the directory in the 'shareddata/charcustom' folder that best suits your item type, then look at the rbxm for any one of the items. If you get a corrupted file, change the URL using the drop down box.\n\nIf you're trying to create a offline item, please use these file extension names when saving your files:\n.rbxm - ROBLOX Model/Item\n.mesh - ROBLOX Mesh\n.png - Texture/Icon\n.wav - Sound"; - MessageBox.Show(helptext, "Novetus Item SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(helptext, "Novetus Asset SDK - Help", MessageBoxButtons.OK, MessageBoxIcon.Information); } } } catch (Exception) { - MessageBox.Show("Error: Unable to download the file. Try using a different file name or ID.", "Novetus Item SDK | Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Error: Unable to download the file. Try using a different file name or ID.", "Novetus Asset SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/Novetus/NovetusLauncher/Forms/CustomGraphicsOptions.cs b/Novetus/NovetusLauncher/Forms/CustomGraphicsOptions.cs index c58b051..5460f14 100644 --- a/Novetus/NovetusLauncher/Forms/CustomGraphicsOptions.cs +++ b/Novetus/NovetusLauncher/Forms/CustomGraphicsOptions.cs @@ -223,7 +223,7 @@ namespace NovetusLauncher if (!hasFoundDir) { - MessageBox.Show("This client does not support setting adjustment through the Novetus Launcher.\nTry opening this client in ROBLOX Studio and adjust it through the settings in Tools -> Settings."); + MessageBox.Show("This client does not support setting adjustment through the Novetus Launcher.\nTry opening this client in ROBLOX Studio and adjust it through the settings in Tools -> Settings.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); Close(); } } @@ -244,7 +244,7 @@ namespace NovetusLauncher if (GraphicsLevel.Value > 19 && (info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_ForceAutomaticQL21 || info.ClientLoadOptions != Settings.GraphicsOptions.ClientLoadOptions.Client_2008AndUp_QualityLevel21)) { - MessageBox.Show("This client does not support quality levels above 19."); + MessageBox.Show("This client does not support quality levels above 19.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -326,7 +326,7 @@ namespace NovetusLauncher private void Styles2007Info_Click(object sender, EventArgs e) { - MessageBox.Show("Make sure you place the styles you want in the Styles folder in " + GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + ClientName + @"\Styles." + Environment.NewLine + "If the files are not placed in this directory, they will not be loaded properly.\nThis client will accept .msstyles and .cjstyles files."); + MessageBox.Show("Make sure you place the styles you want in the Styles folder in " + GlobalPaths.ClientDir.Replace(@"\\", @"\") + @"\" + ClientName + @"\Styles." + Environment.NewLine + "If the files are not placed in this directory, they will not be loaded properly.\nThis client will accept .msstyles and .cjstyles files.", "Novetus - Styles Help", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void GraphicsShadows2007_SelectedIndexChanged(object sender, EventArgs e) diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs index 00c9660..ad9b2b2 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.Designer.cs @@ -41,6 +41,7 @@ namespace NovetusLauncher private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompact)); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); @@ -80,10 +81,8 @@ namespace NovetusLauncher this.label30 = new System.Windows.Forms.Label(); this.listBox2 = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); - this.SearchButton = new System.Windows.Forms.Button(); this.SearchBar = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); - this.button24 = new System.Windows.Forms.Button(); this.treeView1 = new System.Windows.Forms.TreeView(); this.button6 = new System.Windows.Forms.Button(); this.tabPage6 = new System.Windows.Forms.TabPage(); @@ -128,7 +127,6 @@ namespace NovetusLauncher this.label13 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); this.button4 = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.button8 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.label25 = new System.Windows.Forms.Label(); @@ -161,6 +159,11 @@ namespace NovetusLauncher this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.button35 = new System.Windows.Forms.Button(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.button23 = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.SearchButton = new System.Windows.Forms.Button(); + this.button24 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -406,8 +409,8 @@ namespace NovetusLauncher this.textBox8.Name = "textBox8"; this.textBox8.Size = new System.Drawing.Size(100, 20); this.textBox8.TabIndex = 83; - this.textBox8.TextChanged += new System.EventHandler(this.textBox8_TextChanged); this.textBox8.Click += new System.EventHandler(this.textBox8_Click); + this.textBox8.TextChanged += new System.EventHandler(this.textBox8_TextChanged); // // label17 // @@ -630,6 +633,7 @@ namespace NovetusLauncher // // tabPage4 // + this.tabPage4.Controls.Add(this.button23); this.tabPage4.Controls.Add(this.SearchButton); this.tabPage4.Controls.Add(this.SearchBar); this.tabPage4.Controls.Add(this.textBox4); @@ -643,21 +647,11 @@ namespace NovetusLauncher this.tabPage4.Text = "MAPS"; this.tabPage4.UseVisualStyleBackColor = true; // - // SearchButton - // - this.SearchButton.Location = new System.Drawing.Point(164, 3); - this.SearchButton.Name = "SearchButton"; - this.SearchButton.Size = new System.Drawing.Size(49, 23); - this.SearchButton.TabIndex = 69; - this.SearchButton.Text = "Search"; - this.SearchButton.UseVisualStyleBackColor = true; - this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); - // // SearchBar // this.SearchBar.Location = new System.Drawing.Point(7, 5); this.SearchBar.Name = "SearchBar"; - this.SearchBar.Size = new System.Drawing.Size(151, 20); + this.SearchBar.Size = new System.Drawing.Size(125, 20); this.SearchBar.TabIndex = 68; // // textBox4 @@ -671,16 +665,6 @@ namespace NovetusLauncher this.textBox4.Size = new System.Drawing.Size(392, 110); this.textBox4.TabIndex = 67; // - // button24 - // - this.button24.Location = new System.Drawing.Point(216, 3); - this.button24.Name = "button24"; - this.button24.Size = new System.Drawing.Size(76, 23); - this.button24.TabIndex = 59; - this.button24.Text = "Refresh List"; - this.button24.UseVisualStyleBackColor = true; - this.button24.Click += new System.EventHandler(this.Button24Click); - // // treeView1 // this.treeView1.HideSelection = false; @@ -693,9 +677,9 @@ namespace NovetusLauncher // button6 // this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button6.Location = new System.Drawing.Point(294, 3); + this.button6.Location = new System.Drawing.Point(297, 3); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(105, 23); + this.button6.Size = new System.Drawing.Size(102, 23); this.button6.TabIndex = 56; this.button6.Text = "Open Maps Folder"; this.button6.UseVisualStyleBackColor = true; @@ -1156,16 +1140,6 @@ namespace NovetusLauncher this.button4.UseVisualStyleBackColor = true; this.button4.Click += new System.EventHandler(this.Button4Click); // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(6, 12); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // // button8 // this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -1410,6 +1384,55 @@ namespace NovetusLauncher this.button35.Size = new System.Drawing.Size(75, 23); this.button35.TabIndex = 0; // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "search.png"); + this.imageList1.Images.SetKeyName(1, "refresh.png"); + // + // button23 + // + this.button23.Location = new System.Drawing.Point(219, 3); + this.button23.Name = "button23"; + this.button23.Size = new System.Drawing.Size(75, 23); + this.button23.TabIndex = 70; + this.button23.Text = "Add Map..."; + this.button23.UseVisualStyleBackColor = true; + this.button23.Click += new System.EventHandler(this.button23_Click); + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(6, 12); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // + // SearchButton + // + this.SearchButton.ImageKey = "search.png"; + this.SearchButton.ImageList = this.imageList1; + this.SearchButton.Location = new System.Drawing.Point(141, 3); + this.SearchButton.Name = "SearchButton"; + this.SearchButton.Size = new System.Drawing.Size(26, 23); + this.SearchButton.TabIndex = 69; + this.SearchButton.UseVisualStyleBackColor = true; + this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); + // + // button24 + // + this.button24.ImageKey = "refresh.png"; + this.button24.ImageList = this.imageList1; + this.button24.Location = new System.Drawing.Point(173, 3); + this.button24.Name = "button24"; + this.button24.Size = new System.Drawing.Size(24, 23); + this.button24.TabIndex = 59; + this.button24.UseVisualStyleBackColor = true; + this.button24.Click += new System.EventHandler(this.Button24Click); + // // LauncherFormCompact // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1637,5 +1660,7 @@ namespace NovetusLauncher private System.Windows.Forms.TextBox textBox7; private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label20; + private System.Windows.Forms.ImageList imageList1; + private System.Windows.Forms.Button button23; } } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs index a5c103c..d5435f7 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.cs @@ -308,6 +308,11 @@ namespace NovetusLauncher launcherForm.ShowMasterServerWarning(); } #endregion + + private void button23_Click(object sender, EventArgs e) + { + launcherForm.AddNewMap(); + } } #endregion } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx index 0d04b66..8bc94cc 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx @@ -126,6 +126,57 @@ + + + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 + CQAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xgAA/86AAH0Ae0BEQMA + AeoB8AH/LQAB/wHwAfMFAAH/Ae8BDgGSAfIC/wH0AbwBFQFtAf8rAAH/AewB6wEAAf8EAAGSARUB9AEA + Af8B8wH0Af8BAAH/Am0B/ykAAf8B7AHyAe8BFQH/AwAB8gEPAfQBAAHwAQ4BEQEOARQC8gEPAfcB/yYA + AfQB8QHzAe0B8gHvAewB8QQAAesB7wEAAfIBDgHyAQAB/wEHAg4B8CYAAf8B9wEPAW0BQwEOAesB7AHx + BQABDgHzAQABbQEHBAAC8ycAAQcBbQH/AQAB/wGSARAB8gUAAf8BAAH/AQABDgH0AQAB8wbxAfIkAAEU + AfMDAAH/AQ8B/wUAAf8BAAH0AQABDwHzAQAB8wEOAQ8DEgEUAREkAAEQAf8EAAEVAfQGAAEVAfIBAAHr + Ae8CAAHyAQ4B8gIAAfMBESQAAewBvAMAAfQBEQH/BgAB7AH3AQAB8wEOAQcB/wH0AW0BEQH/AQAB8wER + JAAB9AEQAQcB8wHwAUMB8AcAAfMBDwH/AQAB8gETAgAB6wH0Av8B8wERJQAB9AHsARIB7AHyCQAB7AHq + Af8CAAL/AQAB9AFtAREBvAERMwAB/wHsAREB7wHyAfMB8AHsAQ4BkgH3AQ4BETUAAfEB7AEVAREB6gHv + AfQCAAH3ARE+AAH/AQchAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wH+ + AT8EAAL/AfABBwQAAf8BxwHAAQMEAAH/AYMBxAEhBAAB/wEDAYgBAQQAAfgBBwGRAQcEAAHgAQ8BkwHP + BAAB4gEfARIBAQQAAecBHwESAQEEAAHnAZ8BkwEZBAAB5wEfAZABCQQAAeABPwGIAQEEAAHwAX8BxgFB + BAAC/wHAAQEEAAL/AfABGQQAA/8B+QQACw== diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompactSettings.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompactSettings.cs index 6ab37c1..177eabd 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompactSettings.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompactSettings.cs @@ -134,7 +134,7 @@ namespace NovetusLauncher } else { - MessageBox.Show("You do not have the 'Custom' option selected. Please select it before continuing."); + MessageBox.Show("You do not have the 'Custom' option selected. Please select it before continuing.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } #endregion diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs index 092c3e6..1ae5904 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.Designer.cs @@ -41,6 +41,7 @@ namespace NovetusLauncher private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormExtended)); this.button25 = new System.Windows.Forms.Button(); this.button21 = new System.Windows.Forms.Button(); @@ -49,7 +50,6 @@ namespace NovetusLauncher this.label13 = new System.Windows.Forms.Label(); this.textBox2 = new System.Windows.Forms.TextBox(); this.button4 = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.button8 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.label25 = new System.Windows.Forms.Label(); @@ -70,11 +70,6 @@ namespace NovetusLauncher this.button28 = new System.Windows.Forms.Button(); this.button34 = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); - this.SettingsButton = new System.Windows.Forms.Button(); - this.panel3 = new System.Windows.Forms.Panel(); - this.panel4 = new System.Windows.Forms.Panel(); - this.button35 = new System.Windows.Forms.Button(); - this.UAButton = new System.Windows.Forms.Button(); this.tabControl1 = new TabControlWithoutHeader(); this.tabPage1 = new System.Windows.Forms.TabPage(); this.button37 = new System.Windows.Forms.Button(); @@ -161,11 +156,16 @@ namespace NovetusLauncher this.label18 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.SettingsButton = new System.Windows.Forms.Button(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.button35 = new System.Windows.Forms.Button(); + this.UAButton = new System.Windows.Forms.Button(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.button23 = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); - this.panel3.SuspendLayout(); - this.panel4.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); @@ -179,6 +179,9 @@ namespace NovetusLauncher this.tabPage8.SuspendLayout(); this.tabPage5.SuspendLayout(); this.panel5.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // button25 @@ -251,16 +254,6 @@ namespace NovetusLauncher this.button4.UseVisualStyleBackColor = true; this.button4.Click += new System.EventHandler(this.Button4Click); // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBox2.Location = new System.Drawing.Point(3, 3); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(43, 41); - this.pictureBox2.TabIndex = 7; - this.pictureBox2.TabStop = false; - // // button8 // this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -469,61 +462,6 @@ namespace NovetusLauncher this.panel2.Size = new System.Drawing.Size(646, 311); this.panel2.TabIndex = 61; // - // SettingsButton - // - this.SettingsButton.Location = new System.Drawing.Point(0, 0); - this.SettingsButton.Name = "SettingsButton"; - this.SettingsButton.Size = new System.Drawing.Size(75, 23); - this.SettingsButton.TabIndex = 0; - // - // panel3 - // - this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel3.Controls.Add(this.pictureBox2); - this.panel3.Controls.Add(this.textBox2); - this.panel3.Controls.Add(this.textBox5); - this.panel3.Controls.Add(this.button4); - this.panel3.Controls.Add(this.label16); - this.panel3.Controls.Add(this.label15); - this.panel3.Controls.Add(this.label12); - this.panel3.Controls.Add(this.label13); - this.panel3.Location = new System.Drawing.Point(1, 4); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(229, 69); - this.panel3.TabIndex = 62; - // - // panel4 - // - this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel4.Controls.Add(this.button35); - this.panel4.Controls.Add(this.button34); - this.panel4.Controls.Add(this.button21); - this.panel4.Controls.Add(this.button8); - this.panel4.Controls.Add(this.button3); - this.panel4.Controls.Add(this.button25); - this.panel4.Location = new System.Drawing.Point(236, 41); - this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(501, 32); - this.panel4.TabIndex = 63; - // - // button35 - // - this.button35.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button35.Location = new System.Drawing.Point(113, 3); - this.button35.Name = "button35"; - this.button35.Size = new System.Drawing.Size(41, 20); - this.button35.TabIndex = 61; - this.button35.Text = "Studio"; - this.button35.UseVisualStyleBackColor = true; - this.button35.Click += new System.EventHandler(this.button35_Click); - // - // UAButton - // - this.UAButton.Location = new System.Drawing.Point(0, 0); - this.UAButton.Name = "UAButton"; - this.UAButton.Size = new System.Drawing.Size(75, 23); - this.UAButton.TabIndex = 0; - // // tabControl1 // this.tabControl1.Alignment = System.Windows.Forms.TabAlignment.Bottom; @@ -742,8 +680,8 @@ namespace NovetusLauncher this.textBox8.Name = "textBox8"; this.textBox8.Size = new System.Drawing.Size(100, 20); this.textBox8.TabIndex = 68; - this.textBox8.TextChanged += new System.EventHandler(this.textBox8_TextChanged); this.textBox8.Click += new System.EventHandler(this.textBox8_Click); + this.textBox8.TextChanged += new System.EventHandler(this.textBox8_TextChanged); // // label17 // @@ -971,6 +909,7 @@ namespace NovetusLauncher // // tabPage4 // + this.tabPage4.Controls.Add(this.button23); this.tabPage4.Controls.Add(this.SearchButton); this.tabPage4.Controls.Add(this.SearchBar); this.tabPage4.Controls.Add(this.textBox4); @@ -986,11 +925,12 @@ namespace NovetusLauncher // // SearchButton // - this.SearchButton.Location = new System.Drawing.Point(343, 3); + this.SearchButton.ImageKey = "search.png"; + this.SearchButton.ImageList = this.imageList1; + this.SearchButton.Location = new System.Drawing.Point(269, 3); this.SearchButton.Name = "SearchButton"; - this.SearchButton.Size = new System.Drawing.Size(51, 23); + this.SearchButton.Size = new System.Drawing.Size(23, 23); this.SearchButton.TabIndex = 69; - this.SearchButton.Text = "Search"; this.SearchButton.UseVisualStyleBackColor = true; this.SearchButton.Click += new System.EventHandler(this.SearchButton_Click); // @@ -998,7 +938,7 @@ namespace NovetusLauncher // this.SearchBar.Location = new System.Drawing.Point(7, 5); this.SearchBar.Name = "SearchBar"; - this.SearchBar.Size = new System.Drawing.Size(330, 20); + this.SearchBar.Size = new System.Drawing.Size(253, 20); this.SearchBar.TabIndex = 68; // // textBox4 @@ -1014,11 +954,12 @@ namespace NovetusLauncher // // button24 // - this.button24.Location = new System.Drawing.Point(400, 3); + this.button24.ImageKey = "refresh.png"; + this.button24.ImageList = this.imageList1; + this.button24.Location = new System.Drawing.Point(298, 3); this.button24.Name = "button24"; - this.button24.Size = new System.Drawing.Size(98, 23); + this.button24.Size = new System.Drawing.Size(25, 23); this.button24.TabIndex = 59; - this.button24.Text = "Refresh Map List"; this.button24.UseVisualStyleBackColor = true; this.button24.Click += new System.EventHandler(this.Button24Click); // @@ -1034,9 +975,9 @@ namespace NovetusLauncher // button6 // this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button6.Location = new System.Drawing.Point(504, 3); + this.button6.Location = new System.Drawing.Point(516, 3); this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(114, 23); + this.button6.Size = new System.Drawing.Size(102, 23); this.button6.TabIndex = 56; this.button6.Text = "Open Maps Folder"; this.button6.UseVisualStyleBackColor = true; @@ -1514,6 +1455,88 @@ namespace NovetusLauncher this.label7.Text = "PROJECT STARLIGHT"; this.label7.TextAlign = System.Drawing.ContentAlignment.TopCenter; // + // SettingsButton + // + this.SettingsButton.Location = new System.Drawing.Point(0, 0); + this.SettingsButton.Name = "SettingsButton"; + this.SettingsButton.Size = new System.Drawing.Size(75, 23); + this.SettingsButton.TabIndex = 0; + // + // panel3 + // + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel3.Controls.Add(this.pictureBox2); + this.panel3.Controls.Add(this.textBox2); + this.panel3.Controls.Add(this.textBox5); + this.panel3.Controls.Add(this.button4); + this.panel3.Controls.Add(this.label16); + this.panel3.Controls.Add(this.label15); + this.panel3.Controls.Add(this.label12); + this.panel3.Controls.Add(this.label13); + this.panel3.Location = new System.Drawing.Point(1, 4); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(229, 69); + this.panel3.TabIndex = 62; + // + // panel4 + // + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel4.Controls.Add(this.button35); + this.panel4.Controls.Add(this.button34); + this.panel4.Controls.Add(this.button21); + this.panel4.Controls.Add(this.button8); + this.panel4.Controls.Add(this.button3); + this.panel4.Controls.Add(this.button25); + this.panel4.Location = new System.Drawing.Point(236, 41); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(501, 32); + this.panel4.TabIndex = 63; + // + // button35 + // + this.button35.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button35.Location = new System.Drawing.Point(113, 3); + this.button35.Name = "button35"; + this.button35.Size = new System.Drawing.Size(41, 20); + this.button35.TabIndex = 61; + this.button35.Text = "Studio"; + this.button35.UseVisualStyleBackColor = true; + this.button35.Click += new System.EventHandler(this.button35_Click); + // + // UAButton + // + this.UAButton.Location = new System.Drawing.Point(0, 0); + this.UAButton.Name = "UAButton"; + this.UAButton.Size = new System.Drawing.Size(75, 23); + this.UAButton.TabIndex = 0; + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::NovetusLauncher.Properties.Resources.N; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox2.Location = new System.Drawing.Point(3, 3); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(43, 41); + this.pictureBox2.TabIndex = 7; + this.pictureBox2.TabStop = false; + // + // imageList1 + // + this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); + this.imageList1.TransparentColor = System.Drawing.Color.Transparent; + this.imageList1.Images.SetKeyName(0, "search.png"); + this.imageList1.Images.SetKeyName(1, "refresh.png"); + // + // button23 + // + this.button23.Location = new System.Drawing.Point(435, 3); + this.button23.Name = "button23"; + this.button23.Size = new System.Drawing.Size(75, 23); + this.button23.TabIndex = 71; + this.button23.Text = "Add Map..."; + this.button23.UseVisualStyleBackColor = true; + this.button23.Click += new System.EventHandler(this.button23_Click); + // // LauncherFormExtended // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1537,12 +1560,8 @@ namespace NovetusLauncher this.Text = "Novetus"; this.Closing += new System.ComponentModel.CancelEventHandler(this.MainFormClose); this.Load += new System.EventHandler(this.MainFormLoad); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.panel1.ResumeLayout(false); this.panel2.ResumeLayout(false); - this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); - this.panel4.ResumeLayout(false); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); @@ -1561,6 +1580,10 @@ namespace NovetusLauncher this.tabPage5.ResumeLayout(false); this.panel5.ResumeLayout(false); this.panel5.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -1741,5 +1764,7 @@ namespace NovetusLauncher private System.Windows.Forms.Label label6; private System.Windows.Forms.TextBox textBox7; private System.Windows.Forms.Label label3; + private System.Windows.Forms.ImageList imageList1; + private System.Windows.Forms.Button button23; } } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs index 5e073a5..3bab518 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.cs @@ -392,7 +392,7 @@ namespace NovetusLauncher } else { - MessageBox.Show("You do not have the 'Custom' option selected. Please select it before continuing."); + MessageBox.Show("You do not have the 'Custom' option selected. Please select it before continuing.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -441,6 +441,11 @@ namespace NovetusLauncher { launcherForm.ShowMasterServerWarning(); } + + private void button23_Click(object sender, EventArgs e) + { + launcherForm.AddNewMap(); + } #endregion } #endregion diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx index 1e97c92..5bdaf39 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Extended/LauncherFormExtended.resx @@ -117,6 +117,57 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0 + CQAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/xgAA/86AAH0Ae0BEQMA + AeoB8AH/LQAB/wHwAfMFAAH/Ae8BDgGSAfIC/wH0AbwBFQFtAf8rAAH/AewB6wEAAfUEAAGSARUB9AEA + Af8B8wH0Af8BAAH/Am0B/ykAAf8B7AHyAe8BFQH1AwAB8gEPAfQBAAHwAQ4BEQEOARQC8gEPAfcB/yYA + AfQB8QHzAe0B8gHvAfgB8QQAAesB7wEAAfIBDgHyAQAB/wEHAg4B8CYAAf8B9wEPAW0BQwEOAesB+AHx + BQABDgHzAQABbQEHBAAC8ycAAQcBbQH/AQAB/wGSARAB8gUAAf8BAAH/AQABDgH0AQAB8wbxAfIkAAEU + AfMDAAH/AQ8B/wUAAf8BAAH0AQABDwHzAQAB8wEOAQ8DEgEUAREkAAEQAf8EAAEVAfQGAAEVAfIBAAHr + Ae8CAAHyAQ4B8gIAAfMBESQAAfgBvAMAAfQBEQH/BgAB7AH3AQAB8wEOAQcB/wH0AW0BEQH/AQAB8wER + JAAB9AEQAQcB8wHwAUMB8AcAAfMBDwH/AQAB8gETAgAB6wH0Av8B8wERJQAB9AHsARIB+AHyCQAB7AHq + Af8CAAL/AQAB9AFtAREBvAERMwAB/wH4AREB7wHyAfMB8AH4AQ4BkgH3AQ4BETUAAfEB+AEVAREB6gHv + AfQCAAH3ARE+AAH/AQchAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAC/wH+ + AT8EAAL/AfABBwQAAf8BxwHAAQMEAAH/AYMBxAEhBAAB/wEDAYgBAQQAAfgBBwGRAQcEAAHgAQ8BkwHP + BAAB4gEfARIBAQQAAecBHwESAQEEAAHnAZ8BkwEZBAAB5wEfAZABCQQAAeABPwGIAQEEAAHwAX8BxgFB + BAAC/wHAAQEEAAL/AfABGQQAA/8B+QQACw== + + NOTE: - If you have a problem where you can't see your character, REGENERATE YOUR PLAYER ID THEN REJOIN THE SERVER. diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index 51fd21e..67ad57c 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -229,6 +229,11 @@ namespace NovetusLauncher GlobalFuncs.CreateAssetCacheDirectories(); + if (!Directory.Exists(GlobalPaths.MapsDirCustom)) + { + Directory.CreateDirectory(GlobalPaths.MapsDirCustom); + } + ProductVersionLabel.Text = Application.ProductVersion; LocalVars.important = SecurityFuncs.GenerateMD5(Assembly.GetExecutingAssembly().Location); NovetusVersionLabel.Text = GlobalVars.ProgramInformation.Version; @@ -519,7 +524,7 @@ namespace NovetusLauncher } catch (Exception) { - MessageBox.Show("The map '" + searchText + "' cannot be found. Please try another term."); + MessageBox.Show("The map '" + searchText + "' cannot be found. Please try another term.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -767,7 +772,7 @@ namespace NovetusLauncher GlobalFuncs.ConsolePrint("Config Saved.", 3, ConsoleBox); if (ShowBox) { - MessageBox.Show("Config Saved!"); + MessageBox.Show("Config Saved!", "Novetus - Config Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); } } @@ -796,7 +801,7 @@ namespace NovetusLauncher ReadConfigValues(); if (ShowBox) { - MessageBox.Show("Config Reset!"); + MessageBox.Show("Config Reset!", "Novetus - Config Reset", MessageBoxButtons.OK, MessageBoxIcon.Information); } } @@ -880,7 +885,7 @@ namespace NovetusLauncher if (!string.IsNullOrWhiteSpace(addon.getInstallOutcome())) { - MessageBox.Show(addon.getInstallOutcome()); + MessageBox.Show(addon.getInstallOutcome(), "Novetus - Addon Installed", MessageBoxButtons.OK, MessageBoxIcon.Information); } } @@ -890,11 +895,11 @@ namespace NovetusLauncher { Directory.Delete(GlobalPaths.AssetCacheDir, true); GlobalFuncs.ConsolePrint("Asset cache cleared!", 3, ConsoleBox); - MessageBox.Show("Asset cache cleared!"); + MessageBox.Show("Asset cache cleared!", "Novetus - Asset Cache Cleared", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { - MessageBox.Show("There is no asset cache to clear."); + MessageBox.Show("There is no asset cache to clear.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -923,10 +928,10 @@ namespace NovetusLauncher switch (box.Checked) { case false: - MessageBox.Show("Novetus will now restart.", title, MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Novetus will now restart.", title, MessageBoxButtons.OK, MessageBoxIcon.Warning); break; default: - MessageBox.Show("Novetus will now restart." + Environment.NewLine + subText, title, MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Novetus will now restart." + Environment.NewLine + subText, title, MessageBoxButtons.OK, MessageBoxIcon.Warning); break; } @@ -1161,6 +1166,42 @@ namespace NovetusLauncher break; } } + + public void AddNewMap() + { + using (var ofd = new OpenFileDialog()) + { + ofd.Filter = "ROBLOX Level (*.rbxl)|*.rbxl|ROBLOX Level (*.rbxlx)|*.rbxlx"; + ofd.FilterIndex = 1; + ofd.Title = "Load ROBLOX map"; + if (ofd.ShowDialog() == DialogResult.OK) + { + if (!Directory.Exists(GlobalPaths.MapsDirCustom)) + { + Directory.CreateDirectory(GlobalPaths.MapsDirCustom); + } + + string mapname = Path.GetFileName(ofd.FileName); + + try + { + GlobalFuncs.FixedFileCopy(ofd.FileName, GlobalPaths.MapsDirCustom + @"\\" + mapname, true, true); + } + catch (Exception ex) + { + MessageBox.Show("Novetus has experienced an error when adding your map file: " + ex.Message + "\n\nYour file has not been added. Please try again.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + finally + { + if (File.Exists(GlobalPaths.MapsDir + @"\\" + mapname)) + { + Tree.SelectedNode = TreeNodeHelper.SearchTreeView(mapname, Tree.Nodes); + MessageBox.Show("The map '" + mapname + "' was successfully added to Novetus!" , "Novetus - Map Upload Confirmation"); + } + } + } + } + } #endregion #region Helper Functions diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs index ac39108..c6fda32 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetSDK.cs @@ -151,7 +151,7 @@ public partial class AssetSDK : Form AssetDownloaderBatch_Status.Visible = false; - MessageBox.Show("Batch download complete! " + lines.Count() + " items downloaded!", "Novetus Item SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Batch download complete! " + lines.Count() + " items downloaded!", "Novetus Asset SDK - Download Complete", MessageBoxButtons.OK, MessageBoxIcon.Information); } } } @@ -256,7 +256,7 @@ public partial class AssetSDK : Form { if (hasOverrideWarningOpenedOnce == false) { - MessageBox.Show("By using the custom URL setting, you will override any selected entry in the default URL list. Keep this in mind before downloading anything with this option.\n\nAlso, the URL must be a asset url with 'asset/?id=' at the end of it in order for the Asset Downloader to work smoothly.", "Novetus Asset SDK | URL Override Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("By using the custom URL setting, you will override any selected entry in the default URL list. Keep this in mind before downloading anything with this option.\n\nAlso, the URL must be a asset url with 'asset/?id=' at the end of it in order for the Asset Downloader to work smoothly.", "Novetus Asset SDK - URL Override Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); hasOverrideWarningOpenedOnce = true; } } @@ -290,7 +290,7 @@ public partial class AssetSDK : Form { MeshConverter_StatusText.Text = "Ready"; string properName = Path.GetFileName(MeshConverter_OpenOBJDialog.FileName) + ".mesh"; - MessageBox.Show("File " + properName + " created!"); + MessageBox.Show("File " + properName + " created!", "Novetus Asset SDK - Mesh File Created", MessageBoxButtons.OK, MessageBoxIcon.Information); } #endregion diff --git a/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.cs b/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.cs index e14298d..d083288 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/ClientinfoCreator.cs @@ -263,11 +263,11 @@ public partial class ClientinfoEditor : Form label9.Text = "v2 (v" + GlobalVars.ProgramInformation.Version + ")"; - MessageBox.Show(SelectedClientInfoPath + "\\clientinfo.nov saved!", "Novetus Launcher - Novetus Client SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show(SelectedClientInfoPath + "\\clientinfo.nov saved!", "Novetus Client SDK - Clientinfo Saved", MessageBoxButtons.OK, MessageBoxIcon.Information); } else { - MessageBox.Show("You must save the into a seperate directory with a client in it, generate the IDs, then use this option.", "Novetus Launcher - Error when saving to client.", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("You must save the into a seperate directory with a client in it, generate the IDs, then use this option.", "Novetus Client SDK - Error when saving to client.", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -429,7 +429,7 @@ public partial class ClientinfoEditor : Form { if (string.IsNullOrWhiteSpace(SelectedClientInfoPath)) { - MessageBox.Show("Please choose the folder where you would like to save your clientinfo file.", "Novetus Launcher - Novetus Client SDK", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + MessageBox.Show("Please choose the folder where you would like to save your clientinfo file.", "Novetus Client SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); FolderBrowserDialog folderBrowserDialog1 = new FolderBrowserDialog(); if (folderBrowserDialog1.ShowDialog() == DialogResult.OK) @@ -457,7 +457,7 @@ public partial class ClientinfoEditor : Form } else { - MessageBox.Show("Cannot load '" + ClientName.Trim('/') + "'. Please make sure you saved the clientinfo.nov into the client directory and if the file exists.", "Novetus Launcher - Error while generating MD5 for client", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Cannot load '" + ClientName.Trim('/') + "'. Please make sure you saved the clientinfo.nov into the client directory and if the file exists.", "Novetus Client SDK - Error while generating MD5 for client", MessageBoxButtons.OK, MessageBoxIcon.Error); } string ClientScriptMD5 = File.Exists(SelectedClientInfoPath + "\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua") ? SecurityFuncs.GenerateMD5(SelectedClientInfoPath + "\\content\\scripts\\" + GlobalPaths.ScriptName + ".lua") : ""; @@ -468,7 +468,7 @@ public partial class ClientinfoEditor : Form } else { - MessageBox.Show("Cannot load '" + GlobalPaths.ScriptName + ".lua'. Please make sure you saved the clientinfo.nov into the client directory and if the file exists.", "Novetus Launcher - Error while generating MD5 for script", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Cannot load '" + GlobalPaths.ScriptName + ".lua'. Please make sure you saved the clientinfo.nov into the client directory and if the file exists.", "Novetus Client SDK - Error while generating MD5 for script", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs index e31f913..929ea1b 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/ItemCreationSDK.cs @@ -47,7 +47,7 @@ public partial class ItemCreationSDK : Form { if (string.IsNullOrWhiteSpace(ItemNameBox.Text)) { - MessageBox.Show("You must assign an item name before you change the icon.", "Novetus Item Creation SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("You must assign an item name before you change the icon.", "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } else { @@ -69,7 +69,7 @@ public partial class ItemCreationSDK : Form if (!string.IsNullOrWhiteSpace(icon.getInstallOutcome())) { - MessageBox.Show(icon.getInstallOutcome()); + MessageBox.Show(icon.getInstallOutcome(), "Novetus Item Creation SDK - Icon Copy Completed", MessageBoxButtons.OK, MessageBoxIcon.Information); } Image icon1 = GlobalFuncs.LoadImage(icon.ItemDir + "\\" + icon.ItemName.Replace(" ", "") + ".png", ""); @@ -85,7 +85,7 @@ public partial class ItemCreationSDK : Form } else { - MessageBox.Show("An icon with this item's name already exists. Please change the item's name.", "Novetus Item Creation SDK", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("An icon with this item's name already exists. Please change the item's name.", "Novetus Item Creation SDK - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -232,7 +232,7 @@ public partial class ItemCreationSDK : Form DescBox.Text )) { - DialogResult LaunchCharCustom = MessageBox.Show("The creation of your item, " + ItemNameBox.Text + ", is successful! Would you like to test your item out in Character Customization?", "Novetus Item Creation SDK", MessageBoxButtons.YesNo, MessageBoxIcon.Information); + DialogResult LaunchCharCustom = MessageBox.Show("The creation of your item, " + ItemNameBox.Text + ", is successful! Would you like to test your item out in Character Customization?", "Novetus Item Creation SDK - Item Creation Success", MessageBoxButtons.YesNo, MessageBoxIcon.Information); if (LaunchCharCustom == DialogResult.Yes) { @@ -382,7 +382,7 @@ public partial class ItemCreationSDK : Form if (!passed) { msgboxtext += "\n\nThese requirements must be fullfiled before the item can be created."; - MessageBox.Show(msgboxtext, "Novetus Item Creation SDK", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(msgboxtext, "Novetus Item Creation SDK - Requirements", MessageBoxButtons.OK, MessageBoxIcon.Error); } return passed; diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs index 87bf8be..c4c7e36 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs @@ -80,7 +80,7 @@ public partial class NovetusSDK : Form dio.Show(); break; case SDKApps.ClientScriptTester: - MessageBox.Show("Note: If you want to test a specific way of loading a client, select the ClientScript Tester in the 'Versions' tab of the Novetus Launcher, then launch it through any way you wish."); + MessageBox.Show("Note: If you want to test a specific way of loading a client, select the ClientScript Tester in the 'Versions' tab of the Novetus Launcher, then launch it through any way you wish.", "Novetus SDK - Client Script Tester Help", MessageBoxButtons.OK, MessageBoxIcon.Information); #if LAUNCHER GlobalFuncs.LaunchRBXClient("ClientScriptTester", ScriptType.Client, false, false, null, null); #else diff --git a/Novetus/NovetusLauncher/Forms/ServerBrowser.cs b/Novetus/NovetusLauncher/Forms/ServerBrowser.cs index 810c7a9..b5e2127 100644 --- a/Novetus/NovetusLauncher/Forms/ServerBrowser.cs +++ b/Novetus/NovetusLauncher/Forms/ServerBrowser.cs @@ -66,14 +66,14 @@ namespace NovetusLauncher } else { - MessageBox.Show("There are no servers available on this master server."); + MessageBox.Show("There are no servers available on this master server.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } ServerListView.EndUpdate(); } catch (Exception ex) { - MessageBox.Show("Unable to load servers. (" + ex + ")"); + MessageBox.Show("Unable to load servers. (" + ex + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } @@ -98,7 +98,7 @@ namespace NovetusLauncher } else { - MessageBox.Show("Select a server before joining it."); + MessageBox.Show("Select a server before joining it.", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } catch (Exception) diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index fb9bfb7..9e962f4 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -312,6 +312,7 @@ + diff --git a/Novetus/NovetusLauncher/Resources/refresh.png b/Novetus/NovetusLauncher/Resources/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..e7fec3e89dd3cec4a26a10e25582b22a13ec97af GIT binary patch literal 504 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0gXvSK~yMHjncm> zMo}Ec@$*om{7eR{Oph{!V4w`mot(v{cZ$srzYPrk(0%5@5wt_lIjKY!?x3O?MKjQdT22w}v4mfzQN`x*iWPLC u5IW!b0^`uJ(hPNC{uPZ_1{L`u#(V*E;ZSSxSWbBW0000h^j!8g;Ti3Xo!%ve1NCc?uh|qT)h@xU@Ef zv}5)8`?)k_>MI`~;#wi1%Xo%&m%|&jBj*p=u(hQINbxx|ax#|#jWaMZ5@FDER7guq zNvYx%Yhl`9?z;14N_{~`7uN?)ufP94sr)|qntxt^W{83A?Y7Cit+nFI{Z`n7WH2;X z3FxytDt6ez*)g|qM#cuoj>`%@78lr)0)A|2sAM@1s$kY=@UVedVut*U9Y0zZ)QB+n zF9=w0_|O>%-X-@LKh`PKojG&lOIVQ4n>{T0kAn(%n>i*ZO=8f9da}gD{B+jLUm9Ip zK2MS!S19C6^r;dlWqq-!lkgTe~DWM4f Dd(x9R literal 0 HcmV?d00001