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

Changes related to Passphrase Mnemonic UI #34

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/generates_locales.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
pre-build-command: pip install -r requirements.txt
build-command: make gettext
- uses: actions/checkout@v2
- name: Commit report
run: |
git config --global user.name 'Nextcloud Bot'
git config --global user.email 'bot@nextcloud.com'
git commit -am "Updates catalog templates (POT files fetched automatically by transifex)"
git push
- name: Commit report
run: |
git config --global user.name 'Nextcloud Bot'
git config --global user.email 'bot@nextcloud.com'
git commit -am "Updates catalog templates (POT files fetched automatically by transifex)"
git push
13 changes: 7 additions & 6 deletions src/gui/accountsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1011,11 +1011,12 @@ void AccountSettings::displayMnemonic(const QString &mnemonic)
QDialog widget;
Ui_Dialog ui{};
ui.setupUi(&widget);
widget.setWindowTitle(tr("End-to-end encryption mnemonic"));
ui.label->setText(
tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
"Please note these down and keep them safe. "
"They will be needed to add other devices to your account (like your mobile phone or laptop)."));
widget.setWindowTitle(tr("End-to-End encryption mnemonic"));
widget.setWindowFlags(widget.windowFlags() & ~Qt::WindowContextHelpButtonHint);
ui.label->setText(tr("For the encryption, a randomly generated word sequence"
"(passphrase) of 12 words is created. We recommend that you write down the passphrase and keep it safe.\n"
"\n"
"The passphrase is your personal password with which you can access encrypted data in your MagentaCLOUD or enable access to these files on other devices such as your smartphones."));
QFont monoFont(QStringLiteral("Monospace"));
monoFont.setStyleHint(QFont::TypeWriter);
ui.lineEdit->setFont(monoFont);
Expand All @@ -1026,7 +1027,7 @@ void AccountSettings::displayMnemonic(const QString &mnemonic)

ui.lineEdit->focusWidget();
ui.lineEdit->selectAll();
ui.lineEdit->setAlignment(Qt::AlignCenter);
ui.lineEdit->setAlignment(Qt::AlignTop);

const QFont font(QStringLiteral(""), 0);
QFontMetrics fm(font);
Expand Down
11 changes: 9 additions & 2 deletions src/gui/mnemonicdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>588</width>
<height>131</height>
<height>300</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -82,7 +82,14 @@
</spacer>
</item>
<item>
<widget class="QLineEdit" name="lineEdit"/>
<widget class="QLineEdit" name="lineEdit">
<property name="minimumSize">
<size>
<width>0</width>
<height>60</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
Expand Down