Add advanced password generator features (#1841)

* Split between simple and advanced features
* Finetune password character groups
* Support for hex passwords

src/autotype/AutoType.cpp

@@ -756,9 +756,10 @@ bool AutoType::verifyAutoTypeSyntax(const QString& sequence)
         }
     } else if (AutoType::checkHighRepetition(sequence)) {
         QMessageBox::StandardButton reply;
-        reply =
+        reply = QMessageBox::question(nullptr,
-            QMessageBox::question(nullptr, tr("Auto-Type"), tr("This Auto-Type command contains arguments which are "
+                                      tr("Auto-Type"),
-                                                               "repeated very often. Do you really want to proceed?"));
+                                      tr("This Auto-Type command contains arguments which are "
+                                         "repeated very often. Do you really want to proceed?"));
 
         if (reply == QMessageBox::No) {
             return false;

src/browser/BrowserSettings.cpp

@@ -261,6 +261,66 @@ void BrowserSettings::setPasswordUseSpecial(bool useSpecial)
     config()->set("generator/SpecialChars", useSpecial);
 }
 
+bool BrowserSettings::passwordUseBraces()
+{
+    return config()->get("generator/Braces", PasswordGenerator::DefaultBraces).toBool();
+}
+
+void BrowserSettings::setPasswordUseBraces(bool useBraces)
+{
+    config()->set("generator/Braces", useBraces);
+}
+
+bool BrowserSettings::passwordUsePunctuation()
+{
+    return config()->get("generator/Punctuation", PasswordGenerator::DefaultQuotes).toBool();
+}
+
+void BrowserSettings::setPasswordUsePunctuation(bool usePunctuation)
+{
+    config()->set("generator/Punctuation", usePunctuation);
+}
+
+bool BrowserSettings::passwordUseQuotes()
+{
+    return config()->get("generator/Quotes", PasswordGenerator::DefaultQuotes).toBool();
+}
+
+void BrowserSettings::setPasswordUseQuotes(bool useQuotes)
+{
+    config()->set("generator/Quotes", useQuotes);
+}
+
+bool BrowserSettings::passwordUseDashes()
+{
+    return config()->get("generator/Dashes", PasswordGenerator::DefaultDashes).toBool();
+}
+
+void BrowserSettings::setPasswordUseDashes(bool useDashes)
+{
+    config()->set("generator/Dashes", useDashes);
+}
+
+bool BrowserSettings::passwordUseMath()
+{
+    return config()->get("generator/Math", PasswordGenerator::DefaultMath).toBool();
+}
+
+void BrowserSettings::setPasswordUseMath(bool useMath)
+{
+    config()->set("generator/Math", useMath);
+}
+
+bool BrowserSettings::passwordUseLogograms()
+{
+    return config()->get("generator/Logograms", PasswordGenerator::DefaultLogograms).toBool();
+}
+
+void BrowserSettings::setPasswordUseLogograms(bool useLogograms)
+{
+    config()->set("generator/Logograms", useLogograms);
+}
+
 bool BrowserSettings::passwordUseEASCII()
 {
     return config()->get("generator/EASCII", PasswordGenerator::DefaultEASCII).toBool();
@@ -271,6 +331,26 @@ void BrowserSettings::setPasswordUseEASCII(bool useEASCII)
     config()->set("generator/EASCII", useEASCII);
 }
 
+bool BrowserSettings::advancedMode()
+{
+    return config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool();
+}
+
+void BrowserSettings::setAdvancedMode(bool advancedMode)
+{
+    config()->set("generator/AdvancedMode", advancedMode);
+}
+
+QString BrowserSettings::passwordExcludedChars()
+{
+    return config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString();
+}
+
+void BrowserSettings::setPasswordExcludedChars(QString chars)
+{
+    config()->set("generator/ExcludedChars", chars);
+}
+
 int BrowserSettings::passPhraseWordCount()
 {
     return config()->get("generator/WordCount", PassphraseGenerator::DefaultWordCount).toInt();
@@ -347,6 +427,24 @@ PasswordGenerator::CharClasses BrowserSettings::passwordCharClasses()
     if (passwordUseSpecial()) {
         classes |= PasswordGenerator::SpecialCharacters;
     }
+    if (passwordUseBraces()) {
+        classes |= PasswordGenerator::Braces;
+    }
+    if (passwordUsePunctuation()) {
+        classes |= PasswordGenerator::Punctuation;
+    }
+    if (passwordUseQuotes()) {
+        classes |= PasswordGenerator::Quotes;
+    }
+    if (passwordUseDashes()) {
+        classes |= PasswordGenerator::Dashes;
+    }
+    if (passwordUseMath()) {
+        classes |= PasswordGenerator::Math;
+    }
+    if (passwordUseLogograms()) {
+        classes |= PasswordGenerator::Logograms;
+    }
     if (passwordUseEASCII()) {
         classes |= PasswordGenerator::EASCII;
     }

src/browser/BrowserSettings.h

@@ -76,8 +76,24 @@ public:
     static void setPasswordUseUppercase(bool useUppercase);
     static bool passwordUseSpecial();
     static void setPasswordUseSpecial(bool useSpecial);
+    static bool passwordUseBraces();
+    static void setPasswordUseBraces(bool useBraces);
+    static bool passwordUsePunctuation();
+    static void setPasswordUsePunctuation(bool usePunctuation);
+    static bool passwordUseQuotes();
+    static void setPasswordUseQuotes(bool useQuotes);
+    static bool passwordUseDashes();
+    static void setPasswordUseDashes(bool useDashes);
+    static bool passwordUseMath();
+    static void setPasswordUseMath(bool useMath);
+    static bool passwordUseLogograms();
+    static void setPasswordUseLogograms(bool useLogograms);
     static bool passwordUseEASCII();
     static void setPasswordUseEASCII(bool useEASCII);
+    static bool advancedMode();
+    static void setAdvancedMode(bool advancedMode);
+    static QString passwordExcludedChars();
+    static void setPasswordExcludedChars(QString chars);
     static int passPhraseWordCount();
     static void setPassPhraseWordCount(int wordCount);
     static QString passPhraseWordSeparator();

src/cli/Generate.cpp

@@ -44,19 +44,41 @@ int Generate::execute(const QStringList& arguments)
     parser.setApplicationDescription(this->description);
     QCommandLineOption len(QStringList() << "L"
                                          << "length",
-                           QObject::tr("Length of the generated password."),
+                           QObject::tr("Length of the generated password"),
                            QObject::tr("length"));
     parser.addOption(len);
-    QCommandLineOption lower(QStringList() << "l", QObject::tr("Use lowercase characters in the generated password."));
+    QCommandLineOption lower(QStringList() << "l"
+                                           << "lower",
+                             QObject::tr("Use lowercase characters"));
     parser.addOption(lower);
-    QCommandLineOption upper(QStringList() << "u", QObject::tr("Use uppercase characters in the generated password."));
+    QCommandLineOption upper(QStringList() << "u"
+                                           << "upper",
+                             QObject::tr("Use uppercase characters"));
     parser.addOption(upper);
-    QCommandLineOption numeric(QStringList() << "n", QObject::tr("Use numbers in the generated password."));
+    QCommandLineOption numeric(QStringList() << "n"
+                                             << "numeric",
+                               QObject::tr("Use numbers."));
     parser.addOption(numeric);
-    QCommandLineOption special(QStringList() << "s", QObject::tr("Use special characters in the generated password."));
+    QCommandLineOption special(QStringList() << "s"
+                                             << "special",
+                               QObject::tr("Use special characters"));
     parser.addOption(special);
-    QCommandLineOption extended(QStringList() << "e", QObject::tr("Use extended ASCII in the generated password."));
+    QCommandLineOption extended(QStringList() << "e"
+                                              << "extended",
+                                QObject::tr("Use extended ASCII"));
     parser.addOption(extended);
+    QCommandLineOption exclude(QStringList() << "x"
+                                             << "exclude",
+                               QObject::tr("Exclude character set"),
+                               QObject::tr("chars"));
+    parser.addOption(exclude);
+    QCommandLineOption exclude_similar(QStringList() << "exclude-similar",
+                                       QObject::tr("Exclude similar looking characters"));
+    parser.addOption(exclude_similar);
+    QCommandLineOption every_group(QStringList() << "every-group",
+                                   QObject::tr("Include characters from every selected group"));
+    parser.addOption(every_group);
+
     parser.process(arguments);
 
     const QStringList args = parser.positionalArguments();
@@ -92,8 +114,18 @@ int Generate::execute(const QStringList& arguments)
         classes |= PasswordGenerator::EASCII;
     }
 
+    PasswordGenerator::GeneratorFlags flags = 0x0;
+
+    if (parser.isSet(exclude_similar)) {
+        flags |= PasswordGenerator::ExcludeLookAlike;
+    }
+    if (parser.isSet(every_group)) {
+        flags |= PasswordGenerator::CharFromEveryGroup;
+    }
+
     passwordGenerator.setCharClasses(classes);
-    passwordGenerator.setFlags(PasswordGenerator::DefaultFlags);
+    passwordGenerator.setFlags(flags);
+    passwordGenerator.setExcludedChars(parser.value(exclude));
 
     if (!passwordGenerator.isValid()) {
         outputTextStream << parser.helpText().replace("keepassxc-cli", "keepassxc-cli generate");

src/core/PasswordGenerator.cpp

@@ -21,10 +21,13 @@
 #include "crypto/Random.h"
 #include <zxcvbn.h>
 
+const char* PasswordGenerator::DefaultExcludedChars = "";
+
 PasswordGenerator::PasswordGenerator()
     : m_length(0)
     , m_classes(0)
     , m_flags(0)
+    , m_excluded(PasswordGenerator::DefaultExcludedChars)
 {
 }
 
@@ -56,6 +59,11 @@ void PasswordGenerator::setFlags(const GeneratorFlags& flags)
     m_flags = flags;
 }
 
+void PasswordGenerator::setExcludedChars(const QString& chars)
+{
+    m_excluded = chars;
+}
+
 QString PasswordGenerator::generatePassword() const
 {
     Q_ASSERT(isValid());
@@ -130,6 +138,10 @@ bool PasswordGenerator::isValid() const
         return false;
     }
 
+    if (passwordGroups().size() == 0) {
+        return false;
+    }
+
     return true;
 }
 
