Changeset 384:c4d0f0e6a3db in SMSSender

Timestamp:

Apr 16, 2014 11:15:13 AM (4 years ago)

Author:

Sämy Zehnder <saemy.zehnder@…>

Branch:

separation-frontend-backend

Message:

• Connects the correct signal-slot pairs in Schoolnet send-integration.
• Makes the Schoolnet send-integration helper in all cases self-destructive.
• Resizes the send dialog to the required size in the Schoolnet send-integration.

Location:

gateways/Schoolnet/gui/ui

Files:

• senddialogintegration.cpp (modified) (2 diffs)
• senddialogintegration_p.h (modified) (1 diff)

gateways/Schoolnet/gui/ui/senddialogintegration.cpp

@@ -54 +54 @@
 
 
-SendDialogIntegrationHelper::SendDialogIntegrationHelper(ISendingDialog *sendDialog,
-                                                         DeepThought::DeepThoughtHelper *deepThoughtHelper,
-                                                         const Account &account)
+SendDialogIntegrationHelper::SendDialogIntegrationHelper(
+        ISendingDialog *sendDialog,
+        DeepThought::DeepThoughtHelper *deepThoughtHelper,
+        const Account &account)
     : QObject(sendDialog)
     , m_sendDialog(sendDialog)
@@ -63 +64 @@
     , m_question(NULL)
 {
-    //m_oldMinSize = m_sendDialog->minimumSize();
-
     m_sendDialog->preventClose();
-
-    // Install the question dialog
-    QGridLayout *layout = qobject_cast<QGridLayout*>(m_sendDialog->layout());
-    Q_ASSERT(layout);
 
     loadNextQuestion();
     if (m_question) {
+        // Installs the question dialog.
+        QGridLayout *layout = qobject_cast<QGridLayout*>(m_sendDialog->layout());
+        Q_ASSERT(layout);
+
         m_questionBox.reset(new DeepThought::UI::QuestionBox(*m_question, sendDialog));
-        connect(m_questionBox.data(), SIGNAL(answerProvided(Answer*)),
-                this, SLOT(onAnswerProvided(Answer*)), Qt::DirectConnection);
+        connect(m_questionBox.data(), SIGNAL(answerProvided(DeepThought::Answer*)),
+                this, SLOT(onAnswerProvided(DeepThought::Answer*)),
+                Qt::DirectConnection);
         connect(m_questionBox.data(), SIGNAL(nextQuestionRequested()),
-                this, SLOT(loadNextQuestion()), Qt::DirectConnection);
+                this, SLOT(loadNextQuestion()),
+                Qt::DirectConnection);
         connect(m_questionBox.data(), SIGNAL(rejected()),
-                this, SLOT(removeIntegration()), Qt::DirectConnection);
+                this, SLOT(deleteLater()),
+                Qt::DirectConnection);
 
-        layout->addWidget(m_questionBox.data(), layout->rowCount()+1, 0, layout->columnCount()-1, layout->columnCount());
+        layout->addWidget(m_questionBox.data(), layout->rowCount()+1, 0,
+                          layout->columnCount()-1, layout->columnCount());
+        m_sendDialog->adjustSize();
     } else {
-        m_sendDialog->allowClose();
+        deleteLater();
     }
 }
 
-void SendDialogIntegrationHelper::removeIntegration() {
-    /* Resize the sending dialog
-            m_sendDialog->setMinimumSize(0, 0);
-            m_sendDialog->adjustSize();
-            m_sendDialog->setMinimumSize(std::max(m_oldMinSize.width(), m_sendDialog->size().width()),
-                                    std::max(m_oldMinSize.height(), m_sendDialog->size().height()));
-        */
+SendDialogIntegrationHelper::~SendDialogIntegrationHelper() {
+    m_questionBox.reset();
+    m_sendDialog->adjustSize();
 
     m_sendDialog->allowClose();
-    deleteLater();
 }
 
 void SendDialogIntegrationHelper::onAnswerProvided(DeepThought::Answer *answer) {
     m_deepThoughtHelper->proposeAnswer(&m_account, answer);
-    removeIntegration();
+    deleteLater();
 }
 

gateways/Schoolnet/gui/ui/senddialogintegration_p.h

@@ -37 +37 @@
                                 DeepThought::DeepThoughtHelper *deepThoughtHelper,
                                 const Account &account);
+    ~SendDialogIntegrationHelper();
+
 private slots:
-    void removeIntegration();
     void onAnswerProvided(DeepThought::Answer *answer);
     void loadNextQuestion();