Skip to content

Commit

Permalink
Merge pull request #319 from crowning-/v0.12.0.x
Browse files Browse the repository at this point in the history
Included new "Peers list" tab into CSS theme
  • Loading branch information
UdjinM6 committed Apr 20, 2015
2 parents 53aba0f + 5873a5e commit 6420c5a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions src/qt/forms/rpcconsole.ui
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>740</width>
<width>769</width>
<height>485</height>
</rect>
</property>
Expand Down Expand Up @@ -717,6 +717,8 @@
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="cursor">
Expand All @@ -726,7 +728,7 @@
<string>Select a peer to view detailed information.</string>
</property>
<property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
4 changes: 4 additions & 0 deletions src/qt/res/css/drkblue.css
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,10 @@ min-height:25px;
min-width:180px;
}

QDialog#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */
color:#3398CC;
}

QDialog#RPCConsole QPushButton#openDebugLogfileButton {
max-width:60px;
}
Expand Down
2 changes: 0 additions & 2 deletions src/qt/rpcconsole.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ RPCConsole::RPCConsole(QWidget *parent) :
startExecutor();
setTrafficGraphRange(INITIAL_TRAFFIC_GRAPH_MINS);

ui->detailWidget->hide();
ui->peerHeading->setText(tr("Select a peer to view detailed information."));

clear();
Expand Down Expand Up @@ -596,7 +595,6 @@ void RPCConsole::peerLayoutChanged()
// detail node dissapeared from table (node disconnected)
fUnselect = true;
cachedNodeid = -1;
ui->detailWidget->hide();
ui->peerHeading->setText(tr("Select a peer to view detailed information."));
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/qt/rpcconsole.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ public slots:

enum ColumnWidths
{
ADDRESS_COLUMN_WIDTH = 200,
SUBVERSION_COLUMN_WIDTH = 100,
ADDRESS_COLUMN_WIDTH = 170,
SUBVERSION_COLUMN_WIDTH = 140,
PING_COLUMN_WIDTH = 80
};

Expand Down

0 comments on commit 6420c5a

Please sign in to comment.