GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set the vertical layout in .ui file instead of programatically

Browse source
This commit is contained in:
Andrew Chow 2019-11-21 13:26:05 -05:00
parent fe27ef834e
commit 3743ff53b7
2 changed files with 91 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

206
src/qt/forms/overviewpage.ui
View file

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>596</width> <width>596</width>
<height>342</height> <height>419</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -17,7 +17,7 @@
<item> <item>
<widget class="QLabel" name="labelAlerts"> <widget class="QLabel" name="labelAlerts">
<property name="visible"> <property name="visible">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }</string> <string notr="true">QLabel { background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000; }</string>
@ -34,7 +34,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,1"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="1">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
@ -419,128 +419,102 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="orientation"> <item>
<enum>Qt::Vertical</enum> <widget class="QFrame" name="frame_2">
</property> <property name="frameShape">
<property name="sizeHint" stdset="0"> <enum>QFrame::StyledPanel</enum>
<size> </property>
<width>20</width> <property name="frameShadow">
<height>40</height> <enum>QFrame::Raised</enum>
</size> </property>
</property> <layout class="QVBoxLayout" name="verticalLayout">
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QFrame" name="frame_2">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="label_4"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="font"> <item>
<font> <widget class="QLabel" name="label_4">
<weight>75</weight> <property name="font">
<bold>true</bold> <font>
</font> <weight>75</weight>
</property> <bold>true</bold>
<property name="text"> </font>
<string>Recent transactions</string> </property>
</property> <property name="text">
</widget> <string>Recent transactions</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="labelTransactionsStatus">
<property name="enabled">
<bool>true</bool>
</property>
<property name="maximumSize">
<size>
<width>30</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Liquid network after a connection is established, but this process has not completed yet.</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/warning</normaloff>
<disabledoff>:/icons/warning</disabledoff>:/icons/warning</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QPushButton" name="labelTransactionsStatus"> <widget class="QListView" name="listTransactions">
<property name="enabled"> <property name="styleSheet">
<bool>true</bool> <string notr="true">QListView { background: transparent; }</string>
</property> </property>
<property name="maximumSize"> <property name="frameShape">
<size> <enum>QFrame::NoFrame</enum>
<width>30</width>
<height>16777215</height>
</size>
</property> </property>
<property name="toolTip"> <property name="verticalScrollBarPolicy">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Liquid network after a connection is established, but this process has not completed yet.</string> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<property name="text"> <property name="horizontalScrollBarPolicy">
<string/> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<property name="icon"> <property name="selectionMode">
<iconset resource="../bitcoin.qrc"> <enum>QAbstractItemView::NoSelection</enum>
<normaloff>:/icons/warning</normaloff>
<disabledoff>:/icons/warning</disabledoff>:/icons/warning</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </widget>
<item> </item>
<widget class="QListView" name="listTransactions"> </layout>
<property name="styleSheet">
<string notr="true">QListView { background: transparent; }</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</item> </item>
@ -548,6 +522,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../bitcoin.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

5
src/qt/overviewpage.cpp
View file

@ -119,11 +119,6 @@ OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent)
m_balances.balance[::policyAsset] = -1; m_balances.balance[::policyAsset] = -1;
// Move the "Recent Transactions" view below "Balances"
ui->verticalLayout_3->removeWidget(ui->frame_2);
ui->verticalLayout_2->addWidget(ui->frame_2);
ui->horizontalLayout->removeItem(ui->verticalLayout_3);
// use a SingleColorIcon for the "out of sync warning" icon // use a SingleColorIcon for the "out of sync warning" icon
QIcon icon = platformStyle->SingleColorIcon(":/icons/warning"); QIcon icon = platformStyle->SingleColorIcon(":/icons/warning");
icon.addPixmap(icon.pixmap(QSize(64,64), QIcon::Normal), QIcon::Disabled); // also set the disabled icon because we are using a disabled QPushButton to work around missing HiDPI support of QLabel (https://bugreports.qt.io/browse/QTBUG-42503) icon.addPixmap(icon.pixmap(QSize(64,64), QIcon::Normal), QIcon::Disabled); // also set the disabled icon because we are using a disabled QPushButton to work around missing HiDPI support of QLabel (https://bugreports.qt.io/browse/QTBUG-42503)