Merge pull request #172 from AraHaan/Installer-Updates

Updated Installer See Commits for Details.

WindowsInstaller/BetterDiscordWI/App.manifest

@@ -9,4 +9,4 @@
       </requestedPrivileges>
     </security>
   </trustInfo>
-</assembly>
+</assembly>

WindowsInstaller/BetterDiscordWI/BetterDiscordWI.csproj

@@ -33,7 +33,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>BetterDiscord-icon.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\BetterDiscord-icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup />
   <PropertyGroup>
@@ -144,7 +144,7 @@
     <None Include="Resources\bd_logo_large_nobg.png" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="BetterDiscord-icon.ico" />
+    <Content Include="Resources\BetterDiscord-icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

WindowsInstaller/BetterDiscordWI/panels/Panel1.Designer.cs

@@ -34,6 +34,8 @@
             this.tbPath = new BetterDiscordWI.components.CTextBox();
             this.label3 = new System.Windows.Forms.Label();
             this.cbRestart = new System.Windows.Forms.CheckBox();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.checkBox2 = new System.Windows.Forms.CheckBox();
             this.SuspendLayout();
             // 
             // label1
@@ -94,10 +96,35 @@
             this.cbRestart.Text = "Restart Discord after installation";
             this.cbRestart.UseVisualStyleBackColor = true;
             // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(23, 140);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(137, 17);
+            this.checkBox1.TabIndex = 7;
+            this.checkBox1.Text = "Install to DiscordCanary";
+            this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Location = new System.Drawing.Point(23, 163);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(436, 17);
+            this.checkBox2.TabIndex = 8;
+            this.checkBox2.Text = "Install to DiscordPTB (Can break at any time)(Installer will be updated frequentl" +
+    "y for this)";
+            this.checkBox2.UseVisualStyleBackColor = true;
+            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
+            // 
             // Panel1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.checkBox2);
+            this.Controls.Add(this.checkBox1);
             this.Controls.Add(this.cbRestart);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.tbPath);
@@ -119,5 +146,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.CheckBox cbRestart;
         internal components.CTextBox tbPath;
+        private System.Windows.Forms.CheckBox checkBox1;
+        private System.Windows.Forms.CheckBox checkBox2;
     }
 }

WindowsInstaller/BetterDiscordWI/panels/Panel1.cs

@@ -69,5 +69,121 @@ namespace BetterDiscordWI.panels
 
             tbPath.Text = fbd.SelectedPath;
         }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e)
