Changes: Make use of default styles where possible in widgetsgallery.

RevBy: TBD

Details: Some tuneups in bubble page to appear faster, due to conversion
of large images to pixmaps in extended speech bubble sample.

12 files changed, 10 insertions, 151 deletions

diff --git a/demos/widgetsgallery/bannerspage.cpp b/demos/widgetsgallery/bannerspage.cpp
index 175003ca..e11da132 100644
--- a/demos/widgetsgallery/bannerspage.cpp
+++ b/demos/widgetsgallery/bannerspage.cpp
@@ -91,7 +91,6 @@ void BannersPage::createContent()
 void BannersPage::populateLayout()
 {
     list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(new BannersPageCellCreator());
     list->setItemModel(new QStringListModel(list));
     policy->addItem(list, Qt::AlignCenter);
diff --git a/demos/widgetsgallery/bubblepage.cpp b/demos/widgetsgallery/bubblepage.cpp
index 9f234231..c253b3c5 100644
--- a/demos/widgetsgallery/bubblepage.cpp
+++ b/demos/widgetsgallery/bubblepage.cpp
@@ -102,14 +102,13 @@ void BubblePage::createContent()
     expandedItem->addInformationWidget(pendingLabel);
     expandedItem->setCommentsString("+3");
 
-    QPixmap* p0 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_001.jpg");
+    QImage* p0 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_001.jpg");
     MImageWidget* i0 = new MImageWidget(p0);
-    QPixmap* p1 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_002.jpg");
+    QImage* p1 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_002.jpg");
     MImageWidget* i1 = new MImageWidget(p1);
-    QPixmap* p2 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_003.jpg");
+    QImage* p2 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_003.jpg");
     MImageWidget* i2 = new MImageWidget(p2);
     MWidget* widget = new MWidget;
-    widget->setObjectName("centralWidget");
     QGraphicsGridLayout* gl = new QGraphicsGridLayout(widget);
     gl->setSpacing(30);
     gl->addItem(i0, 0,0);
@@ -127,14 +126,13 @@ void BubblePage::createContent()
     secondExpandedItem->setSenderName("");
     secondExpandedItem->setTimeStamp("5 min ago");
 
-    QPixmap* p4 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_004.jpg");
+    QImage* p4 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_004.jpg");
     MImageWidget* i4 = new MImageWidget(p4);
-    QPixmap* p5 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_005.jpg");
+    QImage* p5 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_005.jpg");
     MImageWidget* i5 = new MImageWidget(p5);
-    QPixmap* p6 = new QPixmap(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_006.jpg");
+    QImage* p6 = new QImage(QString(MEDIA_DIR) + QDir::separator() + "photo_450x450_006.jpg");
     MImageWidget* i6 = new MImageWidget(p6);
     MWidget* widget2 = new MWidget;
-    widget2->setObjectName("secondCentralWidget");
     QGraphicsGridLayout* gl2 = new QGraphicsGridLayout(widget2);
     gl2->setSpacing(30);
     gl2->addItem(i4, 0,0);
diff --git a/demos/widgetsgallery/buttongrouppage.cpp b/demos/widgetsgallery/buttongrouppage.cpp
index 19edc46b..6c0e40d8 100644
--- a/demos/widgetsgallery/buttongrouppage.cpp
+++ b/demos/widgetsgallery/buttongrouppage.cpp
@@ -104,7 +104,7 @@ void ButtonGroupPage::createContent()
     MLayout* vLayout = new MLayout;
     MLinearLayoutPolicy* vPolicy = new MLinearLayoutPolicy(vLayout, Qt::Vertical);
     vPolicy->setNotifyWidgetsOfLayoutPositionEnabled(true);
-    vPolicy->setObjectName("buttongroup");
+    vPolicy->setSpacing(0);
     pushButton7 = new MButton();
     pushButton7->setCheckable(true);
     pushButton7->setViewType(MButton::groupType);
diff --git a/demos/widgetsgallery/contentitemspage.cpp b/demos/widgetsgallery/contentitemspage.cpp
index 15c9971e..62d93372 100644
--- a/demos/widgetsgallery/contentitemspage.cpp
+++ b/demos/widgetsgallery/contentitemspage.cpp
@@ -343,7 +343,6 @@ MList *ContentItemsPage::createList(const QString &title, MCellCreator *creator)
     QAbstractItemModel *model = new ContentItemsPageModel(title);
 
     MList *list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(creator);
     list->setItemModel(model);
     list->setShowGroups(true);
diff --git a/demos/widgetsgallery/itemdetailpage.cpp b/demos/widgetsgallery/itemdetailpage.cpp
index 7640cd6b..af6a790c 100644
--- a/demos/widgetsgallery/itemdetailpage.cpp
+++ b/demos/widgetsgallery/itemdetailpage.cpp
@@ -148,7 +148,6 @@ void ItemDetailPage::createContent()
         QFileInfo info(videoId);
         setTitle(info.fileName());
 
-        setObjectName("video-detail-page");
         video = new MyVideoWidget(panel);
         connect(video, SIGNAL(videoReady()), this, SLOT(videoReady()));
 
diff --git a/demos/widgetsgallery/maincategorypage.cpp b/demos/widgetsgallery/maincategorypage.cpp
index 90553987..af32fcc8 100644
--- a/demos/widgetsgallery/maincategorypage.cpp
+++ b/demos/widgetsgallery/maincategorypage.cpp
@@ -90,7 +90,6 @@ void MainCategoryPage::createContent()
 void MainCategoryPage::populateLayout()
 {
     list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(new WidgetGalleryCellCreator());
     list->setItemModel(dataModel);
 
diff --git a/demos/widgetsgallery/mainpage.cpp b/demos/widgetsgallery/mainpage.cpp
index e7413434..c1541cac 100644
--- a/demos/widgetsgallery/mainpage.cpp
+++ b/demos/widgetsgallery/mainpage.cpp
@@ -358,7 +358,6 @@ void MainPage::setInitialPageToShow(const QString& initialPageToShow)
 void MainPage::populateLayout()
 {
     list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(new WidgetGalleryCategoryCellCreator());
     list->setItemModel(new WidgetsGalleryDataModel());
     policy->addItem(list, Qt::AlignCenter);
diff --git a/demos/widgetsgallery/mgridpage.cpp b/demos/widgetsgallery/mgridpage.cpp
index 31f3d3de..c9600680 100644
--- a/demos/widgetsgallery/mgridpage.cpp
+++ b/demos/widgetsgallery/mgridpage.cpp
@@ -168,7 +168,6 @@ void MGridPage::createContent()
     layout->setPortraitPolicy(portraitPolicy);
 
     list = new MList(panel);
-    list->setObjectName("wgList");
     landscapePolicy->addItem(list);
     portraitPolicy->addItem(list);
 
diff --git a/demos/widgetsgallery/mlistpage.cpp b/demos/widgetsgallery/mlistpage.cpp
index 9d06b335..3015fca5 100644
--- a/demos/widgetsgallery/mlistpage.cpp
+++ b/demos/widgetsgallery/mlistpage.cpp
@@ -432,9 +432,9 @@ void MListPage::changeSeparatorsMode(int index)
     bool enableSeparators = (index == 1);
 
     if (enableSeparators)
-        list->setObjectName("wgListWithSeparators");
+        list->setObjectName("listWithSeparators");
     else
-        list->setObjectName("wgList");
+        list->setObjectName("");
 }
 
 void MListPage::changeListIndexVisibility(int index)
@@ -628,7 +628,6 @@ void MListPage::createContent()
     panel->setLayout(layout);
 
     list = new MList(panel);
-    list->setObjectName("wgList");
 
     //% "Remove"
     MAction *action = new MAction(qtTrId("xx_listpage_list_remove"), list);
diff --git a/demos/widgetsgallery/querydialogspage.cpp b/demos/widgetsgallery/querydialogspage.cpp
index 9e395b5b..e734ba66 100644
--- a/demos/widgetsgallery/querydialogspage.cpp
+++ b/demos/widgetsgallery/querydialogspage.cpp
@@ -96,7 +96,6 @@ void QueryDialogsPage::createContent()
 void QueryDialogsPage::populateLayout()
 {
     list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(new QueryDialogsPageCellCreator());
     list->setItemModel(new QStringListModel(list));
     policy->addItem(list, Qt::AlignCenter);
diff --git a/demos/widgetsgallery/singleselectiondialogspage.cpp b/demos/widgetsgallery/singleselectiondialogspage.cpp
index c3c5b61e..ce5317d2 100644
--- a/demos/widgetsgallery/singleselectiondialogspage.cpp
+++ b/demos/widgetsgallery/singleselectiondialogspage.cpp
@@ -95,7 +95,6 @@ void SingleSelectionDialogsPage::createContent()
 void SingleSelectionDialogsPage::populateLayout()
 {
     list = new MList(centralWidget());
-    list->setObjectName("wgList");
     list->setCellCreator(new SingleSelectionDialogsPageCellCreator());
     list->setItemModel(new QStringListModel(list));
     policy->addItem(list, Qt::AlignCenter);
diff --git a/demos/widgetsgallery/theme/base/style/widgetsgallery.css b/demos/widgetsgallery/theme/base/style/widgetsgallery.css
index 98d08dd7..ea3fabf5 100644
--- a/demos/widgetsgallery/theme/base/style/widgetsgallery.css
+++ b/demos/widgetsgallery/theme/base/style/widgetsgallery.css
@@ -1,30 +1,3 @@
-MList#wgMainPageCategoryList {
-    margin-left:    0;
-    padding-left:   0;
-    margin-right:   0;
-    padding-right:  0;
-
-    border-left:    0;
-    border-right:   0;
-    border-top:     0;
-    border-bottom:  0;
-}
-
-MConentItem#wgMainPageCategoryListItem {
-    margin-left:    0;
-    padding-left:   0;
-    margin-right:   0;
-    padding-right:  0;
-
-    border-left:    0;
-    border-right:   0;
-    border-top:     0;
-    border-bottom:  0;
-}
-
-#listItem {
-}
-
 #feedbackButton2 {
     press-feedback: press-different;
     release-feedback: release-different;
@@ -63,78 +36,11 @@ MConentItem#wgMainPageCategoryListItem {
     minimum-feedback-interval: 45;
 }
 
-#wgToggleButton {
-}
-
-#wgToggleButton:selected {
-}
-
-#wgIconLeft {
-    icon-align: left;
-}
-
-#wgIconRight {
-    icon-align: right;
-}
-
-#wgIconTop {
-    icon-align: top;
-}
-
-#wgIconBottom {
-    icon-align: bottom;
-}
-
-#header {
-    font: $FONT_SMALL;
-    color: $COLOR_INVERTED_FOREGROUND;
-    background-image: "Divider-with-label";
-    minimum-size: 32 32;
-}
-
-#richLabelStyle {
-    color: #FFA000;
-}
-
-#wgList {
-    margin-left: 0;
-    margin-top: 0;
-    margin-right: 0;
-    margin-bottom: 0;
-
-    group-header-object-name: "wgListGroupHeaders";
-}
-
-#wgListWithSeparators {
-    margin-left: 0;
-    margin-top: 0;
-    margin-right: 0;
-    margin-bottom: 0;
-
-    group-header-object-name: "wgListGroupHeaders";
+#listWithSeparators {
     horizontal-separator-object-name: "";
     vertical-separator-object-name: "";
 }
 