@@ -140,7 +152,8 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
     if (m_classes & LowerLetters) {
         PasswordGroup group;
 
-        for (int i = 97; i < (97 + 26); i++) {
+        for (int i = 97; i <= (97 + 25); i++) {
+
             if ((m_flags & ExcludeLookAlike) && (i == 108)) { // "l"
                 continue;
             }
@@ -153,7 +166,8 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
     if (m_classes & UpperLetters) {
         PasswordGroup group;
 
-        for (int i = 65; i < (65 + 26); i++) {
+        for (int i = 65; i <= (65 + 25); i++) {
+
             if ((m_flags & ExcludeLookAlike) && (i == 73 || i == 79)) { // "I" and "O"
                 continue;
             }
@@ -176,28 +190,79 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
 
         passwordGroups.append(group);
     }
-    if (m_classes & SpecialCharacters) {
+    if (m_classes & Braces) {
         PasswordGroup group;
 
-        for (int i = 33; i <= 47; i++) {
+        // ()[]{}
-            group.append(i);
+        group.append(40);
+        group.append(41);
+        group.append(91);
+        group.append(93);
+        group.append(123);
+        group.append(125);
+
+        passwordGroups.append(group);
+    }
+    if (m_classes & Punctuation) {
+        PasswordGroup group;
+
+        // .,:;
+        group.append(44);
+        group.append(46);
+        group.append(58);
+        group.append(59);
+
+        passwordGroups.append(group);
+    }
+    if (m_classes & Quotes) {
+        PasswordGroup group;
+
+        // "'
+        group.append(34);
+        group.append(39);
+
+        passwordGroups.append(group);
+    }
+    if (m_classes & Dashes) {
+        PasswordGroup group;
+
+        // -/\_|
+        group.append(45);
+        group.append(47);
+        group.append(92);
+        group.append(95);
+        if (!(m_flags & ExcludeLookAlike)) {
+            group.append(124); // "|"
         }
 
-        for (int i = 58; i <= 64; i++) {
+        passwordGroups.append(group);
-            group.append(i);
+    }
-        }
+    if (m_classes & Math) {
-
+        PasswordGroup group;
-        for (int i = 91; i <= 96; i++) {
+
-            group.append(i);
+        // !*+-<=>?
-        }
+        group.append(33);
-
+        group.append(42);
-        for (int i = 123; i <= 126; i++) {
+        group.append(43);
-            if ((m_flags & ExcludeLookAlike) && (i == 124)) { // "|"
+        group.append(60);
-                continue;
+        group.append(61);
-            }
+        group.append(62);
-
+        group.append(63);
+
+        passwordGroups.append(group);
+    }
+    if (m_classes & Logograms) {
+        PasswordGroup group;
+
+        // #$%&
+        for (int i = 35; i <= 38; i++) {
             group.append(i);
         }
+        // @^`~
+        group.append(64);
+        group.append(94);
+        group.append(96);
+        group.append(126);
 
         passwordGroups.append(group);
     }
@@ -220,6 +285,27 @@ QVector<PasswordGroup> PasswordGenerator::passwordGroups() const
         passwordGroups.append(group);
     }
 
+    // Loop over character groups and remove excluded characters from them;
+    // remove empty groups
+    int i = 0;
+    while (i != passwordGroups.size()) {
+        PasswordGroup group = passwordGroups[i];
+
+        for (QChar ch : m_excluded) {
+            int j = group.indexOf(ch);
+            while (j != -1) {
+                group.remove(j);
+                j = group.indexOf(ch);
+            }
+        }
+        if (group.size() > 0) {
+            passwordGroups.replace(i, group);
+            i++;
+        } else {
+            passwordGroups.remove(i);
+        }
+    }
+
     return passwordGroups;
 }
 
@@ -236,7 +322,22 @@ int PasswordGenerator::numCharClasses() const
     if (m_classes & Numbers) {
         numClasses++;
     }
-    if (m_classes & SpecialCharacters) {
+    if (m_classes & Braces) {
+        numClasses++;
+    }
+    if (m_classes & Punctuation) {
+        numClasses++;
+    }
+    if (m_classes & Quotes) {
+        numClasses++;
+    }
+    if (m_classes & Dashes) {
+        numClasses++;
+    }
+    if (m_classes & Math) {
+        numClasses++;
+    }
+    if (m_classes & Logograms) {
         numClasses++;
     }
     if (m_classes & EASCII) {

src/core/PasswordGenerator.h

@@ -30,19 +30,26 @@ class PasswordGenerator
 public:
     enum CharClass
     {
-        LowerLetters = 0x1,
+        LowerLetters = (1 << 0),
-        UpperLetters = 0x2,
+        UpperLetters = (1 << 1),
-        Numbers = 0x4,
+        Numbers = (1 << 2),
-        SpecialCharacters = 0x8,
+        Braces = (1 << 3),
-        EASCII = 0x10,
+        Punctuation = (1 << 4),
+        Quotes = (1 << 5),
+        Dashes = (1 << 6),
+        Math = (1 << 7),
+        Logograms = (1 << 8),
+        SpecialCharacters = Braces | Punctuation | Quotes | Dashes | Math | Logograms,
+        EASCII = (1 << 9),
         DefaultCharset = LowerLetters | UpperLetters | Numbers
     };
     Q_DECLARE_FLAGS(CharClasses, CharClass)
 
     enum GeneratorFlag
     {
-        ExcludeLookAlike = 0x1,
+        ExcludeLookAlike = (1 << 0),
-        CharFromEveryGroup = 0x2,
+        CharFromEveryGroup = (1 << 1),
+        AdvancedMode = (1 << 2),
         DefaultFlags = ExcludeLookAlike | CharFromEveryGroup
     };
     Q_DECLARE_FLAGS(GeneratorFlags, GeneratorFlag)
@@ -54,6 +61,7 @@ public:
     void setLength(int length);
     void setCharClasses(const CharClasses& classes);
     void setFlags(const GeneratorFlags& flags);
+    void setExcludedChars(const QString& chars);
 
     bool isValid() const;
 
@@ -61,10 +69,18 @@ public:
     int getbits() const;
 
     static const int DefaultLength = 16;
+    static const char* DefaultExcludedChars;
     static constexpr bool DefaultLower = (DefaultCharset & LowerLetters) != 0;
     static constexpr bool DefaultUpper = (DefaultCharset & UpperLetters) != 0;
     static constexpr bool DefaultNumbers = (DefaultCharset & Numbers) != 0;
     static constexpr bool DefaultSpecial = (DefaultCharset & SpecialCharacters) != 0;
+    static constexpr bool DefaultAdvancedMode = (DefaultFlags & AdvancedMode) != 0;
+    static constexpr bool DefaultBraces = (DefaultCharset & Braces) != 0;
+    static constexpr bool DefaultPunctuation = (DefaultCharset & Punctuation) != 0;
+    static constexpr bool DefaultQuotes = (DefaultCharset & Quotes) != 0;
+    static constexpr bool DefaultDashes = (DefaultCharset & Dashes) != 0;
+    static constexpr bool DefaultMath = (DefaultCharset & Math) != 0;
+    static constexpr bool DefaultLogograms = (DefaultCharset & Logograms) != 0;
     static constexpr bool DefaultEASCII = (DefaultCharset & EASCII) != 0;
     static constexpr bool DefaultLookAlike = (DefaultFlags & ExcludeLookAlike) != 0;
     static constexpr bool DefaultFromEveryGroup = (DefaultFlags & CharFromEveryGroup) != 0;
@@ -76,6 +92,7 @@ private:
     int m_length;
     CharClasses m_classes;
     GeneratorFlags m_flags;
+    QString m_excluded;
 
     Q_DISABLE_COPY(PasswordGenerator)
 };

src/gui/DatabaseWidget.cpp

@@ -27,7 +27,6 @@
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QLabel>
 #include <QLineEdit>
 #include <QProcess>
 #include <QSplitter>

src/gui/EditWidgetIcons.cpp

@@ -19,7 +19,6 @@
 #include "EditWidgetIcons.h"
 #include "ui_EditWidgetIcons.h"
 
-#include <QFileDialog>
 #include <QFileDialog>
 #include <QMessageBox>
 

src/gui/PasswordGeneratorWidget.cpp

@@ -42,6 +42,10 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
     connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updateButtonsEnabled(QString)));
     connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updatePasswordStrength(QString)));
     connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), SLOT(togglePasswordShown(bool)));
+    connect(m_ui->buttonSimpleMode, SIGNAL(clicked()), SLOT(selectSimpleMode()));
+    connect(m_ui->buttonAdvancedMode, SIGNAL(clicked()), SLOT(selectAdvancedMode()));
+    connect(m_ui->buttonAddHex, SIGNAL(clicked()), SLOT(excludeHexChars()));
+    connect(m_ui->editExcludedChars, SIGNAL(textChanged(QString)), SLOT(updateGenerator()));
     connect(m_ui->buttonApply, SIGNAL(clicked()), SLOT(applyPassword()));
     connect(m_ui->buttonCopy, SIGNAL(clicked()), SLOT(copyPassword()));
     connect(m_ui->buttonGenerate, SIGNAL(clicked()), SLOT(regeneratePassword()));
@@ -94,11 +98,34 @@ void PasswordGeneratorWidget::loadSettings()
 {
     // Password config
     m_ui->checkBoxLower->setChecked(config()->get("generator/LowerCase", PasswordGenerator::DefaultLower).toBool());
+    m_ui->checkBoxLowerAdv->setChecked(config()->get("generator/LowerCase", PasswordGenerator::DefaultLower).toBool());
     m_ui->checkBoxUpper->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool());
+    m_ui->checkBoxUpperAdv->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool());
     m_ui->checkBoxNumbers->setChecked(config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool());
