3 files changed, 22 insertions, 3 deletions
diff --git a/TODO b/TODO
index f68a1cc..8ac16bd 100644
--- a/TODO
+++ b/TODO
@@ -65,11 +65,11 @@ Release 0.3.3
 	- on key generation
 	- later
 - Refresh key from keyserver [DONE]
+- set maximum keysize to 16384
 - Upload key to keyserver 
 - show message if verify has no valid signature
 - exclude translators list from about dialog [DONE]
 - prevent utf8 encoding for comments on keygeneration
-- set maximum keysize to 16384
 
 Release 0.3.4
 - Catch bad passphrase message
diff --git a/keygendialog.cpp b/keygendialog.cpp
index 532afe7..67c986f 100644
--- a/keygendialog.cpp
+++ b/keygendialog.cpp
@@ -41,10 +41,10 @@ void KeyGenDialog::generateKeyDialog()
     commentEdit = new QLineEdit(this);
 
     keySizeSpinBox = new QSpinBox(this);
-    keySizeSpinBox->setRange(768, 65536);
+    keySizeSpinBox->setRange(1024, 65536);
     keySizeSpinBox->setValue(2048);
 
-    keySizeSpinBox->setSingleStep(256);
+    keySizeSpinBox->setSingleStep(1024);
 
     keyTypeComboBox = new QComboBox(this);
     keyTypeComboBox->addItem("DSA/Elgamal");
@@ -109,6 +109,7 @@ void KeyGenDialog::generateKeyDialog()
 
     connect(expireCheckBox, SIGNAL(stateChanged(int)), this, SLOT(expireBoxChanged()));
     connect(passwordEdit, SIGNAL(textChanged(QString)), this, SLOT(passwordEditChanged()));
+    connect(keyTypeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(keyTypeChanged()));
     this->setLayout(vbox2);
 }
 
@@ -219,6 +220,19 @@ void KeyGenDialog::passwordEditChanged()
     update();
 }
 
+void KeyGenDialog::keyTypeChanged()
+{
+    qDebug() << "changed";
+    if (keyTypeComboBox->currentText() == "RSA") {
+        qDebug() << "RSA";
+        keySizeSpinBox->setMaximum(4096);
+    } else {
+        qDebug() << "DSA";
+        keySizeSpinBox->setMaximum(65536);
+    }
+
+}
+
 int KeyGenDialog::checkPassWordStrength()
 {
     int strength = 0;
diff --git a/keygendialog.h b/keygendialog.h
index 69495c9..75cda4e 100644
--- a/keygendialog.h
+++ b/keygendialog.h
@@ -77,6 +77,11 @@ private slots:
     void passwordEditChanged();
 
     /**
+     * @details When passwordedit changed, set keysize appropriately
+     */
+    void keyTypeChanged();
+
+    /**
      * @details check all lineedits for false entries. Show error, when there is one, otherwise generate the key
      */
     void keyGenAccept();