Skip to content

Commit

Permalink
Merge pull request #24 from DeadlyCrush/development
Browse files Browse the repository at this point in the history 
bug fix - prepare 1.4.0.5
  • Loading branch information
@DeadlyCrush
DeadlyCrush authored Mar 16, 2020
2 parents 7fb5dda + f058441 commit bcf746c
Show file tree
Hide file tree
Showing 15 changed files with 492 additions and 456 deletions.
706 changes: 353 additions & 353 deletions POExileDirection/ControlForm.Designer.cs
View file

Large diffs are not rendered by default.

61 changes: 42 additions & 19 deletions POExileDirection/ControlForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion POExileDirection/DeadlyNotification/NotificationContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 17 additions & 12 deletions POExileDirection/DeadlyNotification/NotificationForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bcf746c

Please sign in to comment.