Merge pull request bitcoin#14 from CryptAxe/master

Overhauled resolvevote dialog

hivemind.pro

@@ -1,22 +1,26 @@
 ######################################################################
-# Automatically generated by qmake (3.0) Mon Nov 16 22:58:22 2015
+# Automatically generated by qmake (3.0) Fri Dec 11 22:09:58 2015
 ######################################################################
 
 TEMPLATE = app
 TARGET = hivemind
 INCLUDEPATH += . \
                src \
+               src/config \
                src/leveldb/port/win \
                src/crypto \
                src/primitives \
                src/script \
+               src/obj \
                src/univalue \
                src/json \
                src/compat \
                src/secp256k1/include \
                src/leveldb/helpers/memenv \
                src/linalg/src \
                src/qt \
+               src/qt/forms \
+               src/test/data \
                src/test \
                src/fdlibm/src \
                src/qt/test \
@@ -87,6 +91,7 @@ HEADERS += src/addrman.h \
            src/wallet_ismine.h \
            src/walletdb.h \
            src/compat/sanity.h \
+           src/config/hivemind-config.h \
            src/crypto/common.h \
            src/crypto/hmac_sha256.h \
            src/crypto/hmac_sha512.h \
@@ -104,6 +109,7 @@ HEADERS += src/addrman.h \
            src/json/json_spirit_value.h \
            src/json/json_spirit_writer.h \
            src/json/json_spirit_writer_template.h \
+           src/obj/build.h \
            src/primitives/block.h \
            src/primitives/market.h \
            src/primitives/transaction.h \
@@ -160,6 +166,7 @@ HEADERS += src/addrman.h \
            src/qt/optionsdialog.h \
            src/qt/optionsmodel.h \
            src/qt/overviewpage.h \
+           src/qt/paymentrequest.pb.h \
            src/qt/paymentrequestplus.h \
            src/qt/paymentserver.h \
            src/qt/peertablemodel.h \
@@ -243,6 +250,22 @@ HEADERS += src/addrman.h \
            src/leveldb/util/testharness.h \
            src/leveldb/util/testutil.h \
            src/linalg/src/tc_mat.h \
+           src/qt/forms/ui_addressbookpage.h \
+           src/qt/forms/ui_askpassphrasedialog.h \
+           src/qt/forms/ui_coincontroldialog.h \
+           src/qt/forms/ui_editaddressdialog.h \
+           src/qt/forms/ui_helpmessagedialog.h \
+           src/qt/forms/ui_intro.h \
+           src/qt/forms/ui_openuridialog.h \
+           src/qt/forms/ui_optionsdialog.h \
+           src/qt/forms/ui_overviewpage.h \
+           src/qt/forms/ui_receivecoinsdialog.h \
+           src/qt/forms/ui_receiverequestdialog.h \
+           src/qt/forms/ui_rpcconsole.h \
+           src/qt/forms/ui_sendcoinsdialog.h \
+           src/qt/forms/ui_sendcoinsentry.h \
+           src/qt/forms/ui_signverifymessagedialog.h \
+           src/qt/forms/ui_transactiondescdialog.h \
            src/qt/test/paymentrequestdata.h \
            src/qt/test/paymentservertests.h \
            src/qt/test/uritests.h \
@@ -268,6 +291,7 @@ HEADERS += src/addrman.h \
            src/secp256k1/src/field_impl.h \
            src/secp256k1/src/group.h \
            src/secp256k1/src/group_impl.h \
+           src/secp256k1/src/libsecp256k1-config.h \
            src/secp256k1/src/num.h \
            src/secp256k1/src/num_gmp.h \
            src/secp256k1/src/num_gmp_impl.h \
@@ -281,6 +305,17 @@ HEADERS += src/addrman.h \
            src/secp256k1/src/testrand.h \
            src/secp256k1/src/testrand_impl.h \
            src/secp256k1/src/util.h \
+           src/test/data/alertTests.raw.h \
+           src/test/data/base58_encode_decode.json.h \
+           src/test/data/base58_keys_invalid.json.h \
+           src/test/data/base58_keys_valid.json.h \
+           src/test/data/script_invalid.json.h \
+           src/test/data/script_valid.json.h \
+           src/test/data/sig_canonical.json.h \
+           src/test/data/sig_noncanonical.json.h \
+           src/test/data/sighash.json.h \
+           src/test/data/tx_invalid.json.h \
+           src/test/data/tx_valid.json.h \
            src/leveldb/helpers/memenv/memenv.h \
            src/leveldb/include/leveldb/c.h \
            src/leveldb/include/leveldb/cache.h \
@@ -299,6 +334,11 @@ HEADERS += src/addrman.h \
            src/leveldb/port/win/stdint.h \
            src/secp256k1/src/java/org_hivemind_NativeSecp256k1.h \
            src/linalg/src/tc_mat.c \
+           src/qt/hivemind.moc \
+           src/qt/hivemindamountfield.moc \
+           src/qt/intro.moc \
+           src/qt/overviewpage.moc \
+           src/qt/rpcconsole.moc \
            src/secp256k1/src/secp256k1.c
 FORMS += src/qt/forms/addressbookpage.ui \
          src/qt/forms/askpassphrasedialog.ui \
@@ -447,9 +487,12 @@ SOURCES += src/addrman.cpp \
            src/qt/optionsdialog.cpp \
            src/qt/optionsmodel.cpp \
            src/qt/overviewpage.cpp \
+           src/qt/paymentrequest.pb.cc \
            src/qt/paymentrequestplus.cpp \
            src/qt/paymentserver.cpp \
            src/qt/peertablemodel.cpp \
+           src/qt/qrc_hivemind.cpp \
+           src/qt/qrc_hivemind_locale.cpp \
            src/qt/qvalidatedlineedit.cpp \
            src/qt/qvaluecombobox.cpp \
            src/qt/receivecoinsdialog.cpp \

src/qt/resolvevotecoltablemodel.cpp

@@ -8,7 +8,6 @@ extern "C"{
 }
 #include "resolvevotecoltablemodel.h"
 
-
 ResolveVoteColTableModel::ResolveVoteColTableModel()
     : QAbstractTableModel(0),
     voteptr(0)
@@ -49,9 +48,7 @@ QVariant ResolveVoteColTableModel::data(const QModelIndex &index, int role) cons
         {
             double value = (*voteptr)->cvecs[row]->a[0][col];
             if (value != (*voteptr)->NA) {
-                char tmp[32];
-                snprintf(tmp, sizeof(tmp), "%.8f", value);
-                return QVariant(QString(tmp));
+                return QVariant(QString::number(value, 'f', 8));
             }
             return QVariant(QString("NA"));
         }