Skip to content

Commit

Permalink
#695 - side menu
Browse files Browse the repository at this point in the history
  • Loading branch information
@chapati
chapati committed Jul 14, 2021
1 parent dfc7e9b commit bebb7fd
Show file tree
Hide file tree
Showing 22 changed files with 90 additions and 8 deletions.
4 changes: 4 additions & 0 deletions ui/i18n/be_BY.ts
View file
Expand Up @@ -3163,5 +3163,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/cs_CZ.ts
View file
Expand Up @@ -3163,5 +3163,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/de_DE.ts
View file
Expand Up @@ -3165,5 +3165,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/en_US.ts
View file
Expand Up @@ -3143,5 +3143,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<source>Show details</source>
<translation>Show details</translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/es_ES.ts
View file
Expand Up @@ -3162,5 +3162,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/fi_FI.ts
View file
Expand Up @@ -3165,5 +3165,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/fr_FR.ts
View file
Expand Up @@ -3165,5 +3165,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/id_ID.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/it_IT.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/ja_JP.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/ko_KR.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/nl_NL.ts
View file
Expand Up @@ -3163,5 +3163,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/ru_RU.ts
View file
Expand Up @@ -3165,5 +3165,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/sr_SR.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/sv_SE.ts
View file
Expand Up @@ -3161,5 +3161,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/th_TH.ts
View file
Expand Up @@ -3165,5 +3165,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/tr_TR.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/vi_VI.ts
View file
Expand Up @@ -3164,5 +3164,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
4 changes: 4 additions & 0 deletions ui/i18n/zh_CN.ts
View file
Expand Up @@ -3176,5 +3176,9 @@ Allow to proceed ? You can always update your choice in Settings later.</source>
<oldsource>show details</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="apps-update-message">
<source>Update Wallet to launch %1 application</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>
10 changes: 8 additions & 2 deletions ui/view/applications.qml
View file
Expand Up @@ -36,13 +36,19 @@ ColumnLayout {
model: statusbarModel
}

// Subtitle row is invisible only when we display appslit
// In all other cases we display it
// - if app, with back button & app title
// - if no app (loading) without back button & title.
// This is to avoid 'Loading (appname)...' message jumping vertically
SubtitleRow {
id: backRow
Layout.fillWidth: true
Layout.topMargin: 50
Layout.bottomMargin: 20
visible: !appsView.visible

text: (control.activeApp || {}).name || ""
visible: !!control.activeApp
text: ((control.activeApp || {}).name || "")

onBack: function () {
main.openApplications()
Expand Down
5 changes: 3 additions & 2 deletions ui/view/controls/SubtitleRow.qml
View file
Expand Up @@ -23,8 +23,9 @@ Item {
}

//% "Back"
text: qsTrId("general-back")
icon.source: "qrc:/assets/icon-back.svg"
text: qsTrId("general-back")
icon.source: "qrc:/assets/icon-back.svg"
visible: !!control.text

onClicked: control.onBack()
}
Expand Down
7 changes: 3 additions & 4 deletions ui/viewmodel/main_view.cpp
View file
Expand Up @@ -120,14 +120,13 @@ QString MainViewModel::getDaoCoreAppID() const
std::string appURL = "";

#if defined(BEAM_TESTNET)
appURL = "https://apps-testnet.beam.mw/app/plugin-dao/index.html";
appURL = "https://apps-testnet.beam.mw/app/plugin-dao-core/index.html";
#elif defined(BEAM_MAINNET)
appURL = "https://apps.beam.mw/app/plugin-dao/index.html";
appURL = "https://apps.beam.mw/app/plugin-dao-core/index.html";
#else
appURL = "http://3.19.141.112:80/app/plugin-dao/index.html";
appURL = "http://3.19.141.112:80/app/plugin-dao-core/index.html";
#endif

const auto appid = beamui::applications::GenerateAppID(appName, appURL);
return QString::fromStdString(appid);
}

0 comments on commit bebb7fd

Please sign in to comment.