LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #2526 from Diapolo/Qt_misc

Browse source 
Bitcoin-Qt: misc small changes
This commit is contained in:
Wladimir J. van der Laan 2013-04-23 09:27:30 -07:00
commit af10e3f6ac
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qt/aboutdialog.cpp
View file

@ -11,7 +11,7 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
// Set current copyright year // Set current copyright year
ui->copyrightLabel->setText(tr("Copyright") + QString(" © ") + tr("2009-%1 The Bitcoin developers").arg(COPYRIGHT_YEAR)); ui->copyrightLabel->setText(tr("Copyright") + QString(" © 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers"));
} }
void AboutDialog::setModel(ClientModel *model) void AboutDialog::setModel(ClientModel *model)

9
src/qt/bitcoin.cpp
View file

@ -146,12 +146,12 @@ int main(int argc, char *argv[])
// Application identification (must be set before OptionsModel is initialized, // Application identification (must be set before OptionsModel is initialized,
// as it is used to locate QSettings) // as it is used to locate QSettings)
app.setOrganizationName("Bitcoin"); QApplication::setOrganizationName("Bitcoin");
app.setOrganizationDomain("bitcoin.org"); QApplication::setOrganizationDomain("bitcoin.org");
if(GetBoolArg("-testnet")) // Separate UI settings for testnet if(GetBoolArg("-testnet")) // Separate UI settings for testnet
app.setApplicationName("Bitcoin-Qt-testnet"); QApplication::setApplicationName("Bitcoin-Qt-testnet");
else else
app.setApplicationName("Bitcoin-Qt"); QApplication::setApplicationName("Bitcoin-Qt");
// ... then GUI settings: // ... then GUI settings:
OptionsModel optionsModel; OptionsModel optionsModel;
@ -207,7 +207,6 @@ int main(int argc, char *argv[])
} }
app.processEvents(); app.processEvents();
app.setQuitOnLastWindowClosed(false); app.setQuitOnLastWindowClosed(false);
try try

2
src/qt/bitcoingui.cpp
View file

@ -42,8 +42,6 @@
#include <QStackedWidget> #include <QStackedWidget>
#include <QDateTime> #include <QDateTime>
#include <QMovie> #include <QMovie>
#include <QFileDialog>
#include <QDesktopServices>
#include <QTimer> #include <QTimer>
#include <QDragEnterEvent> #include <QDragEnterEvent>
#include <QUrl> #include <QUrl>

5
src/qt/overviewpage.cpp
View file

@ -46,9 +46,10 @@ public:
bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool(); bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool();
QVariant value = index.data(Qt::ForegroundRole); QVariant value = index.data(Qt::ForegroundRole);
QColor foreground = option.palette.color(QPalette::Text); QColor foreground = option.palette.color(QPalette::Text);
if(qVariantCanConvert<QColor>(value)) if(value.canConvert<QBrush>())
{ {
foreground = qvariant_cast<QColor>(value); QBrush brush = qvariant_cast<QBrush>(value);
foreground = brush.color();
} }
painter->setPen(foreground); painter->setPen(foreground);