diff --git a/POExileDirection/ControlForm.Designer.cs b/POExileDirection/ControlForm.Designer.cs index dec1ef1..583c32f 100644 --- a/POExileDirection/ControlForm.Designer.cs +++ b/POExileDirection/ControlForm.Designer.cs @@ -32,31 +32,6 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlForm)); this.panel1 = new System.Windows.Forms.Panel(); this.panelCOMMAND = new System.Windows.Forms.Panel(); - this.panelUtilityRectBorder = new System.Windows.Forms.Panel(); - this.panelUtility = new System.Windows.Forms.Panel(); - this.labelSNDOnOff = new System.Windows.Forms.Label(); - this.xuiSwitch1 = new XanderUI.XUISwitch(); - this.labelDND = new System.Windows.Forms.Label(); - this.labelT = new System.Windows.Forms.Label(); - this.labelR = new System.Windows.Forms.Label(); - this.labelE = new System.Windows.Forms.Label(); - this.labelW = new System.Windows.Forms.Label(); - this.labelQ = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.panel6 = new System.Windows.Forms.Panel(); - this.panelInit = new System.Windows.Forms.Panel(); - this.panelUpdateAvailable = new System.Windows.Forms.Panel(); - this.btnUpdate = new System.Windows.Forms.Button(); - this.labelUpdateReadyVersion = new System.Windows.Forms.Label(); - this.DeadlyToolTip = new System.Windows.Forms.ToolTip(this.components); - this.timerInit = new System.Windows.Forms.Timer(this.components); - this.timerParser = new System.Windows.Forms.Timer(this.components); - this.pictureBoxMiya = new System.Windows.Forms.PictureBox(); - this.pictureBoxInit = new System.Windows.Forms.PictureBox(); this.btnDELVE = new System.Windows.Forms.Button(); this.btnManagerie = new System.Windows.Forms.Button(); this.btnEXIT = new System.Windows.Forms.Button(); @@ -66,6 +41,10 @@ private void InitializeComponent() this.panelDrag = new System.Windows.Forms.Panel(); this.btnMinimize = new System.Windows.Forms.Button(); this.btnExpandCollapse = new System.Windows.Forms.Button(); + this.panelUtilityRectBorder = new System.Windows.Forms.Panel(); + this.panelUtility = new System.Windows.Forms.Panel(); + this.labelSNDOnOff = new System.Windows.Forms.Label(); + this.xuiSwitch1 = new XanderUI.XUISwitch(); this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.btnDND = new System.Windows.Forms.Button(); @@ -81,6 +60,18 @@ private void InitializeComponent() this.btn3 = new System.Windows.Forms.Button(); this.btn2 = new System.Windows.Forms.Button(); this.btn1 = new System.Windows.Forms.Button(); + this.labelDND = new System.Windows.Forms.Label(); + this.labelT = new System.Windows.Forms.Label(); + this.labelR = new System.Windows.Forms.Label(); + this.labelE = new System.Windows.Forms.Label(); + this.labelW = new System.Windows.Forms.Label(); + this.labelQ = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.panel6 = new System.Windows.Forms.Panel(); this.btnHideout = new System.Windows.Forms.Button(); this.btnDeadlyTrade = new System.Windows.Forms.Button(); this.btnHelp = new System.Windows.Forms.Button(); @@ -100,19 +91,28 @@ private void InitializeComponent() this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); + this.panelInit = new System.Windows.Forms.Panel(); + this.pictureBoxMiya = new System.Windows.Forms.PictureBox(); + this.pictureBoxInit = new System.Windows.Forms.PictureBox(); + this.panelUpdateAvailable = new System.Windows.Forms.Panel(); + this.btnUpdate = new System.Windows.Forms.Button(); + this.labelUpdateReadyVersion = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.DeadlyToolTip = new System.Windows.Forms.ToolTip(this.components); + this.timerInit = new System.Windows.Forms.Timer(this.components); + this.timerParser = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); this.panelCOMMAND.SuspendLayout(); + this.panelDrag.SuspendLayout(); this.panelUtilityRectBorder.SuspendLayout(); this.panelUtility.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel6.SuspendLayout(); this.panelInit.SuspendLayout(); - this.panelUpdateAvailable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMiya)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxInit)).BeginInit(); - this.panelDrag.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panelUpdateAvailable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // @@ -148,323 +148,6 @@ private void InitializeComponent() this.panelCOMMAND.TabIndex = 25; this.panelCOMMAND.Visible = false; // - // panelUtilityRectBorder - // - this.panelUtilityRectBorder.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); - this.panelUtilityRectBorder.Controls.Add(this.panelUtility); - this.panelUtilityRectBorder.Location = new System.Drawing.Point(14, 52); - this.panelUtilityRectBorder.Name = "panelUtilityRectBorder"; - this.panelUtilityRectBorder.Size = new System.Drawing.Size(224, 66); - this.panelUtilityRectBorder.TabIndex = 46; - this.panelUtilityRectBorder.Visible = false; - // - // panelUtility - // - this.panelUtility.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.panelUtility.Controls.Add(this.labelSNDOnOff); - this.panelUtility.Controls.Add(this.xuiSwitch1); - this.panelUtility.Controls.Add(this.pictureBox3); - this.panelUtility.Controls.Add(this.pictureBox1); - this.panelUtility.Controls.Add(this.btnDND); - this.panelUtility.Controls.Add(this.btnT); - this.panelUtility.Controls.Add(this.btnR); - this.panelUtility.Controls.Add(this.btnE); - this.panelUtility.Controls.Add(this.btnW); - this.panelUtility.Controls.Add(this.btnQ); - this.panelUtility.Controls.Add(this.btn5); - this.panelUtility.Controls.Add(this.btn4); - this.panelUtility.Controls.Add(this.btnTradeHistory); - this.panelUtility.Controls.Add(this.btnSOUND); - this.panelUtility.Controls.Add(this.btn3); - this.panelUtility.Controls.Add(this.btn2); - this.panelUtility.Controls.Add(this.btn1); - this.panelUtility.Controls.Add(this.labelDND); - this.panelUtility.Controls.Add(this.labelT); - this.panelUtility.Controls.Add(this.labelR); - this.panelUtility.Controls.Add(this.labelE); - this.panelUtility.Controls.Add(this.labelW); - this.panelUtility.Controls.Add(this.labelQ); - this.panelUtility.Controls.Add(this.label5); - this.panelUtility.Controls.Add(this.label4); - this.panelUtility.Controls.Add(this.label3); - this.panelUtility.Controls.Add(this.label2); - this.panelUtility.Controls.Add(this.label1); - this.panelUtility.Location = new System.Drawing.Point(1, 1); - this.panelUtility.Name = "panelUtility"; - this.panelUtility.Size = new System.Drawing.Size(222, 64); - this.panelUtility.TabIndex = 45; - // - // labelSNDOnOff - // - this.labelSNDOnOff.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelSNDOnOff.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelSNDOnOff.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelSNDOnOff.Location = new System.Drawing.Point(30, 43); - this.labelSNDOnOff.Name = "labelSNDOnOff"; - this.labelSNDOnOff.Size = new System.Drawing.Size(28, 16); - this.labelSNDOnOff.TabIndex = 49; - this.labelSNDOnOff.Text = "OFF"; - this.labelSNDOnOff.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // xuiSwitch1 - // - this.xuiSwitch1.BackColor = System.Drawing.Color.Transparent; - this.xuiSwitch1.HandleOffColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.xuiSwitch1.HandleOnColor = System.Drawing.Color.Tan; - this.xuiSwitch1.Location = new System.Drawing.Point(59, 41); - this.xuiSwitch1.Name = "xuiSwitch1"; - this.xuiSwitch1.OffColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); - this.xuiSwitch1.OnColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); - this.xuiSwitch1.Size = new System.Drawing.Size(32, 20); - this.xuiSwitch1.SwitchState = XanderUI.XUISwitch.State.Off; - this.xuiSwitch1.SwitchStyle = XanderUI.XUISwitch.Style.Horizontal; - this.xuiSwitch1.TabIndex = 48; - this.xuiSwitch1.Text = "xuiSwitch1"; - this.xuiSwitch1.SwitchStateChanged += new System.EventHandler(this.xuiSwitch1_SwitchStateChanged_1); - // - // labelDND - // - this.labelDND.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelDND.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelDND.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelDND.Location = new System.Drawing.Point(192, 24); - this.labelDND.Name = "labelDND"; - this.labelDND.Size = new System.Drawing.Size(28, 12); - this.labelDND.TabIndex = 22; - this.labelDND.Text = "DND"; - this.labelDND.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labelT - // - this.labelT.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelT.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelT.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelT.Location = new System.Drawing.Point(174, 24); - this.labelT.Name = "labelT"; - this.labelT.Size = new System.Drawing.Size(12, 12); - this.labelT.TabIndex = 22; - this.labelT.Text = "T"; - this.labelT.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labelR - // - this.labelR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelR.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelR.Location = new System.Drawing.Point(157, 24); - this.labelR.Name = "labelR"; - this.labelR.Size = new System.Drawing.Size(12, 12); - this.labelR.TabIndex = 22; - this.labelR.Text = "R"; - this.labelR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labelE - // - this.labelE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelE.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelE.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelE.Location = new System.Drawing.Point(138, 24); - this.labelE.Name = "labelE"; - this.labelE.Size = new System.Drawing.Size(12, 12); - this.labelE.TabIndex = 22; - this.labelE.Text = "E"; - this.labelE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labelW - // - this.labelW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelW.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelW.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelW.Location = new System.Drawing.Point(120, 24); - this.labelW.Name = "labelW"; - this.labelW.Size = new System.Drawing.Size(12, 12); - this.labelW.TabIndex = 22; - this.labelW.Text = "W"; - this.labelW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // labelQ - // - this.labelQ.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.labelQ.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelQ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.labelQ.Location = new System.Drawing.Point(101, 24); - this.labelQ.Name = "labelQ"; - this.labelQ.Size = new System.Drawing.Size(12, 12); - this.labelQ.TabIndex = 22; - this.labelQ.Text = "Q"; - this.labelQ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label5 - // - this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.label5.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.label5.Location = new System.Drawing.Point(79, 24); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(12, 12); - this.label5.TabIndex = 22; - this.label5.Text = "5"; - this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label4 - // - this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.label4.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.label4.Location = new System.Drawing.Point(61, 24); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(12, 12); - this.label4.TabIndex = 22; - this.label4.Text = "4"; - this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label3 - // - this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.label3.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.label3.Location = new System.Drawing.Point(43, 24); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(12, 12); - this.label3.TabIndex = 22; - this.label3.Text = "3"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label2 - // - this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.label2.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.label2.Location = new System.Drawing.Point(24, 24); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(12, 12); - this.label2.TabIndex = 22; - this.label2.Text = "2"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); - this.label1.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); - this.label1.Location = new System.Drawing.Point(7, 24); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(12, 12); - this.label1.TabIndex = 22; - this.label1.Text = "1"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // panel6 - // - this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel6.Controls.Add(this.btnHideout); - this.panel6.Controls.Add(this.btnDeadlyTrade); - this.panel6.Controls.Add(this.btnHelp); - this.panel6.Controls.Add(this.btnSearchRegion); - this.panel6.Controls.Add(this.btnScan); - this.panel6.Controls.Add(this.btnSearchStash); - this.panel6.Controls.Add(this.btnCMD); - this.panel6.Controls.Add(this.btnLOCK); - this.panel6.Controls.Add(this.btnClose); - this.panel6.Controls.Add(this.btnUserOverlay); - this.panel6.Controls.Add(this.btnList); - this.panel6.Controls.Add(this.btnLabOverlay); - this.panel6.Controls.Add(this.button6); - this.panel6.Controls.Add(this.button5); - this.panel6.Controls.Add(this.button9); - this.panel6.Controls.Add(this.button4); - this.panel6.Controls.Add(this.button3); - this.panel6.Controls.Add(this.button2); - this.panel6.Controls.Add(this.button1); - this.panel6.Location = new System.Drawing.Point(14, -2); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(224, 51); - this.panel6.TabIndex = 29; - // - // panelInit - // - this.panelInit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.panelInit.Controls.Add(this.pictureBoxMiya); - this.panelInit.Controls.Add(this.pictureBoxInit); - this.panelInit.Location = new System.Drawing.Point(185, 171); - this.panelInit.Name = "panelInit"; - this.panelInit.Size = new System.Drawing.Size(24, 25); - this.panelInit.TabIndex = 24; - // - // panelUpdateAvailable - // - this.panelUpdateAvailable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(34)))), ((int)(((byte)(46))))); - this.panelUpdateAvailable.Controls.Add(this.btnUpdate); - this.panelUpdateAvailable.Controls.Add(this.labelUpdateReadyVersion); - this.panelUpdateAvailable.Controls.Add(this.pictureBox2); - this.panelUpdateAvailable.Location = new System.Drawing.Point(7, 131); - this.panelUpdateAvailable.Name = "panelUpdateAvailable"; - this.panelUpdateAvailable.Size = new System.Drawing.Size(12, 74); - this.panelUpdateAvailable.TabIndex = 28; - this.panelUpdateAvailable.Visible = false; - // - // btnUpdate - // - this.btnUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(44)))), ((int)(((byte)(56))))); - this.btnUpdate.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnUpdate.FlatAppearance.BorderColor = System.Drawing.Color.DarkGray; - this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnUpdate.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btnUpdate.ForeColor = System.Drawing.Color.White; - this.btnUpdate.Location = new System.Drawing.Point(57, 122); - this.btnUpdate.Name = "btnUpdate"; - this.btnUpdate.Size = new System.Drawing.Size(115, 20); - this.btnUpdate.TabIndex = 17; - this.btnUpdate.Text = "OK. Close Addon"; - this.btnUpdate.UseVisualStyleBackColor = false; - this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); - // - // labelUpdateReadyVersion - // - this.labelUpdateReadyVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(44)))), ((int)(((byte)(56))))); - this.labelUpdateReadyVersion.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.labelUpdateReadyVersion.ForeColor = System.Drawing.Color.Bisque; - this.labelUpdateReadyVersion.Location = new System.Drawing.Point(5, 6); - this.labelUpdateReadyVersion.Name = "labelUpdateReadyVersion"; - this.labelUpdateReadyVersion.Size = new System.Drawing.Size(231, 31); - this.labelUpdateReadyVersion.TabIndex = 1; - this.labelUpdateReadyVersion.Text = "1.3.9.6 Update is available\r\nPlease close and restart Addon."; - this.labelUpdateReadyVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // DeadlyToolTip - // - this.DeadlyToolTip.AutoPopDelay = 5000; - this.DeadlyToolTip.InitialDelay = 200; - this.DeadlyToolTip.ReshowDelay = 100; - // - // timerInit - // - this.timerInit.Interval = 200; - this.timerInit.Tick += new System.EventHandler(this.TimerInit_Tick); - // - // timerParser - // - this.timerParser.Tick += new System.EventHandler(this.TimerParser_Tick); - // - // pictureBoxMiya - // - this.pictureBoxMiya.BackgroundImage = global::POExileDirection.Properties.Resources.DeadlyTradeLauncherICON; - this.pictureBoxMiya.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.pictureBoxMiya.Location = new System.Drawing.Point(54, 72); - this.pictureBoxMiya.Name = "pictureBoxMiya"; - this.pictureBoxMiya.Size = new System.Drawing.Size(24, 24); - this.pictureBoxMiya.TabIndex = 27; - this.pictureBoxMiya.TabStop = false; - // - // pictureBoxInit - // - this.pictureBoxInit.Image = global::POExileDirection.Properties.Resources.spiiner_172_203; - this.pictureBoxInit.Location = new System.Drawing.Point(0, 1); - this.pictureBoxInit.Name = "pictureBoxInit"; - this.pictureBoxInit.Size = new System.Drawing.Size(228, 203); - this.pictureBoxInit.TabIndex = 0; - this.pictureBoxInit.TabStop = false; - // // btnDELVE // this.btnDELVE.BackColor = System.Drawing.Color.Transparent; @@ -620,6 +303,80 @@ private void InitializeComponent() this.btnExpandCollapse.Click += new System.EventHandler(this.btnExpandCollapse_Click); this.btnExpandCollapse.KeyDown += new System.Windows.Forms.KeyEventHandler(this.btnHideout_Enter); // + // panelUtilityRectBorder + // + this.panelUtilityRectBorder.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); + this.panelUtilityRectBorder.Controls.Add(this.panelUtility); + this.panelUtilityRectBorder.Location = new System.Drawing.Point(14, 52); + this.panelUtilityRectBorder.Name = "panelUtilityRectBorder"; + this.panelUtilityRectBorder.Size = new System.Drawing.Size(224, 66); + this.panelUtilityRectBorder.TabIndex = 46; + this.panelUtilityRectBorder.Visible = false; + // + // panelUtility + // + this.panelUtility.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.panelUtility.Controls.Add(this.labelSNDOnOff); + this.panelUtility.Controls.Add(this.xuiSwitch1); + this.panelUtility.Controls.Add(this.pictureBox3); + this.panelUtility.Controls.Add(this.pictureBox1); + this.panelUtility.Controls.Add(this.btnDND); + this.panelUtility.Controls.Add(this.btnT); + this.panelUtility.Controls.Add(this.btnR); + this.panelUtility.Controls.Add(this.btnE); + this.panelUtility.Controls.Add(this.btnW); + this.panelUtility.Controls.Add(this.btnQ); + this.panelUtility.Controls.Add(this.btn5); + this.panelUtility.Controls.Add(this.btn4); + this.panelUtility.Controls.Add(this.btnTradeHistory); + this.panelUtility.Controls.Add(this.btnSOUND); + this.panelUtility.Controls.Add(this.btn3); + this.panelUtility.Controls.Add(this.btn2); + this.panelUtility.Controls.Add(this.btn1); + this.panelUtility.Controls.Add(this.labelDND); + this.panelUtility.Controls.Add(this.labelT); + this.panelUtility.Controls.Add(this.labelR); + this.panelUtility.Controls.Add(this.labelE); + this.panelUtility.Controls.Add(this.labelW); + this.panelUtility.Controls.Add(this.labelQ); + this.panelUtility.Controls.Add(this.label5); + this.panelUtility.Controls.Add(this.label4); + this.panelUtility.Controls.Add(this.label3); + this.panelUtility.Controls.Add(this.label2); + this.panelUtility.Controls.Add(this.label1); + this.panelUtility.Location = new System.Drawing.Point(1, 1); + this.panelUtility.Name = "panelUtility"; + this.panelUtility.Size = new System.Drawing.Size(222, 64); + this.panelUtility.TabIndex = 45; + // + // labelSNDOnOff + // + this.labelSNDOnOff.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelSNDOnOff.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelSNDOnOff.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelSNDOnOff.Location = new System.Drawing.Point(30, 43); + this.labelSNDOnOff.Name = "labelSNDOnOff"; + this.labelSNDOnOff.Size = new System.Drawing.Size(28, 16); + this.labelSNDOnOff.TabIndex = 49; + this.labelSNDOnOff.Text = "OFF"; + this.labelSNDOnOff.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // xuiSwitch1 + // + this.xuiSwitch1.BackColor = System.Drawing.Color.Transparent; + this.xuiSwitch1.HandleOffColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.xuiSwitch1.HandleOnColor = System.Drawing.Color.Tan; + this.xuiSwitch1.Location = new System.Drawing.Point(59, 41); + this.xuiSwitch1.Name = "xuiSwitch1"; + this.xuiSwitch1.OffColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); + this.xuiSwitch1.OnColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(98)))), ((int)(((byte)(59))))); + this.xuiSwitch1.Size = new System.Drawing.Size(32, 20); + this.xuiSwitch1.SwitchState = XanderUI.XUISwitch.State.Off; + this.xuiSwitch1.SwitchStyle = XanderUI.XUISwitch.Style.Horizontal; + this.xuiSwitch1.TabIndex = 48; + this.xuiSwitch1.Text = "xuiSwitch1"; + this.xuiSwitch1.SwitchStateChanged += new System.EventHandler(this.xuiSwitch1_SwitchStateChanged_1); + // // pictureBox3 // this.pictureBox3.Image = global::POExileDirection.Properties.Resources.vertical_line1; @@ -828,10 +585,10 @@ private void InitializeComponent() this.btnSOUND.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSOUND.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSOUND.ForeColor = System.Drawing.Color.LightCoral; - this.btnSOUND.Image = global::POExileDirection.Properties.Resources.Volume_16x16_Mute; - this.btnSOUND.Location = new System.Drawing.Point(8, 43); + this.btnSOUND.Image = global::POExileDirection.Properties.Resources.Volume_16x16; + this.btnSOUND.Location = new System.Drawing.Point(8, 41); this.btnSOUND.Name = "btnSOUND"; - this.btnSOUND.Size = new System.Drawing.Size(14, 14); + this.btnSOUND.Size = new System.Drawing.Size(17, 17); this.btnSOUND.TabIndex = 38; this.btnSOUND.TabStop = false; this.btnSOUND.Text = "img"; @@ -898,6 +655,165 @@ private void InitializeComponent() this.btn1.Click += new System.EventHandler(this.XuiSwitch1_SwitchStateChanged); this.btn1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.btnHideout_Enter); // + // labelDND + // + this.labelDND.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelDND.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelDND.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelDND.Location = new System.Drawing.Point(192, 24); + this.labelDND.Name = "labelDND"; + this.labelDND.Size = new System.Drawing.Size(28, 12); + this.labelDND.TabIndex = 22; + this.labelDND.Text = "DND"; + this.labelDND.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelT + // + this.labelT.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelT.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelT.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelT.Location = new System.Drawing.Point(174, 24); + this.labelT.Name = "labelT"; + this.labelT.Size = new System.Drawing.Size(12, 12); + this.labelT.TabIndex = 22; + this.labelT.Text = "T"; + this.labelT.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelR + // + this.labelR.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelR.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelR.Location = new System.Drawing.Point(157, 24); + this.labelR.Name = "labelR"; + this.labelR.Size = new System.Drawing.Size(12, 12); + this.labelR.TabIndex = 22; + this.labelR.Text = "R"; + this.labelR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelE + // + this.labelE.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelE.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelE.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelE.Location = new System.Drawing.Point(138, 24); + this.labelE.Name = "labelE"; + this.labelE.Size = new System.Drawing.Size(12, 12); + this.labelE.TabIndex = 22; + this.labelE.Text = "E"; + this.labelE.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelW + // + this.labelW.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelW.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelW.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelW.Location = new System.Drawing.Point(120, 24); + this.labelW.Name = "labelW"; + this.labelW.Size = new System.Drawing.Size(12, 12); + this.labelW.TabIndex = 22; + this.labelW.Text = "W"; + this.labelW.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelQ + // + this.labelQ.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.labelQ.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelQ.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.labelQ.Location = new System.Drawing.Point(101, 24); + this.labelQ.Name = "labelQ"; + this.labelQ.Size = new System.Drawing.Size(12, 12); + this.labelQ.TabIndex = 22; + this.labelQ.Text = "Q"; + this.labelQ.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label5 + // + this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.label5.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.label5.Location = new System.Drawing.Point(79, 24); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(12, 12); + this.label5.TabIndex = 22; + this.label5.Text = "5"; + this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label4 + // + this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.label4.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.label4.Location = new System.Drawing.Point(61, 24); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(12, 12); + this.label4.TabIndex = 22; + this.label4.Text = "4"; + this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label3 + // + this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.label3.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.label3.Location = new System.Drawing.Point(43, 24); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(12, 12); + this.label3.TabIndex = 22; + this.label3.Text = "3"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.label2.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.label2.Location = new System.Drawing.Point(24, 24); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(12, 12); + this.label2.TabIndex = 22; + this.label2.Text = "2"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(21)))), ((int)(((byte)(16))))); + this.label1.Font = new System.Drawing.Font("굴림", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(154)))), ((int)(((byte)(109)))), ((int)(((byte)(72))))); + this.label1.Location = new System.Drawing.Point(7, 24); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(12, 12); + this.label1.TabIndex = 22; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // panel6 + // + this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel6.Controls.Add(this.btnHideout); + this.panel6.Controls.Add(this.btnDeadlyTrade); + this.panel6.Controls.Add(this.btnHelp); + this.panel6.Controls.Add(this.btnSearchRegion); + this.panel6.Controls.Add(this.btnScan); + this.panel6.Controls.Add(this.btnSearchStash); + this.panel6.Controls.Add(this.btnCMD); + this.panel6.Controls.Add(this.btnLOCK); + this.panel6.Controls.Add(this.btnClose); + this.panel6.Controls.Add(this.btnUserOverlay); + this.panel6.Controls.Add(this.btnList); + this.panel6.Controls.Add(this.btnLabOverlay); + this.panel6.Controls.Add(this.button6); + this.panel6.Controls.Add(this.button5); + this.panel6.Controls.Add(this.button9); + this.panel6.Controls.Add(this.button4); + this.panel6.Controls.Add(this.button3); + this.panel6.Controls.Add(this.button2); + this.panel6.Controls.Add(this.button1); + this.panel6.Location = new System.Drawing.Point(14, -2); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(224, 51); + this.panel6.TabIndex = 29; + // // btnHideout // this.btnHideout.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(43))))); @@ -1327,6 +1243,75 @@ private void InitializeComponent() this.button1.MouseEnter += new System.EventHandler(this.button1_MouseHover); this.button1.MouseHover += new System.EventHandler(this.button1_MouseHover); // + // panelInit + // + this.panelInit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.panelInit.Controls.Add(this.pictureBoxMiya); + this.panelInit.Controls.Add(this.pictureBoxInit); + this.panelInit.Location = new System.Drawing.Point(185, 171); + this.panelInit.Name = "panelInit"; + this.panelInit.Size = new System.Drawing.Size(24, 25); + this.panelInit.TabIndex = 24; + // + // pictureBoxMiya + // + this.pictureBoxMiya.BackgroundImage = global::POExileDirection.Properties.Resources.DeadlyTradeLauncherICON; + this.pictureBoxMiya.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBoxMiya.Location = new System.Drawing.Point(54, 72); + this.pictureBoxMiya.Name = "pictureBoxMiya"; + this.pictureBoxMiya.Size = new System.Drawing.Size(24, 24); + this.pictureBoxMiya.TabIndex = 27; + this.pictureBoxMiya.TabStop = false; + // + // pictureBoxInit + // + this.pictureBoxInit.Image = global::POExileDirection.Properties.Resources.spiiner_172_203; + this.pictureBoxInit.Location = new System.Drawing.Point(0, 1); + this.pictureBoxInit.Name = "pictureBoxInit"; + this.pictureBoxInit.Size = new System.Drawing.Size(228, 203); + this.pictureBoxInit.TabIndex = 0; + this.pictureBoxInit.TabStop = false; + // + // panelUpdateAvailable + // + this.panelUpdateAvailable.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(29)))), ((int)(((byte)(34)))), ((int)(((byte)(46))))); + this.panelUpdateAvailable.Controls.Add(this.btnUpdate); + this.panelUpdateAvailable.Controls.Add(this.labelUpdateReadyVersion); + this.panelUpdateAvailable.Controls.Add(this.pictureBox2); + this.panelUpdateAvailable.Location = new System.Drawing.Point(7, 131); + this.panelUpdateAvailable.Name = "panelUpdateAvailable"; + this.panelUpdateAvailable.Size = new System.Drawing.Size(12, 74); + this.panelUpdateAvailable.TabIndex = 28; + this.panelUpdateAvailable.Visible = false; + // + // btnUpdate + // + this.btnUpdate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(44)))), ((int)(((byte)(56))))); + this.btnUpdate.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnUpdate.FlatAppearance.BorderColor = System.Drawing.Color.DarkGray; + this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnUpdate.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.btnUpdate.ForeColor = System.Drawing.Color.White; + this.btnUpdate.Location = new System.Drawing.Point(57, 122); + this.btnUpdate.Name = "btnUpdate"; + this.btnUpdate.Size = new System.Drawing.Size(115, 20); + this.btnUpdate.TabIndex = 17; + this.btnUpdate.Text = "OK. Close Addon"; + this.btnUpdate.UseVisualStyleBackColor = false; + this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click); + // + // labelUpdateReadyVersion + // + this.labelUpdateReadyVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(39)))), ((int)(((byte)(44)))), ((int)(((byte)(56))))); + this.labelUpdateReadyVersion.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.labelUpdateReadyVersion.ForeColor = System.Drawing.Color.Bisque; + this.labelUpdateReadyVersion.Location = new System.Drawing.Point(5, 6); + this.labelUpdateReadyVersion.Name = "labelUpdateReadyVersion"; + this.labelUpdateReadyVersion.Size = new System.Drawing.Size(231, 31); + this.labelUpdateReadyVersion.TabIndex = 1; + this.labelUpdateReadyVersion.Text = "1.3.9.6 Update is available\r\nPlease close and restart Addon."; + this.labelUpdateReadyVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // pictureBox2 // this.pictureBox2.Image = global::POExileDirection.Properties.Resources.checkMarkMoving_116_55; @@ -1336,6 +1321,21 @@ private void InitializeComponent() this.pictureBox2.TabIndex = 0; this.pictureBox2.TabStop = false; // + // DeadlyToolTip + // + this.DeadlyToolTip.AutoPopDelay = 5000; + this.DeadlyToolTip.InitialDelay = 200; + this.DeadlyToolTip.ReshowDelay = 100; + // + // timerInit + // + this.timerInit.Interval = 200; + this.timerInit.Tick += new System.EventHandler(this.TimerInit_Tick); + // + // timerParser + // + this.timerParser.Tick += new System.EventHandler(this.TimerParser_Tick); + // // ControlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 11F); @@ -1367,16 +1367,16 @@ private void InitializeComponent() this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.ControlForm_KeyUp); this.panel1.ResumeLayout(false); this.panelCOMMAND.ResumeLayout(false); + this.panelDrag.ResumeLayout(false); this.panelUtilityRectBorder.ResumeLayout(false); this.panelUtility.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panel6.ResumeLayout(false); this.panelInit.ResumeLayout(false); - this.panelUpdateAvailable.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxMiya)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxInit)).EndInit(); - this.panelDrag.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panelUpdateAvailable.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); diff --git a/POExileDirection/ControlForm.cs b/POExileDirection/ControlForm.cs index ba2f816..d42295b 100644 --- a/POExileDirection/ControlForm.cs +++ b/POExileDirection/ControlForm.cs @@ -1042,6 +1042,21 @@ private void Set_FlaskTimerToggleSwitch() btn5.Image = Properties.Resources.check_on; else btn5.Image = Properties.Resources.check_off; + + if (LauncherForm.g_strTimerSound1 == "Y") + { + xuiSwitch1.SwitchState = XanderUI.XUISwitch.State.On; + labelSNDOnOff.ForeColor = Color.FromArgb(235, 182, 111); + labelSNDOnOff.Text = "ON"; + btnSOUND.Image = Properties.Resources.Volume_16x16; + } + else + { + xuiSwitch1.SwitchState = XanderUI.XUISwitch.State.Off; + labelSNDOnOff.ForeColor = Color.FromArgb(28, 21, 16); + labelSNDOnOff.Text = "OFF"; + btnSOUND.Image = Properties.Resources.Volume_16x16_Mute; + } } #endregion @@ -3184,6 +3199,7 @@ private bool KAKAOBUYwithTabName() if (Check_DuplicateTradeMSG(tradeWhisper)) return true; g_TradeMsgList.Add(tradeWhisper); + g_TradeMsgListHistory.Add(tradeWhisper); NotificationForm frmNotifyPanel = new NotificationForm(); frmNotificationContainer.AddNotifyForm(frmNotifyPanel); @@ -3241,10 +3257,10 @@ private bool KAKAOBUYCurrency() if (Check_DuplicateTradeMSG(tradeWhisperCurr)) return true; g_TradeMsgList.Add(tradeWhisperCurr); + g_TradeMsgListHistory.Add(tradeWhisperCurr); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisperCurr = null; return true; @@ -3297,10 +3313,10 @@ private bool KAKAOBUYwithTabNamePoeAppCom() if (Check_DuplicateTradeMSG(tradeWhisper2Un)) return true; g_TradeMsgList.Add(tradeWhisper2Un); + g_TradeMsgListHistory.Add(tradeWhisper2Un); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisper2Un = null; return true; @@ -3351,10 +3367,10 @@ private bool KAKAOBUYENGPriceNoTabName() if (Check_DuplicateTradeMSG(tradeWhisper2)) return true; g_TradeMsgList.Add(tradeWhisper2); + g_TradeMsgListHistory.Add(tradeWhisper2); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisper2 = null; return true; @@ -3405,10 +3421,10 @@ private bool KAKAOBUYKORPriceWIthTabName() if (Check_DuplicateTradeMSG(tradeWhisper3)) return true; g_TradeMsgList.Add(tradeWhisper3); + g_TradeMsgListHistory.Add(tradeWhisper3); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisper3 = null; return true; @@ -3459,10 +3475,10 @@ private bool KAKAOBUYKORUnPricewithTabName() if (Check_DuplicateTradeMSG(tradeWhisper4)) return true; g_TradeMsgList.Add(tradeWhisper4); + g_TradeMsgListHistory.Add(tradeWhisper4); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisper4 = null; return true; @@ -3513,10 +3529,10 @@ private bool KAKAOBUYENGMapLiveSite() if (Check_DuplicateTradeMSG(tradeWhisperENMAP)) return true; g_TradeMsgList.Add(tradeWhisperENMAP); + g_TradeMsgListHistory.Add(tradeWhisperENMAP); - NotificationForm frmNotifySell = new NotificationForm(); - frmNotifySell.Owner = this; - frmNotifySell.Show(); + NotificationForm frmNotifyPanel = new NotificationForm(); + frmNotificationContainer.AddNotifyForm(frmNotifyPanel); tradeWhisperENMAP = null; return true; @@ -3628,7 +3644,6 @@ private void BtnLOCK_Click(object sender, EventArgs e) btnLOCK.Image = Properties.Resources.icon_re_09_unlock; panelDrag.BackgroundImage = Properties.Resources.moving_bar_unlock; strLock = "N"; - //panelDrag.Visible = true; } @@ -4430,6 +4445,14 @@ private void xuiSwitch1_SwitchStateChanged_1(object sender, EventArgs e) btnSOUND.Image = Properties.Resources.Volume_16x16_Mute; LauncherForm.g_strTimerSound1 = "N"; } + + string strINIPath = String.Format("{0}\\{1}", Application.StartupPath, "ConfigPath.ini"); + IniParser parser = new IniParser(strINIPath); + parser.AddSetting("LOCATIONNOTIFY", "FLASKTIMERSOUND", LauncherForm.g_strTimerSound1); + parser.AddSetting("LOCATIONNOTIFY", "FLASKSOUND1", LauncherForm.g_strTimerSound1); + parser.AddSetting("LOCATIONNOTIFY", "VOLUMEFLASKTIMER", LauncherForm.g_FlaskTimerVolume.ToString()); + parser.SaveSettings(); + parser = null; } private void btnSOUND_Click(object sender, EventArgs e) diff --git a/POExileDirection/DeadlyNotification/NotificationContainer.cs b/POExileDirection/DeadlyNotification/NotificationContainer.cs index 6723bfd..65a1e7e 100644 --- a/POExileDirection/DeadlyNotification/NotificationContainer.cs +++ b/POExileDirection/DeadlyNotification/NotificationContainer.cs @@ -110,7 +110,7 @@ private void panelHolder_ShowHide() btnPanelArrow.Image = Properties.Resources.PanelHolderArrow_up; } - if (panelNOTIFICATION.Controls.Count + 1 > 2) + if (ControlForm.g_nNotificationPanelShownCNT > 0) { panelHolder.BackColor = Color.FromArgb(74, 42, 0); btnPanelArrow.Visible = true; diff --git a/POExileDirection/DeadlyNotification/NotificationForm.Designer.cs b/POExileDirection/DeadlyNotification/NotificationForm.Designer.cs index b24873e..fb75355 100644 --- a/POExileDirection/DeadlyNotification/NotificationForm.Designer.cs +++ b/POExileDirection/DeadlyNotification/NotificationForm.Designer.cs @@ -79,10 +79,11 @@ private void InitializeComponent() // labelElapsed // this.labelElapsed.AutoEllipsis = true; + this.labelElapsed.Cursor = System.Windows.Forms.Cursors.Default; this.labelElapsed.ForeColor = System.Drawing.Color.Tan; this.labelElapsed.Location = new System.Drawing.Point(416, 5); this.labelElapsed.Name = "labelElapsed"; - this.labelElapsed.Size = new System.Drawing.Size(74, 12); + this.labelElapsed.Size = new System.Drawing.Size(74, 14); this.labelElapsed.TabIndex = 0; this.labelElapsed.Text = "0h 00m 00s"; this.labelElapsed.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -91,36 +92,35 @@ private void InitializeComponent() // this.labelStashTabDetail.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelStashTabDetail.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(200)))), ((int)(((byte)(124))))); - this.labelStashTabDetail.Location = new System.Drawing.Point(135, 33); + this.labelStashTabDetail.Location = new System.Drawing.Point(135, 31); this.labelStashTabDetail.Name = "labelStashTabDetail"; - this.labelStashTabDetail.Size = new System.Drawing.Size(255, 12); + this.labelStashTabDetail.Size = new System.Drawing.Size(255, 14); this.labelStashTabDetail.TabIndex = 0; this.labelStashTabDetail.Text = "(00, 00) TabName ( Offer : 0000? )"; - this.labelStashTabDetail.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.labelStashTabDetail.Click += new System.EventHandler(this.LabelItemName_Click); // // labelNickName // this.labelNickName.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelNickName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(200)))), ((int)(((byte)(124))))); - this.labelNickName.Location = new System.Drawing.Point(25, 33); + this.labelNickName.Location = new System.Drawing.Point(25, 31); this.labelNickName.Name = "labelNickName"; - this.labelNickName.Size = new System.Drawing.Size(94, 12); + this.labelNickName.Size = new System.Drawing.Size(94, 14); this.labelNickName.TabIndex = 0; - this.labelNickName.Text = "Nick Name\r\nNick Name"; - this.labelNickName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.labelNickName.Text = "Deadly_DeliriumFrost"; this.labelNickName.DoubleClick += new System.EventHandler(this.BtnWhois_Click); // // labelPrice // + this.labelPrice.Cursor = System.Windows.Forms.Cursors.Default; this.labelPrice.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelPrice.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(200)))), ((int)(((byte)(124))))); - this.labelPrice.Location = new System.Drawing.Point(390, 33); + this.labelPrice.Location = new System.Drawing.Point(390, 31); this.labelPrice.Name = "labelPrice"; - this.labelPrice.Size = new System.Drawing.Size(73, 12); + this.labelPrice.Size = new System.Drawing.Size(73, 14); this.labelPrice.TabIndex = 0; this.labelPrice.Text = "99999"; - this.labelPrice.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.labelPrice.TextAlign = System.Drawing.ContentAlignment.TopRight; this.labelPrice.Click += new System.EventHandler(this.LabelItemName_Click); // // panelMiddle @@ -226,10 +226,11 @@ private void InitializeComponent() // // labelLeague // + this.labelLeague.Cursor = System.Windows.Forms.Cursors.Default; this.labelLeague.ForeColor = System.Drawing.Color.Tan; this.labelLeague.Location = new System.Drawing.Point(48, 5); this.labelLeague.Name = "labelLeague"; - this.labelLeague.Size = new System.Drawing.Size(320, 15); + this.labelLeague.Size = new System.Drawing.Size(320, 14); this.labelLeague.TabIndex = 0; this.labelLeague.Text = "LeagueName (1ex = 999c)"; this.labelLeague.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -261,6 +262,7 @@ private void InitializeComponent() this.pictureCurrency.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(25)))), ((int)(((byte)(25))))); this.pictureCurrency.BackgroundImage = global::POExileDirection.Properties.Resources.QuestionMark_20px; this.pictureCurrency.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureCurrency.Cursor = System.Windows.Forms.Cursors.Default; this.pictureCurrency.Location = new System.Drawing.Point(466, 28); this.pictureCurrency.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.pictureCurrency.Name = "pictureCurrency"; @@ -593,6 +595,7 @@ private void InitializeComponent() // labelItemName // this.labelItemName.BackColor = System.Drawing.Color.Transparent; + this.labelItemName.Cursor = System.Windows.Forms.Cursors.Hand; this.labelItemName.Font = new System.Drawing.Font("Cambria", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelItemName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(215)))), ((int)(((byte)(110)))), ((int)(((byte)(23))))); this.labelItemName.Location = new System.Drawing.Point(28, 5); @@ -607,6 +610,7 @@ private void InitializeComponent() // this.btnCurrency.BackColor = System.Drawing.Color.Transparent; this.btnCurrency.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.btnCurrency.Cursor = System.Windows.Forms.Cursors.Default; this.btnCurrency.FlatAppearance.BorderColor = System.Drawing.Color.DimGray; this.btnCurrency.FlatAppearance.BorderSize = 0; this.btnCurrency.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -626,6 +630,7 @@ private void InitializeComponent() // labelPriceAtTitle // this.labelPriceAtTitle.BackColor = System.Drawing.Color.Transparent; + this.labelPriceAtTitle.Cursor = System.Windows.Forms.Cursors.Default; this.labelPriceAtTitle.Font = new System.Drawing.Font("Cambria", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelPriceAtTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(215)))), ((int)(((byte)(110)))), ((int)(((byte)(23))))); this.labelPriceAtTitle.Location = new System.Drawing.Point(259, 6); diff --git a/POExileDirection/DeadlyNotification/NotificationForm.cs b/POExileDirection/DeadlyNotification/NotificationForm.cs index aae2748..1e9bd07 100644 --- a/POExileDirection/DeadlyNotification/NotificationForm.cs +++ b/POExileDirection/DeadlyNotification/NotificationForm.cs @@ -97,7 +97,7 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) { checkQuadTab.Visible = false; - labelPriceAtTitle.Left = 31; + labelPriceAtTitle.Left = 28; btnCurrency.Left = 78; pictureArrow.Left = 103; labelItemName.Left = 126; @@ -112,6 +112,9 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) btnWhois.Image = Properties.Resources.top_bar_user_buy; labelNickName.ForeColor = Color.FromArgb(0, 26, 204, 255); labelStashTabDetail.ForeColor = Color.FromArgb(0, 26, 204, 255); + + labelItemName.Cursor = System.Windows.Forms.Cursors.Default; + labelStashTabDetail.Cursor = System.Windows.Forms.Cursors.Default; } else { @@ -130,6 +133,9 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) btnWhois.Image = Properties.Resources.top_bar_user_sell; labelNickName.ForeColor = Color.FromArgb(0, 255, 236, 26); labelStashTabDetail.ForeColor = Color.FromArgb(0, 255, 236, 26); + + labelItemName.Cursor = System.Windows.Forms.Cursors.Hand; + labelStashTabDetail.Cursor = System.Windows.Forms.Cursors.Hand; } double nCalcRet = 0; @@ -139,10 +145,18 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) labelNickName.Text = tradeItem.nickName; labelItemName.Text = tradeItem.itemName; - if (!String.IsNullOrEmpty(tradeItem.xPos) && !String.IsNullOrEmpty(tradeItem.yPos) && !String.IsNullOrEmpty(tradeItem.tabName)) + labelStashTabDetail.Visible = true; + if (thisTradeMsg.tradePurpose == "BUY") { - string strTabDetail = String.Format("({0}, {1}) {2}", tradeItem.xPos, tradeItem.yPos, tradeItem.tabName); - labelStashTabDetail.Text = strTabDetail; + labelStashTabDetail.Text = "Your Buying"; + } + else + { + if (!String.IsNullOrEmpty(tradeItem.xPos) && !String.IsNullOrEmpty(tradeItem.yPos) && !String.IsNullOrEmpty(tradeItem.tabName)) + { + string strTabDetail = String.Format("({0}, {1}) {2}", tradeItem.xPos, tradeItem.yPos, tradeItem.tabName); + labelStashTabDetail.Text = strTabDetail; + } } //if (!String.IsNullOrEmpty(tradeItem.priceCall)) @@ -161,9 +175,9 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) bool bIsExpansive = false; bool bFoundCurrencyImage = false; - #region ⨌⨌ Currency Character, Image ⨌⨌ try { + #region ⨌⨌ Currency Character, Image ⨌⨌ nCalcRet = 0; dSelectedCurr = 0; if (tradeItem.whichCurrency.Contains("Chaos") || tradeItem.whichCurrency.Contains("Cha") || @@ -510,29 +524,35 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) } btnCurrency.BackgroundImage = pictureCurrency.BackgroundImage; - if (bIsExpansive) - { - labelNickName.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); - labelStashTabDetail.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); - labelPrice.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); - - Task.Run(() => - { - dxWrapper.SetAudioHandler(Application.StartupPath + "\\notify.wav", LauncherForm.g_NotifyVolume/2); - dxWrapper.Play(); - }); - } - else + #endregion + //if (bIsExpansive) + //{ + // labelNickName.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); + // labelStashTabDetail.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); + // labelPrice.ForeColor = System.Drawing.Color.FromArgb(0, 124, 255, 127); + + // Task.Run(() => + // { + // dxWrapper.SetAudioHandler(Application.StartupPath + "\\notify.wav", LauncherForm.g_NotifyVolume/2); + // dxWrapper.Play(); + // }); + //} + //else + //{ + // labelNickName.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); + // labelStashTabDetail.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); + // labelPrice.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); + // Task.Run(() => + // { + // dxWrapper.SetAudioHandler(Application.StartupPath + "\\notify.wav", LauncherForm.g_NotifyVolume/2); + // dxWrapper.Play(); + // }); + //} + Task.Run(() => { - labelNickName.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); - labelStashTabDetail.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); - labelPrice.ForeColor = System.Drawing.Color.FromArgb(0, 255, 200, 124); - Task.Run(() => - { - dxWrapper.SetAudioHandler(Application.StartupPath + "\\notify.wav", LauncherForm.g_NotifyVolume/2); - dxWrapper.Play(); - }); - } + dxWrapper.SetAudioHandler(Application.StartupPath + "\\notify.wav", LauncherForm.g_NotifyVolume / 2); + dxWrapper.Play(); + }); } catch (Exception ex) { @@ -548,7 +568,6 @@ private void Show_TradeInformation(DeadlyTRADE.TradeMSG tradeItem) else btnCurrency.Text = ""; } - #endregion try { @@ -798,7 +817,9 @@ private void LabelItemName_Click(object sender, EventArgs e) try { if (thisTradeMsg.tradePurpose != "SELL") + { return; + } if (thisTradeMsg.tabName == "" || Convert.ToInt32(thisTradeMsg.xPos) == 0 || Convert.ToInt32(thisTradeMsg.yPos) == 0) return; diff --git a/POExileDirection/DeadlyNotification/NotificationForm.resx b/POExileDirection/DeadlyNotification/NotificationForm.resx index baac9ca..13592f9 100644 --- a/POExileDirection/DeadlyNotification/NotificationForm.resx +++ b/POExileDirection/DeadlyNotification/NotificationForm.resx @@ -337,6 +337,9 @@ v4R9r+8bW+Y9s9dMps/g87gZ3TPTKCYiKPPjl4sH0W9X8A0/HqB6+7gxfAAAAABJRU5ErkJggg== + + 17, 17 + 148, 17 diff --git a/POExileDirection/DeadlyOverlay/FlaskICONTimer.cs b/POExileDirection/DeadlyOverlay/FlaskICONTimer.cs index af16fbd..c5edd9c 100644 --- a/POExileDirection/DeadlyOverlay/FlaskICONTimer.cs +++ b/POExileDirection/DeadlyOverlay/FlaskICONTimer.cs @@ -193,56 +193,40 @@ private void timer1_Tick(object sender, EventArgs e) { DeadlyLog4Net._log.Error($"catch {MethodBase.GetCurrentMethod().Name}", ex); ; } - } + } #endregion + //private async Task playTask() + //{ + // bool bRet = await Task.Run(() => PlayAlertSound()); + //} + + //private bool PlayAlertSound() + //{ + // dxWrapper.SetAudioHandler(Application.StartupPath + "\\flaskalert.wav", LauncherForm.g_FlaskTimerVolume / 2); + // dxWrapper.Play(); + + // return true; + //} + + //private Task playTask; private void PlayMediaFile(string filename) { + //Task playTask = new Task(delegate + //{ + // dxWrapper.SetAudioHandler(filename, LauncherForm.g_FlaskTimerVolume / 2); + // dxWrapper.Play(); + //}); + //playTask.Start(); + //await playTask.ConfigureAwait(false); + //playTask = Task.Run(() => { - dxWrapper.SetAudioHandler(Application.StartupPath + "\\flaskalert.wav", LauncherForm.g_FlaskTimerVolume/2); + dxWrapper.SetAudioHandler(filename, LauncherForm.g_FlaskTimerVolume / 2); dxWrapper.Play(); }); } - // Adjust an image's translucency. - /*private Bitmap AdjustAlpha(Image image, float translucency) - { - // Make the ColorMatrix. - float t = translucency; - ColorMatrix cm = new ColorMatrix(new float[][] - { - new float[] {1, 0, 0, 0, 0}, - new float[] {0, 1, 0, 0, 0}, - new float[] {0, 0, 1, 0, 0}, - new float[] {0, 0, 0, t, 0}, - new float[] {0, 0, 0, 0, 1}, - }); - ImageAttributes attributes = new ImageAttributes(); - attributes.SetColorMatrix(cm); - - // Draw the image onto the new bitmap while - // applying the new ColorMatrix. - Point[] points = - { - new Point(0, 0), - new Point(image.Width, 0), - new Point(0, image.Height), - }; - Rectangle rect = new Rectangle(0, 0, image.Width, image.Height); - - // Make the result bitmap. - Bitmap bm = new Bitmap(image.Width, image.Height); - using (Graphics gr = Graphics.FromImage(bm)) - { - gr.DrawImage(image, points, rect, - GraphicsUnit.Pixel, attributes); - } - - // Return the result. - return bm; - }*/ - private void pictureFlask_MouseDown(object sender, MouseEventArgs e) { if (!LauncherForm.g_pinLOCK) diff --git a/POExileDirection/DeadlyTrade.csproj b/POExileDirection/DeadlyTrade.csproj index 454b093..d15a978 100644 --- a/POExileDirection/DeadlyTrade.csproj +++ b/POExileDirection/DeadlyTrade.csproj @@ -981,4 +981,4 @@ - + \ No newline at end of file diff --git a/POExileDirection/Properties/AssemblyInfo.cs b/POExileDirection/Properties/AssemblyInfo.cs index c7e96b0..b838fd2 100644 --- a/POExileDirection/Properties/AssemblyInfo.cs +++ b/POExileDirection/Properties/AssemblyInfo.cs @@ -33,7 +33,7 @@ // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.3")] -[assembly: AssemblyFileVersion("1.4.0.3")] +[assembly: AssemblyVersion("1.4.0.4")] +[assembly: AssemblyFileVersion("1.4.0.4")] [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config", Watch = true)] [assembly: NeutralResourcesLanguage("en")] diff --git a/POExileDirection/obj/Debug/DeadlyTrade.exe b/POExileDirection/obj/Debug/DeadlyTrade.exe index 0cd9b81..a31abed 100644 Binary files a/POExileDirection/obj/Debug/DeadlyTrade.exe and b/POExileDirection/obj/Debug/DeadlyTrade.exe differ diff --git a/POExileDirection/obj/Debug/DeadlyTrade.pdb b/POExileDirection/obj/Debug/DeadlyTrade.pdb index a333f60..e7bfe17 100644 Binary files a/POExileDirection/obj/Debug/DeadlyTrade.pdb and b/POExileDirection/obj/Debug/DeadlyTrade.pdb differ diff --git a/POExileDirection/obj/Release/DeadlyTrade.csproj.GenerateResource.cache b/POExileDirection/obj/Release/DeadlyTrade.csproj.GenerateResource.cache index 20a7b6e..a8e837d 100644 Binary files a/POExileDirection/obj/Release/DeadlyTrade.csproj.GenerateResource.cache and b/POExileDirection/obj/Release/DeadlyTrade.csproj.GenerateResource.cache differ diff --git a/POExileDirection/obj/Release/DeadlyTrade.csprojAssemblyReference.cache b/POExileDirection/obj/Release/DeadlyTrade.csprojAssemblyReference.cache index d27ce3b..bf408a0 100644 Binary files a/POExileDirection/obj/Release/DeadlyTrade.csprojAssemblyReference.cache and b/POExileDirection/obj/Release/DeadlyTrade.csprojAssemblyReference.cache differ diff --git a/POExileDirection/obj/Release/DeadlyTrade.exe b/POExileDirection/obj/Release/DeadlyTrade.exe index a07bbff..a486483 100644 Binary files a/POExileDirection/obj/Release/DeadlyTrade.exe and b/POExileDirection/obj/Release/DeadlyTrade.exe differ diff --git a/POExileDirection/obj/Release/DeadlyTrade.pdb b/POExileDirection/obj/Release/DeadlyTrade.pdb index 8c794cc..3a301b4 100644 Binary files a/POExileDirection/obj/Release/DeadlyTrade.pdb and b/POExileDirection/obj/Release/DeadlyTrade.pdb differ