Skip to content

Commit 4bc2b59

Browse files
Neoperolfurszy
Neoperol
authored and
furszy
committed
status warninng sync dashboard added, warning layouts removed
1 parent 602a692 commit 4bc2b59

20 files changed

+226
-59
lines changed

‎src/qt/pivx.qrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@
232232
<file alias="ic-switch-liliac-on">pivx/res/img/ic-switch-liliac-on.svg</file>
233233
<file alias="ic-switch-off">pivx/res/img/ic-switch-off.svg</file>
234234
<file alias="ic-switch-on">pivx/res/img/ic-switch-on.svg</file>
235+
<file alias="ic-transaction-warning">pivx/res/img/ic-transaction-mint.svg</file>
235236
<file alias="ic-transaction-mint">pivx/res/img/ic-transaction-mint.svg</file>
236237
<file alias="ic-transaction-received">pivx/res/img/ic-transaction-received.svg</file>
237238
<file alias="ic-transaction-sent">pivx/res/img/ic-transaction-sent.svg</file>

‎src/qt/pivx/dashboardwidget.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,13 @@ DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
130130

131131
//ui->listTransactions->setVisible(false);
132132

133+
// Sync Warning
134+
135+
ui->layoutWarning->setVisible(true);
136+
ui->lblWarning->setText("Wait until the wallet is fully synced to see your whole balance");
137+
ui->lblWarning->setProperty("cssClass", "text-warning");
138+
ui->imgWarning->setProperty("cssClass", "ic-warning");
139+
133140
//Empty List
134141

135142
ui->emptyContainer->setVisible(false);

‎src/qt/pivx/forms/addnewcontactdialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
</widget>
101101
</item>
102102
<item>
103-
<spacer name="horizontalSpacer">
103+
<spacer name="horizontalSpacer1">
104104
<property name="orientation">
105105
<enum>Qt::Horizontal</enum>
106106
</property>

‎src/qt/pivx/forms/addresseswidget.ui‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<number>0</number>
4646
</property>
4747
<item>
48-
<layout class="QVBoxLayout" name="verticalLayout_2">
48+
<layout class="QVBoxLayout" name="verticalLayout_21">
4949
<property name="spacing">
5050
<number>0</number>
5151
</property>
@@ -82,7 +82,7 @@
8282
</layout>
8383
</item>
8484
<item>
85-
<spacer name="horizontalSpacer">
85+
<spacer name="horizontalSpacer11">
8686
<property name="orientation">
8787
<enum>Qt::Horizontal</enum>
8888
</property>
@@ -260,7 +260,7 @@
260260
</item>
261261
<item>
262262
<widget class="QWidget" name="layoutNewContact" native="true">
263-
<layout class="QVBoxLayout" name="verticalLayout_7">
263+
<layout class="QVBoxLayout" name="verticalLayout_71">
264264
<property name="spacing">
265265
<number>0</number>
266266
</property>
@@ -277,7 +277,7 @@
277277
<number>20</number>
278278
</property>
279279
<item>
280-
<layout class="QVBoxLayout" name="verticalLayout">
280+
<layout class="QVBoxLayout" name="verticalLayout11">
281281
<property name="spacing">
282282
<number>10</number>
283283
</property>

