Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

Merge branch 'develop' of github.com:hyle-team/zano into develop

Browse source
This commit is contained in:
cryptozoidberg 2019-09-06 16:21:18 +02:00
commit e6d35a8a7f
No known key found for this signature in database
GPG key ID: 22DEB97A54C6FDEC
10 changed files with 60 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -48,8 +48,9 @@
"ONLINE": "Online",
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data"
"SYNCING": "Syncing block",
"LOADING": "Loading blockchain data",
"SLASH": "/"
},
"UPDATE": {
"STANDARD": "Update available",
@ -62,9 +63,7 @@
"CRITICAL_TOOLTIP": "<span class=\"critical-update\">Critical update available.</span><i class=\"icon\"></i><span>Update strongly recommended!</span>",
"TIME": "System time differs from network",
"TIME_TOOLTIP": "<span class=\"wrong-time\">Wrong system time!</span><br><span>Check and repair your system time.</span>"
},
"BLOCK": "Block",
"OF": "of"
}
},
"MAIN": {
"TITLE": "Create or open the wallet to start using Zano",

68
src/gui/qt-daemon/html/main.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

4
src/gui/qt-daemon/html/polyfills.js
View file

@ -5800,8 +5800,8 @@ __webpack_require__.r(__webpack_exports__);
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(/*! D:\Projects\Projects now\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! D:\Projects\Projects now\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
__webpack_require__(/*! d:\Projects\zano\src\gui\qt-daemon\html_source\src\polyfills.ts */"./src/polyfills.ts");
module.exports = __webpack_require__(/*! d:\Projects\zano\src\gui\qt-daemon\html_source\node_modules\@angular-devkit\build-angular\src\angular-cli-files\models\jit-polyfills.js */"./node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/jit-polyfills.js");
/***/ })

4
src/gui/qt-daemon/html/styles.js
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html/styles.js.map
View file

File diff suppressed because one or more lines are too long

5
src/gui/qt-daemon/html_source/src/app/open-wallet-modal/open-wallet-modal.component.scss
View file

@ -16,7 +16,8 @@
background-position: center;
background-size: 200%;
padding: 2rem;
width: 34rem;
min-width: 34rem;
max-width: 64rem;
.title {
font-size: 1.8rem;
@ -28,6 +29,8 @@
.wallet-path {
font-size: 1.3rem;
margin: 5rem 0 2rem;
word-wrap: break-word;
line-height: 2rem;
}
.wrap-button {

9
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.html
View file

@ -73,13 +73,13 @@
</div>
</ng-template>
</div>
<div class="sidebar-synchronization-status">
<div class="sidebar-synchronization-status" [ngStyle]="{'align-items': variablesService.daemon_state === 1 ? 'flex-start' : 'center'}">
<div class="status-container">
<span class="offline" *ngIf="variablesService.daemon_state === 0">
{{ 'SIDEBAR.SYNCHRONIZATION.OFFLINE' | translate }}
</span>
<span class="syncing" *ngIf="variablesService.daemon_state === 1">
{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }}
{{ 'SIDEBAR.SYNCHRONIZATION.SYNCING' | translate }} {{ variablesService.height_app }}{{ 'SIDEBAR.SYNCHRONIZATION.SLASH' | translate }}{{ variablesService.height_max }}
</span>
<span class="online" *ngIf="variablesService.daemon_state === 2">
{{ 'SIDEBAR.SYNCHRONIZATION.ONLINE' | translate }}
@ -103,11 +103,6 @@
<div class="loading" *ngIf="variablesService.daemon_state === 3"></div>
</div>
</div>
<ng-container *ngIf="variablesService.daemon_state === 1 || variablesService.daemon_state === 3">
<ng-container *ngIf="variablesService.daemon_state === 1">
<div class="progress-height">{{ 'SIDEBAR.BLOCK' | translate }} {{ variablesService.height_app }} {{ 'SIDEBAR.OF' | translate }} {{ variablesService.height_max }}</div>
</ng-container>
</ng-container>
<div class="update-container" *ngIf="(variablesService.daemon_state === 0 || variablesService.daemon_state === 2) && [2, 3, 4].indexOf(variablesService.last_build_displaymode) !== -1">
<ng-container *ngIf="variablesService.last_build_displaymode === 2">
<div class="update-text standard">

18
src/gui/qt-daemon/html_source/src/app/sidebar/sidebar.component.scss
View file

@ -225,17 +225,14 @@
.sidebar-synchronization-status {
display: flex;
flex-direction: column;
justify-content: center;
flex: 0 0 8rem;
align-items: center;
justify-content: flex-start;
flex: 0 0 7rem;
font-size: 1.3rem;
.progress-height {
margin-top: 1rem;
}
.status-container {
position: relative;
flex-grow: 1;
text-align: left;
.offline, .online {
@ -256,7 +253,7 @@
}
.syncing, .loading {
line-height: 4rem;
line-height: 5rem;
}
.progress-bar-container {
@ -282,10 +279,7 @@
font-size: 1.3rem;
line-height: 0.7rem;
padding-left: 0.7rem;
}
}
}
.loading {

9
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -48,8 +48,9 @@
"ONLINE": "Online",
"ERROR": "System error",
"COMPLETE": "Completion",
"SYNCING": "Syncing blockchain",
"LOADING": "Loading blockchain data"
"SYNCING": "Syncing block",
"LOADING": "Loading blockchain data",
"SLASH": "/"
},
"UPDATE": {
"STANDARD": "Update available",
@ -62,9 +63,7 @@
"CRITICAL_TOOLTIP": "<span class=\"critical-update\">Critical update available.</span><i class=\"icon\"></i><span>Update strongly recommended!</span>",
"TIME": "System time differs from network",
"TIME_TOOLTIP": "<span class=\"wrong-time\">Wrong system time!</span><br><span>Check and repair your system time.</span>"
},
"BLOCK": "Block",
"OF": "of"
}
},
"MAIN": {
"TITLE": "Create or open the wallet to start using Zano",