Skip to content

Commit

Permalink
More GUI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
metaspartan committed Oct 8, 2017
1 parent 3e666fe commit f15fe5b
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/qt/forms/editaddressdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="stealthCB">
<property name="text">
<string>&amp;Stealth Address</string>
<string>Check this box if you want a new DNR &amp;Stealth Address, starts with an 's'.</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/marketbrowser.ui
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
<string notr="true">margin-right: 15px;</string>
</property>
<property name="text">
<string>Update Prices</string>
<string>Refresh Prices</string>
</property>
<property name="iconSize">
<size>
Expand Down
7 changes: 6 additions & 1 deletion src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,13 @@
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>&lt;b&gt;Recent transactions&lt;/b&gt;</string>
<string>&lt;b&gt;Recent Transactions&lt;/b&gt;</string>
</property>
</widget>
</item>
Expand Down
20 changes: 12 additions & 8 deletions src/qt/forms/statisticspage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ font-family:'Open Sans,sans-serif';</string>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Open Sans,sans-serif</family>
</font>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
Expand Down Expand Up @@ -61,12 +66,11 @@ font-family:'Open Sans,sans-serif';</string>
</property>
<property name="font">
<font>
<family>Open Sans,sans-serif</family>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
<underline>false</underline>
<kerning>true</kerning>
<family>MS Shell Dlg 2</family>
<pointsize>13</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font>
</property>
<property name="autoFillBackground">
Expand All @@ -76,7 +80,7 @@ font-family:'Open Sans,sans-serif';</string>
<string notr="true"/>
</property>
<property name="text">
<string>Update Statistics</string>
<string>Refresh</string>
</property>
</widget>
<widget class="QLabel" name="label">
Expand Down Expand Up @@ -228,7 +232,7 @@ font-family:'Open Sans,sans-serif';</string>
</property>
</widget>
</item>
<item row="9" column="0">
<item row="9" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Market Cap&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
Expand Down
4 changes: 2 additions & 2 deletions src/qt/mintingview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void MintingView::setModel(WalletModel *model)
mintingView->horizontalHeader()->resizeSection(
MintingTableModel::Age, 60);
mintingView->horizontalHeader()->resizeSection(
MintingTableModel::Balance, 120);
MintingTableModel::Balance, 160);
mintingView->horizontalHeader()->resizeSection(
MintingTableModel::CoinDay, 60);
mintingView->horizontalHeader()->resizeSection(
Expand All @@ -164,7 +164,7 @@ void MintingView::setModel(WalletModel *model)
//MintingTableModel::MintReward, QHeaderView::Stretch);
#endif
mintingView->horizontalHeader()->resizeSection(
MintingTableModel::Address, 275);
MintingTableModel::Address, 335);
mintingView->horizontalHeader()->resizeSection(
MintingTableModel::TxHash, 545);
}
Expand Down
6 changes: 3 additions & 3 deletions src/qt/statisticspage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ void StatisticsPage::updateStatistics()
QString phase = "";
if (pindexBest->nHeight < 3000000)
{
phase = "Tribus Proof of Work (POS Fully Starts Block 3000000)";
phase = "Tribus Proof of Work with Proof of Stake";
}
else if (pindexBest->nHeight > 3000000)
{
phase = "PoS (6% per year variable)";
phase = "Proof of Stake";
}

QString subsidy = "";
Expand All @@ -78,7 +78,7 @@ void StatisticsPage::updateStatistics()
}
else if (pindexBest->nHeight > 3000000)
{
subsidy = "Full PoS";
subsidy = "No PoW Reward";
}
QString hardness = QString::number(pHardness, 'f', 6);
QString hardness2 = QString::number(pHardness2, 'f', 6);
Expand Down

0 comments on commit f15fe5b

Please sign in to comment.