nathanwoodburn/FireWallet
nathanwoodburn/FireWallet
1
0
Fork 0
mirror of https://github.com/Nathanwoodburn/FireWallet.git synced 2024-11-24 08:08:14 +11:00
Code Issues Packages Projects Releases Wiki Activity

main: fixed settings location

Browse Source
This commit is contained in:
Nathan Woodburn 2023-06-14 15:49:56 +10:00
parent 14a685690c
commit 960af0b169
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FireWallet/DomainForm.cs
View File

@ -264,8 +264,6 @@ namespace FireWallet
buttonActionAlt.Hide(); buttonActionAlt.Hide();
buttonActionMain.Hide(); buttonActionMain.Hide();
groupBoxAction.Text = "Reserved"; groupBoxAction.Text = "Reserved";
} }
} }
catch (Exception ex) catch (Exception ex)

30
FireWallet/MainForm.Designer.cs generated
View File

@ -59,7 +59,6 @@ namespace FireWallet
buttonNavSend = new Button(); buttonNavSend = new Button();
buttonNavPortfolio = new Button(); buttonNavPortfolio = new Button();
panelPortfolio = new Panel(); panelPortfolio = new Panel();
buttonRenewAll = new Button();
buttonRevealAll = new Button(); buttonRevealAll = new Button();
groupBoxTransactions = new GroupBox(); groupBoxTransactions = new GroupBox();
groupBoxinfo = new GroupBox(); groupBoxinfo = new GroupBox();
@ -70,6 +69,7 @@ namespace FireWallet
labelBalanceTotal = new Label(); labelBalanceTotal = new Label();
labelLocked = new Label(); labelLocked = new Label();
labelBalance = new Label(); labelBalance = new Label();
buttonRenewAll = new Button();
panelSend = new Panel(); panelSend = new Panel();
checkBoxSendSubFee = new CheckBox(); checkBoxSendSubFee = new CheckBox();
buttonSendMax = new Button(); buttonSendMax = new Button();
@ -400,18 +400,6 @@ namespace FireWallet
panelPortfolio.TabIndex = 7; panelPortfolio.TabIndex = 7;
panelPortfolio.Visible = false; panelPortfolio.Visible = false;
// //
// buttonRenewAll
//
buttonRenewAll.FlatStyle = FlatStyle.Flat;
buttonRenewAll.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
buttonRenewAll.Location = new Point(813, 9);
buttonRenewAll.Name = "buttonRenewAll";
buttonRenewAll.Size = new Size(89, 32);
buttonRenewAll.TabIndex = 10;
buttonRenewAll.Text = "Renew All";
buttonRenewAll.UseVisualStyleBackColor = true;
buttonRenewAll.Click += buttonRenewAll_Click;
//
// buttonRevealAll // buttonRevealAll
// //
buttonRevealAll.FlatStyle = FlatStyle.Flat; buttonRevealAll.FlatStyle = FlatStyle.Flat;
@ -518,6 +506,18 @@ namespace FireWallet
labelBalance.TabIndex = 0; labelBalance.TabIndex = 0;
labelBalance.Text = "labelBalance"; labelBalance.Text = "labelBalance";
// //
// buttonRenewAll
//
buttonRenewAll.FlatStyle = FlatStyle.Flat;
buttonRenewAll.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
buttonRenewAll.Location = new Point(813, 9);
buttonRenewAll.Name = "buttonRenewAll";
buttonRenewAll.Size = new Size(89, 32);
buttonRenewAll.TabIndex = 10;
buttonRenewAll.Text = "Renew All";
buttonRenewAll.UseVisualStyleBackColor = true;
buttonRenewAll.Click += buttonRenewAll_Click;
//
// panelSend // panelSend
// //
panelSend.Controls.Add(checkBoxSendSubFee); panelSend.Controls.Add(checkBoxSendSubFee);
@ -792,7 +792,7 @@ namespace FireWallet
panelSettings.Controls.Add(buttonSettingsSave); panelSettings.Controls.Add(buttonSettingsSave);
panelSettings.Controls.Add(groupBoxSettingsExplorer); panelSettings.Controls.Add(groupBoxSettingsExplorer);
panelSettings.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point); panelSettings.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
panelSettings.Location = new Point(1065, 211); panelSettings.Location = new Point(1065, 51);
panelSettings.Name = "panelSettings"; panelSettings.Name = "panelSettings";
panelSettings.Size = new Size(930, 550); panelSettings.Size = new Size(930, 550);
panelSettings.TabIndex = 19; panelSettings.TabIndex = 19;
@ -1007,6 +1007,7 @@ namespace FireWallet
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1152, 575); ClientSize = new Size(1152, 575);
Controls.Add(panelSettings);
Controls.Add(panelaccount); Controls.Add(panelaccount);
Controls.Add(panelPortfolio); Controls.Add(panelPortfolio);
Controls.Add(panelRecieve); Controls.Add(panelRecieve);
@ -1014,7 +1015,6 @@ namespace FireWallet
Controls.Add(panelSend); Controls.Add(panelSend);
Controls.Add(panelNav); Controls.Add(panelNav);
Controls.Add(statusStripmain); Controls.Add(statusStripmain);
Controls.Add(panelSettings);
Icon = (Icon)resources.GetObject("$this.Icon"); Icon = (Icon)resources.GetObject("$this.Icon");
Name = "MainForm"; Name = "MainForm";
Opacity = 0D; Opacity = 0D;

