diff --git a/ArchiSteamFarm.sln b/ArchiSteamFarm.sln index bc4ce775b..437de2ab7 100644 --- a/ArchiSteamFarm.sln +++ b/ArchiSteamFarm.sln @@ -10,6 +10,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigGenerator", "ConfigGe {35AF7887-08B9-40E8-A5EA-797D8B60B30C} = {35AF7887-08B9-40E8-A5EA-797D8B60B30C} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GUI", "GUI\GUI.csproj", "{13949B41-787C-4558-90AE-A9F9E7F86B1F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -24,6 +26,10 @@ Global {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3F6FE68-5E75-415E-BEA1-1E7C16D6A433}.Release|Any CPU.Build.0 = Release|Any CPU + {13949B41-787C-4558-90AE-A9F9E7F86B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13949B41-787C-4558-90AE-A9F9E7F86B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13949B41-787C-4558-90AE-A9F9E7F86B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13949B41-787C-4558-90AE-A9F9E7F86B1F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ArchiSteamFarm/Properties/AssemblyInfo.cs b/ArchiSteamFarm/Properties/AssemblyInfo.cs index 201de5b1d..07e9c4230 100644 --- a/ArchiSteamFarm/Properties/AssemblyInfo.cs +++ b/ArchiSteamFarm/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using ArchiSteamFarm; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("ArchiSteamFarm")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription(SharedInfo.ServiceDescription)] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("ArchiSteamFarm")] diff --git a/ConfigGenerator/Properties/AssemblyInfo.cs b/ConfigGenerator/Properties/AssemblyInfo.cs index af8ea2e46..59195ce78 100644 --- a/ConfigGenerator/Properties/AssemblyInfo.cs +++ b/ConfigGenerator/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using ArchiSteamFarm; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("ConfigGenerator")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription(SharedInfo.ServiceDescription)] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("ConfigGenerator")] diff --git a/GUI/App.config b/GUI/App.config new file mode 100644 index 000000000..731f6de6c --- /dev/null +++ b/GUI/App.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/GUI/Form1.Designer.cs b/GUI/Form1.Designer.cs new file mode 100644 index 000000000..3f923bdf0 --- /dev/null +++ b/GUI/Form1.Designer.cs @@ -0,0 +1,34 @@ +namespace GUI { + partial class Form1 { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Text = "Form1"; + } + + #endregion + } +} + diff --git a/GUI/Form1.cs b/GUI/Form1.cs new file mode 100644 index 000000000..42f2a7bb7 --- /dev/null +++ b/GUI/Form1.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace GUI { + public partial class Form1 : Form { + public Form1() { + InitializeComponent(); + } + } +} diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj new file mode 100644 index 000000000..ecd221439 --- /dev/null +++ b/GUI/GUI.csproj @@ -0,0 +1,198 @@ + + + + + Debug + AnyCPU + {13949B41-787C-4558-90AE-A9F9E7F86B1F} + WinExe + Properties + GUI + GUI + v4.6.1 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + cirno.ico + + + + ..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll + True + + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\NLog.4.4.0-betaV15\lib\net45\NLog.dll + True + + + ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll + True + + + ..\packages\SteamKit2.1.8.0\lib\net45\SteamKit2.dll + True + + + + + + + + + + + + + + + + + + + + + + ArchiHandler.cs + + + ArchiWebHandler.cs + + + ASF.cs + + + Bot.cs + + + BotConfig.cs + + + BotDatabase.cs + + + CardsFarmer.cs + + + ConcurrentEnumerator.cs + + + ConcurrentHashSet.cs + + + CryptoHelper.cs + + + Debugging.cs + + + GlobalConfig.cs + + + GlobalDatabase.cs + + + InMemoryServerListProvider.cs + + + IPAddressConverter.cs + + + IPEndPointConverter.cs + + + JSON\GitHub.cs + + + JSON\Steam.cs + + + Logging.cs + + + MobileAuthenticator.cs + + + Runtime.cs + + + SharedInfo.cs + + + Trading.cs + + + Utilities.cs + + + WCF.cs + + + WebBrowser.cs + + + Form + + + Form1.cs + + + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + True + Settings.settings + True + + + + + + + + + + + \ No newline at end of file diff --git a/GUI/Program.cs b/GUI/Program.cs new file mode 100644 index 000000000..736776227 --- /dev/null +++ b/GUI/Program.cs @@ -0,0 +1,40 @@ +using System; +using System.Windows.Forms; +using GUI; + +// ReSharper disable once CheckNamespace +namespace ArchiSteamFarm { + internal static class Program { + internal static bool IsRunningAsService => false; + + internal static GlobalConfig GlobalConfig { get; private set; } + internal static GlobalDatabase GlobalDatabase { get; private set; } + internal static WebBrowser WebBrowser { get; private set; } + + internal static string GetUserInput(SharedInfo.EUserInputType userInputType, string botName = SharedInfo.ASF, string extraInformation = null) { + return null; + } + + internal static void Exit() { + + } + + internal static void Restart() { + + } + + internal static void OnBotShutdown() { + + } + + /// + /// The main entry point for the application. + /// + [STAThread] + private static void Main() { + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + Application.Run(new Form1()); + } + } +} diff --git a/GUI/Properties/AssemblyInfo.cs b/GUI/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..40da6b374 --- /dev/null +++ b/GUI/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.InteropServices; +using ArchiSteamFarm; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("GUI")] +[assembly: AssemblyDescription(SharedInfo.ServiceDescription)] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("GUI")] +[assembly: AssemblyCopyright(SharedInfo.Copyright)] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("13949b41-787c-4558-90ae-a9f9e7f86b1f")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion(SharedInfo.VersionNumber)] +[assembly: AssemblyFileVersion(SharedInfo.VersionNumber)] diff --git a/GUI/Properties/Resources.Designer.cs b/GUI/Properties/Resources.Designer.cs new file mode 100644 index 000000000..78995be21 --- /dev/null +++ b/GUI/Properties/Resources.Designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GUI.Properties { + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if ((resourceMan == null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GUI.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx new file mode 100644 index 000000000..af7dbebba --- /dev/null +++ b/GUI/Properties/Resources.resx @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUI/Properties/Settings.Designer.cs b/GUI/Properties/Settings.Designer.cs new file mode 100644 index 000000000..e9d336887 --- /dev/null +++ b/GUI/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GUI.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings) (global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/GUI/Properties/Settings.settings b/GUI/Properties/Settings.settings new file mode 100644 index 000000000..39645652a --- /dev/null +++ b/GUI/Properties/Settings.settings @@ -0,0 +1,7 @@ + + + + + + + diff --git a/GUI/cirno.ico b/GUI/cirno.ico new file mode 100644 index 000000000..1d8c2e1eb Binary files /dev/null and b/GUI/cirno.ico differ diff --git a/GUI/packages.config b/GUI/packages.config new file mode 100644 index 000000000..bc443600d --- /dev/null +++ b/GUI/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file