diff --git a/res/ui/preferences.ui b/res/ui/preferences.ui
index a1f722da639b20a40c71ff916e50ef8963329112..519ca253d7dcf7444e8dc82692781d096f147176 100644
--- a/res/ui/preferences.ui
+++ b/res/ui/preferences.ui
@@ -15,46 +15,140 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Default account</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="combo_account"/>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Default referential</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="combo_referential"/>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Language</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="combo_language"/>
- </item>
- </layout>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="tabPosition">
+ <enum>QTabWidget::West</enum>
+ </property>
+ <property name="currentIndex">
+ <number>2</number>
+ </property>
+ <widget class="QWidget" name="tabApplication">
+ <attribute name="title">
+ <string/>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Default account</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_account"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Default &referential</string>
+ </property>
+ <property name="buddy">
+ <cstring>label_3</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_referential"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Language</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_language"/>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <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>
+ <item>
+ <widget class="QCheckBox" name="checkBox">
+ <property name="text">
+ <string>Expert mode</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="displayTab">
+ <attribute name="title">
+ <string/>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="checkBox_2">
+ <property name="text">
+ <string>Maximize Window at Startup</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Numbers after commas </string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox"/>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tabNetwork">
+ <attribute name="title">
+ <string/>
+ </attribute>
+ </widget>
+ </widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
diff --git a/src/cutecoin/core/txhistory.py b/src/cutecoin/core/txhistory.py
index 2f9c6d145ba206681d1956ba02e22f7d6fa92d2e..edd10236d856dd6e438d87ab734474e05838bb23 100644
--- a/src/cutecoin/core/txhistory.py
+++ b/src/cutecoin/core/txhistory.py
@@ -151,8 +151,11 @@ class TxHistory():
parsed_block = self.latest_block
current_block = community.network.latest_block
logging.debug("Refresh from : {0} to {1}".format(self.latest_block, current_block))
- dividends_data = yield from community.bma_access.future_request(qtbma.ud.History,
+ dividends_data = qtbma.ud.History.null_value
+ while dividends_data == qtbma.ud.History.null_value:
+ dividends_data = yield from community.bma_access.future_request(qtbma.ud.History,
req_args={'pubkey': self.wallet.pubkey})
+
dividends = dividends_data['history']['history']
for d in dividends:
if d['block_number'] not in range(parsed_block, parsed_block+99):
@@ -176,6 +179,7 @@ class TxHistory():
udid = 0
for d in dividends:
if d['block_number'] in range(parsed_block, parsed_block+99):
+ d['id'] = udid
new_dividends.append(d)
udid += 1
diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py
index 2d0cd38b01c7ab664feeb94e030bcb178b17d33d..e521933691fb44dc4aec6995092575b0ffddff0e 100644
--- a/src/cutecoin/models/txhistory.py
+++ b/src/cutecoin/models/txhistory.py
@@ -230,9 +230,9 @@ class HistoryTableModel(QAbstractTableModel):
comment = ""
receiver = self.account.name
date_ts = dividend['time']
- udid = dividend['udid']
+ id = dividend['id']
return (date_ts, receiver, amount,
- "", "", Transfer.VALIDATED, udid,
+ "", "", Transfer.VALIDATED, id,
self.account.pubkey)
def refresh_transfers(self):
@@ -241,8 +241,10 @@ class HistoryTableModel(QAbstractTableModel):
for transfer in self.transfers:
if type(transfer) is Received:
self.transfers_data.append(self.data_received(transfer))
- else:
+ elif type(transfer) is Transfer:
self.transfers_data.append(self.data_sent(transfer))
+ elif type(transfer) is dict:
+ self.transfers_data.append(self.data_dividend(transfer))
self.endResetModel()
def rowCount(self, parent):