diff --git a/scr/SCMBot/GraphFrm.Designer.cs b/scr/SCMBot/GraphFrm.Designer.cs index 431172d..967dce2 100644 --- a/scr/SCMBot/GraphFrm.Designer.cs +++ b/scr/SCMBot/GraphFrm.Designer.cs @@ -60,7 +60,6 @@ private void InitializeComponent() this.ClientSize = new System.Drawing.Size(526, 375); this.Controls.Add(this.chart1); this.Name = "GraphFrm"; - this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Graph"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.GraphFrm_FormClosing); diff --git a/scr/SCMBot/Main.Designer.cs b/scr/SCMBot/Main.Designer.cs index 94cdda5..734a4f5 100644 --- a/scr/SCMBot/Main.Designer.cs +++ b/scr/SCMBot/Main.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.panel1 = new System.Windows.Forms.Panel(); this.NameLabel = new System.Windows.Forms.Label(); + this.button3 = new System.Windows.Forms.Button(); this.nameTextBox = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); this.linkTextBox = new System.Windows.Forms.TextBox(); @@ -41,6 +42,7 @@ private void InitializeComponent() this.delayTextBox = new System.Windows.Forms.MaskedTextBox(); this.label9 = new System.Windows.Forms.Label(); this.buyCheckBox = new System.Windows.Forms.CheckBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); this.ExtraGroup = new System.Windows.Forms.GroupBox(); this.resellPriceBox = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); @@ -57,12 +59,20 @@ private void InitializeComponent() this.columnHeader11 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader12 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.contextMenuStrip3 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.deleteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.startSelectedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + 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())); this.columnHeader14 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader15 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.button4 = new System.Windows.Forms.Button(); this.logListBox = new System.Windows.Forms.ListBox(); this.groupBox4 = new System.Windows.Forms.GroupBox(); this.nextButton = new System.Windows.Forms.Button(); @@ -73,10 +83,18 @@ private void InitializeComponent() this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.buyNowButton = new System.Windows.Forms.Button(); + this.addtoScan = new System.Windows.Forms.Button(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.selectedItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.checkedToBothSourcesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fullSetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.emptyTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.prevButton = new System.Windows.Forms.Button(); this.label13 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.searchButton = new System.Windows.Forms.Button(); this.groupBox3 = new System.Windows.Forms.GroupBox(); this.randomDelayBox = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); @@ -88,59 +106,41 @@ private void InitializeComponent() this.sellDelayBox = new System.Windows.Forms.MaskedTextBox(); this.label16 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.button2 = new System.Windows.Forms.Button(); this.InventoryList = new System.Windows.Forms.ListView(); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.label6 = new System.Windows.Forms.Label(); + this.SellButton = new System.Windows.Forms.Button(); this.comboBox3 = new System.Windows.Forms.ComboBox(); + this.button1 = new System.Windows.Forms.Button(); this.label4 = new System.Windows.Forms.Label(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label1 = new System.Windows.Forms.Label(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); 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(); this.label3 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + 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.toolStripImage = new System.Windows.Forms.ToolStripStatusLabel(); - this.button3 = new System.Windows.Forms.Button(); - this.pictureBox4 = new System.Windows.Forms.PictureBox(); - this.deleteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.startSelectedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stopSelectedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.startAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stopAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.button4 = new System.Windows.Forms.Button(); - this.buyNowButton = new System.Windows.Forms.Button(); - this.addtoScan = new System.Windows.Forms.Button(); - this.selectedItemToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.checkedToBothSourcesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fullSetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.emptyTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.searchButton = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.SellButton = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.settingsToolStripMenuItem = 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(); this.DonateBox = new System.Windows.Forms.PictureBox(); this.loginButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -152,6 +152,7 @@ private void InitializeComponent() this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); this.ExtraGroup.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.buyUpDown)).BeginInit(); this.scanGroupBox.SuspendLayout(); @@ -165,14 +166,13 @@ private void InitializeComponent() this.tabPage2.SuspendLayout(); this.groupBox4.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.groupBox2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.contextMenuStrip2.SuspendLayout(); this.statusStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DonateBox)).BeginInit(); this.SuspendLayout(); // @@ -211,11 +211,11 @@ private void InitializeComponent() // panel1 // this.panel1.Controls.Add(this.NameLabel); + this.panel1.Controls.Add(this.scanButton); this.panel1.Controls.Add(this.button3); this.panel1.Controls.Add(this.nameTextBox); this.panel1.Controls.Add(this.label14); this.panel1.Controls.Add(this.linkTextBox); - this.panel1.Controls.Add(this.scanButton); this.panel1.Controls.Add(this.delayTextBox); this.panel1.Controls.Add(this.label9); this.panel1.Controls.Add(this.buyCheckBox); @@ -232,6 +232,14 @@ private void InitializeComponent() resources.ApplyResources(this.NameLabel, "NameLabel"); this.NameLabel.Name = "NameLabel"; // + // button3 + // + this.button3.Image = global::SCMBot.Properties.Resources.copy; + resources.ApplyResources(this.button3, "button3"); + this.button3.Name = "button3"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click_1); + // // nameTextBox // resources.ApplyResources(this.nameTextBox, "nameTextBox"); @@ -271,6 +279,15 @@ private void InitializeComponent() this.buyCheckBox.Name = "buyCheckBox"; this.buyCheckBox.UseVisualStyleBackColor = true; // + // pictureBox4 + // + this.pictureBox4.BackColor = System.Drawing.SystemColors.ButtonHighlight; + this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand; + resources.ApplyResources(this.pictureBox4, "pictureBox4"); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.TabStop = false; + this.pictureBox4.Click += new System.EventHandler(this.pictureBox4_Click); + // // ExtraGroup // this.ExtraGroup.Controls.Add(this.resellPriceBox); @@ -332,7 +349,6 @@ private void InitializeComponent() // resources.ApplyResources(this.scanGroupBox, "scanGroupBox"); this.scanGroupBox.Controls.Add(this.splitContainer3); - this.scanGroupBox.MinimumSize = new System.Drawing.Size(0, 237); this.scanGroupBox.Name = "scanGroupBox"; this.scanGroupBox.TabStop = false; // @@ -416,11 +432,60 @@ private void InitializeComponent() this.contextMenuStrip3.Name = "contextMenuStrip3"; resources.ApplyResources(this.contextMenuStrip3, "contextMenuStrip3"); // + // deleteMenuItem + // + this.deleteMenuItem.Image = global::SCMBot.Properties.Resources.cancel; + this.deleteMenuItem.Name = "deleteMenuItem"; + resources.ApplyResources(this.deleteMenuItem, "deleteMenuItem"); + this.deleteMenuItem.Click += new System.EventHandler(this.удалитьToolStripMenuItem_Click); + // + // startSelectedMenuItem + // + this.startSelectedMenuItem.Image = global::SCMBot.Properties.Resources.selected; + this.startSelectedMenuItem.Name = "startSelectedMenuItem"; + resources.ApplyResources(this.startSelectedMenuItem, "startSelectedMenuItem"); + this.startSelectedMenuItem.Click += new System.EventHandler(this.startSelectedToolStripMenuItem_Click); + // + // stopSelectedMenuItem + // + this.stopSelectedMenuItem.Image = global::SCMBot.Properties.Resources.stop; + this.stopSelectedMenuItem.Name = "stopSelectedMenuItem"; + resources.ApplyResources(this.stopSelectedMenuItem, "stopSelectedMenuItem"); + this.stopSelectedMenuItem.Click += new System.EventHandler(this.stopSelectedToolStripMenuItem_Click); + // + // startAllMenuItem + // + this.startAllMenuItem.Image = global::SCMBot.Properties.Resources.fullset; + this.startAllMenuItem.Name = "startAllMenuItem"; + resources.ApplyResources(this.startAllMenuItem, "startAllMenuItem"); + this.startAllMenuItem.Click += new System.EventHandler(this.startAllToolStripMenuItem_Click); + // + // stopAllMenuItem + // + this.stopAllMenuItem.Image = global::SCMBot.Properties.Resources.stop; + this.stopAllMenuItem.Name = "stopAllMenuItem"; + 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); @@ -462,12 +527,19 @@ private void InitializeComponent() // resources.ApplyResources(this.columnHeader15, "columnHeader15"); // + // button4 + // + resources.ApplyResources(this.button4, "button4"); + this.button4.Image = global::SCMBot.Properties.Resources.graph; + this.button4.Name = "button4"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // // logListBox // resources.ApplyResources(this.logListBox, "logListBox"); this.logListBox.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.logListBox.FormattingEnabled = true; - this.logListBox.MinimumSize = new System.Drawing.Size(100, 4); this.logListBox.Name = "logListBox"; this.logListBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.logListBox_DrawItem); // @@ -484,7 +556,6 @@ private void InitializeComponent() this.groupBox4.Controls.Add(this.label11); this.groupBox4.Controls.Add(this.pictureBox1); this.groupBox4.Controls.Add(this.searchButton); - this.groupBox4.MinimumSize = new System.Drawing.Size(300, 50); this.groupBox4.Name = "groupBox4"; this.groupBox4.TabStop = false; // @@ -542,6 +613,23 @@ private void InitializeComponent() // resources.ApplyResources(this.columnHeader9, "columnHeader9"); // + // buyNowButton + // + resources.ApplyResources(this.buyNowButton, "buyNowButton"); + this.buyNowButton.Image = global::SCMBot.Properties.Resources.buy_now; + this.buyNowButton.Name = "buyNowButton"; + this.buyNowButton.UseVisualStyleBackColor = true; + this.buyNowButton.Click += new System.EventHandler(this.buyNowButton_Click); + // + // addtoScan + // + resources.ApplyResources(this.addtoScan, "addtoScan"); + this.addtoScan.ContextMenuStrip = this.contextMenuStrip1; + this.addtoScan.Image = global::SCMBot.Properties.Resources.add; + this.addtoScan.Name = "addtoScan"; + this.addtoScan.UseVisualStyleBackColor = true; + this.addtoScan.Click += new System.EventHandler(this.addtoScan_Click); + // // contextMenuStrip1 // this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -552,6 +640,34 @@ private void InitializeComponent() this.contextMenuStrip1.Name = "contextMenuStrip1"; resources.ApplyResources(this.contextMenuStrip1, "contextMenuStrip1"); // + // selectedItemToolStripMenuItem + // + this.selectedItemToolStripMenuItem.Image = global::SCMBot.Properties.Resources.selected; + this.selectedItemToolStripMenuItem.Name = "selectedItemToolStripMenuItem"; + resources.ApplyResources(this.selectedItemToolStripMenuItem, "selectedItemToolStripMenuItem"); + this.selectedItemToolStripMenuItem.Click += new System.EventHandler(this.selectedItemToolStripMenuItem_Click); + // + // checkedToBothSourcesToolStripMenuItem + // + this.checkedToBothSourcesToolStripMenuItem.Image = global::SCMBot.Properties.Resources.selected; + this.checkedToBothSourcesToolStripMenuItem.Name = "checkedToBothSourcesToolStripMenuItem"; + resources.ApplyResources(this.checkedToBothSourcesToolStripMenuItem, "checkedToBothSourcesToolStripMenuItem"); + this.checkedToBothSourcesToolStripMenuItem.Click += new System.EventHandler(this.checkedToBothSourcesToolStripMenuItem_Click); + // + // fullSetToolStripMenuItem + // + this.fullSetToolStripMenuItem.Image = global::SCMBot.Properties.Resources.fullset; + this.fullSetToolStripMenuItem.Name = "fullSetToolStripMenuItem"; + resources.ApplyResources(this.fullSetToolStripMenuItem, "fullSetToolStripMenuItem"); + this.fullSetToolStripMenuItem.Click += new System.EventHandler(this.fullSetToolStripMenuItem_Click); + // + // emptyTabToolStripMenuItem + // + this.emptyTabToolStripMenuItem.Image = global::SCMBot.Properties.Resources.blank; + this.emptyTabToolStripMenuItem.Name = "emptyTabToolStripMenuItem"; + resources.ApplyResources(this.emptyTabToolStripMenuItem, "emptyTabToolStripMenuItem"); + this.emptyTabToolStripMenuItem.Click += new System.EventHandler(this.emptyTabToolStripMenuItem_Click); + // // prevButton // resources.ApplyResources(this.prevButton, "prevButton"); @@ -569,6 +685,23 @@ private void InitializeComponent() resources.ApplyResources(this.label11, "label11"); this.label11.Name = "label11"; // + // pictureBox1 + // + resources.ApplyResources(this.pictureBox1, "pictureBox1"); + this.pictureBox1.BackColor = System.Drawing.SystemColors.ButtonHighlight; + this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); + // + // searchButton + // + resources.ApplyResources(this.searchButton, "searchButton"); + this.searchButton.Image = global::SCMBot.Properties.Resources.search; + this.searchButton.Name = "searchButton"; + this.searchButton.UseVisualStyleBackColor = true; + this.searchButton.Click += new System.EventHandler(this.searchButton_Click); + // // groupBox3 // resources.ApplyResources(this.groupBox3, "groupBox3"); @@ -591,7 +724,6 @@ private void InitializeComponent() this.groupBox3.Controls.Add(this.label4); this.groupBox3.Controls.Add(this.pictureBox3); this.groupBox3.Controls.Add(this.textBox1); - this.groupBox3.MinimumSize = new System.Drawing.Size(300, 50); this.groupBox3.Name = "groupBox3"; this.groupBox3.TabStop = false; // @@ -659,6 +791,14 @@ private void InitializeComponent() resources.ApplyResources(this.label2, "label2"); this.label2.Name = "label2"; // + // button2 + // + resources.ApplyResources(this.button2, "button2"); + this.button2.Image = global::SCMBot.Properties.Resources.accept; + this.button2.Name = "button2"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // // InventoryList // resources.ApplyResources(this.InventoryList, "InventoryList"); @@ -700,6 +840,14 @@ private void InitializeComponent() resources.ApplyResources(this.label6, "label6"); this.label6.Name = "label6"; // + // SellButton + // + this.SellButton.Image = global::SCMBot.Properties.Resources.coins; + resources.ApplyResources(this.SellButton, "SellButton"); + this.SellButton.Name = "SellButton"; + this.SellButton.UseVisualStyleBackColor = true; + this.SellButton.Click += new System.EventHandler(this.SellButton_Click); + // // comboBox3 // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -718,11 +866,28 @@ private void InitializeComponent() this.comboBox3.Name = "comboBox3"; this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged); // + // button1 + // + this.button1.Image = global::SCMBot.Properties.Resources.box; + resources.ApplyResources(this.button1, "button1"); + this.button1.Name = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // label4 // resources.ApplyResources(this.label4, "label4"); this.label4.Name = "label4"; // + // pictureBox3 + // + resources.ApplyResources(this.pictureBox3, "pictureBox3"); + this.pictureBox3.BackColor = System.Drawing.SystemColors.ButtonHighlight; + this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.TabStop = false; + this.pictureBox3.Click += new System.EventHandler(this.pictureBox3_Click); + // // textBox1 // resources.ApplyResources(this.textBox1, "textBox1"); @@ -760,6 +925,15 @@ private void InitializeComponent() resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.SystemColors.Window; + this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Hand; + resources.ApplyResources(this.pictureBox2, "pictureBox2"); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); + // // notifyIcon1 // this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip2; @@ -786,6 +960,13 @@ private void InitializeComponent() this.minimizeOnClosingToolStripMenuItem.Name = "minimizeOnClosingToolStripMenuItem"; resources.ApplyResources(this.minimizeOnClosingToolStripMenuItem, "minimizeOnClosingToolStripMenuItem"); // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Image = global::SCMBot.Properties.Resources.settings; + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // // usingProxyStatuslStrip // this.usingProxyStatuslStrip.Image = global::SCMBot.Properties.Resources.host; @@ -793,6 +974,27 @@ private void InitializeComponent() resources.ApplyResources(this.usingProxyStatuslStrip, "usingProxyStatuslStrip"); this.usingProxyStatuslStrip.Click += new System.EventHandler(this.usingProxyStatusToolStripMenuItem_Click); // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.Image = global::SCMBot.Properties.Resources.help; + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); + this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Image = global::SCMBot.Properties.Resources.info; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Image = global::SCMBot.Properties.Resources.logout; + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // // label3 // resources.ApplyResources(this.label3, "label3"); @@ -813,6 +1015,12 @@ private void InitializeComponent() this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.SizingGrip = false; // + // toolStripImage + // + resources.ApplyResources(this.toolStripImage, "toolStripImage"); + this.toolStripImage.Image = global::SCMBot.Properties.Resources.ready; + this.toolStripImage.Name = "toolStripImage"; + // // StatusLabel1 // this.StatusLabel1.Name = "StatusLabel1"; @@ -833,218 +1041,6 @@ private void InitializeComponent() this.openFileDialog1.DefaultExt = "*.bin"; resources.ApplyResources(this.openFileDialog1, "openFileDialog1"); // - // toolStripImage - // - resources.ApplyResources(this.toolStripImage, "toolStripImage"); - this.toolStripImage.Image = global::SCMBot.Properties.Resources.ready; - this.toolStripImage.Name = "toolStripImage"; - // - // button3 - // - this.button3.Image = global::SCMBot.Properties.Resources.copy; - resources.ApplyResources(this.button3, "button3"); - this.button3.Name = "button3"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click_1); - // - // pictureBox4 - // - this.pictureBox4.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.pictureBox4.Cursor = System.Windows.Forms.Cursors.Hand; - resources.ApplyResources(this.pictureBox4, "pictureBox4"); - this.pictureBox4.Name = "pictureBox4"; - this.pictureBox4.TabStop = false; - this.pictureBox4.Click += new System.EventHandler(this.pictureBox4_Click); - // - // deleteMenuItem - // - this.deleteMenuItem.Image = global::SCMBot.Properties.Resources.cancel; - this.deleteMenuItem.Name = "deleteMenuItem"; - resources.ApplyResources(this.deleteMenuItem, "deleteMenuItem"); - this.deleteMenuItem.Click += new System.EventHandler(this.удалитьToolStripMenuItem_Click); - // - // startSelectedMenuItem - // - this.startSelectedMenuItem.Image = global::SCMBot.Properties.Resources.selected; - this.startSelectedMenuItem.Name = "startSelectedMenuItem"; - resources.ApplyResources(this.startSelectedMenuItem, "startSelectedMenuItem"); - this.startSelectedMenuItem.Click += new System.EventHandler(this.startSelectedToolStripMenuItem_Click); - // - // stopSelectedMenuItem - // - this.stopSelectedMenuItem.Image = global::SCMBot.Properties.Resources.stop; - this.stopSelectedMenuItem.Name = "stopSelectedMenuItem"; - resources.ApplyResources(this.stopSelectedMenuItem, "stopSelectedMenuItem"); - this.stopSelectedMenuItem.Click += new System.EventHandler(this.stopSelectedToolStripMenuItem_Click); - // - // startAllMenuItem - // - this.startAllMenuItem.Image = global::SCMBot.Properties.Resources.fullset; - this.startAllMenuItem.Name = "startAllMenuItem"; - resources.ApplyResources(this.startAllMenuItem, "startAllMenuItem"); - this.startAllMenuItem.Click += new System.EventHandler(this.startAllToolStripMenuItem_Click); - // - // stopAllMenuItem - // - this.stopAllMenuItem.Image = global::SCMBot.Properties.Resources.stop; - this.stopAllMenuItem.Name = "stopAllMenuItem"; - resources.ApplyResources(this.stopAllMenuItem, "stopAllMenuItem"); - this.stopAllMenuItem.Click += new System.EventHandler(this.stopAllToolStripMenuItem_Click); - // - // 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); - // - // button4 - // - resources.ApplyResources(this.button4, "button4"); - this.button4.Image = global::SCMBot.Properties.Resources.graph; - this.button4.Name = "button4"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // buyNowButton - // - resources.ApplyResources(this.buyNowButton, "buyNowButton"); - this.buyNowButton.Image = global::SCMBot.Properties.Resources.buy_now; - this.buyNowButton.Name = "buyNowButton"; - this.buyNowButton.UseVisualStyleBackColor = true; - this.buyNowButton.Click += new System.EventHandler(this.buyNowButton_Click); - // - // addtoScan - // - resources.ApplyResources(this.addtoScan, "addtoScan"); - this.addtoScan.ContextMenuStrip = this.contextMenuStrip1; - this.addtoScan.Image = global::SCMBot.Properties.Resources.add; - this.addtoScan.Name = "addtoScan"; - this.addtoScan.UseVisualStyleBackColor = true; - this.addtoScan.Click += new System.EventHandler(this.addtoScan_Click); - // - // selectedItemToolStripMenuItem - // - this.selectedItemToolStripMenuItem.Image = global::SCMBot.Properties.Resources.selected; - this.selectedItemToolStripMenuItem.Name = "selectedItemToolStripMenuItem"; - resources.ApplyResources(this.selectedItemToolStripMenuItem, "selectedItemToolStripMenuItem"); - this.selectedItemToolStripMenuItem.Click += new System.EventHandler(this.selectedItemToolStripMenuItem_Click); - // - // checkedToBothSourcesToolStripMenuItem - // - this.checkedToBothSourcesToolStripMenuItem.Image = global::SCMBot.Properties.Resources.selected; - this.checkedToBothSourcesToolStripMenuItem.Name = "checkedToBothSourcesToolStripMenuItem"; - resources.ApplyResources(this.checkedToBothSourcesToolStripMenuItem, "checkedToBothSourcesToolStripMenuItem"); - this.checkedToBothSourcesToolStripMenuItem.Click += new System.EventHandler(this.checkedToBothSourcesToolStripMenuItem_Click); - // - // fullSetToolStripMenuItem - // - this.fullSetToolStripMenuItem.Image = global::SCMBot.Properties.Resources.fullset; - this.fullSetToolStripMenuItem.Name = "fullSetToolStripMenuItem"; - resources.ApplyResources(this.fullSetToolStripMenuItem, "fullSetToolStripMenuItem"); - this.fullSetToolStripMenuItem.Click += new System.EventHandler(this.fullSetToolStripMenuItem_Click); - // - // emptyTabToolStripMenuItem - // - this.emptyTabToolStripMenuItem.Image = global::SCMBot.Properties.Resources.blank; - this.emptyTabToolStripMenuItem.Name = "emptyTabToolStripMenuItem"; - resources.ApplyResources(this.emptyTabToolStripMenuItem, "emptyTabToolStripMenuItem"); - this.emptyTabToolStripMenuItem.Click += new System.EventHandler(this.emptyTabToolStripMenuItem_Click); - // - // pictureBox1 - // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); - // - // searchButton - // - resources.ApplyResources(this.searchButton, "searchButton"); - this.searchButton.Image = global::SCMBot.Properties.Resources.search; - this.searchButton.Name = "searchButton"; - this.searchButton.UseVisualStyleBackColor = true; - this.searchButton.Click += new System.EventHandler(this.searchButton_Click); - // - // button2 - // - resources.ApplyResources(this.button2, "button2"); - this.button2.Image = global::SCMBot.Properties.Resources.accept; - this.button2.Name = "button2"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // SellButton - // - this.SellButton.Image = global::SCMBot.Properties.Resources.coins; - resources.ApplyResources(this.SellButton, "SellButton"); - this.SellButton.Name = "SellButton"; - this.SellButton.UseVisualStyleBackColor = true; - this.SellButton.Click += new System.EventHandler(this.SellButton_Click); - // - // button1 - // - this.button1.Image = global::SCMBot.Properties.Resources.box; - resources.ApplyResources(this.button1, "button1"); - this.button1.Name = "button1"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // pictureBox3 - // - resources.ApplyResources(this.pictureBox3, "pictureBox3"); - this.pictureBox3.BackColor = System.Drawing.SystemColors.ButtonHighlight; - this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.TabStop = false; - this.pictureBox3.Click += new System.EventHandler(this.pictureBox3_Click); - // - // pictureBox2 - // - this.pictureBox2.BackColor = System.Drawing.SystemColors.Window; - this.pictureBox2.Cursor = System.Windows.Forms.Cursors.Hand; - resources.ApplyResources(this.pictureBox2, "pictureBox2"); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.TabStop = false; - this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); - // - // settingsToolStripMenuItem - // - this.settingsToolStripMenuItem.Image = global::SCMBot.Properties.Resources.settings; - this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; - resources.ApplyResources(this.settingsToolStripMenuItem, "settingsToolStripMenuItem"); - this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.Image = global::SCMBot.Properties.Resources.help; - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - resources.ApplyResources(this.helpToolStripMenuItem, "helpToolStripMenuItem"); - this.helpToolStripMenuItem.Click += new System.EventHandler(this.helpToolStripMenuItem_Click); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Image = global::SCMBot.Properties.Resources.info; - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - resources.ApplyResources(this.aboutToolStripMenuItem, "aboutToolStripMenuItem"); - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Image = global::SCMBot.Properties.Resources.logout; - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // // DonateBox // resources.ApplyResources(this.DonateBox, "DonateBox"); @@ -1090,6 +1086,7 @@ private void InitializeComponent() this.splitContainer2.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); this.ExtraGroup.ResumeLayout(false); this.ExtraGroup.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.buyUpDown)).EndInit(); @@ -1105,17 +1102,16 @@ private void InitializeComponent() this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.contextMenuStrip2.ResumeLayout(false); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DonateBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/scr/SCMBot/Main.cs b/scr/SCMBot/Main.cs index f1430bd..cafe8cc 100644 --- a/scr/SCMBot/Main.cs +++ b/scr/SCMBot/Main.cs @@ -75,6 +75,7 @@ public Main() StatImgLst.Images.Add("Img1", Properties.Resources.ready); StatImgLst.Images.Add("Img2", Properties.Resources.warning); StatImgLst.Images.Add("Img3", Properties.Resources.clock); + StatImgLst.Images.Add("Img4", Properties.Resources.warning); StatImgLst.ColorDepth = ColorDepth.Depth32Bit; scanListView.SmallImageList = StatImgLst; recentListView.SmallImageList = StatImgLst; @@ -109,8 +110,6 @@ private void Main_Load(object sender, EventArgs e) if (cook == null) cook = new CookieContainer(); - - steam_srch.cookieCont = cook; steam_srch.scanID = 0; filterTypeBox.SelectedIndex = 1; @@ -122,21 +121,27 @@ private void Main_Load(object sender, EventArgs e) LoadSettings(true); - if (settings.loginOnstart) - loginButton.PerformClick(); - setNotifyText(Strings.NotLogged); - openFileDialog1.FileName = "scmbot_list_"; string AppPath = Path.GetDirectoryName(Application.ExecutablePath); openFileDialog1.InitialDirectory = AppPath; saveFileDialog1.InitialDirectory = AppPath; + LoadHosts(hostsPath); - if (File.Exists(hostsPath)) + if (settings.loginOnstart) + loginButton.PerformClick(); + + ListViewHelper.EnableDoubleBuffer(scanListView); + } + + + private void LoadHosts(string path) + { + if (File.Exists(path)) { - var plines = File.ReadAllLines(hostsPath); + var plines = File.ReadAllLines(path); ThreadStart readThread = delegate() { @@ -147,31 +152,30 @@ private void Main_Load(object sender, EventArgs e) Match match = Regex.Match(plines[i], ipPattern); if (match.Success) { - Application.DoEvents(); + this.Invoke((MethodInvoker)delegate { StatusLabel1.Text = "Loading hosts... " + (i + 1).ToString() + " of " + plines.Length.ToString(); }); Ping ping = new Ping(); - PingReply pingReply = ping.Send(plines[i]); - hostList.Add(plines[i], pingReply.RoundtripTime.ToString()); - this.Invoke((MethodInvoker)delegate { StatusLabel1.Text = "Loading hosts... " + i.ToString() + " of " + plines.Length.ToString(); }); + PingReply pingReply = ping.Send(plines[i], 2000); + //Don't add dead hosts + if (pingReply.RoundtripTime != 0) + { + hostList.Add(plines[i], pingReply.RoundtripTime.ToString()); + } } } - this.Invoke((MethodInvoker)delegate { StatusLabel1.Text = "Hosts loaded: " + hostList.Count.ToString(); }); + this.Invoke((MethodInvoker)delegate + { StatusLabel1.Text = "Hosts loaded: " + hostList.Count.ToString(); }); }; Thread pTh = new Thread(readThread); pTh.IsBackground = true; pTh.Start(); - - - } else usingProxyStatuslStrip.Enabled = false; + } - ListViewHelper.EnableDoubleBuffer(scanListView); - } - private void Main_Shown(object sender, EventArgs e) { if (settings.firstRun == true) @@ -713,6 +717,25 @@ public void Event_Message(object sender, object data, int searchId, flag myflag, case flag.Scan_cancel: StatusLabel1.Text = Strings.ScanCancel; + if (isMain) + { + scanItems[searchId].Steam.scanInput.StatId = status.Ready; + setStatImg(searchId, status.Ready, scanListView); + BindToControls(scanListView); + } + else + { + for (int i = 0; i < steam_srch.recentInputList.Count; i++) + { + if (steam_srch.recentInputList[i].StatId == status.Wait) + { + steam_srch.recentInputList[i].StatId = status.Ready; + setStatImg(i, status.Ready, recentListView); + } + } + + BindToControls(recentListView); + } break; case flag.Resold: PlaySound(2, settings.playSnd); @@ -1534,6 +1557,12 @@ private void setButtText(status stat) scanButton.Image = Properties.Resources.stop; scanButton.Enabled = true; break; + + case status.Wait: + scanButton.Text = "Wait"; + scanButton.Image = Properties.Resources.clock; + scanButton.Enabled = false; + break; } } @@ -1630,9 +1659,7 @@ private void scanButton_Click(object sender, EventArgs e) if (isScanValid(paramItem, true)) { - startScan(false); - } else { @@ -1641,7 +1668,6 @@ private void scanButton_Click(object sender, EventArgs e) } } - else { stopScan(false); @@ -1839,8 +1865,8 @@ private void stopScan(bool all) if (steamItem.scaninProg) { steamItem.CancelScan(); - paramItem.StatId = status.Ready; - setStatImg(id, 0, scanListView); + paramItem.StatId = status.Wait; + setStatImg(id, status.Wait, scanListView); } } @@ -1862,7 +1888,7 @@ private void stopScan(bool all) if (steam_srch.recentInputList[i].StatId == status.InProcess) { isReady = true; - steam_srch.recentInputList[i].StatId = status.Ready; + steam_srch.recentInputList[i].StatId = status.Wait; setStatImg(i, steam_srch.recentInputList[i].StatId, recentListView); } } @@ -1876,7 +1902,7 @@ private void stopScan(bool all) if (steam_srch.recentInputList[indx].StatId == status.InProcess) { isReady = true; - steam_srch.recentInputList[indx].StatId = status.Ready; + steam_srch.recentInputList[indx].StatId = status.Wait; setStatImg(indx, steam_srch.recentInputList[indx].StatId, recentListView); } } diff --git a/scr/SCMBot/Main.resx b/scr/SCMBot/Main.resx index 83c8e4a..9a2c45d 100644 --- a/scr/SCMBot/Main.resx +++ b/scr/SCMBot/Main.resx @@ -148,7 +148,7 @@ 33, 12 - 34, 13 + 35, 13 64 @@ -168,11 +168,44 @@ 0 + + NoControl + + + 112, 182 + + + 96, 26 + + + 52 + + + Start + + + MiddleRight + + + ImageBeforeText + + + scanButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 1 + NoControl - 12, 186 + 11, 182 95, 26 @@ -199,7 +232,7 @@ panel1 - 1 + 2 84, 9 @@ -220,7 +253,7 @@ panel1 - 2 + 3 True @@ -232,7 +265,7 @@ 9, 36 - 63, 13 + 62, 13 54 @@ -250,7 +283,7 @@ panel1 - 3 + 4 84, 33 @@ -271,39 +304,6 @@ 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 @@ -346,7 +346,7 @@ 2, 60 - 68, 13 + 70, 13 52 @@ -376,7 +376,7 @@ 11, 107 - 71, 17 + 66, 17 55 @@ -454,7 +454,7 @@ 102, 22 - 33, 13 + 34, 13 1 @@ -604,7 +604,7 @@ 8, 15 - 213, 212 + 213, 213 65 @@ -655,55 +655,55 @@ 123 - 12, 56 + 12, 58 - 153, 22 + 145, 22 Delete - 153, 22 + 145, 22 Start Selected - 153, 22 + 145, 22 Stop Selected - 153, 22 + 145, 22 Start All - 153, 22 + 145, 22 Stop All - 150, 6 + 142, 6 - 153, 22 + 145, 22 Export List - 153, 22 + 145, 22 Import List - 154, 164 + 146, 164 contextMenuStrip3 @@ -906,6 +906,9 @@ 2, 0 + + 100, 4 + 129, 189 @@ -960,6 +963,9 @@ 6, 1 + + 0, 237 + 775, 237 @@ -1156,7 +1162,7 @@ Top, Right - 21, 6 + 12, 13 204, 22 @@ -1273,7 +1279,7 @@ 82, 51 - 23, 13 + 24, 13 47 @@ -1395,6 +1401,9 @@ 6, 3 + + 300, 50 + 776, 204 @@ -1588,7 +1597,7 @@ 474, 52 - 46, 13 + 43, 13 61 @@ -1732,7 +1741,7 @@ 217, 52 - 65, 13 + 62, 13 53 @@ -1846,7 +1855,7 @@ 7, 52 - 43, 13 + 41, 13 50 @@ -1990,7 +1999,7 @@ 48, 52 - 32, 13 + 33, 13 43 @@ -2064,6 +2073,9 @@ 6, 3 + + 300, 50 + 778, 244 @@ -2119,7 +2131,7 @@ $this - 3 + 5 True @@ -2131,7 +2143,7 @@ 91, 21 - 32, 13 + 33, 13 35 @@ -2161,7 +2173,7 @@ 54, 40 - 41, 13 + 40, 13 32 @@ -2191,7 +2203,7 @@ 91, 40 - 32, 13 + 33, 13 28 @@ -2299,46 +2311,46 @@ 296, 40 - 16, 33 + 13, 35 - 172, 22 + 170, 22 Minimize on close - 172, 22 + 170, 22 Settings - 172, 22 + 170, 22 Host usage status - 172, 22 + 170, 22 Help - 172, 22 + 170, 22 About... - 172, 22 + 170, 22 Exit - 173, 158 + 171, 136 contextMenuStrip2 @@ -2495,7 +2507,7 @@ 18, 47 - 56, 13 + 57, 13 51 @@ -2513,7 +2525,7 @@ $this - 2 + 4 Top, Right @@ -2528,7 +2540,7 @@ 693, 9 - 79, 13 + 80, 13 53 @@ -2564,7 +2576,7 @@ 17, 17 - 38, 17 + 39, 17 Ready @@ -2597,7 +2609,7 @@ $this - 1 + 3 158, 13 @@ -2825,9 +2837,6 @@ AAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAA= - - NoControl - 620, 700 @@ -2855,12 +2864,54 @@ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + deleteMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + startSelectedMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + stopSelectedMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + startAllMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + stopAllMenuItem + + + 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 @@ -2909,6 +2960,30 @@ System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + selectedItemToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + checkedToBothSourcesToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + fullSetToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + emptyTabToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + columnHeader4 @@ -2945,12 +3020,42 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + settingsToolStripMenuItem + + + 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 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + aboutToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripImage + + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + StatusLabel1 @@ -2975,102 +3080,6 @@ System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripImage - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - deleteMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - startSelectedMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - stopSelectedMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - startAllMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - stopAllMenuItem - - - System.Windows.Forms.ToolStripMenuItem, 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 - - - selectedItemToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - checkedToBothSourcesToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - fullSetToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - emptyTabToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - settingsToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - helpToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - aboutToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - exitToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Main diff --git a/scr/SCMBot/MainUtils.cs b/scr/SCMBot/MainUtils.cs index 6491c35..fbba1e6 100644 --- a/scr/SCMBot/MainUtils.cs +++ b/scr/SCMBot/MainUtils.cs @@ -58,6 +58,7 @@ public enum status : byte Ready = 0, Warning = 1, InProcess = 2, + Wait = 3 } @@ -471,7 +472,8 @@ public static string GetRequest(string url, CookieContainer cookie, bool UseHost //New request.Proxy = null; - request.Timeout = 30000; + request.Timeout = 10000; + request.ReadWriteTimeout = 10000; request.Host = SteamSite._host; //KeepAlive is True by default diff --git a/scr/SCMBot/SteamSite.cs b/scr/SCMBot/SteamSite.cs index 9ecfa5d..10475a5 100644 --- a/scr/SCMBot/SteamSite.cs +++ b/scr/SCMBot/SteamSite.cs @@ -91,12 +91,10 @@ public SteamSite() scanThread.WorkerSupportsCancellation = true; scanThread.DoWork += new DoWorkEventHandler(scanThread_DoWork); - - + reqThread.WorkerSupportsCancellation = true; reqThread.DoWork += new DoWorkEventHandler(reqThread_DoWork); - getInventory.WorkerSupportsCancellation = true; getInventory.DoWork += new DoWorkEventHandler(getInventory_DoWork); @@ -212,11 +210,19 @@ public void CancelListed() { if (listedThredList[0].IsBusy) { - scaninProg = false; - Sem.Release(); - for (int i = 0; i < listedThredList.Count; i++) + try + { + scaninProg = false; + Sem.Release(); + for (int i = 0; i < listedThredList.Count; i++) + { + listedThredList[i].CancelAsync(); + } + + } + catch (Exception) { - listedThredList[i].CancelAsync(); + //hey, dummy } } } @@ -828,8 +834,6 @@ private void StartResellThread(string lotPrice, string resellPrice, AppType appT } - - } } diff --git a/scr/SCMBot/SteamUtils.cs b/scr/SCMBot/SteamUtils.cs index e6ea039..de28cb3 100644 --- a/scr/SCMBot/SteamUtils.cs +++ b/scr/SCMBot/SteamUtils.cs @@ -705,16 +705,15 @@ public byte ParseLotList(string content, List lst, bool full, bool ism lst.Clear(); //Smart ass! + //Lol, fix. if (Main.isHTML && ismain) { - string jsonAssets = Regex.Match(content, @"(?<=g_rgAssets \= )(.*)(?=; - var g_rgCurrency)", RegexOptions.Singleline).ToString(); + string jsonAssets = Regex.Match(content, @"(?<=g_rgAssets \= )(.*)(?=;\r\n\s+var g_rgCurrency)", RegexOptions.Singleline).ToString(); if (jsonAssets == string.Empty) return 6; - string jsonListInfo = Regex.Match(content, @"(?<=g_rgListingInfo \= )(.*)(?=; - var g_plotPriceHistory)", RegexOptions.Singleline).ToString(); + string jsonListInfo = Regex.Match(content, @"(?<=g_rgListingInfo \= )(.*)(?=;\r\n\s+var g_plotPriceHistory)", RegexOptions.Singleline).ToString(); content = "{" + string.Format(buildJson, jsonListInfo, jsonAssets) + "}"; } diff --git a/scr/SCMBot/Strings.Designer.cs b/scr/SCMBot/Strings.Designer.cs index 12fc8c9..340491b 100644 --- a/scr/SCMBot/Strings.Designer.cs +++ b/scr/SCMBot/Strings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // Этот код создан программой. -// Исполняемая версия:4.0.30319.233 +// Исполняемая версия:4.0.30319.18408 // // Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае // повторной генерации кода. @@ -64,7 +64,7 @@ internal Strings() { /// Ищет локализованную строку, похожую на Opensource Project ///Note: Program may contain critical bugs, for testing purposes only! ///Website: http://scmbot.com - ///Copyright © 2013-2014 Maxx53 + ///Copyright © 2013-2015 Maxx53 /// /// ///Do you want to visit Github page?. diff --git a/scr/SCMBot/Strings.fr-FR.resx b/scr/SCMBot/Strings.fr-FR.resx index b583fad..0f7700d 100644 --- a/scr/SCMBot/Strings.fr-FR.resx +++ b/scr/SCMBot/Strings.fr-FR.resx @@ -121,7 +121,7 @@ Projet opensource Note: Ce programme peut contenir des bugs critiques, à utiliser uniquement à des fins de test ! Site web : http://scmbot.com -Copyright © 2013-2014 Maxx53 +Copyright © 2013-2015 Maxx53 Do you want to visit Github page? diff --git a/scr/SCMBot/Strings.resx b/scr/SCMBot/Strings.resx index 04f71ad..11a22ff 100644 --- a/scr/SCMBot/Strings.resx +++ b/scr/SCMBot/Strings.resx @@ -121,7 +121,7 @@ Opensource Project Note: Program may contain critical bugs, for testing purposes only! Website: http://scmbot.com -Copyright © 2013-2014 Maxx53 +Copyright © 2013-2015 Maxx53 Do you want to visit Github page? diff --git a/scr/SCMBot/Strings.ru-RU.resx b/scr/SCMBot/Strings.ru-RU.resx index da3604d..8fd7b88 100644 --- a/scr/SCMBot/Strings.ru-RU.resx +++ b/scr/SCMBot/Strings.ru-RU.resx @@ -121,7 +121,7 @@ Проект с открытым исходным кодом Внимание: Программа может содержать критические ошибки и предназначена только для тестирования! Сайт: http://scmbot.ru -Copyright © 2013-2014 Maxx53 +Copyright © 2013-2015 Maxx53 Хотите посетить страницу проекта на Github?