kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[Qt] re-work overviewpage UI 

- ensure normal and watch-only stuff looks consistent
- simplify UI by removing unneeded UI layout elements
- change some comments to watch-only from watchonly
0.10
Philip Kaufmann 10 years ago
parent
3181986d7e
commit
94e1b9e05b
2 changed files with 340 additions and 360 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 257
      src/qt/forms/overviewpage.ui
  2. 15
      src/qt/overviewpage.cpp

257
src/qt/forms/overviewpage.ui
Unescape View File

@ -13,8 +13,8 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="topLayout"> <layout class="QFormLayout" name="formLayout_3">
<item> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="labelAlerts"> <widget class="QLabel" name="labelAlerts">
<property name="visible"> <property name="visible">
<bool>false</bool> <bool>false</bool>
@ -30,7 +30,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -45,8 +45,6 @@
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="font"> <property name="font">
@ -56,12 +54,15 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Wallet</string> <string>Balances</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelWalletStatus"> <widget class="QLabel" name="labelWalletStatus">
<property name="cursor">
<cursorShape>WhatsThisCursor</cursorShape>
</property>
<property name="toolTip"> <property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string> <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
</property> </property>
@ -76,34 +77,11 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="labelWatchonly">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Watch-only:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
@ -114,30 +92,13 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QGridLayout" name="gridLayout">
<property name="fieldGrowthPolicy"> <property name="spacing">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="horizontalSpacing">
<number>12</number>
</property>
<property name="verticalSpacing">
<number>12</number> <number>12</number>
</property> </property>
<item row="0" column="0"> <item row="2" column="2">
<widget class="QLabel" name="label"> <widget class="QLabel" name="labelWatchPending">
<property name="text">
<string>Available:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelBalance">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -148,10 +109,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your current spendable balance</string> <string>Unconfirmed transactions to watch-only addresses</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -161,14 +122,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="1">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Pending:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelUnconfirmed"> <widget class="QLabel" name="labelUnconfirmed">
<property name="font"> <property name="font">
<font> <font>
@ -183,7 +137,7 @@
<string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string> <string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -193,15 +147,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="2">
<widget class="QLabel" name="labelImmatureText"> <widget class="QLabel" name="labelWatchImmature">
<property name="text">
<string>Immature:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelImmature">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -212,10 +159,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Mined balance that has not yet matured</string> <string>Mined balance in watch-only addresses that has not yet matured</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -225,22 +172,41 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="2">
<widget class="Line" name="lineWatchBalance">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelTotalText"> <widget class="QLabel" name="labelTotalText">
<property name="text"> <property name="text">
<string>Total:</string> <string>Total:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<widget class="QLabel" name="labelTotal"> <widget class="QLabel" name="labelImmature">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -251,10 +217,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your current total balance</string> <string>Mined balance that has not yet matured</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -264,21 +230,28 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="3">
</item> <spacer name="horizontalSpacer_2">
<item> <property name="orientation">
<layout class="QFormLayout" name="formLayout"> <enum>Qt::Horizontal</enum>
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="sizeHint" stdset="0">
<number>12</number> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
<property name="verticalSpacing"> </spacer>
<number>12</number> </item>
<item row="3" column="0">
<widget class="QLabel" name="labelImmatureText">
<property name="text">
<string>Immature:</string>
</property> </property>
<item row="0" column="1"> </widget>
<widget class="QLabel" name="labelWatchAvailable"> </item>
<item row="5" column="1">
<widget class="QLabel" name="labelTotal">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -289,10 +262,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Your current balance in watch-only addresses</string> <string>Your current total balance</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -302,8 +275,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="5" column="2">
<widget class="QLabel" name="labelWatchPending"> <widget class="QLabel" name="labelWatchTotal">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -314,10 +287,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Unconfirmed transactions to watch-only addresses</string> <string>Current total balance in watch-only addresses</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -327,8 +300,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="0" column="2">
<widget class="QLabel" name="labelWatchImmature"> <widget class="QLabel" name="labelWatchonly">
<property name="text">
<string>Watch-only:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelBalanceText">
<property name="text">
<string>Available:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelBalance">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -339,10 +329,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Mined balance in watch-only addresses that has not yet matured</string> <string>Your current spendable balance</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -352,27 +342,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="2"> <item row="1" column="2">
<widget class="Line" name="lineWatchBalance"> <widget class="QLabel" name="labelWatchAvailable">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="labelWatchTotal">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -383,10 +354,10 @@
<cursorShape>IBeamCursor</cursorShape> <cursorShape>IBeamCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Current total balance in watch-only addresses</string> <string>Your current balance in watch-only addresses</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">0 BTC</string> <string notr="true">0.000 000 00 BTC</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -396,23 +367,22 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="0">
</item> <widget class="QLabel" name="labelPendingText">
<item> <property name="text">
<spacer name="horizontalSpacer_3"> <string>Pending:</string>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> </widget>
<enum>QSizePolicy::Expanding</enum> </item>
<item row="0" column="1">
<widget class="QLabel" name="labelSpendable">
<property name="text">
<string>Spendable:</string>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="alignment">
<size> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<width>20</width>
<height>20</height>
</size>
</property> </property>
</spacer> </widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -449,13 +419,22 @@
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text"> <property name="text">
<string>&lt;b&gt;Recent transactions&lt;/b&gt;</string> <string>Recent transactions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelTransactionsStatus"> <widget class="QLabel" name="labelTransactionsStatus">
<property name="cursor">
<cursorShape>WhatsThisCursor</cursorShape>
</property>
<property name="toolTip"> <property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string> <string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
</property> </property>

