Skip to content

Commit

Permalink
Merge pull request #334 from simelo/stdevCrow_Improve_AddressBook_Lay…
Browse files Browse the repository at this point in the history
…out_Settings

Improve Address Book layout, refactor code and fix many bugs
  • Loading branch information
olemis committed Feb 7, 2020
2 parents e2bbda8 + c00c36b commit 4c387b4
Show file tree
Hide file tree
Showing 46 changed files with 1,526 additions and 1,260 deletions.
1 change: 1 addition & 0 deletions fonts.qrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/fonts">
<file>resources/fonts/code-new-roman/code-new-roman.otf</file>
<file>resources/fonts/hemi-head/hemi-head.ttf</file>
</qresource>
</RCC>
9 changes: 9 additions & 0 deletions images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<file>resources/images/icons/visibleOff.svg</file>
<file>resources/images/icons/visibleOn.svg</file>
<file>resources/images/icons/edit.svg</file>
<file>resources/images/icons/delete.svg</file>
<file>resources/images/icons/copy.svg</file>
<file>resources/images/icons/check-simple.svg</file>
<file>resources/images/icons/add-circle.svg</file>
Expand All @@ -35,6 +36,14 @@
<file>resources/images/icons/selectAll-content.svg</file>
<file>resources/images/icons/undo.svg</file>
<file>resources/images/icons/redo.svg</file>
<file>resources/images/icons/log_level_debug.svg</file>
<file>resources/images/icons/log_level_info.svg</file>
<file>resources/images/icons/log_level_warn.svg</file>
<file>resources/images/icons/log_level_error.svg</file>
<file>resources/images/icons/log_level_fatal.svg</file>
<file>resources/images/icons/log_level_panic.svg</file>
<file>resources/images/icons/user.svg</file>
<file>resources/images/icons/contacts.svg</file>
<file>resources/images/icons/outputs.svg</file>
<file>resources/images/icons/pending-transactions.svg</file>
<file>resources/images/icons/blockchain.svg</file>
Expand Down
1 change: 1 addition & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ func main() {

// Add this monospaced font
gui.QFontDatabase_AddApplicationFont(":/fonts/resources/fonts/code-new-roman/code-new-roman.otf")
gui.QFontDatabase_AddApplicationFont(":/fonts/resources/fonts/hemi-head/hemi-head.ttf")

engine := qml.NewQQmlApplicationEngine(nil)
// To speed up UI development, loading QML files from resources is disabled, but it must be re-enabled in order to make a release
Expand Down
1 change: 1 addition & 0 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<file>src/ui/NetworkSettings.qml</file>
<file>src/ui/WalletSettings.qml</file>
<file>src/ui/Settings.qml</file>
<file>src/ui/SettingsAddressBook.qml</file>
<file>src/ui/MenuThemeAccent.qml</file>
<file>src/ui/ToolButtonQR.qml</file>
<file>src/ui/Delegates/WalletListDelegate.qml</file>
Expand Down
Binary file added resources/fonts/hemi-head/hemi-head.ttf
Binary file not shown.
Binary file not shown.
78 changes: 78 additions & 0 deletions resources/images/icons/contacts.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions resources/images/icons/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/images/icons/license.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/icons/log_level_debug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/icons/log_level_error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/icons/log_level_fatal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions resources/images/icons/log_level_info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4c387b4

Please sign in to comment.