From 97229c9b029940330e9877acd8263f2d426adfc4 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Sun, 5 Jul 2015 12:28:10 +0200
Subject: [PATCH] New preferences window
---
res/icons/AUTHORS | 5 +-
res/icons/icons.qrc | 3 +
res/icons/noun_38960_cc.svg | 96 ++++++++++
res/icons/noun_42425_cc.svg | 49 +++++
res/icons/noun_62146_cc.svg | 64 +++++++
res/ui/preferences.ui | 316 +++++++++++++++++++++-----------
src/cutecoin/gui/preferences.py | 5 +
7 files changed, 431 insertions(+), 107 deletions(-)
create mode 100644 res/icons/noun_38960_cc.svg
create mode 100644 res/icons/noun_42425_cc.svg
create mode 100644 res/icons/noun_62146_cc.svg
diff --git a/res/icons/AUTHORS b/res/icons/AUTHORS
index 4a454300..85baffe9 100644
--- a/res/icons/AUTHORS
+++ b/res/icons/AUTHORS
@@ -11,4 +11,7 @@ noun_43022_cc.svg : Created by Piotrek Chuchla
noun_7440_cc.svg : Created by Yuri Mamae
noun_62479_cc.svg : Created by Bridget Gahagan
noun_76373_cc.svg : Created by João Paulo
-noun_5197_cc.svg : Created by Bibzee
\ No newline at end of file
+noun_5197_cc.svg : Created by Bibzee
+noun_38960_cc.svg : Created by Agarunov Oktay-Abraham
+noun_42425_cc.svg : Created by Luis Rodrigues
+noun_62146_cc.svg : Created by Sergey Krivoy
\ No newline at end of file
diff --git a/res/icons/icons.qrc b/res/icons/icons.qrc
index f53129c9..c1c37ab2 100644
--- a/res/icons/icons.qrc
+++ b/res/icons/icons.qrc
@@ -13,6 +13,9 @@
<file alias="wallet_icon">noun_29542_cc.svg</file>
<file alias="tx_icon">noun_63271_cc.svg</file>
<file alias="currency_icon">noun_43022_cc.svg</file>
+ <file alias="settings_display_icon">noun_38960_cc.svg</file>
+ <file alias="settings_app_icon">noun_42425_cc.svg</file>
+ <file alias="settings_network_icon">noun_62146_cc.svg</file>
<file alias="connected">connected.svg</file>
<file alias="weak_connect">weak_connect.svg</file>
<file alias="disconnected">disconnected.svg</file>
diff --git a/res/icons/noun_38960_cc.svg b/res/icons/noun_38960_cc.svg
new file mode 100644
index 00000000..827cabaa
--- /dev/null
+++ b/res/icons/noun_38960_cc.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 50 62.5"
+ enable-background="new 0 0 50 50"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="noun_38960_cc.svg"><metadata
+ id="metadata44"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs42" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1366"
+ inkscape:window-height="709"
+ id="namedview40"
+ showgrid="false"
+ inkscape:zoom="3.776"
+ inkscape:cx="25"
+ inkscape:cy="31.25"
+ inkscape:window-x="-2"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><path
+ d="M30.711,14.454H8.617c-1.107,0-2.008,0.9-2.008,2.008V29.6c0,1.107,0.901,2.009,2.008,2.009h22.095 c1.107,0,2.008-0.901,2.008-2.009V16.462C32.72,15.354,31.82,14.454,30.711,14.454z M8.617,15.792h22.095 c0.37,0,0.67,0.299,0.67,0.67v2.265H7.948v-2.265C7.948,16.091,8.25,15.792,8.617,15.792z M7.948,29.599v-9.533h6.242v10.203H8.617 C8.25,30.269,7.948,29.968,7.948,29.599z M30.711,30.269H15.529V20.065h15.852v9.533C31.381,29.968,31.082,30.269,30.711,30.269z"
+ id="path4" /><circle
+ cx="9.789"
+ cy="17.293"
+ r="0.717"
+ id="circle6" /><circle
+ cx="11.797"
+ cy="17.293"
+ r="0.717"
+ id="circle8" /><circle
+ cx="13.806"
+ cy="17.293"
+ r="0.717"
+ id="circle10" /><rect
+ x="9.07"
+ y="21.319"
+ width="3.935"
+ height="1.338"
+ id="rect12" /><rect
+ x="9.07"
+ y="23.368"
+ width="3.935"
+ height="1.339"
+ id="rect14" /><rect
+ x="9.07"
+ y="25.503"
+ width="3.935"
+ height="1.339"
+ id="rect16" /><rect
+ x="9.07"
+ y="27.68"
+ width="3.935"
+ height="1.34"
+ id="rect18" /><path
+ d="M20.425,21.477h-3.683v2.972h3.683V21.477z M19.086,23.108h-1.004v-0.292h1.004V23.108z"
+ id="path20" /><rect
+ x="16.743"
+ y="25.503"
+ width="13.308"
+ height="1.339"
+ id="rect22" /><rect
+ x="16.743"
+ y="27.68"
+ width="13.308"
+ height="1.34"
+ id="rect24" /><path
+ d="M25.238,21.477h-3.683v2.972h3.683V21.477z M23.899,23.108h-1.004v-0.292h1.004V23.108z"
+ id="path26" /><path
+ d="M26.367,24.448h3.684v-2.972h-3.684V24.448z M27.706,22.815h1.004v0.292h-1.004V22.815z"
+ id="path28" /><g
+ id="g30"><path
+ d="M44.773,44.332H5.196c-2.079,0-3.769-1.69-3.769-3.769V13.065c0-2.079,1.69-3.769,3.769-3.769h39.577 c2.078,0,3.768,1.69,3.768,3.769v27.498C48.541,42.642,46.852,44.332,44.773,44.332z M5.196,10.427 c-1.455,0-2.639,1.184-2.639,2.639v27.498c0,1.455,1.184,2.639,2.639,2.639h39.577c1.455,0,2.638-1.184,2.638-2.639V13.065 c0-1.455-1.183-2.639-2.638-2.639H5.196z"
+ id="path32" /></g><path
+ d="M43.834,34.272l-2.076-2.076l2.197-1.099c0.186-0.093,0.292-0.29,0.27-0.495c-0.022-0.206-0.171-0.376-0.37-0.425 l-7.254-1.814c-0.168-0.042-0.346,0.008-0.469,0.131s-0.172,0.3-0.129,0.468l1.813,7.254c0.05,0.199,0.22,0.347,0.425,0.37 c0.018,0.003,0.036,0.004,0.054,0.004c0.187,0,0.357-0.104,0.442-0.274l1.099-2.196l2.076,2.076 c0.266,0.267,0.613,0.398,0.962,0.398c0.347,0,0.696-0.132,0.961-0.398C44.365,35.665,44.365,34.804,43.834,34.272z M43.136,35.498 c-0.094,0.095-0.205,0.109-0.263,0.109s-0.168-0.015-0.264-0.111l-3.045-3.043l-1.114,2.228l-1.291-5.159l5.16,1.29l-2.229,1.114 l3.047,3.045c0.095,0.095,0.108,0.206,0.108,0.264S43.231,35.403,43.136,35.498z"
+ id="path34" /></svg>
\ No newline at end of file
diff --git a/res/icons/noun_42425_cc.svg b/res/icons/noun_42425_cc.svg
new file mode 100644
index 00000000..f6b8c6e9
--- /dev/null
+++ b/res/icons/noun_42425_cc.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 100 125"
+ enable-background="new 0 0 100 100"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="noun_42425_cc.svg"><metadata
+ id="metadata18"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs16" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1366"
+ inkscape:window-height="709"
+ id="namedview14"
+ showgrid="false"
+ inkscape:zoom="1.888"
+ inkscape:cx="50"
+ inkscape:cy="62.5"
+ inkscape:window-x="-2"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><g
+ id="g4"
+ transform="translate(0,12)"><path
+ d="M 99,57.669 99,41.331 87.822,38.01 C 87.084,35.6 86.217,33.29 85.052,31.102 L 90.793,20.71 79.266,9.158 68.886,14.851 C 66.698,13.687 64.394,12.915 61.985,12.178 L 58.669,1 42.331,1 39.01,12.178 c -2.41,0.737 -4.72,1.605 -6.908,2.769 L 21.71,9.206 10.158,20.734 15.851,31.113 c -1.164,2.188 -2.436,4.493 -3.173,6.902 L 1,41.331 1,57.669 12.678,60.99 c 0.737,2.41 1.855,4.721 3.019,6.908 l -5.616,10.391 11.591,11.553 10.411,-5.693 c 2.188,1.164 4.508,2.437 6.917,3.174 L 42.331,99 58.669,99 61.99,87.322 c 2.41,-0.737 4.721,-1.855 6.908,-3.02 l 10.391,5.616 11.553,-11.591 -5.693,-10.41 c 1.164,-2.188 1.937,-4.509 2.674,-6.918 L 99,57.669 Z M 50.5,79.873 c -16.774,0 -30.373,-13.599 -30.373,-30.373 0,-16.774 13.598,-30.372 30.373,-30.372 16.775,0 30.373,13.598 30.373,30.372 0,16.774 -13.598,30.373 -30.373,30.373 z"
+ id="path6"
+ inkscape:connector-curvature="0" /><path
+ d="m 53.125,50.135 4.353,-4.354 c 1.64,-1.64 0.89,-4.44 -1.35,-5.04 L 40.15,36.461 c -2.24,-0.6 -4.289,1.449 -3.689,3.689 l 4.281,15.977 c 0.6,2.24 3.4,2.99 5.04,1.35 l 4.354,-4.353 9.907,9.907 c 0.817,0.817 2.142,0.817 2.959,0 l 0.03,-0.03 c 0.817,-0.817 0.817,-2.142 0,-2.959 l -9.907,-9.907 z"
+ id="path8"
+ inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/res/icons/noun_62146_cc.svg b/res/icons/noun_62146_cc.svg
new file mode 100644
index 00000000..00572988
--- /dev/null
+++ b/res/icons/noun_62146_cc.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 100 125"
+ enable-background="new 0 0 100 100"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="noun_62146_cc.svg"><metadata
+ id="metadata26"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs24" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1366"
+ inkscape:window-height="709"
+ id="namedview22"
+ showgrid="false"
+ inkscape:zoom="1.888"
+ inkscape:cx="50"
+ inkscape:cy="39.907766"
+ inkscape:window-x="-2"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><g
+ id="g4"
+ transform="matrix(1.1447278,0,0,1.1447278,-8.4204046,3.5272159)"><rect
+ x="31"
+ y="32.5"
+ width="41"
+ height="4"
+ id="rect6" /></g><g
+ id="g8"
+ transform="matrix(1.1447278,0,0,1.1447278,-8.4204046,3.5272159)"><rect
+ x="48"
+ y="82.5"
+ width="9"
+ height="17.5"
+ id="rect10" /></g><path
+ d="m 37.368709,4.8871525 0,33.5542625 4.578911,0 0,-33.5542625 -4.578911,0 z m 3.451355,7.0824315 -2.324943,0 0,-5.5805485 2.324943,0 0,5.5805485 z"
+ id="path12"
+ inkscape:connector-curvature="0" /><path
+ d="m 60.263266,4.8871525 0,33.5542625 4.578911,0 0,-33.5542625 -4.578911,0 z m 3.451354,7.0824315 -2.324942,0 0,-5.5805485 2.324942,0 0,5.5805485 z"
+ id="path14"
+ inkscape:connector-curvature="0" /><path
+ d="m 27.066159,43.020326 0,30.907652 12.019642,21.749829 24.039285,0 L 74,73.927978 l 0,-30.907652 -46.933841,0 z m 40.065474,32.05238 -34.341835,0 0,-2.289456 34.341835,0 0,2.289456 z"
+ id="path16"
+ inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/res/ui/preferences.ui b/res/ui/preferences.ui
index 519ca253..004f3c29 100644
--- a/res/ui/preferences.ui
+++ b/res/ui/preferences.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>300</height>
+ <width>443</width>
+ <height>315</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,140 +15,242 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="tabPosition">
- <enum>QTabWidget::West</enum>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="topMargin">
+ <number>6</number>
</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="QVBoxLayout" name="verticalLayout_6">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
<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>
+ <widget class="QPushButton" name="button_app">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../icons/icons.qrc">
+ <normaloff>:/icons/settings_app_icon</normaloff>:/icons/settings_app_icon</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>65</width>
+ <height>65</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
</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>
+ <widget class="QPushButton" name="button_display">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../icons/icons.qrc">
+ <normaloff>:/icons/settings_display_icon</normaloff>:/icons/settings_display_icon</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>65</width>
+ <height>65</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <widget class="QPushButton" name="button_network">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="../icons/icons.qrc">
+ <normaloff>:/icons/settings_network_icon</normaloff>:/icons/settings_network_icon</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>65</width>
+ <height>65</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
+ <widget class="QWidget" name="page">
+ <layout class="QVBoxLayout" name="verticalLayout_7">
<item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Language</string>
- </property>
- </widget>
+ <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>
- <widget class="QComboBox" name="combo_language"/>
+ <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>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
- <spacer name="horizontalSpacer">
+ <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>
+ <item>
+ <spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>20</width>
+ <height>40</height>
</size>
</property>
</spacer>
</item>
+ </layout>
+ <zorder></zorder>
+ <zorder></zorder>
+ <zorder></zorder>
+ <zorder>verticalSpacer</zorder>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <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>
- <widget class="QCheckBox" name="checkBox">
- <property name="text">
- <string>Expert mode</string>
- </property>
- </widget>
+ <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>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>Language</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="combo_language"/>
+ </item>
+ </layout>
</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">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>20</width>
+ <height>40</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>
+ <zorder></zorder>
+ <zorder></zorder>
+ <zorder></zorder>
+ <zorder>verticalSpacer_2</zorder>
+ </widget>
+ <widget class="QWidget" name="page_3"/>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
@@ -162,7 +264,9 @@
</item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="../icons/icons.qrc"/>
+ </resources>
<connections>
<connection>
<sender>buttonBox</sender>
diff --git a/src/cutecoin/gui/preferences.py b/src/cutecoin/gui/preferences.py
index c674625c..8f01452b 100644
--- a/src/cutecoin/gui/preferences.py
+++ b/src/cutecoin/gui/preferences.py
@@ -9,8 +9,10 @@ from PyQt5.QtCore import QCoreApplication
from ..core.account import Account
from . import toast
from PyQt5.QtWidgets import QDialog
+from PyQt5.QtGui import QIcon
from ..gen_resources.preferences_uic import Ui_PreferencesDialog
+import icons_rc
class PreferencesDialog(QDialog, Ui_PreferencesDialog):
@@ -36,6 +38,9 @@ class PreferencesDialog(QDialog, Ui_PreferencesDialog):
for lang in ('en_GB', 'fr_FR'):
self.combo_language.addItem(lang)
self.combo_language.setCurrentText(self.app.preferences['lang'])
+ self.button_app.clicked.connect(lambda: self.stackedWidget.setCurrentIndex(0))
+ self.button_display.clicked.connect(lambda: self.stackedWidget.setCurrentIndex(1))
+ self.button_network.clicked.connect(lambda: self.stackedWidget.setCurrentIndex(2))
def accept(self):
pref = {'account': self.combo_account.currentText(),
--
GitLab