diff options
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-10-25 04:35:01 +0000 |
---|---|---|
committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2009-10-25 04:35:01 +0000 |
commit | 6ccefea62ae5644c9b318234c6a8a6c077d00922 (patch) | |
tree | 3b7788ae10dc2507e48c100f39a94c92ab9af70d /ui.cpp | |
parent | 44e1254d1c5ba55c77bbc59c007e22e6e782947a (diff) | |
download | bitcoin-6ccefea62ae5644c9b318234c6a8a6c077d00922.tar.xz |
fix display of new generated coins, fix assertion in bitcoinminer
Diffstat (limited to 'ui.cpp')
-rw-r--r-- | ui.cpp | 55 |
1 files changed, 51 insertions, 4 deletions
@@ -306,6 +306,8 @@ CMainFrame::CMainFrame(wxWindow* parent) : CMainFrameBase(parent) // Init column headers
int nDateWidth = DateTimeStr(1229413914).size() * 6 + 8;
+ if (!strstr(DateTimeStr(1229413914).c_str(), "2008"))
+ nDateWidth += 12;
m_listCtrl->InsertColumn(0, "", wxLIST_FORMAT_LEFT, 0);
m_listCtrl->InsertColumn(1, "", wxLIST_FORMAT_LEFT, 0);
m_listCtrl->InsertColumn(2, "Status", wxLIST_FORMAT_LEFT, 90);
@@ -441,12 +443,33 @@ void CMainFrame::InsertLine(bool fNew, int nIndex, uint256 hashKey, string strSo m_listCtrl->SetItemData(nIndex, nData);
}
+bool CMainFrame::DeleteLine(uint256 hashKey)
+{
+ long nData = *(long*)&hashKey;
+
+ // Find item
+ int nIndex = -1;
+ while ((nIndex = m_listCtrl->FindItem(nIndex, nData)) != -1)
+ if (GetItemText(m_listCtrl, nIndex, 1) == hashKey.ToString())
+ break;
+
+ if (nIndex != -1)
+ m_listCtrl->DeleteItem(nIndex);
+
+ return nIndex != -1;
+}
+
string FormatTxStatus(const CWalletTx& wtx)
{
// Status
int nDepth = wtx.GetDepthInMainChain();
if (!wtx.IsFinal())
- return strprintf("Open for %d blocks", nBestHeight - wtx.nLockTime);
+ {
+ if (wtx.nLockTime < 500000000)
+ return strprintf("Open for %d blocks", nBestHeight - wtx.nLockTime);
+ else
+ return strprintf("Open until %s", DateTimeStr(wtx.nLockTime).c_str());
+ }
else if (nDepth < 6)
return strprintf("%d/unconfirmed", nDepth);
else
@@ -503,7 +526,11 @@ void CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex) // are special because if their block is not accepted, they are not valid.
//
if (wtx.GetDepthInMainChain() < 2)
+ {
+ // In case it was previously displayed
+ DeleteLine(hash);
return;
+ }
}
// Find the block the tx is in
@@ -800,6 +827,17 @@ void CMainFrame::OnPaint(wxPaintEvent& event) event.Skip();
}
+void DelayedRepaint(void* parg)
+{
+ static bool fOneThread;
+ if (fOneThread)
+ return;
+ fOneThread = true;
+ Sleep(1000);
+ MainFrameRepaint();
+ fOneThread = false;
+}
+
void CMainFrame::OnPaintListCtrl(wxPaintEvent& event)
{
// Update listctrl contents
@@ -824,7 +862,7 @@ void CMainFrame::OnPaintListCtrl(wxPaintEvent& event) // Update status bar
string strGen = "";
if (fGenerateBitcoins)
- strGen = " Generating";
+ strGen = " Generating";
if (fGenerateBitcoins && vNodes.empty())
strGen = "(not connected)";
m_statusBar->SetStatusText(strGen, 1);
@@ -833,8 +871,16 @@ void CMainFrame::OnPaintListCtrl(wxPaintEvent& event) m_statusBar->SetStatusText(strStatus, 2);
// Balance total
+ bool fRefreshed = false;
TRY_CRITICAL_BLOCK(cs_mapWallet)
+ {
m_staticTextBalance->SetLabel(FormatMoney(GetBalance()) + " ");
+ fRefreshed = true;
+ }
+
+ // mapWallet was locked, try again later
+ if (!vWalletUpdated.empty() || !fRefreshed)
+ _beginthread(DelayedRepaint, 0, NULL);
m_listCtrl->OnPaint(event);
}
@@ -1414,7 +1460,7 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event) CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent)
{
- m_staticTextVersion->SetLabel(strprintf("version 0.%d.%d Alpha", VERSION/100, VERSION%100));
+ m_staticTextVersion->SetLabel(strprintf("version 0.%d.%d Beta", VERSION/100, VERSION%100));
// Workaround until upgrade to wxWidgets supporting UTF-8
wxString str = m_staticTextMain->GetLabel();
@@ -3358,6 +3404,8 @@ bool CMyApp::OnInit2() return false;
}
+ //RandAddSeedPerfmon();
+
if (!StartNode(strErrors))
wxMessageBox(strErrors, "Bitcoin");
@@ -3517,7 +3565,6 @@ void SetStartOnSystemStartup(bool fAutoStart) // Get the current executable path
char pszExePath[MAX_PATH];
GetModuleFileName(NULL, pszExePath, sizeof(pszExePath));
- _strlwr(pszExePath);
// Set the path to the shortcut target
psl->SetPath(pszExePath);
|