Skip to content

Commit ab0ec67

Browse files
laanwjlaanwj
committed
Merge pull request #6209
e059726 [Qt] deselect peer when switching away from peers tab in RPC console (Philip Kaufmann) 7211ada [Qt] replace Boost foreach with Qt version peertablemodel.cpp (Philip Kaufmann) 1b0db7b [Qt] extend rpc console peers tab (Philip Kaufmann)
2 parents 8ccc07c + e059726 commit ab0ec67

File tree

4 files changed

+132
-49
lines changed

4 files changed

+132
-49
lines changed

‎src/qt/forms/rpcconsole.ui

Lines changed: 97 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -745,13 +745,36 @@
745745
</property>
746746
<layout class="QGridLayout" name="gridLayout_3">
747747
<item row="0" column="0">
748+
<widget class="QLabel" name="label_30">
749+
<property name="text">
750+
<string>Whitelisted</string>
751+
</property>
752+
</widget>
753+
</item>
754+
<item row="0" column="2">
755+
<widget class="QLabel" name="peerWhitelisted">
756+
<property name="cursor">
757+
<cursorShape>IBeamCursor</cursorShape>
758+
</property>
759+
<property name="text">
760+
<string>N/A</string>
761+
</property>
762+
<property name="textFormat">
763+
<enum>Qt::PlainText</enum>
764+
</property>
765+
<property name="textInteractionFlags">
766+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
767+
</property>
768+
</widget>
769+
</item>
770+
<item row="1" column="0">
748771
<widget class="QLabel" name="label_23">
749772
<property name="text">
750773
<string>Direction</string>
751774
</property>
752775
</widget>
753776
</item>
754-
<item row="0" column="2">
777+
<item row="1" column="2">
755778
<widget class="QLabel" name="peerDirection">
756779
<property name="cursor">
757780
<cursorShape>IBeamCursor</cursorShape>
@@ -767,14 +790,14 @@
767790
</property>
768791
</widget>
769792
</item>
770-
<item row="1" column="0">
793+
<item row="2" column="0">
771794
<widget class="QLabel" name="label_21">
772795
<property name="text">
773796
<string>Version</string>
774797
</property>
775798
</widget>
776799
</item>
777-
<item row="1" column="2">
800+
<item row="2" column="2">
778801
<widget class="QLabel" name="peerVersion">
779802
<property name="cursor">
780803
<cursorShape>IBeamCursor</cursorShape>
@@ -790,14 +813,14 @@
790813
</property>
791814
</widget>
792815
</item>
793-
<item row="2" column="0">
816+
<item row="3" column="0">
794817
<widget class="QLabel" name="label_28">
795818
<property name="text">
796819
<string>User Agent</string>
797820
</property>
798821
</widget>
799822
</item>
800-
<item row="2" column="2">
823+
<item row="3" column="2">
801824
<widget class="QLabel" name="peerSubversion">
802825
<property name="cursor">
803826
<cursorShape>IBeamCursor</cursorShape>
@@ -813,14 +836,14 @@
813836
</property>
814837
</widget>
815838
</item>
816-
<item row="3" column="0">
839+
<item row="4" column="0">
817840
<widget class="QLabel" name="label_4">
818841
<property name="text">
819842
<string>Services</string>
820843
</property>
821844
</widget>
822845
</item>
823-
<item row="3" column="2">
846+
<item row="4" column="2">
824847
<widget class="QLabel" name="peerServices">
825848
<property name="cursor">
826849
<cursorShape>IBeamCursor</cursorShape>
@@ -839,7 +862,7 @@
839862
<item row="5" column="0">
840863
<widget class="QLabel" name="label_29">
841864
<property name="text">
842-
<string>Starting Height</string>
865+
<string>Starting Block</string>
843866
</property>
844867
</widget>
845868
</item>
@@ -862,7 +885,7 @@
862885
<item row="6" column="0">
863886
<widget class="QLabel" name="label_27">
864887
<property name="text">
865-
<string>Sync Height</string>
888+
<string>Synced Headers</string>
866889
</property>
867890
</widget>
868891
</item>
@@ -883,13 +906,36 @@
883906
</widget>
884907
</item>
885908
<item row="7" column="0">
909+
<widget class="QLabel" name="label_25">
910+
<property name="text">
911+
<string>Synced Blocks</string>
912+
</property>
913+
</widget>
914+
</item>
915+
<item row="7" column="2">
916+
<widget class="QLabel" name="peerCommonHeight">
917+
<property name="cursor">
918+
<cursorShape>IBeamCursor</cursorShape>
919+
</property>
920+
<property name="text">
921+
<string>N/A</string>
922+
</property>
923+
<property name="textFormat">
924+
<enum>Qt::PlainText</enum>
925+
</property>
926+
<property name="textInteractionFlags">
927+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
928+
</property>
929+
</widget>
930+
</item>
931+
<item row="8" column="0">
886932
<widget class="QLabel" name="label_24">
887933
<property name="text">
888934
<string>Ban Score</string>
889935
</property>
890936
</widget>
891937
</item>
892-
<item row="7" column="2">
938+
<item row="8" column="2">
893939
<widget class="QLabel" name="peerBanScore">
894940
<property name="cursor">
895941
<cursorShape>IBeamCursor</cursorShape>
@@ -905,14 +951,14 @@
905951
</property>
906952
</widget>
907953
</item>
908-
<item row="8" column="0">
954+
<item row="9" column="0">
909955
<widget class="QLabel" name="label_22">
910956
<property name="text">
911957
<string>Connection Time</string>
912958
</property>
913959
</widget>
914960
</item>
915-
<item row="8" column="2">
961+
<item row="9" column="2">
916962
<widget class="QLabel" name="peerConnTime">
917963
<property name="cursor">
918964
<cursorShape>IBeamCursor</cursorShape>
@@ -928,14 +974,14 @@
928974
</property>
929975
</widget>
930976
</item>
931-
<item row="9" column="0">
977+
<item row="10" column="0">
932978
<widget class="QLabel" name="label_15">
933979
<property name="text">
934980
<string>Last Send</string>
935981
</property>
936982
</widget>
937983
</item>
938-
<item row="9" column="2">
984+
<item row="10" column="2">
939985
<widget class="QLabel" name="peerLastSend">
940986
<property name="cursor">
941987
<cursorShape>IBeamCursor</cursorShape>
@@ -951,14 +997,14 @@
951997
</property>
952998
</widget>
953999
</item>
954-
<item row="10" column="0">
1000+
<item row="11" column="0">
9551001
<widget class="QLabel" name="label_19">
9561002
<property name="text">
9571003
<string>Last Receive</string>
9581004
</property>
9591005
</widget>
9601006
</item>
961-
<item row="10" column="2">
1007+
<item row="11" column="2">
9621008
<widget class="QLabel" name="peerLastRecv">
9631009
<property name="cursor">
9641010
<cursorShape>IBeamCursor</cursorShape>
@@ -974,14 +1020,14 @@
9741020
</property>
9751021
</widget>
9761022
</item>
977-
<item row="11" column="0">
1023+
<item row="12" column="0">
9781024
<widget class="QLabel" name="label_18">
9791025
<property name="text">
9801026
<string>Bytes Sent</string>
9811027
</property>
9821028
</widget>
9831029
</item>
984-
<item row="11" column="2">
1030+
<item row="12" column="2">
9851031
<widget class="QLabel" name="peerBytesSent">
9861032
<property name="cursor">
9871033
<cursorShape>IBeamCursor</cursorShape>
@@ -997,14 +1043,14 @@
9971043
</property>
9981044
</widget>
9991045
</item>
1000-
<item row="12" column="0">
1046+
<item row="13" column="0">
10011047
<widget class="QLabel" name="label_20">
10021048
<property name="text">
10031049
<string>Bytes Received</string>
10041050
</property>
10051051
</widget>
10061052
</item>
1007-
<item row="12" column="2">
1053+
<item row="13" column="2">
10081054
<widget class="QLabel" name="peerBytesRecv">
10091055
<property name="cursor">
10101056
<cursorShape>IBeamCursor</cursorShape>
@@ -1020,14 +1066,14 @@
10201066
</property>
10211067
</widget>
10221068
</item>
1023-
<item row="13" column="0">
1069+
<item row="14" column="0">
10241070
<widget class="QLabel" name="label_26">
10251071
<property name="text">
10261072
<string>Ping Time</string>
10271073
</property>
10281074
</widget>
10291075
</item>
1030-
<item row="13" column="2">
1076+
<item row="14" column="2">
10311077
<widget class="QLabel" name="peerPingTime">
10321078
<property name="cursor">
10331079
<cursorShape>IBeamCursor</cursorShape>
@@ -1043,14 +1089,40 @@
10431089
</property>
10441090
</widget>
10451091
</item>
1046-
<item row="14" column="0">
1092+
<item row="15" column="0">
1093+
<widget class="QLabel" name="peerPingWaitLabel">
1094+
<property name="toolTip">
1095+
<string>The duration of a currently outstanding ping.</string>
1096+
</property>
1097+
<property name="text">
1098+
<string>Ping Wait</string>
1099+
</property>
1100+
</widget>
1101+
</item>
1102+
<item row="15" column="2">
1103+
<widget class="QLabel" name="peerPingWait">
1104+
<property name="cursor">
1105+
<cursorShape>IBeamCursor</cursorShape>
1106+
</property>
1107+
<property name="text">
1108+
<string>N/A</string>
1109+
</property>
1110+
<property name="textFormat">
1111+
<enum>Qt::PlainText</enum>
1112+
</property>
1113+
<property name="textInteractionFlags">
1114+
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
1115+
</property>
1116+
</widget>
1117+
</item>
1118+
<item row="16" column="0">
10471119
<widget class="QLabel" name="label_timeoffset">
10481120
<property name="text">
10491121
<string>Time Offset</string>
10501122
</property>
10511123
</widget>
10521124
</item>
1053-
<item row="14" column="2">
1125+
<item row="16" column="2">
10541126
<widget class="QLabel" name="timeoffset">
10551127
<property name="cursor">
10561128
<cursorShape>IBeamCursor</cursorShape>
@@ -1066,7 +1138,7 @@
10661138
</property>
10671139
</widget>
10681140
</item>
1069-
<item row="15" column="1">
1141+
<item row="17" column="1">
10701142
<spacer name="verticalSpacer_3">
10711143
<property name="orientation">
10721144
<enum>Qt::Vertical</enum>

‎src/qt/peertablemodel.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ class PeerTablePriv
6363
#if QT_VERSION >= 0x040700
6464
cachedNodeStats.reserve(vNodes.size());
6565
#endif
66-
BOOST_FOREACH(CNode* pnode, vNodes)
66+
foreach (CNode* pnode, vNodes)
6767
{
6868
CNodeCombinedStats stats;
6969
stats.nodeStateStats.nMisbehavior = 0;
7070
stats.nodeStateStats.nSyncHeight = -1;
71+
stats.nodeStateStats.nCommonHeight = -1;
7172
stats.fNodeStateStatsAvailable = false;
7273
pnode->copyStats(stats.nodeStats);
7374
cachedNodeStats.append(stats);
@@ -91,7 +92,7 @@ class PeerTablePriv
9192
// build index map
9293
mapNodeRows.clear();
9394
int row = 0;
94-
BOOST_FOREACH(CNodeCombinedStats &stats, cachedNodeStats)
95+
foreach (const CNodeCombinedStats& stats, cachedNodeStats)
9596
mapNodeRows.insert(std::pair<NodeId, int>(stats.nodeStats.nodeid, row++));
9697
}
9798

0 commit comments

Comments
 (0)