-#labelListItemFile {
-    color: #FFFFFF;
-    font: "Nokia Sans Wide" 21px;
-}
-
-#labelListItemComments {
-    color: #F7941E;
-    font: "Nokia Sans Wide" 15px;
-}
-
-#wgListGroupHeaders {
-    margin-bottom: 0px;
-    margin-top: 10px;
-}
-
-#wgViewmenuLabel {
-    font: "Nokia Sans" 16;
-}
-
 MSliderStyle#video-player-slider {
 
     background-base-image: "video-duislider-background" 7px 7px 7px 7px;
@@ -179,17 +85,6 @@ MButtonStyle#video-player-button {
     icon-align: center;
 }
 
-MApplicationPageStyle#video-detail-page {
-}
-
-ItemDetailPage MVideoWidgetStyle {
-    color-key: #001000;
-}
-
-ItemDetailPage MVideoWidgetStyle:fullscreen {
-    color-key: #001000;
-}
-
 MWidgetStyle#center-overlay-container {
     background-image: multimedia-overlay-center-background 17px 17px 17px 17px;
 }
@@ -216,28 +111,3 @@ MLabelStyle#video-title-label {
     background-image: ;
     background-color: black;
 }
-
-#gridItem {
-    margin-left: 0px;
-    padding-left: 0px;
-    margin-right: 0px;
-    padding-right: 0px;
-
-    border-left: 0px;
-    border-right: 0px;
-    border-top: 0px;
-    border-bottom: 0px;
-}
-
-#badge {
-    minimum-size: 30px 30px;
-    preferred-size: 30px 30px;
-    maximum-size: 30px 30px;
-
-    border-width: 0px;
-}
-
-MAbstractLayoutPolicyStyle#buttongroup {
-    vertical-spacing: 0;
-    horizontal-spacing: 0;
-}