diff --git a/scr/SCMBot/Main.Designer.cs b/scr/SCMBot/Main.Designer.cs index 68282dd..dd28fc0 100644 --- a/scr/SCMBot/Main.Designer.cs +++ b/scr/SCMBot/Main.Designer.cs @@ -64,6 +64,9 @@ private void InitializeComponent() this.stopSelectedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.stopAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.recentListView = new System.Windows.Forms.ListView(); this.columnHeader13 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); @@ -132,6 +135,8 @@ private void InitializeComponent() this.toolStripImage = new System.Windows.Forms.ToolStripStatusLabel(); this.StatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.ProgressBar1 = new System.Windows.Forms.ToolStripProgressBar(); + this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.DonateBox = new System.Windows.Forms.PictureBox(); this.loginButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -308,6 +313,8 @@ private void InitializeComponent() resources.GetString("resellComboBox.Items2")}); resources.ApplyResources(this.resellComboBox, "resellComboBox"); this.resellComboBox.Name = "resellComboBox"; + this.resellComboBox.SelectedIndexChanged += new System.EventHandler(this.resellComboBox_SelectedIndexChanged); + this.resellComboBox.Click += new System.EventHandler(this.resellComboBox_Click); // // wishpriceBox // @@ -415,7 +422,10 @@ private void InitializeComponent() this.startSelectedMenuItem, this.stopSelectedMenuItem, this.startAllMenuItem, - this.stopAllMenuItem}); + this.stopAllMenuItem, + this.toolStripMenuItem1, + this.exportListToolStripMenuItem, + this.importListToolStripMenuItem}); this.contextMenuStrip3.Name = "contextMenuStrip3"; resources.ApplyResources(this.contextMenuStrip3, "contextMenuStrip3"); // @@ -454,6 +464,25 @@ private void InitializeComponent() resources.ApplyResources(this.stopAllMenuItem, "stopAllMenuItem"); this.stopAllMenuItem.Click += new System.EventHandler(this.stopAllToolStripMenuItem_Click); // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + resources.ApplyResources(this.toolStripMenuItem1, "toolStripMenuItem1"); + // + // exportListToolStripMenuItem + // + this.exportListToolStripMenuItem.Image = global::SCMBot.Properties.Resources.export; + this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; + resources.ApplyResources(this.exportListToolStripMenuItem, "exportListToolStripMenuItem"); + this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); + // + // importListToolStripMenuItem + // + this.importListToolStripMenuItem.Image = global::SCMBot.Properties.Resources.import; + this.importListToolStripMenuItem.Name = "importListToolStripMenuItem"; + resources.ApplyResources(this.importListToolStripMenuItem, "importListToolStripMenuItem"); + this.importListToolStripMenuItem.Click += new System.EventHandler(this.importListToolStripMenuItem_Click); + // // tabPage2 // this.tabPage2.Controls.Add(this.recentListView); @@ -970,6 +999,16 @@ private void InitializeComponent() this.ProgressBar1.Name = "ProgressBar1"; resources.ApplyResources(this.ProgressBar1, "ProgressBar1"); // + // saveFileDialog1 + // + this.saveFileDialog1.DefaultExt = "*.bin"; + resources.ApplyResources(this.saveFileDialog1, "saveFileDialog1"); + // + // openFileDialog1 + // + this.openFileDialog1.DefaultExt = "*.bin"; + resources.ApplyResources(this.openFileDialog1, "openFileDialog1"); + // // DonateBox // resources.ApplyResources(this.DonateBox, "DonateBox"); @@ -998,7 +1037,6 @@ private void InitializeComponent() this.Controls.Add(this.groupBox2); this.Controls.Add(this.label15); this.Controls.Add(this.DonateBox); - this.DoubleBuffered = true; this.Name = "Main"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Main_FormClosing); this.Load += new System.EventHandler(this.Main_Load); @@ -1154,6 +1192,11 @@ private void InitializeComponent() private System.Windows.Forms.Label label18; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.ComboBox filterTypeBox; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem importListToolStripMenuItem; + private System.Windows.Forms.SaveFileDialog saveFileDialog1; + private System.Windows.Forms.OpenFileDialog openFileDialog1; } } diff --git a/scr/SCMBot/Main.cs b/scr/SCMBot/Main.cs index 89e0125..7c83678 100644 --- a/scr/SCMBot/Main.cs +++ b/scr/SCMBot/Main.cs @@ -7,6 +7,9 @@ using System.Windows.Forms.DataVisualization.Charting; using System.Collections.Generic; using System.Linq; +using System.IO; +using System.Runtime.Serialization.Formatters.Binary; +using System.Text.RegularExpressions; // Внимание! Данная наработка - всего-лишь грубая реализация идеи. @@ -50,6 +53,7 @@ public partial class Main : Form private Size lastFrmSize; private Point lastFrmPos; + private bool ResComboClicked = false; public Main() { @@ -86,7 +90,7 @@ private void Main_Load(object sender, EventArgs e) settingsForm.intLangComboBox.DisplayMember = "NativeName"; settingsForm.intLangComboBox.ValueMember = "Name"; - steam_srch.cookieCont = ReadCookiesFromDisk(cockPath); + steam_srch.cookieCont = (CookieContainer)LoadBinary(cockPath); steam_srch.scanID = 0; filterTypeBox.SelectedIndex = 1; @@ -101,6 +105,13 @@ private void Main_Load(object sender, EventArgs e) loginButton.PerformClick(); setNotifyText(Strings.NotLogged); + + + openFileDialog1.FileName = "scmbot_list_"; + string AppPath = Path.GetDirectoryName(Application.ExecutablePath); + openFileDialog1.InitialDirectory = AppPath; + saveFileDialog1.InitialDirectory = AppPath; + } private void Main_Shown(object sender, EventArgs e) @@ -166,6 +177,9 @@ private void LoadSettings(bool loadtabs) splitContainer1.Panel2Collapsed = settings.hideInvent; minimizeOnClosingToolStripMenuItem.Checked = settings.minOnClose; + lastFrmPos = this.Location; + lastFrmSize = this.Size; + if (settings.formParams == null) { settings.formParams = new MainFormParams(this.Size, this.Location, this.WindowState, @@ -326,15 +340,15 @@ private void LoadTabs(saveTabLst lst) private void SaveTabs(saveTabLst lst) { if (scanItems.Count != 0) - { - for (int i = 0; i < scanItems.Count; i++) + { + for (int i = 0; i < scanItems.Count; i++) { - lst.Add(scanItems[i].Steam.scanInput); - } + lst.Add(scanItems[i].Steam.scanInput); + } - if (scanListView.SelectedIndices.Count != 0) - lst.Position = scanListView.SelectedIndices[0]; - else lst.Position = 0; + if (scanListView.SelectedIndices.Count != 0) + lst.Position = scanListView.SelectedIndices[0]; + else lst.Position = 0; } } @@ -554,7 +568,6 @@ public void Event_Message(object sender, object data, int searchId, flag myflag, item.Name = info.P1; item.ImgLink = info.P2; - scanListView.Items[searchId].SubItems[1].Text = info.P1; SetColumnWidths(scanListView, true); @@ -625,11 +638,12 @@ public void Event_Message(object sender, object data, int searchId, flag myflag, break; case flag.ActPrice: - string sweet2 = MainScanItem.LogItem.DoFracture(message); + var lowprice2 = ((StrParam)data).P1; + if (isFirstTab) { - scanItems[searchId].Steam.scanInput.ResellPrice = sweet2; + scanItems[searchId].Steam.scanInput.ResellPrice = lowprice2; scanItems[searchId].Steam.scanInput.ResellType = 2; if (scanListView.SelectedIndices[0] == searchId) { @@ -639,7 +653,7 @@ public void Event_Message(object sender, object data, int searchId, flag myflag, else { - steam_srch.recentInputList[searchId].ResellPrice = sweet2; + steam_srch.recentInputList[searchId].ResellPrice = lowprice2; steam_srch.recentInputList[searchId].ResellType = 2; if (recentListView.SelectedIndices[0] == searchId) @@ -1051,7 +1065,7 @@ private void Main_FormClosing(object sender, FormClosingEventArgs e) } else { - WriteCookiesToDisk(cockPath, steam_srch.cookieCont); + SaveBinary(cockPath, steam_srch.cookieCont); SaveSettings(true); } } @@ -1787,7 +1801,7 @@ private void deleteSelected() if (isFirstTab) { - if (scanListView.SelectedItems.Count != 0) + if ((scanListView.SelectedItems.Count != 0) && (scanItems.Count != 0)) { for (int i = 0; i < scanListView.Items.Count; i++) { @@ -1989,16 +2003,11 @@ private void scanListView_MouseUp(object sender, MouseEventArgs e) stopSelectedMenuItem.Enabled = block; deleteMenuItem.Enabled = block; - if (scanListView.Items.Count == 0) - { - startAllMenuItem.Enabled = false; - stopAllMenuItem.Enabled = false; - } - else - { - startAllMenuItem.Enabled = true; - stopAllMenuItem.Enabled = true; - } + bool block2 = !(scanListView.Items.Count == 0); + + startAllMenuItem.Enabled = block2; + stopAllMenuItem.Enabled = block2; + exportListToolStripMenuItem.Enabled = block2; } } @@ -2131,26 +2140,46 @@ private void InventoryList_SelectedIndexChanged(object sender, EventArgs e) } + public static StrParam GetFromLink(string url) + { + string markname = string.Empty; + + string appId = Regex.Match(url, "(?<=listings/)(.*)(?=/)").ToString(); + + if (url.Contains('?')) + markname = Regex.Match(url, "(?<=" + appId + @"/)(.*)(?=\?)").ToString(); + else + markname = url.Substring(url.IndexOf(appId) + 4); + + return new StrParam(appId, markname); + } + - //Not used temporary private void resellComboBox_SelectedIndexChanged(object sender, EventArgs e) { if (settings.loadActual) { - if ((resellComboBox.SelectedIndex == 2) && (steam_srch.Logged)) + if (ResComboClicked) { - if (isFirstTab) - { - var ourItem = scanItems[scanListView.SelectedIndices[0]].Steam.scanInput; - //steam_srch.GetPriceTread(ourItem.Link, scanListView.SelectedIndices[0], false); - } - else + ResComboClicked = false; + + if ((resellComboBox.SelectedIndex == 2) && (steam_srch.Logged)) { - var ourItem = steam_srch.recentInputList[recentListView.SelectedIndices[0]]; - // steam_srch.GetPriceTread(ourItem.Link, recentListView.SelectedIndices[0], false); - } + if (isFirstTab) + { + var ourItem = scanItems[scanListView.SelectedIndices[0]].Steam.scanInput; + var param = GetFromLink(ourItem.Link); + steam_srch.GetPriceTread(param.P1, param.P2, scanListView.SelectedIndices[0], false); + } + else + { + var ourItem = steam_srch.recentInputList[recentListView.SelectedIndices[0]]; + var param = GetFromLink(ourItem.Link); + steam_srch.GetPriceTread(param.P1, param.P2, recentListView.SelectedIndices[0], false); + } - resellPriceBox.Text = Strings.Loading; + resellPriceBox.Text = Strings.Loading; + } } } } @@ -2230,7 +2259,7 @@ private void ClearGraph() private void button4_Click(object sender, EventArgs e) { - if (isFirstTab) + if (isFirstTab && (scanListView.SelectedIndices.Count != 0)) { ClearGraph(); @@ -2277,6 +2306,7 @@ private void button4_Click(object sender, EventArgs e) graphFrm.chart1.ChartAreas[0].AxisY.StripLines.Add(stripWished); graphFrm.Show(); + } } @@ -2347,6 +2377,7 @@ private void scanListView_DragDrop(object sender, DragEventArgs e) ListViewItem insertItem = (ListViewItem)dragItem.Clone(); scanListView.Items.Insert(itemIndex, insertItem); scanListView.Items.Remove(dragItem); + insertItem.Selected = true; } } @@ -2423,6 +2454,7 @@ private void recentListView_DragDrop(object sender, DragEventArgs e) ListViewItem insertItem = (ListViewItem)dragItem.Clone(); recentListView.Items.Insert(itemIndex, insertItem); recentListView.Items.Remove(dragItem); + insertItem.Selected = true; } } @@ -2455,6 +2487,66 @@ private void Main_Resize(object sender, EventArgs e) splitContainer3.Refresh(); } + private void exportListToolStripMenuItem_Click(object sender, EventArgs e) + { + saveFileDialog1.FileName = "scmbot_list_" + DateTime.Now.ToString("dd_MM_yyyy"); + + if (saveFileDialog1.ShowDialog() == DialogResult.OK) + { + if (isFirstTab) + { + saveTabLst lst = new saveTabLst(); + SaveTabs(lst); + SaveBinary(saveFileDialog1.FileName, lst); + } + else + { + SaveBinary(saveFileDialog1.FileName, steam_srch.recentInputList); + } + } + } + + + private void importListToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + + try + { + saveTabLst lst = (saveTabLst)LoadBinary(openFileDialog1.FileName); + if (lst != null) + { + + if (isFirstTab) + { + scanItems.Clear(); + scanListView.Items.Clear(); + LoadTabs(lst); + } + else + { + recentListView.Items.Clear(); + steam_srch.recentInputList.Clear(); + steam_srch.recentInputList = lst; + LoadRecent(steam_srch.recentInputList); + } + } + else + MessageBox.Show("Bin-file is not correct!", Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error); + + } + catch (Exception) + { + //dummy + } + } + } + + private void resellComboBox_Click(object sender, EventArgs e) + { + ResComboClicked = true; + } } } diff --git a/scr/SCMBot/Main.resx b/scr/SCMBot/Main.resx index d783bf4..ca6adcc 100644 --- a/scr/SCMBot/Main.resx +++ b/scr/SCMBot/Main.resx @@ -137,6 +137,25 @@ Horizontal + + + True + + + NoControl + + + 33, 12 + + + 34, 13 + + + 64 + + + Name + NameLabel @@ -149,6 +168,27 @@ 0 + + NoControl + + + 12, 186 + + + 95, 26 + + + 56 + + + Copy + + + MiddleRight + + + ImageBeforeText + button3 @@ -161,6 +201,15 @@ 1 + + 84, 9 + + + 126, 20 + + + 63 + nameTextBox @@ -173,6 +222,24 @@ 2 + + True + + + NoControl + + + 9, 36 + + + 63, 13 + + + 54 + + + Link to Item + label14 @@ -185,6 +252,15 @@ 3 + + 84, 33 + + + 126, 20 + + + 50 + linkTextBox @@ -197,6 +273,27 @@ 4 + + NoControl + + + 115, 186 + + + 96, 26 + + + 52 + + + Start + + + MiddleRight + + + ImageBeforeText + scanButton @@ -209,6 +306,24 @@ 5 + + 84, 81 + + + 0000000 + + + + + + 56, 20 + + + 57 + + + 3000 + delayTextBox @@ -221,6 +336,24 @@ 6 + + True + + + NoControl + + + 2, 60 + + + 68, 13 + + + 52 + + + Wished Price + label9 @@ -233,6 +366,24 @@ 7 + + True + + + NoControl + + + 11, 107 + + + 71, 17 + + + 55 + + + buy qty.: + buyCheckBox @@ -245,6 +396,21 @@ 8 + + NoControl + + + 145, 57 + + + 64, 64 + + + CenterImage + + + 59 + pictureBox4 @@ -257,886 +423,75 @@ 9 - - ExtraGroup - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 137, 19 - - panel1 + + 55, 20 - - 10 + + 2 - - wishpriceBox + + resellPriceBox - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel1 + + ExtraGroup - - 11 + + 0 - - label12 + + True - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl - - panel1 + + 102, 22 - - 12 + + 33, 13 - - buyUpDown + + 1 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Value - - panel1 + + label7 - - 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8, 15 + + ExtraGroup - - 213, 212 + + 1 - - - 65 + + Without resell - - panel1 + + Set markup - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Your price - - splitContainer2.Panel1 + + 6, 19 - - 0 + + 91, 21 - - Top, Bottom, Left, Right - - - splitContainer3 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scanGroupBox - - - 0 - - - 6, 1 - - - 775, 237 - - - 63 - - - Scan Items - - - scanGroupBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer2.Panel1 - - - 1 - - - splitContainer2.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer2 - - - 0 - - - Top, Bottom, Left, Right - - - nextButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 0 - - - searchBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 1 - - - FoundList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - - - buyNowButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 3 - - - addtoScan - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 4 - - - prevButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 5 - - - label13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 6 - - - label11 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 7 - - - pictureBox1 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 8 - - - searchButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 9 - - - 6, 3 - - - 776, 204 - - - 40 - - - Find Item - - - groupBox4 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer2.Panel2 - - - 0 - - - splitContainer2.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer2 - - - 1 - - - 791, 459 - - - 245 - - - 51 - - - splitContainer2 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel1 - - - 0 - - - splitContainer1.Panel1 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 - - - 0 - - - 330 - - - Top, Bottom, Left, Right - - - filterTypeBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 0 - - - label18 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 1 - - - textBox2 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 2 - - - label17 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 3 - - - sellDelayBox - - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 4 - - - label16 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 5 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 6 - - - button2 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 7 - - - InventoryList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 8 - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 9 - - - SellButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 10 - - - comboBox3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 11 - - - button1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 12 - - - label4 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 13 - - - pictureBox3 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 14 - - - textBox1 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 15 - - - 6, 3 - - - 778, 244 - - - 49 - - - My Inventory - - - groupBox3 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1.Panel2 - - - 0 - - - splitContainer1.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer1 - - - 1 - - - 130 - - - 794, 719 - - - 465 - - - 50 - - - splitContainer1 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - True - - - NoControl - - - 33, 12 - - - 34, 13 - - - 64 - - - Name - - - NameLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - NoControl - - - 12, 186 - - - 95, 26 - - - 56 - - - Copy - - - MiddleRight - - - ImageBeforeText - - - button3 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - 84, 9 - - - 126, 20 - - - 63 - - - nameTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 2 - - - True - - - NoControl - - - 9, 36 - - - 63, 13 - - - 54 - - - Link to Item - - - label14 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - - - 84, 33 - - - 126, 20 - - - 50 - - - linkTextBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 4 - - - NoControl - - - 115, 186 - - - 96, 26 - - - 52 - - - Start - - - MiddleRight - - - ImageBeforeText - - - scanButton - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - 84, 81 - - - 0000000 - - - - - - 56, 20 - - - 57 - - - 3000 - - - delayTextBox - - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - True - - - NoControl - - - 2, 60 - - - 68, 13 - - - 52 - - - Wished Price - - - label9 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 7 - - - True - - - NoControl - - - 11, 107 - - - 71, 17 - - - 55 - - - buy qty.: - - - buyCheckBox - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 8 - - - NoControl - - - 145, 57 - - - 64, 64 - - - CenterImage - - - 59 - - - pictureBox4 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 9 - - - resellPriceBox - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ExtraGroup - - + 0 - - label7 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ExtraGroup - - - 1 - resellComboBox @@ -1173,179 +528,293 @@ 10 - - 137, 19 + + 84, 57 - - 55, 20 + + 56, 20 - - 2 + + 53 - - resellPriceBox + + wishpriceBox - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ExtraGroup + + panel1 - - 0 + + 11 - + True - + NoControl - - 102, 22 + + 33, 84 - - 33, 13 + + 34, 13 - - 1 + + 56 - - Value + + Delay - - label7 + + label12 - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ExtraGroup + + panel1 - - 1 + + 12 - - Without resell + + 84, 105 - - Set markup + + 56, 20 - - Your price + + 60 - - 6, 19 + + buyUpDown - - 91, 21 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + panel1 + + + 13 + + + 8, 15 + + + 213, 212 + + + 65 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer2.Panel1 + + 0 - - resellComboBox + + Top, Bottom, Left, Right - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Left, Right - - ExtraGroup + + 218, 14 - - 2 + + Top, Bottom, Left, Right - - 84, 57 + + Top, Bottom, Left, Right - - 56, 20 + + Status - - 53 + + 52 - - wishpriceBox + + Name - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 116 - - panel1 + + Wished Price - - 11 + + 123 - - True + + 12, 56 + + + 153, 22 - - NoControl + + Delete - - 33, 84 + + 153, 22 + + + Start Selected + + + 153, 22 + + + Stop Selected + + + 153, 22 + + + Start All + + + 153, 22 + + + Stop All + + + 150, 6 + + + 153, 22 + + + Export List + + + 153, 22 + + + Import List + + + 154, 164 + + + contextMenuStrip3 + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0, 0 + + + 403, 186 + + + 63 + + + scanListView + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tabPage1 + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 404, 186 + + + 0 + + + Item Page + + + tabPage1 + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 34, 13 + + tabControl1 - - 56 + + 0 - - Delay + + Top, Bottom, Left, Right - - label12 + + Status - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 52 - - panel1 + + Name - - 12 + + 116 - - 84, 105 + + Wished Price - - 56, 20 + + 123 - - 60 + + 0, 0 - - buyUpDown + + 403, 186 - - System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 64 - - panel1 + + recentListView - - 13 + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Bottom, Left, Right + + tabPage2 - - 218, 14 + + 0 - - Top, Bottom, Left, Right + + 4, 22 - - tabPage1 + + 3, 3, 3, 3 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 404, 186 - - tabControl1 + + 1 - - 0 + + Newly Listed tabPage2 @@ -1488,210 +957,45 @@ 0 - - scanListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 404, 186 - - - 0 - - - Item Page - - - tabPage1 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 0 - - - Top, Bottom, Left, Right - - - Status - - - 52 - - - Name - - - 116 - - - Wished Price - - - 123 - - - 415, 14 - - - 154, 114 - - - contextMenuStrip3 - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0, 0 - - - 403, 186 - - - 63 - - - scanListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage1 - - - 0 - - - 153, 22 - - - Delete - - - 153, 22 - - - Start Selected - - - 153, 22 - - - Stop Selected - - - 153, 22 - - - Start All - - - 153, 22 - - - Stop All - - - recentListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - 4, 22 - - - 3, 3, 3, 3 - - - 404, 186 - - - 1 - - - Newly Listed - - - tabPage2 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabControl1 - - - 1 - - - Top, Bottom, Left, Right - - - Status - - - 52 + + 6, 1 - - Name + + 775, 237 - - 116 + + 63 - - Wished Price + + Scan Items - - 123 + + scanGroupBox - - 0, 0 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 403, 186 + + splitContainer2.Panel1 - - 64 + + 1 - - recentListView + + splitContainer2.Panel1 - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage2 + + splitContainer2 - + 0 + + Top, Bottom, Left, Right + False @@ -1755,27 +1059,6 @@ Top, Bottom, Left, Right - - 7, 78 - - - 761, 120 - - - 53 - - - FoundList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox4 - - - 2 - @@ -1806,6 +1089,27 @@ 149 + + 7, 78 + + + 761, 120 + + + 53 + + + FoundList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox4 + + + 2 + Top, Right @@ -1852,8 +1156,32 @@ Top, Right - 21, 17 + 21, 6 + + 204, 22 + + + Checked to Selected Tab + + + 204, 22 + + + Checked to Both Tabs + + + 204, 22 + + + Full Set + + + 204, 22 + + + EmptyTab + 205, 92 @@ -1902,30 +1230,6 @@ 4 - - 204, 22 - - - Checked to Selected Tab - - - 204, 22 - - - Checked to Both Tabs - - - 204, 22 - - - Full Set - - - 204, 22 - - - EmptyTab - False @@ -2088,6 +1392,81 @@ 9 + + 6, 3 + + + 776, 204 + + + 40 + + + Find Item + + + groupBox4 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer2.Panel2 + + + 0 + + + splitContainer2.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer2 + + + 1 + + + 791, 459 + + + 245 + + + 51 + + + splitContainer2 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel1 + + + 0 + + + splitContainer1.Panel1 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 0 + + + 330 + + + Top, Bottom, Left, Right + Type @@ -2121,6 +1500,9 @@ True + + NoControl + 340, 51 @@ -2172,6 +1554,9 @@ True + + NoControl + 470, 23 @@ -2229,6 +1614,9 @@ True + + NoControl + 352, 23 @@ -2322,27 +1710,6 @@ Top, Bottom, Left, Right - - 6, 79 - - - 764, 159 - - - 51 - - - InventoryList - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 - - - 8 - @@ -2358,14 +1725,35 @@ Name - - 155 + + 155 + + + Cost + + + 96 + + + 6, 79 + + + 764, 159 + + + 51 + + + InventoryList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Cost + + groupBox3 - - 96 + + 8 True @@ -2592,6 +1980,66 @@ 15 + + 6, 3 + + + 778, 244 + + + 49 + + + My Inventory + + + groupBox3 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1.Panel2 + + + 0 + + + splitContainer1.Panel2 + + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + splitContainer1 + + + 1 + + + 130 + + + 794, 719 + + + 465 + + + 50 + + + splitContainer1 + + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + True @@ -2685,54 +2133,6 @@ Top, Left, Right - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 0 - - - pictureBox2 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox2 - - - 1 - - - 97, 3 - - - 590, 64 - - - 36 - - - Account Info - - - groupBox2 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - True @@ -2790,12 +2190,66 @@ 1 + + 97, 3 + + + 590, 64 + + + 36 + + + Account Info + + + groupBox2 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + - 163, 22 + 296, 40 - 264, 21 + 16, 33 + + 166, 22 + + + Minimize on close + + + 166, 22 + + + Settings + + + 166, 22 + + + Help + + + 166, 22 + + + About... + + + 166, 22 + + + Exit + 167, 114 @@ -2944,36 +2398,6 @@ True - - 166, 22 - - - Minimize on close - - - 166, 22 - - - Settings - - - 166, 22 - - - Help - - - 166, 22 - - - About... - - - 166, 22 - - - Exit - True @@ -3038,11 +2462,32 @@ 8 - 552, 18 + 294, 13 None + + False + + + None + + + 17, 17 + + + 38, 17 + + + Ready + + + 100, 16 + + + False + 0, 789 @@ -3067,26 +2512,23 @@ 3 - - False - - - None - - - 17, 17 - - - 38, 17 + + 158, 13 + + + Binary files|*.bin - - Ready + + Export List - - 100, 16 + + 159, 42 + + + Binary files|*.bin - - False + + Import List Top, Right @@ -3353,6 +2795,24 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripMenuItem1 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exportListToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + importListToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + columnHeader13 @@ -3503,6 +2963,18 @@ System.Windows.Forms.ToolStripProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + saveFileDialog1 + + + System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + openFileDialog1 + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Main diff --git a/scr/SCMBot/Main.ru-RU.resx b/scr/SCMBot/Main.ru-RU.resx index 87951d8..ace69d7 100644 --- a/scr/SCMBot/Main.ru-RU.resx +++ b/scr/SCMBot/Main.ru-RU.resx @@ -206,38 +206,53 @@ Ваша цена - 176, 114 + 207, 164 - 175, 22 + 206, 22 Удалить - 175, 22 + 206, 22 Старт выделенное - 175, 22 + 206, 22 Стоп выделенное - 175, 22 + 206, 22 Старт все - 175, 22 + 206, 22 Стоп все + + 203, 6 + + + 206, 22 + + + Экспортировать список + + + 206, 22 + + + Импортировать список + Новые поступления @@ -617,6 +632,18 @@ Готов + + Бинарные файлы|*.bin + + + Экспортировать список + + + Бинарные файлы|*.bin + + + Импортировать список + MiddleLeft diff --git a/scr/SCMBot/MainUtils.cs b/scr/SCMBot/MainUtils.cs index 168c335..500d365 100644 --- a/scr/SCMBot/MainUtils.cs +++ b/scr/SCMBot/MainUtils.cs @@ -69,7 +69,7 @@ public partial class Main string aboutApp = appName + "\r\n" + Strings.aboutBody; - const string homePage = "https://github.com/Maxx53/SteamCMBot"; + const string homePage = "https://github.com/Maxx53/SCMBot"; const string helpPage = homePage + "/wiki"; public const string cockPath = "coockies.dat"; @@ -253,41 +253,47 @@ public static void AddtoLog(string logstr) } - public static void WriteCookiesToDisk(string file, CookieContainer cookieJar) + public static void SaveBinary(string p, object o) { - using (Stream stream = File.Create(file)) + try { - try - { - BinaryFormatter formatter = new BinaryFormatter(); - formatter.Serialize(stream, cookieJar); - } - catch (Exception e) + if (o != null) { - AddtoLog("Problem writing cookies to disk: " + e.GetType()); + using (Stream stream = File.Create(p)) + { + BinaryFormatter bin = new BinaryFormatter(); + bin.Serialize(stream, o); + } } } + catch (Exception e) + { + AddtoLog("Saving Binary Exception: " + e.Message); + } } - static CookieContainer ReadCookiesFromDisk(string file) - { + + private static object LoadBinary(string p) + { try { - using (Stream stream = File.Open(file, FileMode.Open)) + using (Stream stream = File.Open(p, FileMode.Open)) { - BinaryFormatter formatter = new BinaryFormatter(); - return (CookieContainer)formatter.Deserialize(stream); + BinaryFormatter bin = new BinaryFormatter(); + var res = bin.Deserialize(stream); + return res; } } catch (Exception e) { - AddtoLog("Problem reading cookies from disk: " + e.GetType()); - return new CookieContainer(); + AddtoLog("Error Opening " + p + ": " + e.Message); + return null; } } + static private Color backColor(Image img, bool doWhite) { Color back = SystemColors.Control; @@ -530,7 +536,7 @@ public static string Decrypt(string cipherText) } } - public void StartCmdLine(string process, string param, bool wait) + public static void StartCmdLine(string process, string param, bool wait) { System.Diagnostics.Process p = new System.Diagnostics.Process(); p.StartInfo = new System.Diagnostics.ProcessStartInfo(process, param); @@ -547,7 +553,7 @@ public class StrParam public StrParam(string p1, string p2) { this.P1 = p1; - this.P2 = p1; + this.P2 = p2; } public StrParam(string p1, string p2, string p3) diff --git a/scr/SCMBot/Properties/Resources.Designer.cs b/scr/SCMBot/Properties/Resources.Designer.cs index ce58900..8b23ffe 100644 --- a/scr/SCMBot/Properties/Resources.Designer.cs +++ b/scr/SCMBot/Properties/Resources.Designer.cs @@ -148,6 +148,13 @@ internal static System.IO.UnmanagedMemoryStream error2 { } } + internal static System.Drawing.Bitmap export { + get { + object obj = ResourceManager.GetObject("export", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap fullset { get { object obj = ResourceManager.GetObject("fullset", resourceCulture); @@ -169,6 +176,13 @@ internal static System.Drawing.Bitmap help { } } + internal static System.Drawing.Bitmap import { + get { + object obj = ResourceManager.GetObject("import", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap info { get { object obj = ResourceManager.GetObject("info", resourceCulture); diff --git a/scr/SCMBot/Properties/Resources.resx b/scr/SCMBot/Properties/Resources.resx index f6a6d07..79b4a1a 100644 --- a/scr/SCMBot/Properties/Resources.resx +++ b/scr/SCMBot/Properties/Resources.resx @@ -121,85 +121,91 @@ ..\Resources\logout.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\buy_now.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ding.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\login.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\selected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\error.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\fullset.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\selected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\working.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\login.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\graph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\success.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\working.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\coins.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ready.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\btn_donate.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ding.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\error.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\error2.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\success.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\accept.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\btn_donate.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\coins.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\graph.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\buy_now.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\import.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/scr/SCMBot/Resources/export.png b/scr/SCMBot/Resources/export.png new file mode 100644 index 0000000..dd72838 Binary files /dev/null and b/scr/SCMBot/Resources/export.png differ diff --git a/scr/SCMBot/Resources/import.png b/scr/SCMBot/Resources/import.png new file mode 100644 index 0000000..f429108 Binary files /dev/null and b/scr/SCMBot/Resources/import.png differ diff --git a/scr/SCMBot/SCMBot.csproj b/scr/SCMBot/SCMBot.csproj index 4d831a3..1af1e63 100644 --- a/scr/SCMBot/SCMBot.csproj +++ b/scr/SCMBot/SCMBot.csproj @@ -288,6 +288,8 @@ + + diff --git a/scr/SCMBot/SettingsFrm.cs b/scr/SCMBot/SettingsFrm.cs index cc22c09..b13a68b 100644 --- a/scr/SCMBot/SettingsFrm.cs +++ b/scr/SCMBot/SettingsFrm.cs @@ -52,7 +52,7 @@ private void button2_Click(object sender, EventArgs e) hugeCock.Add(site, new Cookie(CookieFrm.stlog, cookieForm.textBox3.Text)); Main.steam_srch.cookieCont = hugeCock; - Main.WriteCookiesToDisk(Main.cockPath, Main.steam_srch.cookieCont); + Main.SaveBinary(Main.cockPath, Main.steam_srch.cookieCont); } } diff --git a/scr/SCMBot/Strings.Designer.cs b/scr/SCMBot/Strings.Designer.cs index 3f615ac..12fc8c9 100644 --- a/scr/SCMBot/Strings.Designer.cs +++ b/scr/SCMBot/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Этот код создан программой. -// Исполняемая версия:4.0.30319.36119 +// Исполняемая версия:4.0.30319.233 // // Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае // повторной генерации кода. @@ -63,11 +63,11 @@ internal Strings() { /// /// Ищет локализованную строку, похожую на Opensource Project ///Note: Program may contain critical bugs, for testing purposes only! - ///Website: http://scmbot.ru + ///Website: http://scmbot.com ///Copyright © 2013-2014 Maxx53 /// /// - ///Do you want to vist Github page?. + ///Do you want to visit Github page?. /// internal static string aboutBody { get { diff --git a/scr/SCMBot/Strings.fr-FR.resx b/scr/SCMBot/Strings.fr-FR.resx index bdeb267..b583fad 100644 --- a/scr/SCMBot/Strings.fr-FR.resx +++ b/scr/SCMBot/Strings.fr-FR.resx @@ -120,11 +120,11 @@ Projet opensource Note: Ce programme peut contenir des bugs critiques, à utiliser uniquement à des fins de test ! -Site web : http://scmbot.ru +Site web : http://scmbot.com Copyright © 2013-2014 Maxx53 -Do you want to vist Github page? +Do you want to visit Github page? Déjà connecté diff --git a/scr/SCMBot/Strings.resx b/scr/SCMBot/Strings.resx index f7867f3..04f71ad 100644 --- a/scr/SCMBot/Strings.resx +++ b/scr/SCMBot/Strings.resx @@ -120,11 +120,11 @@ Opensource Project Note: Program may contain critical bugs, for testing purposes only! -Website: http://scmbot.ru +Website: http://scmbot.com Copyright © 2013-2014 Maxx53 -Do you want to vist Github page? +Do you want to visit Github page? Already Logged