Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix diagnostics, add ETTS test, fix tooltipcolor, add missing lock, and add email=investor check #1647

Merged
merged 8 commits into from
Mar 2, 2020
Merged

Fix diagnostics, add ETTS test, fix tooltipcolor, add missing lock, and add email=investor check #1647

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9dab2a
Add missing lock to AdvertiseBeacon
jamescowens Feb 27, 2020
e959d76
Change function ConfiguredForInvestorMode to also accept
jamescowens Feb 27, 2020
3c54455
Fix tooltip color scheme for all stylesheet modes
jamescowens Feb 27, 2020
c68975e
Straighten out diagnostics
jamescowens Feb 28, 2020
73255ba
PR review adjustments and additional minor changes
jamescowens Mar 1, 2020
c30b1f9
Add reasonable ETTS test to diagnostics
jamescowens Mar 1, 2020
a32bdb5
Remove listen=1 condition for port test.
jamescowens Mar 2, 2020
b05ca69
Handle ETTS no coins (infinite) case
jamescowens Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/neuralnet/researcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ std::string Researcher::Email()

bool Researcher::ConfiguredForInvestorMode(bool log)
{
if (GetBoolArg("-investor", false)) {
if (GetBoolArg("-investor", false) || Researcher::Email() == "investor") {
if (log) LogPrintf("Investor mode configured. Skipping CPID import.");
return true;
}
Expand Down
20 changes: 15 additions & 5 deletions src/qt/bitcoingui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,12 +553,12 @@ void BitcoinGUI::createToolBars()
// Use a red color for the toolbars background if on testnet.
if (GetBoolArg("-testnet"))
{
toolbar2->setStyleSheet("background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 darkRed, stop: 1 darkRed)");
toolbar2->setStyleSheet("background-color:darkRed");
toolbar3->setStyleSheet("background-color:darkRed");
}
else
{
toolbar2->setStyleSheet("background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(65,0,127), stop: 1 rgb(65,0,127))");
toolbar2->setStyleSheet("background-color:rgb(65,0,127)");
toolbar3->setStyleSheet("background-color:rgb(65,0,127)");
}

Expand Down Expand Up @@ -722,10 +722,10 @@ void BitcoinGUI::aboutClicked()
dlg.exec();
}

void BitcoinGUI::setNumConnections(int count)
void BitcoinGUI::setNumConnections(int n)
{
QString icon;
switch(count)
switch (n)
{
case 0: icon = ":/icons/connect_0"; break;
case 1: case 2: case 3: icon = ":/icons/connect_1"; break;
Expand All @@ -734,7 +734,17 @@ void BitcoinGUI::setNumConnections(int count)
default: icon = ":/icons/connect_4"; break;
}
labelConnectionsIcon->setPixmap(QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelConnectionsIcon->setToolTip(tr("%1 active connection(s) to Gridcoin network").arg(count));

if (n == 0)
{
labelConnectionsIcon->setToolTip(tr("No active connections to the Gridcoin network. "
"If this persists more than a few minutes, please check your configuration "
"and your network connectivity."));
}
else
{
labelConnectionsIcon->setToolTip(tr("%n active connection(s) to the Gridcoin network", "", n));
}
}

void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
Expand Down
Loading