compile fixes by Unthinkingbit
authorWladimir J. van der Laan <laanwj@gmail.com>
Sat, 25 Jun 2011 21:14:10 +0000 (23:14 +0200)
committerWladimir J. van der Laan <laanwj@gmail.com>
Sat, 25 Jun 2011 21:14:10 +0000 (23:14 +0200)
src/qt/bitcoinamountfield.cpp
src/qt/forms/sendcoinsdialog.ui
src/qt/guiutil.cpp
src/qt/transactiondesc.cpp
src/qtui.h

index 935bd13..8166ce6 100644 (file)
@@ -13,7 +13,7 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent):
     amount->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
     amount->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
     amount->installEventFilter(this);
-    amount->setMaximumWidth(80);
+    amount->setMaximumWidth(100);
     decimals = new QLineEdit(this);
     decimals->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
     decimals->setMaxLength(8);
index 3212424..efefe6a 100644 (file)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>736</width>
-    <height>193</height>
+    <width>660</width>
+    <height>151</height>
    </rect>
   </property>
   <property name="windowTitle">
index a81cc14..ec8b435 100644 (file)
@@ -9,7 +9,7 @@
 
 QString GUIUtil::DateTimeStr(qint64 nTime)
 {
-    QDateTime date = QDateTime::fromMSecsSinceEpoch(nTime*1000);
+    QDateTime date = QDateTime::fromTime_t((qint32)nTime);
     return date.date().toString(Qt::SystemLocaleShortDate) + QString(" ") + date.toString("hh:mm");
 }
 
index 9120f19..84b617b 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "guiutil.h"
 #include "main.h"
-#include "externui.h"
+#include "qtui.h"
 
 #include <QString>
 
index 3243164..42f44e0 100644 (file)
@@ -5,6 +5,7 @@
 #define BITCOIN_EXTERNUI_H
 
 #include <string>
+#include <boost/function/function0.hpp>
 
 typedef void wxWindow;
 #define wxYES                   0x00000002