-    m_ui->checkBoxSpecialChars->setChecked(
+    m_ui->checkBoxNumbersAdv->setChecked(
-        config()->get("generator/SpecialChars", PasswordGenerator::DefaultSpecial).toBool());
+        config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool());
+    m_ui->advancedBar->setVisible(
+        config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool());
+    m_ui->excludedChars->setVisible(
+        config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool());
+    m_ui->checkBoxExcludeAlike->setVisible(
+        config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool());
+    m_ui->checkBoxEnsureEvery->setVisible(
+        config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool());
+    m_ui->editExcludedChars->setText(
+        config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString());
+    m_ui->simpleBar->setVisible(
+        !(config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool()));
+    m_ui->checkBoxBraces->setChecked(config()->get("generator/Braces", PasswordGenerator::DefaultBraces).toBool());
+    m_ui->checkBoxQuotes->setChecked(config()->get("generator/Quotes", PasswordGenerator::DefaultQuotes).toBool());
+    m_ui->checkBoxPunctuation->setChecked(
+        config()->get("generator/Punctuation", PasswordGenerator::DefaultPunctuation).toBool());
+    m_ui->checkBoxDashes->setChecked(config()->get("generator/Dashes", PasswordGenerator::DefaultDashes).toBool());
+    m_ui->checkBoxMath->setChecked(config()->get("generator/Math", PasswordGenerator::DefaultMath).toBool());
+    m_ui->checkBoxLogograms->setChecked(
+        config()->get("generator/Logograms", PasswordGenerator::DefaultLogograms).toBool());
     m_ui->checkBoxExtASCII->setChecked(config()->get("generator/EASCII", PasswordGenerator::DefaultEASCII).toBool());
