Skip to content

Open "Peers list" page when clicking on connections icon in status bar #335

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

Merged
UdjinM6 merged 11 commits into from
May 20, 2015
Merged

Open "Peers list" page when clicking on connections icon in status bar #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6aca473
Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x
crowning- Apr 30, 2015
4fa0713
Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x
crowning- May 3, 2015
acec2b3
Resync with upstream
crowning- May 3, 2015
af08fbf
Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x
crowning- May 15, 2015
32c6068
Merge remote-tracking branch 'upstream/v0.12.0.x' into v0.12.0.x
crowning- May 17, 2015
2154f94
Open peers information page when clicking on connections item
crowning- May 17, 2015
8f61995
Use constants instead of hard coded values
crowning- May 17, 2015
eea3317
Use existing constant instead of hardcoded size value
crowning- May 17, 2015
34a205b
Fix tooltip background for OSX
crowning- May 20, 2015
472d2a2
fix tooltip background
UdjinM6 May 20, 2015
2d86395
Merge pull request #1 from UdjinM6/tooltip_fix
crowning- May 20, 2015
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
9 changes: 7 additions & 2 deletions src/qt/bitcoingui.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
frameBlocksLayout->setSpacing(3);
unitDisplayControl = new UnitDisplayStatusBarControl();
labelEncryptionIcon = new QLabel();
labelConnectionsIcon = new QLabel();
labelConnectionsIcon = new QPushButton();
labelConnectionsIcon->setFlat(true); // Make the button look like a label, but clickable
labelConnectionsIcon->setStyleSheet(".QPushButton { background-color: rgba(255, 255, 255, 0);}");
labelConnectionsIcon->setMaximumSize(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE);
labelBlocksIcon = new QLabel();
if(enableWallet)
{
Expand Down Expand Up @@ -216,6 +219,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
connect(openPeersAction, SIGNAL(triggered()), rpcConsole, SLOT(showPeers()));
connect(openConfEditorAction, SIGNAL(triggered()), rpcConsole, SLOT(showConfEditor()));
connect(showBackupsAction, SIGNAL(triggered()), rpcConsole, SLOT(showBackups()));
connect(labelConnectionsIcon, SIGNAL(clicked()), rpcConsole, SLOT(showPeers()));

// prevents an open debug window from becoming stuck/unusable on client shutdown
connect(quitAction, SIGNAL(triggered()), rpcConsole, SLOT(hide()));
Expand Down Expand Up @@ -700,7 +704,8 @@ void BitcoinGUI::setNumConnections(int count)
case 7: case 8: case 9: icon = ":/icons/connect_3"; break;
default: icon = ":/icons/connect_4"; break;
}
labelConnectionsIcon->setPixmap(QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
QIcon connectionItem = QIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE);
labelConnectionsIcon->setIcon(connectionItem);
labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Dash network", "", count));
}

Expand Down
3 changes: 2 additions & 1 deletion src/qt/bitcoingui.h
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <QMap>
#include <QMenu>
#include <QPoint>
#include <QPushButton>
#include <QSystemTrayIcon>

class ClientModel;
Expand Down Expand Up @@ -79,7 +80,7 @@ class BitcoinGUI : public QMainWindow

UnitDisplayStatusBarControl *unitDisplayControl;
QLabel *labelEncryptionIcon;
QLabel *labelConnectionsIcon;
QPushButton *labelConnectionsIcon;
QLabel *labelBlocksIcon;
QLabel *progressBarLabel;
QProgressBar *progressBar;
Expand Down