Add experimental http proxy support

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / dialog / DBEncryptDialog.java

diff --git a/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java b/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
index 252d41c..1c22766 100644 (file)
--- a/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
+++ b/src/cx/fbn/nevernote/dialog/DBEncryptDialog.java
@@ -19,6 +19,7 @@
 \r
 package cx.fbn.nevernote.dialog;\r
 \r
+import com.trolltech.qt.gui.QComboBox;\r
 import com.trolltech.qt.gui.QDialog;\r
 import com.trolltech.qt.gui.QGridLayout;\r
 import com.trolltech.qt.gui.QLabel;\r
@@ -31,6 +32,8 @@ public class DBEncryptDialog extends QDialog {
        private final QLineEdit password1;\r
        private final QLineEdit password2;\r
        private final QPushButton ok;\r
+       private final QComboBox encryptionType;\r
+       private final QLabel encryptionLabel;\r
        \r
        \r
        // Constructor\r
@@ -50,13 +53,22 @@ public class DBEncryptDialog extends QDialog {
                password1.textChanged.connect(this, "validateInput()");\r
                password2.textChanged.connect(this, "validateInput()");\r
                \r
+               encryptionLabel = new QLabel(tr("Encryption Method"));\r
+               encryptionType = new QComboBox();\r
+               encryptionType.addItem(tr("AES"), "AES");\r
+               encryptionType.addItem(tr("XTEA"), "XTEA");\r
+               \r
                passwordGrid.addWidget(new QLabel(tr("Password")), 1,1);\r
                passwordGrid.addWidget(password1, 1, 2);\r
                passwordGrid.addWidget(new QLabel(tr("Verify Password")), 2,1);\r
                passwordGrid.addWidget(password2, 2, 2);\r
+               passwordGrid.addWidget(encryptionLabel, 3,1);\r
+               passwordGrid.addWidget(encryptionType, 3,2);\r
                passwordGrid.setContentsMargins(10, 10,  -10, -10);\r
                grid.addLayout(passwordGrid,1,1);\r
                \r
+               \r
+               \r
                ok = new QPushButton(tr("OK"));\r
                ok.setEnabled(false);\r
                ok.clicked.connect(this, "okButtonPressed()");\r
@@ -67,6 +79,16 @@ public class DBEncryptDialog extends QDialog {
                grid.addLayout(buttonGrid,2,1);\r
        }\r
        \r
+       public void hideEncryption() {\r
+               encryptionType.setVisible(false);\r
+               encryptionLabel.setVisible(false);\r
+       }\r
+       \r
+       public String getEncryptionMethod() {\r
+               int i = encryptionType.currentIndex();\r
+               return encryptionType.itemData(i).toString();\r
+       }\r
+       \r
        // The OK button was pressed\r
        @SuppressWarnings("unused")\r
        private void okButtonPressed() {\r