New: API for setting icon in MDialog's titlebar.

RevBy: Dominik Kapusta, Adrian Yanes
Details: Dialog has possibility to put icon in the same place that
progress indicator was originally placed. If bot (progress indicator and
icon) are set then indicator gets priority and overrides the icon.

2 files changed, 22 insertions, 5 deletions

diff --git a/tests/ut_mdialog/ut_mdialog.cpp b/tests/ut_mdialog/ut_mdialog.cpp
index 5714c254..c647f377 100644
--- a/tests/ut_mdialog/ut_mdialog.cpp
+++ b/tests/ut_mdialog/ut_mdialog.cpp
@@ -217,6 +217,17 @@ void Ut_MDialog::settersAndGetters()
     }
 
     {
+        QString val;
+        val = QString("Test string 1");
+        dialog->setTitleBarIconId(val);
+        QCOMPARE(dialog->titleBarIconId(), val);
+
+        val = QString("Something else");
+        dialog->setTitleBarIconId(val);
+        QCOMPARE(dialog->titleBarIconId(), val);
+    }
+
+    {
         MButton *button1 = new MButton();
         MButton *button2 = new MButton();
 
diff --git a/tests/ut_mdialogview/ut_mdialogview.cpp b/tests/ut_mdialogview/ut_mdialogview.cpp
index a9ecf181..d4f3864e 100644
--- a/tests/ut_mdialogview/ut_mdialogview.cpp
+++ b/tests/ut_mdialogview/ut_mdialogview.cpp
@@ -20,6 +20,8 @@
 #include "ut_mdialogview.h"
 
 #include <mdialogstyle.h>
+#include <mlayout.h>
+#include <mlinearlayoutpolicy.h>
 #include "mdialogview_p.h"
 #include "mgridlayoutpolicy.h"
 //#include "mbuttongrouplayoutpolicy.h"
@@ -115,6 +117,7 @@ void Ut_MDialogView::titleBarVisibility()
 void Ut_MDialogView::spinnerVisibility()
 {
     QGraphicsWidget *dialogSpinner = 0;
+    QGraphicsWidget *titleBar = 0;
 
     dialogSpinner = fetchWidget(*controller, "MDialogProgressIndicator");
 
@@ -126,15 +129,18 @@ void Ut_MDialogView::spinnerVisibility()
     dialogSpinner = fetchWidget(*controller, "MDialogProgressIndicator");
 
     // after changing visibility to true spinner should be
-    // created and visible
+    // created and included in titleBar's layout
     QVERIFY(dialogSpinner != 0);
-    QCOMPARE(dialogSpinner->isVisible(), true);
+    titleBar = fetchWidget(*controller, "MDialogTitleBar");
+    QVERIFY(titleBar != 0);
+    MLayout *titleBarLayout = (MLayout*)titleBar->layout();
+    QVERIFY(titleBarLayout->policy()->itemAt(0)==dialogSpinner);
 
-    // after changing visibility to false spinner should
-    // be hidden
+    // after changing visibility to false spinner shouldn't be
+    // present in titleBar layout
     model->setProgressIndicatorVisible(false);
+    QVERIFY(titleBarLayout->policy()->itemAt(0)!=dialogSpinner);
 
-    QCOMPARE(dialogSpinner->isVisible(), false);
 
 }