‎src/qt/pivx/forms/coincontrolpivwidget.ui‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
<number>20</number>
5555
</property>
5656
<item>
57-
<layout class="QHBoxLayout" name="horizontalLayout_3">
57+
<layout class="QHBoxLayout" name="horizontalLayout_31">
5858
<property name="spacing">
5959
<number>0</number>
6060
</property>
6161
<item>
62-
<spacer name="horizontalSpacer_2">
62+
<spacer name="horizontalSpacer_21">
6363
<property name="orientation">
6464
<enum>Qt::Horizontal</enum>
6565
</property>
@@ -100,7 +100,7 @@
100100
</widget>
101101
</item>
102102
<item>
103-
<spacer name="horizontalSpacer">
103+
<spacer name="horizontalSpacer2">
104104
<property name="orientation">
105105
<enum>Qt::Horizontal</enum>
106106
</property>
@@ -134,7 +134,7 @@
134134
</layout>
135135
</item>
136136
<item>
137-
<spacer name="verticalSpacer">
137+
<spacer name="verticalSpacer1">
138138
<property name="orientation">
139139
<enum>Qt::Vertical</enum>
140140
</property>
@@ -189,7 +189,7 @@
189189
</item>
190190
<item>
191191
<widget class="QWidget" name="layoutQuantity" native="true">
192-
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,1">
192+
<layout class="QHBoxLayout" name="horizontalLayout_51" stretch="0,1">
193193
<item>
194194
<widget class="QLabel" name="labelTitleQuantity">
195195
<property name="text">
@@ -362,13 +362,13 @@
362362
</layout>
363363
</item>
364364
<item>
365-
<layout class="QHBoxLayout" name="horizontalLayout_3">
365+
<layout class="QHBoxLayout" name="horizontalLayout_31">
366366
<property name="spacing">
367367
<number>20</number>
368368
</property>
369369
<item>
370370
<widget class="QWidget" name="layoutBytes" native="true">
371-
<layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,1">
371+
<layout class="QHBoxLayout" name="horizontalLayout_41" stretch="0,1">
372372
<item>
373373
<widget class="QLabel" name="labelTitleBytes">
374374
<property name="text">
@@ -388,7 +388,7 @@
388388
</item>
389389
<item>
390390
<widget class="QWidget" name="layoutDust" native="true">
391-
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,1">
391+
<layout class="QHBoxLayout" name="horizontalLayout_52" stretch="0,1">
392392
<item>
393393
<widget class="QLabel" name="labelTitleDust">
394394
<property name="text">
@@ -408,7 +408,7 @@
408408
</item>
409409
<item>
410410
<widget class="QWidget" name="layoutChange" native="true">
411-
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,1">
411+
<layout class="QHBoxLayout" name="horizontalLayout_53" stretch="0,1">
412412
<item>
413413
<widget class="QLabel" name="labelTitleChange">
414414
<property name="text">
@@ -428,7 +428,7 @@
428428
</item>
429429
<item>
430430
<widget class="QWidget" name="layoutAfter" native="true">
431-
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="0,1">
431+
<layout class="QHBoxLayout" name="horizontalLayout_54" stretch="0,1">
432432
<item>
433433
<widget class="QLabel" name="labelTitleAfter">
434434
<property name="text">

‎src/qt/pivx/forms/dashboardwidget.ui‎

