diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-09 12:15:32 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-09 12:15:32 -0500 |
commit | 9b53650a455c235f5b15c6df42ab58f24582596d (patch) | |
tree | 0c53059389f624750d411b959963fc339b2bd0ca | |
parent | 7de7913abdbaa30f0ef6ad1b63508d3a8441d08f (diff) | |
parent | 2d8bc0e6da2203ba2ae62bb167110529e5b6f7d4 (diff) | |
download | bitcoin-9b53650a455c235f5b15c6df42ab58f24582596d.tar.xz |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
contrib/debian/changelog
-rw-r--r-- | contrib/debian/changelog | 9 | ||||
-rw-r--r-- | contrib/debian/control | 4 | ||||
-rw-r--r-- | contrib/debian/manpages/bitcoind.1 | 2 | ||||
-rw-r--r-- | src/qt/bitcoingui.cpp | 8 | ||||
-rw-r--r-- | src/qt/bitcoingui.h | 1 | ||||
-rw-r--r-- | src/qt/forms/transactiondescdialog.ui | 3 |
6 files changed, 23 insertions, 4 deletions
diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 4510641825..5e38c7bd20 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,12 @@ +bitcoin (0.5.2-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 + + -- Matt Corallo <matt@bluematt.me> Sat, 7 Jan 2012 13:37:00 -0500 + bitcoin (0.5.2-natty0) natty; urgency=low * New upstream release. diff --git a/contrib/debian/control b/contrib/debian/control index 13fde5948c..c41664ca6f 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -24,7 +24,7 @@ Vcs-Browser: http://github.com/bitcoin/bitcoin Package: bitcoind Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: peer-to-peer network based anonymous digital currency - daemon +Description: peer-to-peer network based digital currency - daemon Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and @@ -42,7 +42,7 @@ Description: peer-to-peer network based anonymous digital currency - daemon Package: bitcoin-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: peer-to-peer network based anonymous digital currency - QT GUI +Description: peer-to-peer network based digital currency - QT GUI Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/bitcoind.1 index 0179406a16..bf46a6609c 100644 --- a/contrib/debian/manpages/bitcoind.1 +++ b/contrib/debian/manpages/bitcoind.1 @@ -1,6 +1,6 @@ .TH BITCOIND "1" "January 2011" "bitcoind 3.19" .SH NAME -bitcoind \- peer-to-peer network based anonymous digital currency +bitcoind \- peer-to-peer network based digital currency .SH SYNOPSIS bitcoin [options] <command> [params] .TP diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 60c75286a7..1c49683364 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -57,6 +57,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent): walletModel(0), encryptWalletAction(0), changePassphraseAction(0), + aboutQtAction(0), trayIcon(0), notificator(0) { @@ -209,7 +210,10 @@ void BitcoinGUI::createActions() quitAction->setMenuRole(QAction::QuitRole); aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About %1").arg(qApp->applicationName()), this); aboutAction->setToolTip(tr("Show information about Bitcoin")); - aboutAction->setMenuRole(QAction::AboutQtRole); + aboutAction->setMenuRole(QAction::AboutRole); + aboutQtAction = new QAction(tr("About &Qt"), this); + aboutQtAction->setToolTip(tr("Show information about Qt")); + aboutQtAction->setMenuRole(QAction::AboutQtRole); optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this); optionsAction->setToolTip(tr("Modify configuration options for bitcoin")); optionsAction->setMenuRole(QAction::PreferencesRole); @@ -226,6 +230,7 @@ void BitcoinGUI::createActions() connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); + connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); connect(openBitcoinAction, SIGNAL(triggered()), this, SLOT(showNormal())); connect(encryptWalletAction, SIGNAL(triggered(bool)), this, SLOT(encryptWallet(bool))); connect(changePassphraseAction, SIGNAL(triggered()), this, SLOT(changePassphrase())); @@ -253,6 +258,7 @@ void BitcoinGUI::createMenuBar() QMenu *help = appMenuBar->addMenu(tr("&Help")); help->addAction(aboutAction); + help->addAction(aboutQtAction); } void BitcoinGUI::createToolBars() diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index ecb356dc35..a0905e44ad 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -82,6 +82,7 @@ private: QAction *exportAction; QAction *encryptWalletAction; QAction *changePassphraseAction; + QAction *aboutQtAction; QSystemTrayIcon *trayIcon; Notificator *notificator; diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui index 2f70a38214..9a9f6db158 100644 --- a/src/qt/forms/transactiondescdialog.ui +++ b/src/qt/forms/transactiondescdialog.ui @@ -19,6 +19,9 @@ <property name="toolTip"> <string>This pane shows a detailed description of the transaction</string> </property> + <property name="readOnly"> + <bool>true</bool> + </property> </widget> </item> <item> |