+    m_ui->checkBoxExtASCIIAdv->setChecked(config()->get("generator/EASCII", PasswordGenerator::DefaultEASCII).toBool());
     m_ui->checkBoxExcludeAlike->setChecked(
         config()->get("generator/ExcludeAlike", PasswordGenerator::DefaultLookAlike).toBool());
     m_ui->checkBoxEnsureEvery->setChecked(
@@ -120,11 +147,25 @@ void PasswordGeneratorWidget::loadSettings()
 void PasswordGeneratorWidget::saveSettings()
 {
     // Password config
-    config()->set("generator/LowerCase", m_ui->checkBoxLower->isChecked());
+    if (m_ui->simpleBar->isVisible()) {
-    config()->set("generator/UpperCase", m_ui->checkBoxUpper->isChecked());
+        config()->set("generator/LowerCase", m_ui->checkBoxLower->isChecked());
-    config()->set("generator/Numbers", m_ui->checkBoxNumbers->isChecked());
+        config()->set("generator/UpperCase", m_ui->checkBoxUpper->isChecked());
+        config()->set("generator/Numbers", m_ui->checkBoxNumbers->isChecked());
+        config()->set("generator/EASCII", m_ui->checkBoxExtASCII->isChecked());
+    } else {
+        config()->set("generator/LowerCase", m_ui->checkBoxLowerAdv->isChecked());
+        config()->set("generator/UpperCase", m_ui->checkBoxUpperAdv->isChecked());
+        config()->set("generator/Numbers", m_ui->checkBoxNumbersAdv->isChecked());
+        config()->set("generator/EASCII", m_ui->checkBoxExtASCIIAdv->isChecked());
+    }
     config()->set("generator/SpecialChars", m_ui->checkBoxSpecialChars->isChecked());
-    config()->set("generator/EASCII", m_ui->checkBoxExtASCII->isChecked());
+    config()->set("generator/Braces", m_ui->checkBoxBraces->isChecked());
+    config()->set("generator/Punctuation", m_ui->checkBoxPunctuation->isChecked());
+    config()->set("generator/Quotes", m_ui->checkBoxQuotes->isChecked());
+    config()->set("generator/Dashes", m_ui->checkBoxDashes->isChecked());
+    config()->set("generator/Math", m_ui->checkBoxMath->isChecked());
+    config()->set("generator/Logograms", m_ui->checkBoxLogograms->isChecked());
+    config()->set("generator/ExcludedChars", m_ui->editExcludedChars->text());
     config()->set("generator/ExcludeAlike", m_ui->checkBoxExcludeAlike->isChecked());
     config()->set("generator/EnsureEvery", m_ui->checkBoxEnsureEvery->isChecked());
     config()->set("generator/Length", m_ui->spinBoxLength->value());
@@ -276,6 +317,48 @@ void PasswordGeneratorWidget::togglePasswordShown(bool showing)
     m_ui->togglePasswordButton->blockSignals(blockSignals);
 }
 
+void PasswordGeneratorWidget::selectSimpleMode()
+{
+    m_ui->advancedBar->hide();
+    m_ui->excludedChars->hide();
+    m_ui->checkBoxExcludeAlike->hide();
+    m_ui->checkBoxEnsureEvery->hide();
+    m_ui->checkBoxUpper->setChecked(m_ui->checkBoxUpperAdv->isChecked());
+    m_ui->checkBoxLower->setChecked(m_ui->checkBoxLowerAdv->isChecked());
+    m_ui->checkBoxNumbers->setChecked(m_ui->checkBoxNumbersAdv->isChecked());
+    m_ui->checkBoxSpecialChars->setChecked(m_ui->checkBoxBraces->isChecked() | m_ui->checkBoxPunctuation->isChecked()
+                                           | m_ui->checkBoxQuotes->isChecked()
+                                           | m_ui->checkBoxMath->isChecked()
+                                           | m_ui->checkBoxDashes->isChecked()
+                                           | m_ui->checkBoxLogograms->isChecked());
+    m_ui->checkBoxExtASCII->setChecked(m_ui->checkBoxExtASCIIAdv->isChecked());
+    m_ui->simpleBar->show();
+}
+
+void PasswordGeneratorWidget::selectAdvancedMode()
+{
+    m_ui->simpleBar->hide();
+    m_ui->checkBoxUpperAdv->setChecked(m_ui->checkBoxUpper->isChecked());
+    m_ui->checkBoxLowerAdv->setChecked(m_ui->checkBoxLower->isChecked());
+    m_ui->checkBoxNumbersAdv->setChecked(m_ui->checkBoxNumbers->isChecked());
+    m_ui->checkBoxBraces->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxPunctuation->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxQuotes->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxMath->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxDashes->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxLogograms->setChecked(m_ui->checkBoxSpecialChars->isChecked());
+    m_ui->checkBoxExtASCIIAdv->setChecked(m_ui->checkBoxExtASCII->isChecked());
+    m_ui->advancedBar->show();
+    m_ui->excludedChars->show();
+    m_ui->checkBoxExcludeAlike->show();
+    m_ui->checkBoxEnsureEvery->show();
+}
+
+void PasswordGeneratorWidget::excludeHexChars()
+{
+    m_ui->editExcludedChars->setText("GHIJKLMNOPQRSTUVWXYZghijklmnopqrstuvwxyz");
+}
+
 void PasswordGeneratorWidget::colorStrengthIndicator(double entropy)
 {
     // Take the existing stylesheet and convert the text and background color to arguments
@@ -306,24 +389,69 @@ PasswordGenerator::CharClasses PasswordGeneratorWidget::charClasses()
 {
     PasswordGenerator::CharClasses classes;
 
-    if (m_ui->checkBoxLower->isChecked()) {
+    if (m_ui->simpleBar->isVisible()) {
-        classes |= PasswordGenerator::LowerLetters;
-    }
 
-    if (m_ui->checkBoxUpper->isChecked()) {
+        if (m_ui->checkBoxLower->isChecked()) {
-        classes |= PasswordGenerator::UpperLetters;
+            classes |= PasswordGenerator::LowerLetters;
-    }
+        }
 
-    if (m_ui->checkBoxNumbers->isChecked()) {
+        if (m_ui->checkBoxUpper->isChecked()) {
-        classes |= PasswordGenerator::Numbers;
+            classes |= PasswordGenerator::UpperLetters;
-    }
+        }
 
-    if (m_ui->checkBoxSpecialChars->isChecked()) {
+        if (m_ui->checkBoxNumbers->isChecked()) {
-        classes |= PasswordGenerator::SpecialCharacters;
+            classes |= PasswordGenerator::Numbers;
-    }
+        }
 
-    if (m_ui->checkBoxExtASCII->isChecked()) {
+        if (m_ui->checkBoxSpecialChars->isChecked()) {
-        classes |= PasswordGenerator::EASCII;
+            classes |= PasswordGenerator::SpecialCharacters;
+        }
+
+        if (m_ui->checkBoxExtASCII->isChecked()) {
+            classes |= PasswordGenerator::EASCII;
+        }
+
+    } else {
+
+        if (m_ui->checkBoxLowerAdv->isChecked()) {
+            classes |= PasswordGenerator::LowerLetters;
+        }
+
+        if (m_ui->checkBoxUpperAdv->isChecked()) {
+            classes |= PasswordGenerator::UpperLetters;
+        }
+
+        if (m_ui->checkBoxNumbersAdv->isChecked()) {
+            classes |= PasswordGenerator::Numbers;
+        }
+
+        if (m_ui->checkBoxBraces->isChecked()) {
+            classes |= PasswordGenerator::Braces;
+        }
+
+        if (m_ui->checkBoxPunctuation->isChecked()) {
+            classes |= PasswordGenerator::Punctuation;
+        }
+
+        if (m_ui->checkBoxQuotes->isChecked()) {
+            classes |= PasswordGenerator::Quotes;
+        }
+
+        if (m_ui->checkBoxDashes->isChecked()) {
+            classes |= PasswordGenerator::Dashes;
+        }
+
+        if (m_ui->checkBoxMath->isChecked()) {
+            classes |= PasswordGenerator::Math;
+        }
+
+        if (m_ui->checkBoxLogograms->isChecked()) {
+            classes |= PasswordGenerator::Logograms;
+        }
+
+        if (m_ui->checkBoxExtASCIIAdv->isChecked()) {
+            classes |= PasswordGenerator::EASCII;
+        }
     }
 
     return classes;
@@ -361,7 +489,22 @@ void PasswordGeneratorWidget::updateGenerator()
             if (classes.testFlag(PasswordGenerator::Numbers)) {
                 minLength++;
             }
-            if (classes.testFlag(PasswordGenerator::SpecialCharacters)) {
+            if (classes.testFlag(PasswordGenerator::Braces)) {
+                minLength++;
+            }
+            if (classes.testFlag(PasswordGenerator::Punctuation)) {
+                minLength++;
+            }
+            if (classes.testFlag(PasswordGenerator::Quotes)) {
+                minLength++;
+            }
+            if (classes.testFlag(PasswordGenerator::Dashes)) {
+                minLength++;
+            }
+            if (classes.testFlag(PasswordGenerator::Math)) {
+                minLength++;
+            }
+            if (classes.testFlag(PasswordGenerator::Logograms)) {
                 minLength++;
             }
             if (classes.testFlag(PasswordGenerator::EASCII)) {
@@ -382,6 +525,11 @@ void PasswordGeneratorWidget::updateGenerator()
 
         m_passwordGenerator->setLength(m_ui->spinBoxLength->value());
         m_passwordGenerator->setCharClasses(classes);
+        if (m_ui->simpleBar->isVisible()) {
+            m_passwordGenerator->setExcludedChars("");
+        } else {
+            m_passwordGenerator->setExcludedChars(m_ui->editExcludedChars->text());
+        }
         m_passwordGenerator->setFlags(flags);
 
         if (m_passwordGenerator->isValid()) {

src/gui/PasswordGeneratorWidget.h

@@ -65,6 +65,9 @@ private slots:
     void updateButtonsEnabled(const QString& password);
     void updatePasswordStrength(const QString& password);
     void togglePasswordShown(bool hidden);
+    void selectSimpleMode();
+    void selectAdvancedMode();
+    void excludeHexChars();
 
     void passwordSliderMoved();
     void passwordSpinBoxChanged();

src/gui/PasswordGeneratorWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>547</width>
+    <width>571</width>
-    <height>352</height>
+    <height>394</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,7 +19,7 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,0">
    <property name="sizeConstraint">
     <enum>QLayout::SetMinimumSize</enum>
    </property>
@@ -175,12 +175,6 @@ QProgressBar::chunk {
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QTabWidget" name="tabWidget">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
        <property name="tabPosition">
         <enum>QTabWidget::North</enum>
        </property>
@@ -204,155 +198,598 @@ QProgressBar::chunk {
              </property>
              <layout class="QVBoxLayout" name="verticalLayout">
               <item>
-               <layout class="QHBoxLayout" name="alphabetLayout" stretch="0,0,0,0,1,0">
+               <widget class="QWidget" name="simpleBar" native="true">
-                <item>
+                <layout class="QHBoxLayout" name="horizontalLayout_4">
-                 <widget class="QToolButton" name="checkBoxUpper">
+                 <property name="leftMargin">
-                  <property name="minimumSize">
+                  <number>0</number>
-                   <size>
+                 </property>
-                    <width>0</width>
+                 <property name="topMargin">
-                    <height>25</height>
+                  <number>0</number>
-                   </size>
+                 </property>
-                  </property>
+                 <property name="rightMargin">
-                  <property name="focusPolicy">
+                  <number>0</number>
-                   <enum>Qt::StrongFocus</enum>
+                 </property>
-                  </property>
+                 <property name="bottomMargin">
-                  <property name="toolTip">
+                  <number>0</number>
-                   <string>Upper Case Letters</string>
+                 </property>
-                  </property>
+                 <item>
-                  <property name="text">
+                  <layout class="QHBoxLayout" name="alphabetLayout" stretch="0,0,0,0,0,0,0">
-                   <string notr="true">A-Z</string>
+                   <item>
-                  </property>
+                    <widget class="QToolButton" name="checkBoxUpper">
-                  <property name="checkable">
+                     <property name="minimumSize">
-                   <bool>true</bool>
+                      <size>
-                  </property>
+                       <width>0</width>
-                  <attribute name="buttonGroup">
+                       <height>25</height>
-                   <string notr="true">optionButtons</string>
+                      </size>
-                  </attribute>
+                     </property>
-                 </widget>
+                     <property name="focusPolicy">
-                </item>
+                      <enum>Qt::StrongFocus</enum>
-                <item>
+                     </property>
-                 <widget class="QToolButton" name="checkBoxLower">
+                     <property name="toolTip">
-                  <property name="minimumSize">
+                      <string>Upper Case Letters</string>
-                   <size>
+                     </property>
-                    <width>0</width>
+                     <property name="text">
-                    <height>25</height>
+                      <string notr="true">A-Z</string>
-                   </size>
+                     </property>
-                  </property>
+                     <property name="checkable">
-                  <property name="focusPolicy">
+                      <bool>true</bool>
-                   <enum>Qt::StrongFocus</enum>
+                     </property>
-                  </property>
+                     <attribute name="buttonGroup">
-                  <property name="toolTip">
+                      <string notr="true">optionButtons</string>
-                   <string>Lower Case Letters</string>
+                     </attribute>
-                  </property>
+                    </widget>
-                  <property name="text">
+                   </item>
-                   <string notr="true">a-z</string>
+                   <item>
-                  </property>
+                    <widget class="QToolButton" name="checkBoxLower">
-                  <property name="checkable">
+                     <property name="minimumSize">
-                   <bool>true</bool>
+                      <size>
-                  </property>
+                       <width>0</width>
-                  <attribute name="buttonGroup">
+                       <height>25</height>
-                   <string notr="true">optionButtons</string>
+                      </size>
-                  </attribute>
+                     </property>
-                 </widget>
+                     <property name="focusPolicy">
-                </item>
+                      <enum>Qt::StrongFocus</enum>
-                <item>
+                     </property>
-                 <widget class="QToolButton" name="checkBoxNumbers">
+                     <property name="toolTip">
-                  <property name="minimumSize">
+                      <string>Lower Case Letters</string>
-                   <size>
+                     </property>
-                    <width>0</width>
+                     <property name="text">
-                    <height>25</height>
+                      <string notr="true">a-z</string>
-                   </size>
+                     </property>
-                  </property>
+                     <property name="checkable">
-                  <property name="focusPolicy">
+                      <bool>true</bool>
-                   <enum>Qt::StrongFocus</enum>
+                     </property>
-                  </property>
+                     <attribute name="buttonGroup">
-                  <property name="toolTip">
+                      <string notr="true">optionButtons</string>
-                   <string>Numbers</string>
+                     </attribute>
-                  </property>
+                    </widget>
-                  <property name="text">
+                   </item>
-                   <string notr="true">0-9</string>
+                   <item>
-                  </property>
+                    <widget class="QToolButton" name="checkBoxNumbers">
-                  <property name="checkable">
+                     <property name="minimumSize">
-                   <bool>true</bool>
+                      <size>
-                  </property>
+                       <width>0</width>
-                  <attribute name="buttonGroup">
+                       <height>25</height>
-                   <string notr="true">optionButtons</string>
+                      </size>
-                  </attribute>
+                     </property>
-                 </widget>
+                     <property name="focusPolicy">
-                </item>
+                      <enum>Qt::StrongFocus</enum>
-                <item>
+                     </property>
-                 <widget class="QToolButton" name="checkBoxSpecialChars">
+                     <property name="toolTip">
-                  <property name="minimumSize">
+                      <string>Numbers</string>
-                   <size>
+                     </property>
-                    <width>0</width>
+                     <property name="text">
-                    <height>25</height>
+                      <string notr="true">0-9</string>
-                   </size>
+                     </property>
-                  </property>
+                     <property name="checkable">
-                  <property name="focusPolicy">
+                      <bool>true</bool>
-                   <enum>Qt::StrongFocus</enum>
+                     </property>
-                  </property>
+                     <attribute name="buttonGroup">
-                  <property name="toolTip">
+                      <string notr="true">optionButtons</string>
-                   <string>Special Characters</string>
+                     </attribute>
-                  </property>
+                    </widget>
-                  <property name="text">
+                   </item>
-                   <string notr="true">/*_&amp; ...</string>
+                   <item>
-                  </property>
+                    <widget class="QToolButton" name="checkBoxSpecialChars">
-                  <property name="checkable">
+                     <property name="enabled">
-                   <bool>true</bool>
+                      <bool>true</bool>
-                  </property>
+                     </property>
-                  <attribute name="buttonGroup">
+                     <property name="minimumSize">
-                   <string notr="true">optionButtons</string>
+                      <size>
-                  </attribute>
+                       <width>0</width>
-                 </widget>
+                       <height>25</height>
-                </item>
+                      </size>
-                <item>
+                     </property>
-                 <widget class="QToolButton" name="checkBoxExtASCII">
+                     <property name="focusPolicy">
-                  <property name="minimumSize">
+                      <enum>Qt::StrongFocus</enum>
-                   <size>
+                     </property>
-                    <width>0</width>
+                     <property name="toolTip">
-                    <height>25</height>
+                      <string>Special Characters</string>
-                   </size>
+                     </property>
-                  </property>
+                     <property name="text">
-                  <property name="maximumSize">
+                      <string notr="true">/*_&amp; ...</string>
-                   <size>
+                     </property>
-                    <width>16777215</width>
+                     <property name="checkable">
-                    <height>16777215</height>
+                      <bool>true</bool>
-                   </size>
+                     </property>
-                  </property>
+                     <attribute name="buttonGroup">
-                  <property name="focusPolicy">
+                      <string notr="true">optionButtons</string>
-                   <enum>Qt::StrongFocus</enum>
+                     </attribute>
-                  </property>
+                    </widget>
-                  <property name="toolTip">
+                   </item>
-                   <string>Extended ASCII</string>
+                   <item>
-                  </property>
+                    <widget class="QToolButton" name="checkBoxExtASCII">
-                  <property name="text">
+                     <property name="minimumSize">
-                   <string>Extended ASCII</string>
+                      <size>
-                  </property>
+                       <width>0</width>
-                  <property name="checkable">
+                       <height>25</height>
-                   <bool>true</bool>
+                      </size>
-                  </property>
+                     </property>
-                  <attribute name="buttonGroup">
+                     <property name="maximumSize">
-                   <string notr="true">optionButtons</string>
+                      <size>
-                  </attribute>
+                       <width>16777215</width>
-                 </widget>
+                       <height>16777215</height>
-                </item>
+                      </size>
-                <item>
+                     </property>
-                 <spacer name="horizontalSpacer">
+                     <property name="focusPolicy">
-                  <property name="orientation">
+                      <enum>Qt::StrongFocus</enum>
-                   <enum>Qt::Horizontal</enum>
+                     </property>
-                  </property>
+                     <property name="toolTip">
-                  <property name="sizeHint" stdset="0">
+                      <string>Extended ASCII</string>
-                   <size>
+                     </property>
-                    <width>40</width>
+                     <property name="text">
-                    <height>20</height>
+                      <string>ExtendedASCII</string>
-                   </size>
+                     </property>
-                  </property>
+                     <property name="checkable">
-                 </spacer>
+                      <bool>true</bool>
-                </item>
+                     </property>
-               </layout>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="horizontalSpacer">
+                     <property name="orientation">
+                      <enum>Qt::Horizontal</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>40</width>
+                       <height>20</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                   <item>
+                    <widget class="QPushButton" name="buttonAdvancedMode">
+                     <property name="minimumSize">
+                      <size>
+                       <width>0</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="toolTip">
+                      <string>Switch to advanced mode</string>
+                     </property>
+                     <property name="text">
+                      <string>Advanced</string>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="advancedBar" native="true">
+                <property name="enabled">
+                 <bool>true</bool>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_5">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_4">
+                   <item>
+                    <widget class="QToolButton" name="checkBoxUpperAdv">
+                     <property name="minimumSize">
+                      <size>
+                       <width>40</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Upper Case Letters A to F</string>
+                     </property>
+                     <property name="text">
+                      <string>A-Z</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QToolButton" name="checkBoxLowerAdv">
+                     <property name="minimumSize">
+                      <size>
+                       <width>40</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Lower Case Letters A to F</string>
+                     </property>
+                     <property name="text">
+                      <string>a-z</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_6">
+                   <item>
+                    <widget class="QToolButton" name="checkBoxNumbersAdv">
+                     <property name="minimumSize">
+                      <size>
+                       <width>40</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Numbers</string>
+                     </property>
+                     <property name="text">
+                      <string>0-9</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QToolButton" name="checkBoxBraces">
+                     <property name="minimumSize">
+                      <size>
+                       <width>40</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Braces</string>
+                     </property>
+                     <property name="text">
+                      <string>{[(</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_7">
+                   <item>
+                    <widget class="QToolButton" name="checkBoxPunctuation">
+                     <property name="minimumSize">
+                      <size>
+                       <width>35</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Punctuation</string>
+                     </property>
+                     <property name="text">
+                      <string>.,:;</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QToolButton" name="checkBoxQuotes">
+                     <property name="minimumSize">
+                      <size>
+                       <width>35</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Quotes</string>
+                     </property>
+                     <property name="text">
+                      <string>&quot; '</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_8">
+                   <item>
+                    <widget class="QToolButton" name="checkBoxMath">
+                     <property name="minimumSize">
+                      <size>
+                       <width>60</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Math</string>
+                     </property>
+                     <property name="text">
+                      <string>&lt;*+!?=</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QToolButton" name="checkBoxDashes">
+                     <property name="minimumSize">
+                      <size>
+                       <width>60</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Dashes</string>
+                     </property>
+                     <property name="text">
+                      <string>\_|-/</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_9">
+                   <item>
+                    <widget class="QToolButton" name="checkBoxLogograms">
+                     <property name="minimumSize">
+                      <size>
+                       <width>105</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Logograms</string>
+                     </property>
+                     <property name="text">
+                      <string>#$%&amp;&amp;@^`~</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                   <item>
+                    <widget class="QToolButton" name="checkBoxExtASCIIAdv">
+                     <property name="minimumSize">
+                      <size>
+                       <width>105</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="focusPolicy">
+                      <enum>Qt::StrongFocus</enum>
+                     </property>
+                     <property name="toolTip">
+                      <string>Extended ASCII</string>
+                     </property>
+                     <property name="text">
+                      <string>ExtendedASCII</string>
+                     </property>
+                     <property name="checkable">
+                      <bool>true</bool>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                 <item>
+                  <spacer name="horizontalSpacer_3">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>40</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item>
+                  <layout class="QVBoxLayout" name="verticalLayout_10">
+                   <item alignment="Qt::AlignTop">
+                    <widget class="QPushButton" name="buttonSimpleMode">
+                     <property name="minimumSize">
+                      <size>
+                       <width>0</width>
+                       <height>25</height>
+                      </size>
+                     </property>
+                     <property name="toolTip">
+                      <string>Switch to simple mode</string>
+                     </property>
+                     <property name="text">
+                      <string>Simple</string>
+                     </property>
+                     <attribute name="buttonGroup">
+                      <string notr="true">optionButtons</string>
+                     </attribute>
+                    </widget>
+                   </item>
+                  </layout>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QWidget" name="excludedChars" native="true">
+                <property name="enabled">
+                 <bool>true</bool>
+                </property>
+                <layout class="QGridLayout" name="gridLayout_5">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="rightMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item row="0" column="1">
+                  <widget class="QLineEdit" name="editExcludedChars">
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>25</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Character set to exclude from generated password</string>
+                   </property>
+                   <property name="clearButtonEnabled">
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="0">
+                  <widget class="QLabel" name="labelExcludedChars">
+                   <property name="text">
+                    <string>Do not include:</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="0" column="2">
+                  <widget class="QPushButton" name="buttonAddHex">
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>25</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Add non-hex letters to &quot;do not include&quot; list</string>
+                   </property>
+                   <property name="text">
+                    <string>Hex</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <spacer name="verticalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>0</height>
+                 </size>
+                </property>
+               </spacer>
               </item>
               <item>
                <widget class="QCheckBox" name="checkBoxExcludeAlike">
+                <property name="toolTip">
+                 <string>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</string>
+                </property>
                 <property name="text">
                  <string>Exclude look-alike characters</string>
                 </property>
@@ -534,6 +971,19 @@ QProgressBar::chunk {
                </property>
               </widget>
              </item>
+             <item row="3" column="1">
+              <spacer name="verticalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>40</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
             </layout>
            </item>
           </layout>
@@ -585,9 +1035,6 @@ QProgressBar::chunk {
      </item>
     </layout>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4"/>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -607,7 +1054,29 @@ QProgressBar::chunk {
   <tabstop>checkBoxLower</tabstop>
   <tabstop>checkBoxNumbers</tabstop>
   <tabstop>checkBoxSpecialChars</tabstop>
+  <tabstop>checkBoxExtASCII</tabstop>
+  <tabstop>buttonAdvancedMode</tabstop>
+  <tabstop>checkBoxUpperAdv</tabstop>
+  <tabstop>checkBoxNumbersAdv</tabstop>
+  <tabstop>checkBoxPunctuation</tabstop>
+  <tabstop>checkBoxMath</tabstop>
+  <tabstop>checkBoxLogograms</tabstop>
+  <tabstop>checkBoxBraces</tabstop>
+  <tabstop>checkBoxQuotes</tabstop>
+  <tabstop>checkBoxDashes</tabstop>
+  <tabstop>checkBoxExtASCIIAdv</tabstop>
+  <tabstop>editExcludedChars</tabstop>
+  <tabstop>buttonSimpleMode</tabstop>
   <tabstop>checkBoxExcludeAlike</tabstop>
+  <tabstop>checkBoxEnsureEvery</tabstop>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>comboBoxWordList</tabstop>
+  <tabstop>sliderWordCount</tabstop>
+  <tabstop>spinBoxWordCount</tabstop>
+  <tabstop>editWordSeparator</tabstop>
+  <tabstop>buttonGenerate</tabstop>
+  <tabstop>buttonCopy</tabstop>
+  <tabstop>buttonApply</tabstop>
  </tabstops>
  <resources/>
  <connections/>