From 8937647d5f176692f6e89a1a58f5d7334c62e371 Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Fri, 17 Mar 2017 01:43:50 +0100
Subject: [PATCH] let every string as separator

---
 src/core/PassphraseGenerator.cpp    |  2 +-
 src/core/PassphraseGenerator.h      |  4 ++--
 src/gui/PasswordGeneratorWidget.cpp | 11 ++++++-----
 src/gui/PasswordGeneratorWidget.ui  |  9 +++------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp
index dca687226..6585809b8 100644
--- a/src/core/PassphraseGenerator.cpp
+++ b/src/core/PassphraseGenerator.cpp
@@ -75,7 +75,7 @@ void PassphraseGenerator::setWordlist(QString path)
     }
 }
 
-void PassphraseGenerator::setWordseparator(QChar separator) {
+void PassphraseGenerator::setWordseparator(QString separator) {
     m_separator = separator;
 }
 
diff --git a/src/core/PassphraseGenerator.h b/src/core/PassphraseGenerator.h
index 729432922..be1c1e677 100644
--- a/src/core/PassphraseGenerator.h
+++ b/src/core/PassphraseGenerator.h
@@ -30,14 +30,14 @@ public:
     double calculateEntropy(QString passphrase);
     void setWordCount(int wordCount);
     void setWordlist(QString path);
-    void setWordseparator(QChar separator);
+    void setWordseparator(QString separator);
     bool isValid() const;
 
     QString generatePassphrase() const;
 
 private:
     int m_wordCount;
-    QChar m_separator;
+    QString m_separator;
     QVector<QString> m_wordlist;
 
     Q_DISABLE_COPY(PassphraseGenerator)
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index aa8e60856..52fb4ab3f 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -48,7 +48,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
     connect(m_ui->sliderWordCount, SIGNAL(valueChanged(int)), SLOT(dicewareSliderMoved()));
     connect(m_ui->spinBoxWordCount, SIGNAL(valueChanged(int)), SLOT(dicewareSpinBoxChanged()));
 
-    connect(m_ui->comboBoxWordSeparator, SIGNAL(currentIndexChanged(int)), SLOT(updateGenerator()));
+    connect(m_ui->editWordSeparator, SIGNAL(textChanged(QString)), SLOT(updateGenerator()));
     connect(m_ui->comboBoxWordList, SIGNAL(currentIndexChanged(int)), SLOT(updateGenerator()));
     connect(m_ui->optionButtons, SIGNAL(buttonClicked(int)), SLOT(updateGenerator()));
     connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateGenerator()));
@@ -63,7 +63,8 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
         m_ui->strengthLabel->setFont(defaultFont);
     }
 
-    m_ui->comboBoxWordSeparator->addItems(QStringList() << " " << "#" << "_" << ";" << "-" << ":" << "." << "@");
+    // set default separator to Space
+    m_ui->editWordSeparator->setText(" ");
 
     QDir path(filePath()->dataPath("wordlists/"));
     QStringList files = path.entryList(QDir::Files);
@@ -97,7 +98,7 @@ void PasswordGeneratorWidget::loadSettings()
 
     // Diceware config
     m_ui->spinBoxWordCount->setValue(config()->get("generator/WordCount", 6).toInt());
-    m_ui->comboBoxWordSeparator->setCurrentIndex(config()->get("generator/WordSeparator", 0).toInt());
+    m_ui->editWordSeparator->setText(config()->get("generator/WordSeparator", " ").toString());
     m_ui->comboBoxWordList->setCurrentText(config()->get("generator/WordList", "eff_large.wordlist").toString());
 
     // Password or diceware?
@@ -117,7 +118,7 @@ void PasswordGeneratorWidget::saveSettings()
 
     // Diceware config
     config()->set("generator/WordCount", m_ui->spinBoxWordCount->value());
-    config()->set("generator/WordSeparator", m_ui->comboBoxWordSeparator->currentIndex());
+    config()->set("generator/WordSeparator", m_ui->editWordSeparator->text());
     config()->set("generator/WordList", m_ui->comboBoxWordList->currentText());
 
     // Password or diceware?
@@ -364,7 +365,7 @@ void PasswordGeneratorWidget::updateGenerator()
             QString path = filePath()->dataPath("wordlists/" + m_ui->comboBoxWordList->currentText());
             m_dicewareGenerator->setWordlist(path);
         }
-        m_dicewareGenerator->setWordseparator(m_ui->comboBoxWordSeparator->currentText().at(0));
+        m_dicewareGenerator->setWordseparator(m_ui->editWordSeparator->text());
 
         if (m_dicewareGenerator->isValid()) {
             m_ui->buttonGenerate->setEnabled(true);
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 2e9711bef..6d47cd654 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -537,12 +537,9 @@ QProgressBar::chunk {
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QComboBox" name="comboBoxWordSeparator">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
+            <widget class="QLineEdit" name="editWordSeparator">
+             <property name="text">
+              <string> </string>
              </property>
             </widget>
            </item>