Lines changed: 141 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<number>0</number>
4949
</property>
5050
<item>
51-
<layout class="QVBoxLayout" name="verticalLayout">
51+
<layout class="QVBoxLayout" name="verticalLayout22">
5252
<property name="spacing">
5353
<number>0</number>
5454
</property>
@@ -150,6 +150,139 @@
150150
</property>
151151
</spacer>
152152
</item>
153+
<item>
154+
<widget class="QWidget" name="layoutWarning" native="true">
155+
<layout class="QVBoxLayout" name="verticalLayout_3">
156+
<property name="spacing">
157+
<number>0</number>
158+
</property>
159+
<property name="leftMargin">
160+
<number>0</number>
161+
</property>
162+
<property name="topMargin">
163+
<number>0</number>
164+
</property>
165+
<property name="rightMargin">
166+
<number>0</number>
167+
</property>
168+
<property name="bottomMargin">
169+
<number>0</number>
170+
</property>
171+
<item>
172+
<widget class="QWidget" name="containerWarning" native="true">
173+
<layout class="QVBoxLayout" name="verticalLayout_21">
174+
<property name="spacing">
175+
<number>9</number>
176+
</property>
177+
<property name="leftMargin">
178+
<number>20</number>
179+
</property>
180+
<property name="topMargin">
181+
<number>9</number>
182+
</property>
183+
<property name="rightMargin">
184+
<number>20</number>
185+
</property>
186+
<property name="bottomMargin">
187+
<number>0</number>
188+
</property>
189+
<item>
190+
<widget class="QFrame" name="frameWarning">
191+
<property name="styleSheet">
192+
<string notr="true">border:none;</string>
193+
</property>
194+
<property name="frameShape">
195+
<enum>QFrame::StyledPanel</enum>
196+
</property>
197+
<property name="frameShadow">
198+
<enum>QFrame::Raised</enum>
199+
</property>
200+
<layout class="QHBoxLayout" name="horizontalLayout11" stretch="0,2">
201+
<property name="leftMargin">
202+
<number>0</number>
203+
</property>
204+
<property name="topMargin">
205+
<number>0</number>
206+
</property>
207+
<property name="rightMargin">
208+
<number>0</number>
209+
</property>
210+
<property name="bottomMargin">
211+
<number>0</number>
212+
</property>
213+
<item>
214+
<widget class="QPushButton" name="imgWarning">
215+
<property name="styleSheet">
216+
<string notr="true">border:none;</string>
217+
</property>
218+
<property name="text">
219+
<string/>
220+
</property>
221+
<property name="iconSize">
222+
<size>
223+
<width>24</width>
224+
<height>24</height>
225+
</size>
226+
</property>
227+
</widget>
228+
</item>
229+
<item>
230+
<layout class="QVBoxLayout" name="verticalLayout23">
231+
<property name="spacing">
232+
<number>3</number>
233+
</property>
234+
<property name="leftMargin">
235+
<number>12</number>
236+
</property>
237+
<item>
238+
<widget class="QLabel" name="lblWarning">
239+
<property name="styleSheet">
240+
<string notr="true"/>
241+
</property>
242+
<property name="text">
243+
<string>Received from Bob</string>
244+
</property>
245+
<property name="alignment">
246+
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
247+
</property>
248+
</widget>
249+
</item>
250+
</layout>
251+
</item>
252+
</layout>
253+
</widget>
254+
</item>
255+
<item>
256+
<widget class="QLabel" name="lblDivisory">
257+
<property name="minimumSize">
258+
<size>
259+
<width>0</width>
260+
<height>1</height>
261+
</size>
262+
</property>
263+
<property name="maximumSize">
264+
<size>
265+
<width>16777215</width>
266+
<height>1</height>
267+
</size>
268+
</property>
269+
<property name="styleSheet">
270+
<string notr="true">background-color:#bababa;</string>
271+
</property>
272+
<property name="text">
273+
<string/>
274+
</property>
275+
<property name="alignment">
276+
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
277+
</property>
278+
</widget>
279+
</item>
280+
</layout>
281+
</widget>
282+
</item>
283+
</layout>
284+
</widget>
285+
</item>
153286
<item>
154287
<widget class="QListView" name="listTransactions">
155288
<property name="mouseTracking">
@@ -194,7 +327,7 @@
194327
<number>20</number>
195328
</property>
196329
<item>
197-
<spacer name="verticalSpacer">
330+
<spacer name="verticalSpacer12">
198331
<property name="orientation">
199332
<enum>Qt::Vertical</enum>
200333
</property>
@@ -220,7 +353,7 @@
220353
<property name="frameShadow">
221354
<enum>QFrame::Raised</enum>
222355
</property>
223-
<layout class="QVBoxLayout" name="verticalLayout">
356+
<layout class="QVBoxLayout" name="verticalLayout12">
224357
<property name="spacing">
225358
<number>30</number>
226359
</property>
@@ -278,7 +411,7 @@
278411
</widget>
279412
</item>
280413
<item>
281-
<spacer name="verticalSpacer_2">
414+
<spacer name="verticalSpacer_21">
282415
<property name="orientation">
283416
<enum>Qt::Vertical</enum>
284417
</property>
@@ -317,7 +450,7 @@
317450
<height>0</height>
318451
</size>
319452
</property>
320-
<layout class="QVBoxLayout" name="verticalLayout_3">
453+
<layout class="QVBoxLayout" name="verticalLayout_31">
321454
<property name="spacing">
322455
<number>0</number>
323456
</property>
@@ -777,7 +910,7 @@
777910
<property name="frameShadow">
778911
<enum>QFrame::Raised</enum>
779912
</property>
780-
<layout class="QVBoxLayout" name="verticalLayout_7" stretch="1,8,0,0">
913+
<layout class="QVBoxLayout" name="verticalLayout_71" stretch="1,8,0,0">
781914
<property name="spacing">
782915
<number>0</number>
783916
</property>
@@ -794,7 +927,7 @@
794927
<number>10</number>
795928
</property>
796929
<item>
797-
<spacer name="verticalSpacer">
930+
<spacer name="verticalSpacer11">
798931
<property name="orientation">
799932
<enum>Qt::Vertical</enum>
800933
</property>
@@ -807,7 +940,7 @@
807940
</spacer>
808941
</item>
809942
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
810-
<widget class="QFrame" name="emptyScreen">
943+
<widget class="QFrame" name="emptyScreen1">
811944
<property name="sizePolicy">
812945
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
813946
<horstretch>0</horstretch>

‎src/qt/pivx/forms/defaultdialog.ui‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<number>0</number>
6363
</property>
6464
<item>
65-
<spacer name="horizontalSpacer_2">
65+
<spacer name="horizontalSpacer_21">
6666
<property name="orientation">
6767
<enum>Qt::Horizontal</enum>
6868
</property>
@@ -184,7 +184,7 @@
184184
<item>
185185
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,2,2,0">
186186
<item>
187-
<spacer name="horizontalSpacer">
187+
<spacer name="horizontalSpacer11">
188188
<property name="orientation">
189189
<enum>Qt::Horizontal</enum>
190190
</property>

‎src/qt/pivx/forms/denomgenerationdialog.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
</widget>
104104
</item>
105105
<item>
106-
<spacer name="horizontalSpacer">
106+
<spacer name="horizontalSpacer1">
107107
<property name="orientation">
108108
<enum>Qt::Horizontal</enum>
109109
</property>

‎src/qt/pivx/forms/lockunlock.ui‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
</layout>
115115
</item>
116116
<item>
117-
<layout class="QHBoxLayout" name="horizontalLayout_3">
117+
<layout class="QHBoxLayout" name="horizontalLayout_31">
118118
<item>
119119
<widget class="QPushButton" name="pushButtonLocked">
120120
<property name="minimumSize">

0 commit comments

Comments
 (0)