aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/coding.md40
-rw-r--r--src/qt/coincontroldialog.cpp12
-rw-r--r--src/test/data/script_invalid.json4
-rw-r--r--src/test/data/script_valid.json4
4 files changed, 38 insertions, 22 deletions
diff --git a/doc/coding.md b/doc/coding.md
index 3581d7deb2..ab3a73494a 100644
--- a/doc/coding.md
+++ b/doc/coding.md
@@ -63,32 +63,32 @@ and its cs_KeyStore lock for example).
-------
Threads
+- ThreadScriptCheck : Verifies block scripts.
+
+- ThreadImport : Loads blocks from blk*.dat files or bootstrap.dat.
+
- StartNode : Starts other threads.
-- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
+- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
+
+- ThreadDNSAddressSeed : Loads addresses of peers from the DNS.
+
+- ThreadMapPort : Universal plug-and-play startup/shutdown
- ThreadSocketHandler : Sends/Receives data from peers on port 8333.
-
-- ThreadMessageHandler : Higher-level message handling (sending and receiving).
-
+
+- ThreadOpenAddedConnections : Opens network connections to added nodes.
+
- ThreadOpenConnections : Initiates new connections to peers.
-- ThreadTopUpKeyPool : replenishes the keystore's keypool.
-
-- ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.
-
-- SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
-
-- ThreadDelayedRepaint : repaint the gui
+- ThreadMessageHandler : Higher-level message handling (sending and receiving).
+
+- DumpAddresses : Dumps IP addresses of nodes to peers.dat.
- ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
-
+
- ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
-
-- ThreadBitcoinMiner : Generates bitcoins
-
-- ThreadMapPort : Universal plug-and-play startup/shutdown
-
-- Shutdown : Does an orderly shutdown of everything
-
-- ExitTimeout : Windows-only, sleeps 5 seconds then exits application
+
+- BitcoinMiner : Generates bitcoins (if wallet is enabled).
+
+- Shutdown : Does an orderly shutdown of everything.
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 1e5a2efc94..f0d48baf90 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -386,6 +386,18 @@ void CoinControlDialog::viewItemChanged(QTreeWidgetItem* item, int column)
if (ui->treeWidget->isEnabled()) // do not update on every click for (un)select all
CoinControlDialog::updateLabels(model, this);
}
+
+ // todo: this is a temporary qt5 fix: when clicking a parent node in tree mode, the parent node
+ // including all childs are partially selected. But the parent node should be fully selected
+ // as well as the childs. Childs should never be partially selected in the first place.
+ // Please remove this ugly fix, once the bug is solved upstream.
+#if QT_VERSION >= 0x050000
+ else if (column == COLUMN_CHECKBOX && item->childCount() > 0)
+ {
+ if (item->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked && item->child(0)->checkState(COLUMN_CHECKBOX) == Qt::PartiallyChecked)
+ item->setCheckState(COLUMN_CHECKBOX, Qt::Checked);
+ }
+#endif
}
// return human readable label for priority number
diff --git a/src/test/data/script_invalid.json b/src/test/data/script_invalid.json
index 761cc4a008..8cb365a46f 100644
--- a/src/test/data/script_invalid.json
+++ b/src/test/data/script_invalid.json
@@ -325,5 +325,7 @@
["NOP1 0x01 1", "HASH160 0x14 0xda1745e9b549bd0bfa1a569971c77eba30cd5a4b EQUAL"],
["0 0x01 0x50", "HASH160 0x14 0xece424a6bb6ddf4db592c0faed60685047a361b1 EQUAL", "OP_RESERVED in P2SH should fail"],
-["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "OP_VER in P2SH should fail"]
+["0 0x01 VER", "HASH160 0x14 0x0f4d7845db968f2a81b530b6f3c1d6246d4c7e01 EQUAL", "OP_VER in P2SH should fail"],
+
+["0x00", "'00' EQUAL", "Basic OP_0 execution"]
]
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json
index e4c181cae8..3b4c191865 100644
--- a/src/test/data/script_valid.json
+++ b/src/test/data/script_valid.json
@@ -411,5 +411,7 @@
["0x4c 0x40 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242",
"0x4d 0x4000 0x42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242 EQUAL",
-"Basic PUSHDATA1 signedness check"]
+"Basic PUSHDATA1 signedness check"],
+
+["0x00", "SIZE 0 EQUAL", "Basic OP_0 execution"]
]