Minor spacing and messaging improvements

snowblossomcoin · Jul 12, 2019 · 556447b · 556447b
1 parent e9c190d
commit 556447b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/iceleaf/src/AddressPanel.java b/iceleaf/src/AddressPanel.java
@@ -62,7 +62,7 @@ public void setupPanel()
     c.weightx = 0.0;
     c.weighty= 0.0;
     c.gridheight = 1;
-    c.anchor = GridBagConstraints.NORTHWEST;
+    c.anchor = GridBagConstraints.WEST;
 
     c.gridwidth = 1;
     panel.add(new JLabel("Wallet to view addresses of:"), c);
@@ -87,7 +87,7 @@ public class UpdateThread extends PeriodicThread
   {
     public UpdateThread()
     {
-      super(15000);
+      super(45000);
 
     }
     public void runPass()
@@ -98,13 +98,15 @@ public void runPass()
         if (wallet_name == null)
         {
           setMessageBox("no wallet selected");
+          setStatusBox("");
           return;
         }
 
         SnowBlossomClient client = ice_leaf.getWalletPanel().getWallet( wallet_name );
         if (client == null)
         {
           setMessageBox("no wallet selected");
+          setStatusBox("");
           return;
         }
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -115,8 +117,6 @@ public void runPass()
 
         for(AddressSpecHash hash : WalletUtil.getAddressesByAge(db, ice_leaf.getParams()))
         {
-
-
           String address = hash.toAddressString(ice_leaf.getParams());
           boolean used = db.getUsedAddressesMap().containsKey(address);
           BalanceInfo bi = client.getBalance(hash);
@@ -133,6 +133,7 @@ public void runPass()
 			catch(Throwable t)
 			{
 				setMessageBox(ErrorUtil.getThrowInfo(t));
+        setStatusBox("");
 			}
     }
 

diff --git a/iceleaf/src/BasePanel.java b/iceleaf/src/BasePanel.java
@@ -84,7 +84,7 @@ public void setup()
     GridBagConstraints c = new GridBagConstraints();
     c.gridheight = 1;
 		c.gridwidth = GridBagConstraints.REMAINDER;
-    c.anchor = GridBagConstraints.NORTHWEST;
+    c.anchor = GridBagConstraints.WEST;
 
     c.weightx=0.0;
     c.weighty=0.0;

diff --git a/iceleaf/src/MakeWalletPanel.java b/iceleaf/src/MakeWalletPanel.java
@@ -59,7 +59,7 @@ public void setupPanel()
     c.weighty= 0.0;
     c.gridheight = 1;
     c.gridwidth = 1;
-    c.anchor = GridBagConstraints.NORTHWEST;
+    c.anchor = GridBagConstraints.WEST;
 
 
     panel.add(new JLabel("Name for new wallet: "), c);
@@ -186,6 +186,7 @@ else if (import_seed_button.isSelected())
         }
 
         name_field.setText("");
+        import_field.setText("");
         ice_leaf.getWalletPanel().wake();
 
       }

diff --git a/iceleaf/src/NodePanel.java b/iceleaf/src/NodePanel.java
@@ -38,7 +38,7 @@ public void setupPanel()
 			c.weightx = 0.0;
 			c.weighty= 0.0;
 			c.gridheight = 1;
-			c.anchor = GridBagConstraints.NORTHWEST;
+			c.anchor = GridBagConstraints.WEST;
 
     c.gridwidth = GridBagConstraints.REMAINDER;
 		if (ice_leaf_prefs.getBoolean("node_run_local", false))

diff --git a/iceleaf/src/NodeSelectionPanel.java b/iceleaf/src/NodeSelectionPanel.java
@@ -49,7 +49,7 @@ public void setupPanel()
 			c.weightx = 0.0;
 			c.weighty= 0.0;
 			c.gridheight = 1;
-			c.anchor = GridBagConstraints.NORTHWEST;
+			c.anchor = GridBagConstraints.WEST;
 
     c.gridwidth = GridBagConstraints.REMAINDER;
 

diff --git a/iceleaf/src/SendPanel.java b/iceleaf/src/SendPanel.java
@@ -71,7 +71,7 @@ public void setupPanel()
     c.weightx = 0.0;
     c.weighty= 0.0;
     c.gridheight = 1;
-    c.anchor = GridBagConstraints.NORTHWEST;
+    c.anchor = GridBagConstraints.WEST;
 
 
     c.gridwidth = 1;
@@ -145,9 +145,11 @@ public void run()
             SubmitReply reply = ice_leaf.getStubHolder().getBlockingStub().submitTransaction(tx_result.getTx());
             ChainHash tx_hash = new ChainHash(tx_result.getTx().getTxHash());
             setMessageBox(String.format("%s\n%s", tx_hash.toString(), reply.toString()));
+            setStatusBox("");
 
 						send_state = 0;
 						setProgressBar(0, SEND_DELAY);
+            setStatusBox("");
 
 						return;
 					}
@@ -163,11 +165,13 @@ public void run()
         setupTx();
 
 
+        setStatusBox("Time delay to review");
 				for(int i=0; i<SEND_DELAY; i+=SEND_DELAY_STEP)
 				{
 					setProgressBar(i, SEND_DELAY);
 					sleep(SEND_DELAY_STEP);
 				}
+        setStatusBox("Ready to broadcast");
 				setProgressBar(SEND_DELAY, SEND_DELAY);
 				synchronized(state_obj)
 				{
@@ -176,6 +180,7 @@ public void run()
 			}
 			catch(Throwable t)
 			{
+        setStatusBox("Error");
 				setMessageBox(ErrorUtil.getThrowInfo(t));
 
 				synchronized(state_obj)
@@ -189,6 +194,8 @@ public void run()
 
   private void setupTx() throws Exception
   {
+    setStatusBox("Creating transaction");
+    setMessageBox("");
     TransactionFactoryConfig.Builder config = TransactionFactoryConfig.newBuilder();
     config.setSign(true);
     config.setChangeFreshAddress(true);

diff --git a/iceleaf/src/SettingsPanel.java b/iceleaf/src/SettingsPanel.java
@@ -24,7 +24,7 @@ public void setupPanel()
 			c.weightx = 0.0;
 			c.weighty= 0.0;
 			c.gridheight = 1;
-			c.anchor = GridBagConstraints.NORTHWEST;
+			c.anchor = GridBagConstraints.WEST;
 
 			c.gridwidth = 1;
 			panel.add(new JLabel("Wallet Directory"), c);

diff --git a/iceleaf/src/WalletPanel.java b/iceleaf/src/WalletPanel.java
@@ -49,7 +49,7 @@ public void setupPanel()
 			c.weightx = 0.0;
 			c.weighty= 0.0;
 			c.gridheight = 1;
-			c.anchor = GridBagConstraints.NORTHWEST;
+			c.anchor = GridBagConstraints.WEST;
 
     c.gridwidth = GridBagConstraints.REMAINDER;