27
FireWallet/MainForm.cs
View File

@ -221,7 +221,8 @@ namespace FireWallet
if (hideScreen) if (hideScreen)
{ {
hsdProcess.StartInfo.RedirectStandardError = true; hsdProcess.StartInfo.RedirectStandardError = true;
} else }
else
{ {
hsdProcess.StartInfo.RedirectStandardError = false; hsdProcess.StartInfo.RedirectStandardError = false;
} }
@ -240,7 +241,7 @@ namespace FireWallet
hsdProcess.Start(); hsdProcess.Start();
// Wait for HSD to start // Wait for HSD to start
await Task.Delay(2000); await Task.Delay(2000);
// Check if HSD is running // Check if HSD is running
if (hsdProcess.HasExited) if (hsdProcess.HasExited)
{ {
@ -866,7 +867,7 @@ namespace FireWallet
// Check how many TX there are // Check how many TX there are
APIresponse = await APIGet("wallet/"+ account,true); APIresponse = await APIGet("wallet/" + account, true);
JObject wallet = JObject.Parse(APIresponse); JObject wallet = JObject.Parse(APIresponse);
if (!wallet.ContainsKey("balance")) if (!wallet.ContainsKey("balance"))
{ {
@ -883,7 +884,7 @@ namespace FireWallet
int toSkip = TotalTX - toGet; int toSkip = TotalTX - toGet;
// GET TXs // GET TXs
APIresponse = await APIPost("", true, "{\"method\": \"listtransactions\",\"params\": [\"default\"," +toGet+","+ toSkip+ "]}"); APIresponse = await APIPost("", true, "{\"method\": \"listtransactions\",\"params\": [\"default\"," + toGet + "," + toSkip + "]}");
if (APIresponse == "Error") if (APIresponse == "Error")
{ {
@ -891,7 +892,7 @@ namespace FireWallet
return; return;
} }
JObject TXGET = JObject.Parse(APIresponse); JObject TXGET = JObject.Parse(APIresponse);
// Check for error // Check for error
if (TXGET["error"].ToString() != "") if (TXGET["error"].ToString() != "")
{ {
@ -950,7 +951,7 @@ namespace FireWallet
AutoSize = true, AutoSize = true,
Location = new Point(10, 25) Location = new Point(10, 25)
}; };
tmpPanel.Controls.Add(labelHash); tmpPanel.Controls.Add(labelHash);
JArray inputs = JArray.Parse(tx["inputs"].ToString()); JArray inputs = JArray.Parse(tx["inputs"].ToString());
@ -968,10 +969,10 @@ namespace FireWallet
{ {
cost = "Received: " + costHNS.ToString() + " HNS"; cost = "Received: " + costHNS.ToString() + " HNS";
} }
Label labelInputOutput = new Label() Label labelInputOutput = new Label()
{ {
@ -1172,6 +1173,7 @@ namespace FireWallet
} }
panelSettings.Show(); panelSettings.Show();
panelSettings.Dock = DockStyle.Fill;
buttonSettingsSave.Top = panelSettings.Height - buttonSettingsSave.Height - 10; buttonSettingsSave.Top = panelSettings.Height - buttonSettingsSave.Height - 10;
labelSettingsSaved.Top = buttonSettingsSave.Top + 10; labelSettingsSaved.Top = buttonSettingsSave.Top + 10;
textBoxExTX.Text = userSettings["explorer-tx"]; textBoxExTX.Text = userSettings["explorer-tx"];
@ -1677,7 +1679,8 @@ namespace FireWallet
domainTMP.Controls.Add(domainName); domainTMP.Controls.Add(domainName);
if (!name.ContainsKey("stats")) { if (!name.ContainsKey("stats"))
{
AddLog("Domain " + Domains[i] + " does not have stats"); AddLog("Domain " + Domains[i] + " does not have stats");
continue; continue;
} }
@ -1716,8 +1719,8 @@ namespace FireWallet
foreach (Control c in domainTMP.Controls) foreach (Control c in domainTMP.Controls)
{ {
c.Click += new EventHandler((sender, e) => c.Click += new EventHandler((sender, e) =>
{ {
DomainForm domainForm = new DomainForm(this, name["name"].ToString(), userSettings["explorer-tx"], userSettings["explorer-domain"]); DomainForm domainForm = new DomainForm(this, name["name"].ToString(), userSettings["explorer-tx"], userSettings["explorer-domain"]);
domainForm.Show(); domainForm.Show();
}); });