diff --git a/scr/SCMBot/Main.Designer.cs b/scr/SCMBot/Main.Designer.cs index aa85df0..fed43c5 100644 --- a/scr/SCMBot/Main.Designer.cs +++ b/scr/SCMBot/Main.Designer.cs @@ -126,6 +126,7 @@ private void InitializeComponent() this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); this.minimizeOnClosingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.usingProxyStatuslStrip = new System.Windows.Forms.ToolStripMenuItem(); this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -139,7 +140,6 @@ private void InitializeComponent() this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.DonateBox = new System.Windows.Forms.PictureBox(); this.loginButton = new System.Windows.Forms.Button(); - this.usingProxyStatuslStrip = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -944,6 +944,12 @@ private void InitializeComponent() resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); // + // usingProxyStatuslStrip + // + this.usingProxyStatuslStrip.Name = "usingProxyStatuslStrip"; + resources.ApplyResources(this.usingProxyStatuslStrip, "usingProxyStatuslStrip"); + this.usingProxyStatuslStrip.Click += new System.EventHandler(this.usingProxyStatusToolStripMenuItem_Click); + // // helpToolStripMenuItem // this.helpToolStripMenuItem.Image = global::SCMBot.Properties.Resources.help; @@ -1028,12 +1034,6 @@ private void InitializeComponent() this.loginButton.UseVisualStyleBackColor = true; this.loginButton.Click += new System.EventHandler(this.loginButton_Click); // - // usingProxyStatuslStrip - // - this.usingProxyStatuslStrip.Name = "usingProxyStatuslStrip"; - resources.ApplyResources(this.usingProxyStatuslStrip, "usingProxyStatuslStrip"); - this.usingProxyStatuslStrip.Click += new System.EventHandler(this.usingProxyStatusToolStripMenuItem_Click); - // // Main // resources.ApplyResources(this, "$this"); diff --git a/scr/SCMBot/Main.cs b/scr/SCMBot/Main.cs index d9b91e8..05147a6 100644 --- a/scr/SCMBot/Main.cs +++ b/scr/SCMBot/Main.cs @@ -57,6 +57,10 @@ public partial class Main : Form private Size lastFrmSize; private Point lastFrmPos; private bool ResComboClicked = false; + private bool sortDirect = true; + + public static int walletVal = 0; + public static int stopfundsVal = 0; public Main() { @@ -192,6 +196,11 @@ private void LoadSettings(bool loadtabs) settingsForm.ignoreBox.Checked = settings.ignoreWarn; settingsForm.actualBox.Checked = settings.loadActual; + settingsForm.stopFundsBox.Text = MainScanItem.LogItem.DoFracture(settings.StopFunds.ToString()); + stopfundsVal = settings.StopFunds; + + settingsForm.FeeCheckBox.Checked = settings.withFee; + settingsForm.playSndCheckBox.Checked = settings.playSnd; settingsForm.resDelayBox.Text = settings.resellDelay.ToString(); @@ -302,6 +311,11 @@ private void SaveSettings(bool savetabs) settings.InvType = comboBox3.SelectedIndex; settings.LastCurr = steam_srch.currencies.Current; + settings.StopFunds = Convert.ToInt32(SteamSite.GetSweetPrice(settingsForm.stopFundsBox.Text)); + stopfundsVal = settings.StopFunds; + + settings.withFee = settingsForm.FeeCheckBox.Checked; + settings.Language = settingsForm.intLangComboBox.SelectedItem.ToString(); settings.formParams = new MainFormParams(lastFrmSize, lastFrmPos, this.WindowState, @@ -342,7 +356,9 @@ private void LoadTabs(saveTabLst lst) scanListView.Items.Add(lstItem); var scanItem = new MainScanItem(ourItem, steam_srch.cookieCont, new eventDelegate(Event_Message), settings.LastCurr, settings.ignoreWarn, settings.resellDelay); - if (isScanValid(ourItem, true)) + + + if (isScanValid(ourItem, true)) { ourItem.StatId = status.Ready; setStatImg(i, ourItem.StatId, scanListView); @@ -446,6 +462,7 @@ public void GetAccInfo(StrParam mess) { StartLoadImgTread(mess.P3, pictureBox2); label5.Text = mess.P2; + walletVal = Convert.ToInt32(SteamSite.GetSweetPrice(mess.P2)); label10.Text = mess.P1; ProgressBar1.Visible = false; SetButton(loginButton, Strings.Logout, 2); @@ -472,11 +489,12 @@ private void UpdateScanCurrs() private void AddToScanLog(string message, int scanId, byte color, bool addcurr, bool ismain) { - if (ismain) + if (ismain) { cutLog(scanItems[scanId].LogCont, settings.logCount); scanItems[scanId].LogCont.Add(new MainScanItem.LogItem(color, message, DateTime.Now, addcurr, steam_srch.currencies.GetName())); ScrollLbox(scanId, scanListView, true); + } else { @@ -1216,7 +1234,14 @@ private void SellButton_Click(object sender, EventArgs e) { var ouritem = filteredInvList[InventoryList.CheckedItems[i].Index]; if ((ouritem.Marketable) && (ouritem.Price != "0")) - steam_srch.toSellList.Add(new SteamSite.ItemToSell(ouritem.AssetId, ouritem.Price)); + { + string truePrice = ouritem.Price; + + if (settings.withFee) + truePrice = CalcWithFee(truePrice); + + steam_srch.toSellList.Add(new SteamSite.ItemToSell(ouritem.AssetId, truePrice)); + } } steam_srch.sellDelay = Convert.ToInt32(sellDelayBox.Text); @@ -1224,6 +1249,8 @@ private void SellButton_Click(object sender, EventArgs e) } + + private void InventoryList_ColumnWidthChanging(object sender, ColumnWidthChangingEventArgs e) { if (e.ColumnIndex == 0) @@ -1235,8 +1262,55 @@ private void InventoryList_ColumnWidthChanging(object sender, ColumnWidthChangin private void InventoryList_ColumnClick(object sender, ColumnClickEventArgs e) { - //itemComparer.ColumnIndex = e.Column; - //((ListView)sender).Sort(); + if (steam_srch.Logged && steam_srch.inventList.Count != 0 && e.Column != 0) + { + filteredInvList.Clear(); + + //Sorry for copypaste + + if (sortDirect) + { + switch (e.Column) + { + case 1: + + filteredInvList = steam_srch.inventList.OrderBy(foo => foo.Type).ToList(); + break; + + case 2: + filteredInvList = steam_srch.inventList.OrderBy(foo => foo.Name).ToList(); + break; + + case 3: + filteredInvList = steam_srch.inventList.OrderBy(foo => foo.Price).ToList(); + break; + } + } + else + { + switch (e.Column) + { + case 1: + + filteredInvList = steam_srch.inventList.OrderByDescending(foo => foo.Type).ToList(); + break; + + case 2: + filteredInvList = steam_srch.inventList.OrderByDescending(foo => foo.Name).ToList(); + break; + + case 3: + filteredInvList = steam_srch.inventList.OrderByDescending(foo => foo.Price).ToList(); + break; + } + + } + + + FillInventoryList(); + sortDirect = !sortDirect; + } + } @@ -1391,6 +1465,11 @@ private void button2_Click(object sender, EventArgs e) } } + + + + + private void setButtText(status stat) { switch (stat) @@ -1710,10 +1789,7 @@ private void stopScan(bool all) var steamItem = ourItem.Steam; var paramItem = steamItem.scanInput; - if (!steamItem.scaninProg) - continue; - - if (paramItem.StatId == status.InProcess) + if (steamItem.scaninProg) { steamItem.CancelScan(); paramItem.StatId = status.Ready; @@ -2594,5 +2670,34 @@ private void usingProxyStatusToolStripMenuItem_Click(object sender, EventArgs e) proxyStatForm.Show(); } + + //Not Used Yet! + private void scanListView_ColumnClick(object sender, ColumnClickEventArgs e) + { + saveTabLst lst = new saveTabLst(); + SaveTabs(lst); + + scanItems.Clear(); + scanListView.Items.Clear(); + + switch (e.Column) + { + case 0: + lst.Sort(delegate(saveTab p1, saveTab p2) { return p1.StatId.CompareTo(p2.StatId); }); + break; + + case 1: + lst.Sort(delegate(saveTab p1, saveTab p2){return p1.Name.CompareTo(p2.Name);}); + break; + + case 2: + lst.Sort(delegate(saveTab p1, saveTab p2) { return p1.Price.CompareTo(p2.Price); }); + break; + } + + LoadTabs(lst); + + } + } } diff --git a/scr/SCMBot/Main.resx b/scr/SCMBot/Main.resx index 5d5f3e0..561cc52 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,1095 +423,398 @@ 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 + + resellComboBox - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel1 + + ExtraGroup - + 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 + + 10, 130 - - Start + + 198, 46 - - MiddleRight + + 61 - - ImageBeforeText + + Resell for - - scanButton + + ExtraGroup - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 5 - - - 84, 81 - - - 0000000 + + 10 - - + + 84, 57 - + 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 + + 53 - - label9 + + wishpriceBox - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 7 + + 11 - + 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 + + 33, 84 - - 64, 64 + + 34, 13 - - CenterImage + + 56 - - 59 + + Delay - - pictureBox4 + + label12 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 9 + + 12 - - resellPriceBox + + 84, 105 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 56, 20 - - ExtraGroup + + 60 - - 0 + + buyUpDown - - label7 + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + panel1 - - ExtraGroup + + 13 - - 1 + + 8, 15 - - resellComboBox + + 213, 212 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 65 - - ExtraGroup + + panel1 - - 2 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 10, 130 + + splitContainer2.Panel1 - - 198, 46 + + 0 - - 61 + + Top, Bottom, Left, Right - - Resell for + + Top, Bottom, Left, Right - - ExtraGroup + + 218, 14 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Bottom, Left, Right - - panel1 + + Top, Bottom, Left, Right - - 10 + + Status - - 137, 19 + + 52 - - 55, 20 + + Name - - 2 + + 116 - - resellPriceBox + + Wished Price - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 123 - - ExtraGroup + + 12, 56 + + + 153, 22 - - 0 + + Delete - - True + + 153, 22 - - NoControl + + Start Selected - - 102, 22 + + 153, 22 - - 33, 13 + + Stop Selected - - 1 + + 153, 22 - - Value + + Start All - - label7 + + 153, 22 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Stop All - - ExtraGroup + + 150, 6 - - 1 + + 153, 22 - - Without resell + + Export List - - Set markup + + 153, 22 - - Your price + + Import List - - 6, 19 + + 154, 164 - - 91, 21 + + contextMenuStrip3 - - 0 + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - resellComboBox + + 0, 0 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 403, 186 - - ExtraGroup + + 63 - - 2 + + scanListView - - 84, 57 + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 56, 20 + + tabPage1 - - 53 + + 0 - - wishpriceBox + + 4, 22 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 3, 3, 3, 3 - - panel1 + + 404, 186 - - 11 + + 0 - - True + + Item Page - - NoControl + + tabPage1 - - 33, 84 + + 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 @@ -1455,258 +924,78 @@ 1 - - splitContainer3.Panel2 - - - System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - splitContainer3 - - - 1 - - - 549, 213 - - - 414 - - - 65 - - - splitContainer3 - - - System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - scanGroupBox - - - 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 - - - 12, 56 - - - 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 - - - 153, 22 - - - Delete - - - 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 - - - recentListView - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPage2 - - - 0 - - - 4, 22 + + splitContainer3.Panel2 - - 3, 3, 3, 3 + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 404, 186 + + splitContainer3 - + 1 - - Newly Listed + + 549, 213 - - tabPage2 + + 414 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 65 - - tabControl1 + + splitContainer3 - - 1 + + System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Bottom, Left, Right + + scanGroupBox - - Status + + 0 - - 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 @@ -1770,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 - @@ -1821,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 @@ -1869,6 +1158,30 @@ 21, 6 + + 204, 22 + + + Checked to Selected Tab + + + 204, 22 + + + Checked to Both Tabs + + + 204, 22 + + + Full Set + + + 204, 22 + + + EmptyTab + 205, 92 @@ -1917,30 +1230,6 @@ 4 - - 204, 22 - - - Checked to Selected Tab - - - 204, 22 - - - Checked to Both Tabs - - - 204, 22 - - - Full Set - - - 204, 22 - - - EmptyTab - False @@ -2082,26 +1371,101 @@ 80, 25 - - 39 + + 39 + + + Search + + + MiddleRight + + + 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 - - Search + + splitContainer1.Panel1 - - MiddleRight + + System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - searchButton + + splitContainer1 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - - groupBox4 + + 330 - - 9 + + Top, Bottom, Left, Right Type @@ -2113,7 +1477,7 @@ Cost - 392, 47 + 396, 50 72, 21 @@ -2140,7 +1504,7 @@ NoControl - 340, 51 + 344, 53 46, 13 @@ -2167,10 +1531,10 @@ Top, Left, Right - 470, 48 + 474, 50 - 230, 20 + 226, 20 60 @@ -2194,7 +1558,7 @@ NoControl - 470, 23 + 474, 22 20, 13 @@ -2218,7 +1582,7 @@ 3 - 392, 20 + 396, 19 0000000 @@ -2254,7 +1618,7 @@ NoControl - 352, 23 + 356, 22 34, 13 @@ -2284,7 +1648,7 @@ NoControl - 106, 50 + 109, 53 59, 13 @@ -2314,7 +1678,7 @@ NoControl - 234, 44 + 234, 47 97, 25 @@ -2346,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 - @@ -2391,6 +1734,27 @@ 96 + + 6, 79 + + + 764, 159 + + + 51 + + + InventoryList + + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox3 + + + 8 + True @@ -2596,7 +1960,7 @@ 14 - 172, 47 + 172, 50 56, 20 @@ -2616,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 @@ -2709,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 @@ -2814,6 +2190,30 @@ 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 + 296, 40 @@ -2857,7 +2257,7 @@ Exit - 177, 158 + 177, 136 contextMenuStrip2 @@ -3073,6 +2473,27 @@ None + + False + + + None + + + 17, 17 + + + 38, 17 + + + Ready + + + 100, 16 + + + False + 0, 789 @@ -3097,27 +2518,6 @@ 3 - - False - - - None - - - 17, 17 - - - 38, 17 - - - Ready - - - 100, 16 - - - False - 158, 13 @@ -3533,6 +2933,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + usingProxyStatuslStrip + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + helpToolStripMenuItem @@ -3581,12 +2987,6 @@ System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - usingProxyStatuslStrip - - - System.Windows.Forms.ToolStripMenuItem, 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 ace69d7..f5155c7 100644 --- a/scr/SCMBot/Main.ru-RU.resx +++ b/scr/SCMBot/Main.ru-RU.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Предметы для сканирования - - - Найти предмет - - - Мой инвентарь - 23, 12 @@ -166,9 +157,6 @@ Купить: - - Перепродать - Цена @@ -181,6 +169,9 @@ Ваша цена + + Перепродать + 20, 84 @@ -190,12 +181,6 @@ Задержка - - Смотреть график - - - Страница предмета - Статус @@ -205,9 +190,6 @@ Ваша цена - - 207, 164 - 206, 22 @@ -253,8 +235,11 @@ Импортировать список - - Новые поступления + + 207, 164 + + + Страница предмета Статус @@ -265,6 +250,15 @@ Ваша цена + + Новые поступления + + + Смотреть график + + + Предметы для сканирования + 129, 45 @@ -283,12 +277,6 @@ Купить - - 254, 92 - - - Сканер - 253, 22 @@ -313,6 +301,12 @@ Пустая вкладка + + 254, 92 + + + Сканер + 74, 45 @@ -328,6 +322,9 @@ Поиск + + Найти предмет + Тип @@ -373,6 +370,9 @@ Задержка + + 102, 53 + 64, 13 @@ -418,6 +418,9 @@ Нет + + Мой инвентарь + 106, 21 @@ -442,15 +445,45 @@ Нет - - Ваш аккаунт - 30, 13 Имя: + + Ваш аккаунт + + + 204, 22 + + + Свернуть при закрытии + + + 204, 22 + + + Настройки + + + 204, 22 + + + Помощь + + + 204, 22 + + + О программе + + + 204, 22 + + + Выход + 205, 114 @@ -590,36 +623,6 @@ AAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAA= - - 204, 22 - - - Свернуть при закрытии - - - 204, 22 - - - Настройки - - - 204, 22 - - - Помощь - - - 204, 22 - - - О программе - - - 204, 22 - - - Выход - 78, 13 diff --git a/scr/SCMBot/MainUtils.cs b/scr/SCMBot/MainUtils.cs index dc9e149..35b23e3 100644 --- a/scr/SCMBot/MainUtils.cs +++ b/scr/SCMBot/MainUtils.cs @@ -523,6 +523,33 @@ public static string GetRequest(string url, CookieContainer cookie, bool UseProx } + + //That's all folks. Not precisely. + public static string CalcWithFee(string strInput) + { + + int intres = 0; + int input = Convert.ToInt32(strInput); + + //Magic + double temp = input / 1.15; + + if (input > 10) + intres = Convert.ToInt32(Math.Ceiling(temp)); + else + if (input < 4) + { + if (input == 3) + intres = 1; + else + intres = 0; + } + else + intres = Convert.ToInt32(temp) - 1; + + return intres.ToString(); + } + private string GetScanErrMess(string message) { string mess = string.Empty; @@ -807,7 +834,6 @@ public static string DoFracture(string input) } - public int Id { get; set; } public string Text { get; set; } diff --git a/scr/SCMBot/Properties/Settings.Designer.cs b/scr/SCMBot/Properties/Settings.Designer.cs index d8c7b07..2da48d9 100644 --- a/scr/SCMBot/Properties/Settings.Designer.cs +++ b/scr/SCMBot/Properties/Settings.Designer.cs @@ -297,6 +297,38 @@ public bool ignoreWarn } } + [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))] + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("true")] + public bool withFee + { + get + { + return ((bool)(this["withFee"])); + } + set + { + this["withFee"] = value; + } + } + + [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))] + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1000")] + public int StopFunds + { + get + { + return ((int)(this["stopFunds"])); + } + set + { + this["stopFunds"] = value; + } + } + [global::System.Configuration.SettingsProviderAttribute(typeof(PortableSettingsProvider))] [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] diff --git a/scr/SCMBot/SettingsFrm.Designer.cs b/scr/SCMBot/SettingsFrm.Designer.cs index 0f93433..2c0bcd5 100644 --- a/scr/SCMBot/SettingsFrm.Designer.cs +++ b/scr/SCMBot/SettingsFrm.Designer.cs @@ -60,6 +60,9 @@ private void InitializeComponent() this.tabPage1 = new System.Windows.Forms.TabPage(); this.button2 = new System.Windows.Forms.Button(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.FeeCheckBox = new System.Windows.Forms.CheckBox(); + this.stopFundsBox = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); this.actualBox = new System.Windows.Forms.CheckBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.keepLogBox = new System.Windows.Forms.CheckBox(); @@ -282,6 +285,9 @@ private void InitializeComponent() // tabPage2 // resources.ApplyResources(this.tabPage2, "tabPage2"); + this.tabPage2.Controls.Add(this.FeeCheckBox); + this.tabPage2.Controls.Add(this.stopFundsBox); + this.tabPage2.Controls.Add(this.label15); this.tabPage2.Controls.Add(this.actualBox); this.tabPage2.Controls.Add(this.resDelayBox); this.tabPage2.Controls.Add(this.label7); @@ -292,6 +298,22 @@ private void InitializeComponent() this.tabPage2.Name = "tabPage2"; this.tabPage2.UseVisualStyleBackColor = true; // + // FeeCheckBox + // + resources.ApplyResources(this.FeeCheckBox, "FeeCheckBox"); + this.FeeCheckBox.Name = "FeeCheckBox"; + this.FeeCheckBox.UseVisualStyleBackColor = true; + // + // stopFundsBox + // + resources.ApplyResources(this.stopFundsBox, "stopFundsBox"); + this.stopFundsBox.Name = "stopFundsBox"; + // + // label15 + // + resources.ApplyResources(this.label15, "label15"); + this.label15.Name = "label15"; + // // actualBox // resources.ApplyResources(this.actualBox, "actualBox"); @@ -395,5 +417,8 @@ private void InitializeComponent() private System.Windows.Forms.Button button2; public System.Windows.Forms.CheckBox actualBox; public System.Windows.Forms.CheckBox keepLogBox; + public System.Windows.Forms.TextBox stopFundsBox; + private System.Windows.Forms.Label label15; + public System.Windows.Forms.CheckBox FeeCheckBox; } } \ No newline at end of file diff --git a/scr/SCMBot/SettingsFrm.resx b/scr/SCMBot/SettingsFrm.resx index 4121a01..6bb0ec3 100644 --- a/scr/SCMBot/SettingsFrm.resx +++ b/scr/SCMBot/SettingsFrm.resx @@ -131,15 +131,15 @@ 198, 41 - - 94, 67 - 317, 151 1 + + Save and Close + Language: @@ -152,21 +152,30 @@ 1 - - tabPage1 + + Hide "My Inventory" panel + + + 94, 67 33 - - 32 + + tabPage3 - - 2 + + label15 - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage1 + + + label1 + + + tchinese actualBox @@ -186,9 +195,6 @@ czech - - 10 - 68 @@ -198,32 +204,35 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 67, 90 - - Ignore Items with warnings - - - 67, 67 + + 70 155, 21 + + intLangComboBox + + + 72 + 52, 20 - - logCountBox + + - - tabPage3 + + 65, 13 playSndCheckBox @@ -231,9 +240,15 @@ 63 + + FeeCheckBox + 80, 20 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 5 @@ -241,13 +256,22 @@ 4, 44 - 11, 13 + 13, 13 2 + + Resell delay: + + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - 49, 13 + 50, 13 + + + 100 tabControl1 @@ -258,6 +282,9 @@ tabPage3 + + tabPage2 + 12, 194 @@ -265,23 +292,35 @@ Search results: - 0 + 3 label10 - - 1 + + 107, 17 317, 151 + + 242, 94 + Settings + + tabPage1 + greek + + System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + swedish + Name @@ -291,18 +330,18 @@ 1 - - 7 - label11 - - tabPage3 + + NoControl 12, 12 + + 227, 124 + tabControl1 @@ -312,8 +351,8 @@ french - - tabPage3 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 52, 20 @@ -330,18 +369,12 @@ True + + 95, 16 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 108, 17 - - - hideInventBox - - - $this - True @@ -351,14 +384,17 @@ 29, 13 - - 0 + + 3 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3 - - True + + label9 2 @@ -369,36 +405,36 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 5 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 1 - - numThreadsBox - 109, 118 - - label14 - 3, 3, 3, 3 - - 67, 13 + + stopFundsBox - - 113, 20 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3 + + 9 + + + 68, 13 3, 3, 3, 3 + + Sell by your price with fee + Load actual price @@ -411,8 +447,11 @@ 28, 18 - - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + wallet funds tabControl1 @@ -421,7 +460,7 @@ 157, 15 - 42, 13 + 43, 13 System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -429,23 +468,23 @@ tabPage2 - - passwordBox + + 2 57 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage1 + + 18, 68 - 77, 13 - - - japanese + 79, 13 17, 17 @@ -453,23 +492,26 @@ 101, 27 + + 69 + - - 129, 21 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tabPage2 System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label12 + + 136, 98 + + + numThreadsBox records @@ -484,7 +526,7 @@ loginBox - 3 + 6 tabPage3 @@ -495,17 +537,14 @@ tabPage2 + + searchResBox + * - - tabPage2 - - 75, 13 - - - NoControl + 80, 13 label8 @@ -513,15 +552,18 @@ label13 - - True - 0 + + 2 + 95, 41 + + True + True @@ -546,8 +588,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 100 + + 0 + + + 17 + + + label3 4, 24 @@ -555,8 +603,8 @@ tabPage4 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True tabPage3 @@ -564,33 +612,36 @@ Clear log after: - - searchResBox + + 14, 17 + + + Network + + + tabPage2 - 153, 13 + 160, 13 - - tabPage4 + + tabPage1 - + + 1 + + + $this + + True System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage1 - 4, 24 - - 18, 68 - - - 1 - True @@ -600,32 +651,47 @@ tabPage3 + + 150, 17 + Interface - - 2 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 4 + + + 53, 13 17, 94 - - 0 + + 129, 21 66 - - System.Windows.Forms.MaskedTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - label2 0 - - 11, 13 + + tabPage2 + + + 13, 13 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 00000 @@ -633,17 +699,20 @@ Keep Log - - 11, 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 00000 + + 16 + + + 59 5 - - User + + tabPage2 67 @@ -660,38 +729,50 @@ 233, 208 + + 0 + 17, 41 + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True + + NoControl + True 18 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 00000 button1 - - True - - - Login + + 1 * + + 71 + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 67, 67 + + + 7 ignoreBox @@ -702,41 +783,56 @@ $this + + 15 + + + 2 + 66 113, 20 - - label1 + + True - - 61 + + button2 + + + 13, 13 + + + True 58, 13 - - tabPage1 - 317, 151 + + 113, 20 + tabControl1 20, 118 + + tabPage1 + + + 0 + Play sounds - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True tabPage2 @@ -744,20 +840,11 @@ 65 - - Resell delay: - 15, 19 - - tabPage1 - - - intLangComboBox - - - brazilian + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 tabPage1 @@ -765,14 +852,17 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tabPage3 + + NoControl + + + Login at start System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 151, 17 + 157, 17 Language: @@ -780,9 +870,6 @@ tabControl1 - - Password - tabPage4 @@ -792,11 +879,14 @@ tabPage3 + + 4 + 3 - 72, 17 + 70, 17 Import cookie @@ -804,12 +894,18 @@ 82, 15 + + Login + 52, 20 True + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + keepLogBox @@ -825,9 +921,6 @@ 58, 13 - - 59 - * @@ -844,7 +937,7 @@ True - 5 + 8 100 @@ -861,9 +954,6 @@ tabPage1 - - portuguese - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -873,23 +963,26 @@ * Restart needed to take effect - - finnish - - - label7 - 4, 24 - - 15 + + logCountBox + + + NoControl + + + 3 - 2 + 5 - - 16 + + 1 + + + per page System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -897,23 +990,26 @@ 4, 24 + + label16 + - 87, 17 + 90, 17 64 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Stop Buying Items at: - 151, 17 + 152, 17 9 - - 242, 94 + + Password tabPage2 @@ -927,14 +1023,17 @@ 1 + + 85, 20 + True italian - - hungarian + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 koreana @@ -942,32 +1041,32 @@ * - - polish + + tabPage3 norwegian - 133, 13 + 138, 13 - - 6 + + portuguese - - button2 + + schinese System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 16 + + 61 + + + Ignore Items with warnings 83, 17 @@ -981,11 +1080,14 @@ resDelayBox + + 136, 121 + 0 - - 17 + + 10 199, 17 @@ -996,23 +1098,32 @@ tabPage3 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + finnish + + + japanese System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Number of parallel threads: + + brazilian + + + romanian 346, 247 - - label4 + + Number of parallel threads: - - schinese + + True + + + 19, 124 english @@ -1020,6 +1131,9 @@ 0000000 + + label7 + label5 @@ -1032,8 +1146,8 @@ 65 - - swedish + + tabPage3 spanish @@ -1041,26 +1155,35 @@ thai - - tchinese + + tabPage1 turkish - - label3 + + polish + + + label12 + + + User tabPage4 - 4 + 7 154, 19 - - Hide "My Inventory" panel + + label4 + + + True 17, 98 @@ -1068,48 +1191,42 @@ True - - 4 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Network - - - Save and Close - - - per page + + 111, 13 NoControl + + 32 + bulgarian System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Login at start + + passwordBox - - romanian + + hungarian - - 14, 17 + + hideInventBox + + + 5 317, 151 - - 0 - 4 + + tabPage4 + checkBox2 @@ -1119,8 +1236,8 @@ label6 - - 3 + + tabPage3 german @@ -1128,17 +1245,8 @@ 60 - - NoControl - - - label9 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 53, 13 + + label14 True diff --git a/scr/SCMBot/SettingsFrm.ru-RU.resx b/scr/SCMBot/SettingsFrm.ru-RU.resx index 9b4172c..ea685aa 100644 --- a/scr/SCMBot/SettingsFrm.ru-RU.resx +++ b/scr/SCMBot/SettingsFrm.ru-RU.resx @@ -119,7 +119,7 @@ - 79, 17 + 80, 17 Автологин @@ -128,7 +128,7 @@ 17, 44 - 45, 13 + 44, 13 Пароль @@ -137,7 +137,7 @@ 20, 18 - 38, 13 + 37, 13 Логин @@ -149,7 +149,7 @@ 20, 69 - 132, 13 + 134, 13 Задержка перепродажи: @@ -170,7 +170,7 @@ 19, 19 - 38, 13 + 37, 13 Язык: @@ -206,7 +206,7 @@ на странице - 113, 13 + 114, 13 Результатов поиска: @@ -215,7 +215,7 @@ 135, 41 - 38, 13 + 37, 13 Язык: @@ -245,19 +245,19 @@ строк - 108, 13 + 110, 13 Очищать лог после: - 191, 13 + 188, 13 * Требуется перезапуск программы - 136, 13 + 135, 13 Параллельных запросов: @@ -271,11 +271,32 @@ Площадка + + 22, 108 + + + 168, 17 + + + Продажа с учетом комиссии + + + 206, 124 + + + 19, 127 + + + 181, 13 + + + Не покупать при балансе меньше: + - 22, 92 + 22, 89 - 168, 17 + 174, 17 Загружать актуальную цену @@ -287,7 +308,7 @@ 150, 118 - 76, 17 + 75, 17 Вести лог diff --git a/scr/SCMBot/SteamSite.cs b/scr/SCMBot/SteamSite.cs index 3b3be57..5ba75c8 100644 --- a/scr/SCMBot/SteamSite.cs +++ b/scr/SCMBot/SteamSite.cs @@ -504,7 +504,7 @@ public int BuyLogic(int wished, string sessid, ScanItem ourItem, saveTab Input, if (total <= wished) { - if (Input.ToBuy) + if ((Input.ToBuy) && (Main.walletVal > Main.stopfundsVal)) { var buyresp = BuyItem(cookieCont, sessid, ourItem.ListringId, Input.Link, ourItem.Price.ToString(), ourItem.Fee.ToString(), totalStr);