diff options
| -rw-r--r-- | TODO | 7 | ||||
| -rw-r--r-- | wizard.cpp | 31 |
2 files changed, 16 insertions, 22 deletions
@@ -24,14 +24,11 @@ Release 0.3.2 - if import failed, because no key was found [DONE] - if key is already in keyring [DONE] - BUG: Also show details, when key is really new [DONE] -<<<<<<< HEAD -======= - Wizard on first start (Create Key, Import from keys older gpg4usb, import from gnupg) [DONE] - import conf from old gpg4usb - - only show one import dateil dialog, when importing public/private keys + - only show one import detail dialog, when importing public/private keys - always activate next button - nextid is not called when clicking finish button ->>>>>>> a rough new configuration of wizard. Pages are in right order - option in settingsdialog for enabling steganographic operations [DONE] - minimal steganography option: remove or add pgp-headers on demand [DONE] - Add advanced tab to settings dialog [DONE] @@ -50,7 +47,7 @@ Release 0.3.2 - images should be included in paragraph [DONE] - every html should have prev, next, toc link - remove menu and logo from subpages - - docs for sign&verify + - docs for sign&verify BUGS: @@ -111,37 +111,34 @@ ImportFromGpg4usbPage::ImportFromGpg4usbPage(GpgME::GpgContext *ctx, KeyMgmt *ke mKeyMgmt=keyMgmt; setTitle(tr("Keyring Import")); - QGroupBox *gpg4usbBox = new QGroupBox(tr("Import keys and/or settings from older gpg4usb"), this); - - QGridLayout *gpg4usbLayout = new QGridLayout(); - QLabel *gnupgLabel = new QLabel(tr("Point to the folder of last gpg4usb")); - gpg4usbLayout->addWidget(gnupgLabel,1,3); + QLabel *topLabel = new QLabel(tr("Import keys and/or settings from older gpg4usb. Just check, what you want to " + "import, click the import button and choose the directory " + "of your old gpg4usb in the appearing file dialog."), this); + topLabel->setWordWrap(true); gpg4usbKeyCheckBox = new QCheckBox(); gpg4usbKeyCheckBox->setChecked(true); - gpg4usbLayout->addWidget(gpg4usbKeyCheckBox,2,1,Qt::AlignRight); - QLabel *privateKeyLabel2 = new QLabel(tr("Keys")); - gpg4usbLayout->addWidget(privateKeyLabel2,2,2); + QLabel *keyLabel = new QLabel(tr("Keys")); gpg4usbConfigCheckBox = new QCheckBox(); gpg4usbConfigCheckBox->setChecked(true); - gpg4usbLayout->addWidget(gpg4usbConfigCheckBox,3,1,Qt::AlignRight); - QLabel *gpg4usbLabel = new QLabel(tr("Configuration")); - gpg4usbLayout->addWidget(gpg4usbLabel,3,2); + QLabel *configLabel = new QLabel(tr("Configuration")); QWidget *importFromGpg4usbButtonBox = new QWidget(this); QHBoxLayout *importFromGpg4usbButtonBoxLayout = new QHBoxLayout(importFromGpg4usbButtonBox); importFromGpg4usbButton = new QPushButton(tr("Import from older gpg4usb")); connect(importFromGpg4usbButton, SIGNAL(clicked()), this, SLOT(importKeysFromGpg4usb())); importFromGpg4usbButtonBox->setLayout(importFromGpg4usbButtonBoxLayout); - gpg4usbLayout->addWidget(importFromGpg4usbButton,2,3); - - gpg4usbBox->setLayout(gpg4usbLayout); - layout = new QVBoxLayout(); - layout->addWidget(gpg4usbBox); + QGridLayout *gpg4usbLayout = new QGridLayout(); + gpg4usbLayout->addWidget(topLabel,1,1,1,2); + gpg4usbLayout->addWidget(gpg4usbKeyCheckBox,2,1,Qt::AlignRight); + gpg4usbLayout->addWidget(keyLabel,2,2); + gpg4usbLayout->addWidget(gpg4usbConfigCheckBox,3,1,Qt::AlignRight); + gpg4usbLayout->addWidget(configLabel,3,2); + gpg4usbLayout->addWidget(importFromGpg4usbButton,4,2); - this->setLayout(layout); + this->setLayout(gpg4usbLayout); } bool ImportFromGpg4usbPage::importKeysFromGpg4usb() |