[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kexi] src/formeditor: Fix order of initialization in KexiActionSelectionDialog (removes crash, regr
From:       Jaroslaw Staniek <staniek () kde ! org>
Date:       2016-02-29 23:12:14
Message-ID: E1aaWz8-0000sv-Kv () scm ! kde ! org
[Download RAW message or body]

Git commit a08a5c03258aa15947273d766b275c41b3b219c9 by Jaroslaw Staniek.
Committed on 29/02/2016 at 23:07.
Pushed by staniek into branch 'master'.

Fix order of initialization in KexiActionSelectionDialog (removes crash, regression in 3.0)

M  +13   -13   src/formeditor/kexiactionselectiondialog.cpp

http://commits.kde.org/kexi/a08a5c03258aa15947273d766b275c41b3b219c9

diff --git a/src/formeditor/kexiactionselectiondialog.cpp b/src/formeditor/kexiactionselectiondialog.cpp
index bca021d..8a1641a 100644
--- a/src/formeditor/kexiactionselectiondialog.cpp
+++ b/src/formeditor/kexiactionselectiondialog.cpp
@@ -518,6 +518,19 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(
     d->actionToExecuteLbl->setText(xi18n("Action to execute:"));
     d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteLbl, 0, 1, Qt::AlignTop | Qt::AlignLeft);
 
+    // buttons
+    d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QPushButton *okButton = d->buttonBox->button(QDialogButtonBox::Ok);
+    okButton->setDefault(true);
+    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    connect(d->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(d->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    d->actionWidgetName = actionWidgetName;
+    d->buttonBox->button(QDialogButtonBox::Ok)->setText(xi18nc("Assign action", "&Assign"));
+    //buttonBox->button(QDialogButtonBox::Ok)->setIcon(koIconName("dialog-ok"));
+    d->buttonBox->button(QDialogButtonBox::Ok)->setToolTip(xi18n("Assign action"));
+    mainLayout->addWidget(d->buttonBox);
+
     // temporary show all sections to avoid resizing the dialog in the future
     d->actionCategoriesListView->selectAction("table");
     d->setActionToExecuteSectionVisible(true);
@@ -558,19 +571,6 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(
         d->actionCategoriesListView->selectAction("noaction");
         d->actionCategoriesListView->setFocus();
     }
-
-    // buttons
-    d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QPushButton *okButton = d->buttonBox->button(QDialogButtonBox::Ok);
-    okButton->setDefault(true);
-    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(d->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(d->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    d->actionWidgetName = actionWidgetName;
-    d->buttonBox->button(QDialogButtonBox::Ok)->setText(xi18nc("Assign action", "&Assign"));
-    //buttonBox->button(QDialogButtonBox::Ok)->setIcon(koIconName("dialog-ok"));
-    d->buttonBox->button(QDialogButtonBox::Ok)->setToolTip(xi18n("Assign action"));
-    mainLayout->addWidget(d->buttonBox);
 }
 
 KexiActionSelectionDialog::~KexiActionSelectionDialog()

[prev in list] [next in list] [prev in thread] [next in thread]