summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-20 20:42:49 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-20 20:42:49 (GMT)
commit6abc51220ce7894afaf98bfafff788d5aaac7293 (patch)
treefb421a1b5643688da83e84065c602c15d91044c5
parent9764a4ab83c0003deb6140e9d088883c29973560 (diff)
Port KDialogs in KeysManager to QDialogs.
-rw-r--r--adduid.ui51
-rw-r--r--editor/kgpgeditor.cpp17
-rw-r--r--groupedit.ui153
-rw-r--r--keysmanager.cpp64
-rw-r--r--keysmanager.h4
-rw-r--r--newkey.ui141
-rw-r--r--sourceselect.ui77
7 files changed, 249 insertions, 258 deletions
diff --git a/adduid.ui b/adduid.ui
index e93bfce..10099cc 100644
--- a/adduid.ui
+++ b/adduid.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>AddUid</class>
- <widget class="QWidget" name="AddUid" >
- <property name="geometry" >
+ <widget class="QWidget" name="AddUid">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,52 +10,52 @@
<height>283</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>Name (minimum 5 characters):</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="kLineEdit1" />
+ <widget class="QLineEdit" name="kLineEdit1"/>
</item>
<item>
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>Email:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="kLineEdit2" />
+ <widget class="QLineEdit" name="kLineEdit2"/>
</item>
<item>
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Comment (optional):</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="kLineEdit3" />
+ <widget class="QLineEdit" name="kLineEdit3"/>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -62,15 +63,15 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/editor/kgpgeditor.cpp b/editor/kgpgeditor.cpp
index ad614e4..d16ff25 100644
--- a/editor/kgpgeditor.cpp
+++ b/editor/kgpgeditor.cpp
@@ -30,6 +30,7 @@
#include <kgpgexternalactions.h>
#include <KActionCollection>
+#include <KConfigGroup>
#include <KEncodingFileDialog>
#include <KFind>
#include <KFileDialog>
@@ -57,9 +58,6 @@
#include <QWidget>
#include <kio/netaccess.h>
#include <kio/renamedialog.h>
-#include <KConfigGroup>
-#include <QDialogButtonBox>
-#include <QPushButton>
class KgpgView : public QWidget {
public:
@@ -496,22 +494,14 @@ void KgpgEditor::slotFilePreDec()
QPointer<QDialog> popn = new QDialog(this);
popn->setWindowTitle(i18n("Decrypt File To"));
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
popn->setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
- QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
- okButton->setDefault(true);
- okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
- popn->connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
- popn->connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
- buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
popn->setModal( true );
SrcSelect *page = new SrcSelect();
mainLayout->addWidget(page);
- mainLayout->addWidget(buttonBox);
page->newFilename->setUrl(QUrl(oldname));
page->newFilename->setMode(KFile::File);
page->newFilename->setWindowTitle(i18n("Save File"));
@@ -519,6 +509,11 @@ void KgpgEditor::slotFilePreDec()
page->checkClipboard->setText(i18n("Editor"));
page->resize(page->minimumSize());
popn->resize(popn->minimumSize());
+
+ page->buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(page->buttonBox, SIGNAL(accepted()), popn, SLOT(accept()));
+ connect(page->buttonBox, SIGNAL(rejected()), popn, SLOT(reject()));
+
if (popn->exec() == QDialog::Accepted)
{
if (page->checkFile->isChecked())
diff --git a/groupedit.ui b/groupedit.ui
index f5527b7..7c4ff58 100644
--- a/groupedit.ui
+++ b/groupedit.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>groupEdit</class>
- <widget class="QWidget" name="groupEdit" >
- <property name="geometry" >
+ <widget class="QWidget" name="groupEdit">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,55 +10,50 @@
<height>456</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabelAvailable" >
- <property name="font" >
+ <widget class="QLabel" name="textLabelAvailable">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QWidget">
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel">
- <property name="text">
- <string>Search:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="filterEdit">
- <property name="clearButtonEnabled" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Search:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="filterEdit">
+ <property name="clearButtonEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QTableView" name="availableKeys" >
- <property name="acceptDrops" >
- <bool>true</bool>
- </property>
- <property name="sortingEnabled" >
+ <widget class="QTableView" name="availableKeys">
+ <property name="acceptDrops">
<bool>true</bool>
</property>
- <property name="dragEnabled" >
+ <property name="dragEnabled">
<bool>false</bool>
</property>
<property name="alternatingRowColors">
@@ -69,61 +65,49 @@
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <column>
- <property name="text" >
- <string>Name</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string comment="@title:column Title of a column of emails" >Email</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Id</string>
- </property>
- </column>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="kActiveLabel1" >
- <property name="font" >
+ <widget class="QLabel" name="kActiveLabel1">
+ <property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
- <property name="text" >
+ <property name="text">
<string>Keys in the Group</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonAdd" >
- <property name="text" >
+ <widget class="QPushButton" name="buttonAdd">
+ <property name="text">
<string/>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonRemove" >
- <property name="text" >
+ <widget class="QPushButton" name="buttonRemove">
+ <property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>20</height>
@@ -134,14 +118,11 @@
</layout>
</item>
<item>
- <widget class="QTableView" name="groupKeys" >
- <property name="acceptDrops" >
+ <widget class="QTableView" name="groupKeys">
+ <property name="acceptDrops">
<bool>true</bool>
</property>
- <property name="sortingEnabled" >
- <bool>true</bool>
- </property>
- <property name="dragEnabled" >
+ <property name="dragEnabled">
<bool>false</bool>
</property>
<property name="alternatingRowColors">
@@ -153,32 +134,20 @@
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
- <column>
- <property name="text" >
- <string>Name</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string comment="@title:column Title of a column of emails" >Email</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Id</string>
- </property>
- </column>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
</widget>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
+ <resources/>
<connections/>
</ui>
diff --git a/keysmanager.cpp b/keysmanager.cpp
index 46ed77e..cbb7212 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -582,11 +582,11 @@ void KeysManager::slotGenerateKeyDone(KJob *job)
case KGpgTransaction::TS_OK: {
updateStatusCounter();
- QPointer<KDialog> keyCreated = new KDialog(this);
+ QPointer<QDialog> keyCreated = new QDialog(this);
keyCreated->setWindowTitle(i18n("New Key Pair Created"));
- keyCreated->setButtons(KDialog::Ok);
- keyCreated->setDefaultButton(KDialog::Ok);
- keyCreated->setModal(true);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ keyCreated->setLayout(mainLayout);
newKey *page = new newKey(keyCreated);
page->TLname->setText(QLatin1String( "<b>" ) + genkey->getName() + QLatin1String( "</b>" ));
@@ -611,7 +611,9 @@ void KeysManager::slotGenerateKeyDone(KJob *job)
page->LEfinger->setText(fingerprint);
page->CBdefault->setChecked(true);
page->show();
- keyCreated->setMainWidget(page);
+ mainLayout->addWidget(page);
+ page->buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(page->buttonBox, SIGNAL(accepted()), keyCreated, SLOT(accept()));
keyCreated->exec();
if (keyCreated.isNull())
@@ -877,14 +879,18 @@ void KeysManager::slotAddUid()
return;
}
- addUidWidget = new KDialog(this );
+ addUidWidget = new QDialog(this);
addUidWidget->setWindowTitle(i18n("Add New User Id"));
- addUidWidget->setButtons( KDialog::Ok | KDialog::Cancel );
- addUidWidget->setDefaultButton( KDialog::Ok );
- addUidWidget->setModal( true );
- addUidWidget->enableButtonOk(false);
- AddUid *keyUid = new AddUid(addUidWidget);
- addUidWidget->setMainWidget(keyUid);
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ addUidWidget->setLayout(mainLayout);
+ keyUid = new AddUid(addUidWidget);
+ mainLayout->addWidget(keyUid);
+
+ keyUid->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+ keyUid->buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(keyUid->buttonBox, SIGNAL(accepted()), addUidWidget, SLOT(accept()));
+ connect(keyUid->buttonBox, SIGNAL(rejected()), addUidWidget, SLOT(reject()));
+
//keyUid->setMinimumSize(keyUid->sizeHint());
keyUid->setMinimumWidth(300);
@@ -909,7 +915,7 @@ void KeysManager::slotAddUidFin(int res)
void KeysManager::slotAddUidEnable(const QString & name)
{
- addUidWidget->enableButtonOk(name.length() > 4);
+ keyUid->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(name.length() > 4);
}
void KeysManager::slotAddPhoto()
@@ -1758,17 +1764,22 @@ void KeysManager::editGroup()
if (!nd || (nd->getType() != ITYPE_GROUP))
return;
KGpgGroupNode *gnd = nd->toGroupNode();
- QPointer<KDialog> dialogGroupEdit = new KDialog(this );
+ QPointer<QDialog> dialogGroupEdit = new QDialog(this );
dialogGroupEdit->setWindowTitle(i18n("Group Properties"));
- dialogGroupEdit->setButtons( KDialog::Ok | KDialog::Cancel );
- dialogGroupEdit->setDefaultButton( KDialog::Ok );
- dialogGroupEdit->setModal( true );
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ QWidget *mainWidget = new QWidget(this);
+ mainLayout->addWidget(mainWidget);
+ dialogGroupEdit->setLayout(mainLayout);
+
QList<KGpgNode *> members(gnd->getChildren());
groupEdit *gEdit = new groupEdit(dialogGroupEdit, &members, imodel);
- dialogGroupEdit->setMainWidget(gEdit);
+ mainLayout->addWidget(gEdit);
+ gEdit->buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(gEdit->buttonBox, SIGNAL(accepted()), dialogGroupEdit, SLOT(accept()));
+ connect(gEdit->buttonBox, SIGNAL(rejected()), dialogGroupEdit, SLOT(reject()));
gEdit->show();
@@ -2520,17 +2531,22 @@ void KeysManager::slotDelKeyDone(int res)
void KeysManager::slotPreImportKey()
{
- QPointer<KDialog> dial = new KDialog(this);
+ QPointer<QDialog> dial = new QDialog(this);
dial->setWindowTitle(i18n("Key Import"));
- dial->setButtons(KDialog::Ok | KDialog::Cancel);
- dial->setDefaultButton(KDialog::Ok);
- dial->setModal(true);
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ QWidget *mainWidget = new QWidget(this);
+ mainLayout->addWidget(mainWidget);
+ dial->setLayout(mainLayout);
SrcSelect *page = new SrcSelect();
- dial->setMainWidget(page);
+ mainLayout->addWidget(page);
page->newFilename->setWindowTitle(i18n("Open File"));
page->newFilename->setMode(KFile::File);
+ page->buttonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
+ connect(page->buttonBox, SIGNAL(accepted()), dial, SLOT(accept()));
+ connect(page->buttonBox, SIGNAL(rejected()), dial, SLOT(reject()));
+
if (dial->exec() == QDialog::Accepted) {
if (page->checkFile->isChecked()) {
QUrl impname = page->newFilename->url();
@@ -2716,7 +2732,7 @@ KeysManager::clipEncrypt()
}
QPointer<KgpgSelectPublicKeyDlg> dialog = new KgpgSelectPublicKeyDlg(this, imodel, QKeySequence(goToDefaultKey->shortcut()), true);
- if (dialog->exec() == KDialog::Accepted) {
+ if (dialog->exec() == QDialog::Accepted) {
KGpgEncrypt::EncryptOptions encOptions = KGpgEncrypt::AsciiArmored;
QStringList options;
diff --git a/keysmanager.h b/keysmanager.h
index 6a76002..6ea1f2b 100644
--- a/keysmanager.h
+++ b/keysmanager.h
@@ -21,7 +21,6 @@
#include "model/kgpgitemmodel.h"
#include "model/kgpgitemnode.h"
-#include <KDialog>
#include <KToggleAction>
#include <KXmlGuiWindow>
@@ -252,7 +251,8 @@ private:
QMenu *m_popuporphan; // popup on an orphan key
QLineEdit *m_listviewsearch;
- KDialog *addUidWidget;
+ QDialog *addUidWidget;
+ AddUid *keyUid;
QLabel m_statusBarLabel;
diff --git a/newkey.ui b/newkey.ui
index f45a49c..03e6e5e 100644
--- a/newkey.ui
+++ b/newkey.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>newKey</class>
- <widget class="QWidget" name="newKey" >
- <property name="geometry" >
+ <widget class="QWidget" name="newKey">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,50 +10,50 @@
<height>489</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>New Key Pair Created</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="groupBox2" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox2">
+ <property name="title">
<string>New Key Created</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>You have successfully created the following key:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel3">
+ <property name="text">
<string>Name:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="TLname" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+ <widget class="QLabel" name="TLname">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string comment="KDE::DoNotExtract">textLabel7</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -60,23 +61,23 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
<string>Email:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="TLemail" >
- <property name="text" >
+ <widget class="QLabel" name="TLemail">
+ <property name="text">
<string comment="KDE::DoNotExtract">textLabel8</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -84,23 +85,23 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
<string>Key ID:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="TLid" >
- <property name="text" >
+ <widget class="QLabel" name="TLid">
+ <property name="text">
<string comment="KDE::DoNotExtract">textLabel10</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -108,34 +109,34 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabel6" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel6">
+ <property name="text">
<string>Fingerprint:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="LEfinger" >
- <property name="frame" >
+ <widget class="QLineEdit" name="LEfinger">
+ <property name="frame">
<bool>true</bool>
</property>
- <property name="readOnly" >
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="CBdefault" >
- <property name="whatsThis" >
- <string>&lt;qt>&lt;b>Set as your default key:&lt;/b>&lt;br />
-&lt;p>Checking this option sets the newly created key pair as the default key pair.&lt;/p>&lt;/qt></string>
+ <widget class="QCheckBox" name="CBdefault">
+ <property name="whatsThis">
+ <string>&lt;qt&gt;&lt;b&gt;Set as your default key:&lt;/b&gt;&lt;br /&gt;
+&lt;p&gt;Checking this option sets the newly created key pair as the default key pair.&lt;/p&gt;&lt;/qt&gt;</string>
</property>
- <property name="text" >
+ <property name="text">
<string>Set as your default key</string>
</property>
</widget>
@@ -146,33 +147,33 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox1" >
- <property name="title" >
+ <widget class="QGroupBox" name="groupBox1">
+ <property name="title">
<string>Revocation Certificate</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
<string>It is recommended to save or print a revocation certificate in case your key is compromised.</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QCheckBox" name="CBsave" >
- <property name="text" >
+ <widget class="QCheckBox" name="CBsave">
+ <property name="text">
<string>Save as:</string>
</property>
</widget>
</item>
<item>
- <widget class="KUrlRequester" name="kURLRequester1" >
- <property name="enabled" >
+ <widget class="KUrlRequester" name="kURLRequester1">
+ <property name="enabled">
<bool>false</bool>
</property>
</widget>
@@ -180,8 +181,8 @@
</layout>
</item>
<item>
- <widget class="QCheckBox" name="CBprint" >
- <property name="text" >
+ <widget class="QCheckBox" name="CBprint">
+ <property name="text">
<string>Print</string>
</property>
</widget>
@@ -191,10 +192,10 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
@@ -202,18 +203,20 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
+ <customwidgets>
<customwidget>
<class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
+ <extends>QWidget</extends>
+ <header>KUrlRequester</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/sourceselect.ui b/sourceselect.ui
index d90da66..f288194 100644
--- a/sourceselect.ui
+++ b/sourceselect.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>SrcSelect</class>
- <widget class="QWidget" name="SrcSelect" >
- <property name="geometry" >
+ <widget class="QWidget" name="SrcSelect">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,70 +10,70 @@
<height>243</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QGroupBox" name="buttonGroup2" >
- <property name="title" >
+ <widget class="QGroupBox" name="buttonGroup2">
+ <property name="title">
<string/>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QRadioButton" name="checkClipboard" >
- <property name="text" >
- <string>Clipboard</string>
+ <widget class="QRadioButton" name="checkClipboard">
+ <property name="text">
+ <string>C&amp;lipboard</string>
</property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QRadioButton" name="checkFile" >
- <property name="text" >
+ <widget class="QRadioButton" name="checkFile">
+ <property name="text">
<string>File:</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <widget class="KUrlRequester" name="newFilename" >
- <property name="enabled" >
+ <widget class="KUrlRequester" name="newFilename">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="mode" >
- <enum>KFile::File|KFile::ExistingOnly</enum>
+ <property name="mode">
+ <set>KFile::ExistingOnly</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
- <layout class="QHBoxLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="QRadioButton" name="checkServer" >
- <property name="text" >
- <string>Keyserver:</string>
+ <widget class="QRadioButton" name="checkServer">
+ <property name="text">
+ <string>&amp;Keyserver:</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLineEdit" name="keyIds" >
+ <widget class="QLineEdit" name="keyIds">
<property name="enabled">
<bool>false</bool>
</property>
@@ -88,13 +89,13 @@
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>331</width>
<height>51</height>
@@ -102,19 +103,25 @@
</property>
</spacer>
</item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
- <customwidgets>
+ <customwidgets>
<customwidget>
<class>KUrlRequester</class>
- <extends>QFrame</extends>
+ <extends>QWidget</extends>
<header>kurlrequester.h</header>
</customwidget>
</customwidgets>
<includes>
- <include location="local" >kurlrequester.h</include>
- <include location="local" >klineedit.h</include>
- <include location="local" >kpushbutton.h</include>
+ <include location="local">KUrlRequester</include>
</includes>
<resources/>
+ <connections/>
</ui>