From: Wladimir J. van der Laan Date: Thu, 26 Jan 2012 18:00:02 +0000 (+0100) Subject: Merge pull request #593 (Full URL Support in bitcoin-qt) X-Git-Tag: v0.4.0-unstable~129^2~250 X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=70f55355e29c8e45b607e782c5d76609d23cc858;hp=-c;p=novacoin.git Merge pull request #593 (Full URL Support in bitcoin-qt) --- 70f55355e29c8e45b607e782c5d76609d23cc858 diff --combined bitcoin-qt.pro index 71ee1fe,ab5414c..cd68720 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@@ -97,7 -97,6 +97,7 @@@ HEADERS += src/qt/bitcoingui.h src/base58.h \ src/bignum.h \ src/checkpoints.h \ + src/compat.h \ src/util.h \ src/uint256.h \ src/serialize.h \ @@@ -145,7 -144,8 +145,8 @@@ src/qt/qvaluecombobox.h \ src/qt/askpassphrasedialog.h \ src/protocol.h \ - src/qt/notificator.h + src/qt/notificator.h \ + src/qt/qtipcserver.h SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/transactiontablemodel.cpp \ @@@ -157,7 -157,6 +158,7 @@@ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ src/util.cpp \ + src/netbase.cpp \ src/key.cpp \ src/script.cpp \ src/main.cpp \ @@@ -194,7 -193,8 +195,8 @@@ src/qt/qvaluecombobox.cpp \ src/qt/askpassphrasedialog.cpp \ src/protocol.cpp \ - src/qt/notificator.cpp + src/qt/notificator.cpp \ + src/qt/qtipcserver.cpp RESOURCES += \ src/qt/bitcoin.qrc diff --combined contrib/debian/changelog index a261845,44aa683..db5e268 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@@ -1,11 -1,9 +1,13 @@@ bitcoin (0.5.1-natty1) natty; urgency=low + * Remove mentions on anonymity in package descriptions and manpage. + These should never have been there, bitcoin isnt anonymous without + a ton of work that virtually no users will ever be willing and + capable of doing + * Add GNOME/KDE support for bitcoin-qt's bitcoin: URI support. + Thanks to luke-jr for the KDE .protocol file. - -- Matt Corallo Sat, 7 Jan 2012 13:37:00 -0500 + -- Matt Corallo Fri, 23 Dec 2011 20:25:00 -0500 bitcoin (0.5.1-natty0) natty; urgency=low diff --combined src/init.cpp index 837d73f,05ba795..d237e24 --- a/src/init.cpp +++ b/src/init.cpp @@@ -192,7 -192,7 +192,7 @@@ bool AppInit2(int argc, char* argv[] " -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" + " -port= \t\t " + _("Listen for connections on (default: 8333 or testnet: 18333)") + "\n" + " -maxconnections=\t " + _("Maintain at most connections to peers (default: 125)") + "\n" + - " -addnode= \t " + _("Add a node to connect to") + "\n" + + " -addnode= \t " + _("Add a node to connect to and attempt to keep the connection open") + "\n" + " -connect= \t\t " + _("Connect only to the specified node") + "\n" + " -noirc \t " + _("Don't find peers using internet relay chat") + "\n" + " -nolisten \t " + _("Don't accept connections from outside") + "\n" + @@@ -227,7 -227,6 +227,7 @@@ " -rpcport= \t\t " + _("Listen for JSON-RPC connections on (default: 8332)") + "\n" + " -rpcallowip= \t\t " + _("Allow JSON-RPC connections from specified IP address") + "\n" + " -rpcconnect= \t " + _("Send commands to node running on (default: 127.0.0.1)") + "\n" + + " -blocknotify= " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" + " -keypool= \t " + _("Set key pool size to (default: 100)") + "\n" + " -rescan \t " + _("Rescan the block chain for missing wallet transactions") + "\n"; @@@ -273,7 -272,7 +273,7 @@@ #ifndef QT_GUI for (int i = 1; i < argc; i++) - if (!IsSwitchChar(argv[i][0])) + if (!IsSwitchChar(argv[i][0]) && !(strlen(argv[i]) > 7 && strncasecmp(argv[i], "bitcoin:", 8) == 0)) fCommandLine = true; if (fCommandLine) @@@ -463,7 -462,7 +463,7 @@@ if (mapArgs.count("-proxy")) { fUseProxy = true; - addrProxy = CAddress(mapArgs["-proxy"]); + addrProxy = CService(mapArgs["-proxy"], 9050); if (!addrProxy.IsValid()) { wxMessageBox(_("Invalid -proxy address"), "Bitcoin"); @@@ -471,7 -470,7 +471,7 @@@ } } - bool fTor = (fUseProxy && addrProxy.port == htons(9050)); + bool fTor = (fUseProxy && addrProxy.GetPort() == 9050); if (fTor) { // Use SoftSetArg here so user can override any of these if they wish. @@@ -512,7 -511,7 +512,7 @@@ { BOOST_FOREACH(string strAddr, mapMultiArgs["-addnode"]) { - CAddress addr(strAddr, fAllowDNS); + CAddress addr(CService(strAddr, GetDefaultPort(), fAllowDNS)); addr.nTime = 0; // so it won't relay unless successfully connected if (addr.IsValid()) AddAddress(addr); diff --combined src/qt/bitcoingui.cpp index d77279d,c9381a6..f9f92f0 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@@ -417,6 -417,7 +417,6 @@@ void BitcoinGUI::setNumBlocks(int count { if(!clientModel) return; - int initTotal = clientModel->getNumBlocksAtStartup(); int total = clientModel->getNumBlocksOfPeers(); QString tooltip; @@@ -427,8 -428,8 +427,8 @@@ progressBarLabel->setVisible(true); progressBarLabel->setText(tr("Synchronizing with network...")); progressBar->setVisible(true); - progressBar->setMaximum(total - initTotal); - progressBar->setValue(count - initTotal); + progressBar->setMaximum(total); + progressBar->setValue(count); } else { @@@ -670,6 -671,13 +670,13 @@@ void BitcoinGUI::dropEvent(QDropEvent * event->acceptProposedAction(); } + void BitcoinGUI::handleURL(QString strURL) + { + gotoSendCoinsPage(); + QUrl url = QUrl(strURL); + sendCoinsPage->handleURL(&url); + } + void BitcoinGUI::setEncryptionStatus(int status) { switch(status)