Mercurial > hg > bitcoin

diff ui.cpp @ 73:2498d0a0521d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed colors on ubuntu lucid, enabled -O2 in makefile.unix, boost removed -mt from their library names in 1.40, updated bitcoin icon, hashmeter, generated and hashmeter log entries -- version 0.2.13 git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@86 1a98c847-1fd6-4fd8-948a-caf3550aa51b
author s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
date Mon, 21 Jun 2010 01:33:44 +0000 (2010-06-21)
parents 0fecfb941a51
children 9c042b491420
line wrap: on
line diff
--- a/ui.cpp
+++ b/ui.cpp
@@ -250,7 +250,8 @@
 #ifdef __WXMSW__
     SetIcon(wxICON(bitcoin));
 #else
-    SetIcon(bitcoin16_xpm);
+    SetIcon(bitcoin20_xpm);
+    SetBackgroundColour(m_toolBar->GetBackgroundColour());
     wxFont fontTmp = m_staticText41->GetFont();
     fontTmp.SetFamily(wxFONTFAMILY_TELETYPE);
     m_staticTextBalance->SetFont(fontTmp);
@@ -374,13 +375,13 @@
     // to get rid of the deprecated warning.  Just ignore it.
     if (!event.Iconized())
         fClosedToTray = false;
-#ifndef __WXMSW__
-    // Tray is not reliable on ubuntu 9.10 gnome
-    fClosedToTray = false;
-#endif
+#ifdef __WXMSW__
+    // The tray icon sometimes disappears on ubuntu karmic
+    // Hiding the taskbar button doesn't work reliably on ubuntu lucid
     if (fMinimizeToTray && event.Iconized())
         fClosedToTray = true;
     Show(!fClosedToTray);
+#endif
     ptaskbaricon->Show(fMinimizeToTray || fClosedToTray);
 }