+        {
+            if (checkBox1.Checked == true)
+            {
+                checkBox2.Checked = false;
+                String[] directories = Directory.GetDirectories(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\DiscordCanary");
+
+                String highestVersion = null;
+
+                foreach (String s in directories)
+                {
+                    Debug.Print(s);
+                    if (!s.Contains("app-")) continue;
+                    if (String.IsNullOrEmpty(highestVersion))
+                    {
+                        highestVersion = s;
+                        continue;
+                    }
+
+                    if (String.CompareOrdinal(s, highestVersion) > 0)
+                    {
+                        highestVersion = s;
+                    }
+                }
+
+
+                tbPath.Text = highestVersion;
+            }
+            if (checkBox1.Checked == false)
+            {
+                if (checkBox2.Checked == false)
+                {
+                    String[] directories = Directory.GetDirectories(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\Discord");
+
+                    String highestVersion = null;
+
+                    foreach (String s in directories)
+                    {
+                        Debug.Print(s);
+                        if (!s.Contains("app-")) continue;
+                        if (String.IsNullOrEmpty(highestVersion))
+                        {
+                            highestVersion = s;
+                            continue;
+                        }
+
+                        if (String.CompareOrdinal(s, highestVersion) > 0)
+                        {
+                            highestVersion = s;
+                        }
+                    }
+
+
+                    tbPath.Text = highestVersion;
+                }
+            }
+        }
+
+        private void checkBox2_CheckedChanged(object sender, EventArgs e)
+        {
+            if (checkBox2.Checked == true)
+            {
+                checkBox1.Checked = false;
+                String[] directories = Directory.GetDirectories(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\DiscordPTB");
+
+                String highestVersion = null;
+
+                foreach (String s in directories)
+                {
+                    Debug.Print(s);
+                    if (!s.Contains("app-")) continue;
+                    if (String.IsNullOrEmpty(highestVersion))
+                    {
+                        highestVersion = s;
+                        continue;
+                    }
+
+                    if (String.CompareOrdinal(s, highestVersion) > 0)
+                    {
+                        highestVersion = s;
+                    }
+                }
+
+
+                tbPath.Text = highestVersion;
+            }
+            if (checkBox2.Checked == false)
+            {
+                if (checkBox1.Checked == false)
+                {
+                    String[] directories = Directory.GetDirectories(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\Discord");
+
+                    String highestVersion = null;
+
+                    foreach (String s in directories)
+                    {
+                        Debug.Print(s);
+                        if (!s.Contains("app-")) continue;
+                        if (String.IsNullOrEmpty(highestVersion))
+                        {
+                            highestVersion = s;
+                            continue;
+                        }
+
+                        if (String.CompareOrdinal(s, highestVersion) > 0)
+                        {
+                            highestVersion = s;
+                        }
+                    }
+
+
+                    tbPath.Text = highestVersion;
+                }
+            }
+        }
     }
 }

WindowsInstaller/BetterDiscordWI/panels/Panel2.cs

@@ -234,13 +234,13 @@ namespace BetterDiscordWI.panels
                             }
                             if (GetParent().DiscordPath.Contains("DiscordPTB\\"))
                             {
-                                //"mainWindow = new _browserWindow2"
                                 if (line.Contains("var _discord_overlay2"))
                                 {
                                     lines.Add(line);
                                     lines.Add("var _betterDiscord = require('betterdiscord');");
                                 }
-                                else if (line.Contains("mainWindow = new _browserWindow2"))
+                                //"mainWindow = new _browserWindow2" was changed in DiscordPTB v0.0.6
+                                else if (line.Contains("mainWindow = new _electron.BrowserWindow"))
                                 {
                                     lines.Add(line);
                                     lines.Add(File.ReadAllText("splice"));

WindowsInstaller/README.md

@@ -0,0 +1,2 @@
+## To Compile Move the DLL's folder to ``BetterDiscordWI\bin``
+## Enjoy Building the Installer.

WindowsInstaller/dlls/README.md

@@ -0,0 +1,102 @@
+# BetterDiscordApp
+
+If you have issues then join the BD Discord server: [Here](https://discord.gg/0Tmfo5ZbORCRqbAd)
+If your Discord breaks then uninstall BD and try again 
+# Do not contact Discord support about BD issues. 
+
+Better Discord App enhances Discord desktop app with new features.
+
+![ss](http://i.imgur.com/P0XEyp6.jpg)
+
+## Windows Universal Installer
+* Download the latest installer from [releases](https://github.com/Jiiks/BetterDiscordApp/releases)
+* Follow the instructions
+* .NET 4.0 required https://www.microsoft.com/en-us/download/details.aspx?id=30653
+* Windows Installer users asar.net https://github.com/Jiiks/asar.net
+
+## Auto Installation
+* Download the latest package from [releases](https://github.com/Jiiks/BetterDiscordApp/releases)
+* Run the installer
+* Installer requires [node](https://nodejs.org/en/download/) download the binaries and place in the same folder as the installer if you don't have node installed.
+* Installer uses [asar](https://github.com/atom/asar) which is bundled with the installer.
+* Installer uses [wrench](https://github.com/ryanmcgrath/wrench-js) which is bundled with the installer.
+
+## Manual Installation
+* Extract app.asar
+* Add BetterDiscord as a dependency
+* Add init to Discord load event
+* Move BetterDiscord to node_modules
+
+## Features
+
+**Emotes:**
+BetterDiscord adds all [Twitch.tv](http://twitch.tv), most [FrankerFaceZ](http://frankerfacez.com) and [BetterTTV](http://betterttv.net) emotes to Discord. Supported emotes: https://betterdiscord.net/emotes
+
+**Quick Emote Menu:**
+Quick Emote Menu adds a menu for quickly adding twitch emotes and your favorite emotes.
+
+**Emote Autocapitalize:**
+Automatically capitalize [Twitch.tv](http://twitch.tv) global emotes.
+
+**Emote Autocomplete:**
+Automatically completes/suggests emotes.(soon)
+
+**Minimal Mode:**
+Minimal mode makes elements smaller and hides certain elements.
+
+**Voice Chat Mode:**
+Only display voice channels
+
+**Public Servers:**
+A menu for displaying public servers. [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/data/serverlist.json)
+
+**Custom CSS**
+BetterDiscord supports custom CSS for styling Discord to your liking.
+
+**Custom Themes**
+BetterDiscord comes with a theme loader for loading your own or downloading themes made by others.
+
+**Plugins**
+BetterDiscord comes with a JavaSCript plugin loader for loading your own or downloading plugins made by others.
+
+**Spoilers**
+Add spoilers to your chat, simply add [!s] to your message.
+
+**Save Logs Locally:**
+Save chatlogs locally.(soon)
+
+## Adding you server to public servers
+Edit the [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/data/serverlist.json) and submit a pull request.
+
+## BetterDiscord Uses the following API's
+* https://twitchemotes.com/apidocs for Twitch emotes
+* https://api.betterttv.net/emotes for [BetterTTV](https://nightdev.com/betterttv/) emotes
+
+## Credits
+* MacOS Installer by [Candunc](https://github.com/Candunc) 
+* Emote titles by [pendo324](https://github.com/pendo324)
+* Majority of FFZ emote work by [Pohky] (https://github.com/pohky)
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Jiiks | [Jiiks.net] (https://jiiks.net)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

WindowsInstaller/dlls/splice

@@ -0,0 +1,2 @@
+_betterDiscord = new _betterDiscord.BetterDiscord(mainWindow);
+_betterDiscord.init();