Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

a window inside QT GUI to interact with safecoin-cli #18

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
011bb1b
bump version
Jul 22, 2020
5cfd7c9
Update connection.cpp
Jul 22, 2020
509db56
Merge pull request #4 from Fair-Exchange/master
MartlnS Jul 22, 2020
305cf17
link to Mac build guide
MartlnS Jul 22, 2020
cf0c9c0
fix balancesTable
OleksandrBlack Jul 22, 2020
019c6b6
Merge pull request #35 from MartlnS/master
Jul 22, 2020
854165f
fix safenode logo position
MartlnS Jul 22, 2020
a595467
Merge pull request #36 from MartlnS/master
Jul 22, 2020
8febf47
enable getaddressesbyaccount to retrieve all addresses
Jul 23, 2020
cd4832d
imported WIFs should go in default account
Jul 23, 2020
09240dd
fix isvalid
Jul 25, 2020
51ecefa
Bump version
Jul 25, 2020
b9f1ea3
Add additional delay for further syncing
Jul 26, 2020
5652c56
account for spaces in application path
Jul 27, 2020
8314624
deprecation fix
Jul 27, 2020
b333dab
fix duplicate line_5
Jul 28, 2020
109b5f0
resolve duplicate gridLayout_5
Jul 28, 2020
093356c
resolve redundant line_2
Jul 28, 2020
498c770
Safenodes Tab 5
Jul 28, 2020
96502ad
resolve label_22 conflict
Jul 28, 2020
a29cfa2
restore matrix
Jul 28, 2020
96c96e1
restore matrix
Jul 28, 2020
d885e4a
fix recipient header
Jul 28, 2020
59ff8e4
theme update, add Midnight from Charles Sharpe
Jul 29, 2020
12bf90b
fix theme dropdowns
Aug 3, 2020
760b798
fix midnight, fix dropdowns
OleksandrBlack Aug 4, 2020
a69fa65
fix uk lng, fix logo dialog
OleksandrBlack Aug 4, 2020
5c06218
Sending button are hidden until complete synchronization or transacti…
OleksandrBlack Aug 4, 2020
b48d8c0
compile
Aug 5, 2020
173752d
fix squished headers
OleksandrBlack Aug 5, 2020
c42128b
fix confirm transaction tab
OleksandrBlack Aug 5, 2020
81fdf9b
fix blue theme
OleksandrBlack Aug 5, 2020
aa2a9ac
Bump Version
Aug 5, 2020
37e7905
Always download ZCash Params to user's home directory
3DA4C300 Aug 9, 2020
fb07f35
add listunspent as method for private key export - cases where addres…
Aug 11, 2020
30899ac
add listunspent as method for private key export - cases where addres…
Aug 11, 2020
9a3bfaa
specify listunspent for addresses with unset accounts
Aug 11, 2020
9447f72
Merge pull request #40 from 3DA4C300/master
Aug 11, 2020
2339993
change order to address null results
Aug 11, 2020
9f976f8
Merge branch 'master' of https://github.com/Fair-Exchange/safewallet
Aug 11, 2020
82aa00a
handle empty lists on unspent address queries
Aug 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,5 @@ safecoinwallet
node_modules
safe-qt-wallet.pro.user
safecoinwallet_resource.rc
msvc_make.bat
msvc_make.bat
safewallet_resource.rc
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ make
./safewallet.app/Contents/MacOS/safewallet
```

For a more indepth build guide please read our mac build guide [here](docs/build-mac.md)
### Emulating the embedded node

In binary releases, safewallet will use node binaries in the current directory to sync a node from scratch.
Expand All @@ -93,4 +94,3 @@ The above assumes safewallet and safecoin git repos are in the same directory. F
### Support

For support or other questions, Join [Discord](https://discordapp.com/invite/vQgYGJz), or tweet at [@safecoins](https://twitter.com/safecoins) or [file an issue](https://github.com/Fair-Exchange/safewallet/issues).

3 changes: 2 additions & 1 deletion application.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<file>res/css/dark.css</file>
<file>res/css/default.css</file>
<file>res/css/light.css</file>
<file>res/css/matrix.css</file>
<file>res/css/midnight.css</file>
<file>res/css/matrix.css</file>
</qresource>
<qresource prefix="/images/blue">
<file>res/images/blue/unchecked.png</file>
Expand Down
31 changes: 5 additions & 26 deletions res/css/blue.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ QLabel {

QGroupBox#groupBox {
background-color: #014d67;
margin: 25px;
margin: -5px;
margin-top: 10px;
margin-bottom: 10px;
padding: 15px;
Expand Down Expand Up @@ -46,21 +46,6 @@ QGroupBox#horizontalGroupBox_3 {
border-left: 7px solid #e6e6e6;
}

/* send to */
QGroupBox#groupBox_3 {
background-color: #014d67;
margin: 25px;
margin-top: 10px;
margin-bottom: 10px;
padding: 15px;
border-radius: 4px;
border-left: 7px solid #e6e6e6;
}

QGroupBox#verticalGroupBox {
background-color: #014d67;
border-radius: 4px;
}

QGroupBox#groupBox_3 QScrollArea {
background-color: #014d67;
Expand Down Expand Up @@ -99,16 +84,6 @@ QGroupBox#groupBox_3 QWidget#sendToWidgets QPushButton:pressed {
border:1px solid #e6e6e6;
}

/* send from */
QGroupBox#groupBox_4 {
background-color: #014d67;
margin: 25px;
margin-top: 10px;
margin-bottom: 10px;
padding: 15px;
border-radius: 4px;
border-left: 7px solid #e6e6e6;
}

/* Receive with section */
QGroupBox#groupBox_6 {
Expand Down Expand Up @@ -406,3 +381,7 @@ QCheckBox::indicator:indeterminate:pressed {
image:url(':/images/blue/res/images/blue/checked');
}

QComboBox { /* default values */
min-height: 30px;
min-width: 100px;
}
19 changes: 4 additions & 15 deletions res/css/dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,6 @@ QGroupBox#horizontalGroupBox_3 {
border-left: 7px solid #014d67;
}

/* send to */
QGroupBox#groupBox_3 {
background-color: #212121;
margin: 25px;
margin-top: 10px;
margin-bottom: 10px;
padding: 15px;
border-radius: 4px;
border-left: 7px solid #014d67;
}

QGroupBox#verticalGroupBox {
background-color: #212121;
border-radius: 4px;
}

QGroupBox#groupBox_3 QScrollArea {
background-color: #212121;
Expand Down Expand Up @@ -407,3 +392,7 @@ QCheckBox::indicator:indeterminate:pressed {
image:url(':/images/blue/res/images/blue/checked');
}

QComboBox { /* default values */
min-height: 30px;
min-width: 100px;
}
7 changes: 5 additions & 2 deletions res/css/default.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow
{
/**/

}
}
QComboBox { /* default values */
min-height: 30px;
min-width: 100px;
}
19 changes: 4 additions & 15 deletions res/css/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,6 @@ QGroupBox#horizontalGroupBox_3 {
border-left: 7px solid #014d67;
}

/* send to */
QGroupBox#groupBox_3 {
background-color: #e6e6e6;
margin: 25px;
margin-top: 10px;
margin-bottom: 10px;
padding: 15px;
border-radius: 4px;
border-left: 7px solid #014d67;
}

QGroupBox#verticalGroupBox {
background-color: #e6e6e6;
border-radius: 4px;
}

QGroupBox#groupBox_3 QScrollArea {
background-color: #e6e6e6;
Expand Down Expand Up @@ -427,3 +412,7 @@ QCheckBox::indicator:indeterminate:pressed {
image:url(':/images/blue/res/images/blue/checked');
}

QComboBox { /* default values */
min-height: 30px;
min-width: 100px;
}
4 changes: 2 additions & 2 deletions res/css/matrix.css
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ QLineEdit:disabled, QPushButton:disabled, QPlainTextEdit:disabled {

QComboBox {
background-color: rgba(0, 16, 0, 128);
min-height: 28px;
min-height: 28px;
min-width: 80px;
border: 1px solid rgb(0, 64, 0);
border-radius: 4px;
Expand Down Expand Up @@ -194,4 +194,4 @@ QDialogButtonBox {
QHeaderView::section {
background-color: rgba(0, 0, 0, 0.6);
border: 1px solid rgb(0, 128, 0);
}
}
144 changes: 144 additions & 0 deletions res/css/midnight.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
/*
Theme: Midnight Qt
Version: 1.0.2
Reference: https://doc.qt.io/qt-5/stylesheet-reference.html

Author: Charles Sharpe
Date: Apr. 23, 2020
Website: https://www.csharpe.me
License: https://opensource.org/licenses/MIT
*/

QWidget, QMainWindow, QMenuBar, QMenu, QDialog, QTabWidget, QTableView, QTableView::item, QScrollArea, QGroupBox, QPlainTextEdit, QLineEdit, QLabel, MainWindow
{
background-color: #111;
color: #fff;
}

QPushButton {
padding: 10px 15px;
}

QPushButton:hover {
background: #222;
}

QLineEdit, QRadioButton::indicator::unchecked, QCheckBox::indicator::unchecked {
background: #222;
border: 1px solid #333;
border-radius: 3px;
}

QLineEdit {
font-size: 12px;
}

QLineEdit:focus {
border: 1px solid #9d8400;
}

QWidget QLabel {
font-size: 11pt;
}

QWidget QCheckBox {
font-weight: bold;
}

QTabWidget QTabBar::tab {
min-height: 15px;
padding: 15px 25px;
border: 1px ridge #222;
left: 1px; /* Fix 1px alignment */
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
}

QTabWidget QTabBar::tab:selected {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #555, stop: 1 #111);
color:#fff;
border: 1px ridge #222;
border-bottom: 0px; /* Overwrites border-bottom */
}

QTabWidget QTabBar::tab:hover {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #555, stop: 1 #111);
}

QHeaderView { /* Table Header */
background-color:#111;
}

QHeaderView::section { /* Table Header Sections */
qproperty-alignment:center;
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
color:#fff;
min-height:25px;
font-weight:bold;
font-size:12px;
outline:0;
border:1px ridge #222;
padding: 2px 5px;
}

QHeaderView::section:last {
border-right: 0px ridge #222;
}

QScrollArea {
background:transparent;
border:0px;
}

QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */
background:#111;
}

QTableView::item { /* Table Item */
background-color:#111;
border:1px solid #222;
font-size:12px;
}

QTableView::item:selected { /* Table Item Selected */
background-color:#fff;
color:#000;
}

QMenuBar {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #222, stop: 1 #111);
color: #fff;
}

QMenuBar::item {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #222, stop: 1 #111);
color: #fff;
padding: 5px 7px;
margin: 0px;
}

QMenuBar::item:selected {
background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #333, stop: 1 #111);
}

QMenu {
border:1px solid #222;
}

QMenu::item {
padding: 7px 15px;
}

QMenu::item:selected {
background: #222;
}

QMenu::separator {
height: 1px;
margin: 3px 7px 3px 7px; /* space at ends of separator */
background: #222;
}

QComboBox { /* default values */
min-height: 30px;
min-width: 100px;
}
Binary file modified res/safe_qt_wallet_uk.qm
Binary file not shown.
8 changes: 4 additions & 4 deletions src/about.ui
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Copyright (c) 2019 Martin, OleksandrBlack, miodrag, Duke Leto, David Mercer and Aditya Kulkarni. (MIT License)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Copyright (c) 2020 Jeff Galloway, Martin, OleksandrBlack, miodrag, Duke Leto, David Mercer and Aditya Kulkarni. (MIT License)&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Special thanks to:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;JSON for Modern C++ : &lt;/span&gt;&lt;a href=&quot;https://nlohmann.github.io/json/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; text-decoration: underline; color:#0000ff;&quot;&gt;https://nlohmann.github.io/json/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;QR Code generator library Nayuki : &lt;/span&gt;&lt;a href=&quot;https://www.nayuki.io/page/qr-code-generator-library&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.nayuki.io/page/qr-code-ge…&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Made with QT : &lt;/span&gt;&lt;a href=&quot;https://www.qt.io/&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;JSON for Modern C++ : &lt;/span&gt;&lt;a href=&quot;https://nlohmann.github.io/json/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://nlohmann.github.io/json/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;QR Code generator library Nayuki : &lt;/span&gt;&lt;a href=&quot;https://www.nayuki.io/page/qr-code-generator-library&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.nayuki.io/page/qr-code-ge…&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Made with QT : &lt;/span&gt;&lt;a href=&quot;https://www.qt.io/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;LICENSE:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &amp;quot;Software&amp;quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:&lt;/span&gt;&lt;/p&gt;
&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot; style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.&lt;/li&gt;
Expand Down
Loading