D10529: docbook file: convert tabs to spaces

[Henrik Fehlauer]

rkflx added a comment.


  Okay, let's go for spaces then. We are not the only one 
.

INLINE COMMENTS

> ngraham wrote in index.docbook:323
> Was the change to break this up onto multiple lines intentional?

@gregormi This should be fixed, i.e. remove the linebreaks. Looks like if there 
were some inline tabs too, those could be removed as well.

Other than that, I think you've catched all tabs.

REPOSITORY
  R166 Spectacle

REVISION DETAIL
  https://phabricator.kde.org/D10529

To: gregormi, #spectacle, #documentation
Cc: ltoscano, yurchor, rkflx, lueck, ngraham

[kmymoney/5.0] kmymoney: Allow to select keys during File/Save As

[Thomas Baumgart]

Git commit 03831143604ffb5f49267fc5dfdde97bb7059866 by Thomas Baumgart.
Committed on 16/02/2018 at 19:19.
Pushed by tbaumgart into branch '5.0'.

Allow to select keys during File/Save As

Due to the change in the KDE file save dialog the additional widgets
could not be inserted dynamically into the dialog as we did in KDE4.
This has been solved by an additional dialog when GPG encryption has
been enabled in the settings and is available.

BUG: 390467
FIXED-IN: 5.0.1
GUI:

M  +1-0kmymoney/dialogs/CMakeLists.txt
M  +77   -88   kmymoney/dialogs/kgpgkeyselectiondlg.cpp
M  +15   -3kmymoney/dialogs/kgpgkeyselectiondlg.h
A  +139  -0kmymoney/dialogs/kgpgkeyselectiondlg.ui
M  +19   -89   kmymoney/kmymoney.cpp
M  +1-6kmymoney/kmymoney.h

https://commits.kde.org/kmymoney/03831143604ffb5f49267fc5dfdde97bb7059866

diff --git a/kmymoney/dialogs/CMakeLists.txt b/kmymoney/dialogs/CMakeLists.txt
index 043f00c9..9726a1a5 100644
--- a/kmymoney/dialogs/CMakeLists.txt
+++ b/kmymoney/dialogs/CMakeLists.txt
@@ -64,6 +64,7 @@ set(dialogs_UI
   kenterscheduledlg.ui
   kequitypriceupdatedlg.ui kequitypriceupdateconfdlg.ui
   kfindtransactiondlg.ui kgeneratesqldlg.ui
+  kgpgkeyselectiondlg.ui
   kloadtemplatedlg.ui
   kmymoneyfileinfodlg.ui kmymoneypricedlg.ui
   knewaccountdlg.ui knewbankdlg.ui knewbudgetdlg.ui
diff --git a/kmymoney/dialogs/kgpgkeyselectiondlg.cpp 
b/kmymoney/dialogs/kgpgkeyselectiondlg.cpp
index ca15228e..34e820bb 100644
--- a/kmymoney/dialogs/kgpgkeyselectiondlg.cpp
+++ b/kmymoney/dialogs/kgpgkeyselectiondlg.cpp
@@ -19,25 +19,17 @@
 
 // 
 // QT Includes
-
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 
 // 
 // KDE Includes
 
-#include 
-#include 
-#include 
-
 // 
 // Project Includes
 
 #include 
-#include 
-#include 
+#include 
 
 class KGpgKeySelectionDlgPrivate
 {
@@ -45,6 +37,10 @@ class KGpgKeySelectionDlgPrivate
 
 public:
   KGpgKeySelectionDlgPrivate()
+  : ui(new Ui::KGpgKeySelectionDlg)
+  , needCheckList(true)
+  , listOk(false)
+  , checkCount(0)
   {
   }
 
@@ -52,11 +48,10 @@ public:
   {
   }
 
-  KEditListWidget*   m_listWidget;
-  KLed*   m_keyLed;
-  boolm_needCheckList;
-  boolm_listOk;
-  int m_checkCount;
+  Ui::KGpgKeySelectionDlg*  ui;
+  bool  needCheckList;
+  bool  listOk;
+  int   checkCount;
 };
 
 
@@ -65,57 +60,11 @@ KGpgKeySelectionDlg::KGpgKeySelectionDlg(QWidget *parent) :
 d_ptr(new KGpgKeySelectionDlgPrivate)
 {
   Q_D(KGpgKeySelectionDlg);
-  d->m_needCheckList = true;
-  d->m_listOk = false;
-  d->m_checkCount = 0;
-  // TODO: check port to kf5
-  setWindowTitle(i18n("Select additional keys"));
-  QDialogButtonBox *buttonBox = new 
QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-  QWidget *mainWidget = new QWidget(this);
-  QVBoxLayout *mainLayout = new QVBoxLayout;
-  setLayout(mainLayout);
-  mainLayout->addWidget(mainWidget);
-  QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
-  okButton->setDefault(true);
-  okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-  connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
-  connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
-  buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
-  setModal(true);
-  QWidget* page = new QWidget(this);
-  mainLayout->addWidget(page);
-  mainLayout->addWidget(buttonBox);
-
-  QGroupBox *listBox = new QGroupBox(i18n("User identification"), page);
-  QVBoxLayout *verticalLayout = new QVBoxLayout(listBox);
-  verticalLayout->setSpacing(6);
-  verticalLayout->setContentsMargins(0, 0, 0, 0);
-  d->m_listWidget = new KEditListWidget(listBox);
-  d->m_listWidget->connect(buttonBox, &QDialogButtonBox::accepted, this, 
&QDialog::accept);
-  d->m_listWidget->connect(buttonBox, &QDialogButtonBox::rejected, this, 
&QDialog::reject);
-  d->m_listWidget->setWhatsThis(i18n("Enter the id of the key you want to use 
for data encryption. This can either be an e-mail address or the hexadecimal 
key id. In case of the key id, do not forget the leading 0x."));
-  verticalLayout->addWidget(d->m_listWidget);
-
-  // add a LED for the availability of all keys
-  QHBoxLayout* ledBox = new QHBoxLayout();
-  ledBox->setContentsMargins(0, 0, 0, 0);
-  ledBox->setSpacing(6);
-  ledBox->setObjectName("ledBoxLayout");
-
-  d->m_keyLed = new KLed(page);
-  mainLayout->addWidget(d->m_keyLed);
-  d->m_keyLed->setShape(KLed::Circular);
-  d->m_keyLed->setLook(KLed::Sunken);
-
-  ledBox->addWidget(d->m_keyLed);
-  ledBox->addWidget(new QLabel(i18n("Keys for all of the above user ids 
found"), page));
-  ledBox->addItem(new QSpacerItem(50, 20, QSizePolicy::Expanding, 
QSizePolicy