15
src/qt/overviewpage.cpp
Unescape View File

@ -162,15 +162,16 @@ void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64
bool showWatchOnlyImmature = watchImmatureBalance != 0; bool showWatchOnlyImmature = watchImmatureBalance != 0;
bool showWatchOnly = (watchOnlyBalance != 0 || watchUnconfBalance != 0 || showWatchOnlyImmature); bool showWatchOnly = (watchOnlyBalance != 0 || watchUnconfBalance != 0 || showWatchOnlyImmature);
// for symmetry reasons also show immature label when the watchonly one is shown // for symmetry reasons also show immature label when the watch-only one is shown
ui->labelImmature->setVisible(showImmature || showWatchOnlyImmature); ui->labelImmature->setVisible(showImmature || showWatchOnlyImmature);
ui->labelImmatureText->setVisible(showImmature || showWatchOnlyImmature); ui->labelImmatureText->setVisible(showImmature || showWatchOnlyImmature);
ui->labelWatchonly->setVisible(showWatchOnly); // show Watchonly label ui->labelSpendable->setVisible(showWatchOnly); // show spendable label (only when watch-only is active)
ui->lineWatchBalance->setVisible(showWatchOnly); // show watchonly balance separator line ui->labelWatchonly->setVisible(showWatchOnly); // show watch-only label
ui->labelWatchAvailable->setVisible(showWatchOnly); // show watchonly available balance ui->lineWatchBalance->setVisible(showWatchOnly); // show watch-only balance separator line
ui->labelWatchImmature->setVisible(showWatchOnlyImmature); // show watchonly immature balance ui->labelWatchAvailable->setVisible(showWatchOnly); // show watch-only available balance
ui->labelWatchPending->setVisible(showWatchOnly); // show watchonly pending balance ui->labelWatchImmature->setVisible(showWatchOnlyImmature); // show watch-only immature balance
ui->labelWatchTotal->setVisible(showWatchOnly); // show watchonly total balance ui->labelWatchPending->setVisible(showWatchOnly); // show watch-only pending balance
ui->labelWatchTotal->setVisible(showWatchOnly); // show watch-only total balance
} }
void OverviewPage::setClientModel(ClientModel *model) void OverviewPage::setClientModel(ClientModel *model)

Write Preview
Loading…
Cancel
Save