Interface redesigned.

CraigsCoin · Oct 5, 2014 · 6a1b12a · 6a1b12a
1 parent 40e645f
commit 6a1b12a
Show file tree

Hide file tree

Showing 46 changed files with 1,508 additions and 739 deletions.
diff --git a/src/ads.h b/src/ads.h
@@ -6,6 +6,8 @@
 static const int64_t AD_FEE_AMOUNT = 5 * COIN;
 static const char AD_FEE_ADDRESS[] = "CHjJ6sJ7PpnPhc4XYHmgNY2YHLZeR4QueT";
 static const char AD_FEE_ADDRESS_TESTNET[] = "mmrBgTm1ycomXHdSooj3gf6zkf1FGDGhqY";
+static const unsigned int AD_MARKUP_LENGTH = 300;
+static const unsigned int AD_MAX_BYTES = 10000 + AD_MARKUP_LENGTH;
 
 
 struct AdEntry

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -8,7 +8,7 @@
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       2
-#define CLIENT_VERSION_REVISION    0
+#define CLIENT_VERSION_REVISION    2
 #define CLIENT_VERSION_BUILD       0
 
 //libzerocoin activation reserv. v.2.0

diff --git a/src/main.cpp b/src/main.cpp
@@ -477,7 +477,8 @@ bool CTransaction::CheckTransaction() const
     // Size limits
     if (::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
         return DoS(100, error("CTransaction::CheckTransaction() : size limits failed"));
-
+    if (msg.size() > AD_MAX_BYTES)
+      return DoS(10, error("CTransaction::CheckTransaction() : msg size too high"));
     const bool hasMsg = !msg.empty();
 
     // Check for negative or overflow output values

diff --git a/src/obj/build.h b/src/obj/build.h
@@ -1,2 +1,2 @@
 // No build information available
-#define BUILD_DATE "2014-09-21 00:49:32 +0400"
+#define BUILD_DATE "2014-09-05 19:21:51 +0400"
diff --git a/src/obj/zerocoin/.gitignore b/src/obj/zerocoin/.gitignore
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -45,6 +45,12 @@
         <file alias="staking_off">res/icons/staking_off.png</file>
         <file alias="staking_on">res/icons/staking_on.png</file>
         <file alias="ads">res/icons/ads.png</file>
+        <file alias="header">res/icons/header.png</file>
+        <file alias="close">res/icons/close.png</file>
+        <file alias="maximize">res/icons/maximize.png</file>
+        <file alias="minimize">res/icons/minimize.png</file>
+        <file alias="restore">res/icons/restore.png</file>
+        <file alias="plus">res/icons/plus.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>
@@ -95,4 +101,7 @@
         <file alias="zh_CN">locale/bitcoin_zh_CN.qm</file>
         <file alias="zh_TW">locale/bitcoin_zh_TW.qm</file>
     </qresource>
+    <qresource prefix="/styles">
+        <file alias="default">res/style.txt</file>
+    </qresource>
 </RCC>