Added new placeholder assets for tabs and top sites.

These will be used while thumbnails of websites can not be used.
Also removed assets obsoleted by these new ones.

Reviewed-by: Hugo Parente Lima

19 files changed, 42 insertions, 38 deletions

diff --git a/src/core/TabsModel.cpp b/src/core/TabsModel.cpp
index 5c96c56..ba73b8e 100644
--- a/src/core/TabsModel.cpp
+++ b/src/core/TabsModel.cpp
@@ -43,7 +43,7 @@ QVariant TabsModel::data(const QModelIndex& index, int role) const
             return data->property("url");
         break;
     case ScreenshotRole:
-        static QString defaultScreenShot = QLatin1String("qrc:///mobile/fav/icon03");
+        static QString defaultScreenShot = QLatin1String("qrc:///mobile/grid/thumb_tabs_placeholder");
         return QVariant::fromValue(defaultScreenShot);
     }
     return QVariant();
diff --git a/src/mobile/images/fav_03.png b/src/mobile/images/fav_03.png
deleted file mode 100644
index 70eb349..0000000
--- a/src/mobile/images/fav_03.png
+++ /dev/null
diff --git a/src/mobile/images/overlayer_label_mysites.png b/src/mobile/images/overlayer_label_mysites.png
new file mode 100644
index 0000000..5d9e9e7
--- /dev/null
+++ b/src/mobile/images/overlayer_label_mysites.png
diff --git a/src/mobile/images/overlayer_label_tabs.png b/src/mobile/images/overlayer_label_tabs.png
new file mode 100644
index 0000000..235557f
--- /dev/null
+++ b/src/mobile/images/overlayer_label_tabs.png
diff --git a/src/mobile/images/thumb_close_01.png b/src/mobile/images/thumb_close_01.png
deleted file mode 100644
index 193e5bf..0000000
--- a/src/mobile/images/thumb_close_01.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_close_02.png b/src/mobile/images/thumb_close_02.png
deleted file mode 100644
index e3be677..0000000
--- a/src/mobile/images/thumb_close_02.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_close_03.png b/src/mobile/images/thumb_close_03.png
deleted file mode 100644
index 0171b5b..0000000
--- a/src/mobile/images/thumb_close_03.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_close_04.png b/src/mobile/images/thumb_close_04.png
deleted file mode 100644
index 80e4cd6..0000000
--- a/src/mobile/images/thumb_close_04.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_mask_01.png b/src/mobile/images/thumb_mask_01.png
deleted file mode 100644
index 46499eb..0000000
--- a/src/mobile/images/thumb_mask_01.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_mask_02.png b/src/mobile/images/thumb_mask_02.png
deleted file mode 100644
index 9543991..0000000
--- a/src/mobile/images/thumb_mask_02.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_mask_03.png b/src/mobile/images/thumb_mask_03.png
deleted file mode 100644
index ef6d1d8..0000000
--- a/src/mobile/images/thumb_mask_03.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_mask_04.png b/src/mobile/images/thumb_mask_04.png
deleted file mode 100644
index 1e0c5bf..0000000
--- a/src/mobile/images/thumb_mask_04.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_mysites_placeholder.png b/src/mobile/images/thumb_mysites_placeholder.png
new file mode 100644
index 0000000..9cc8752
--- /dev/null
+++ b/src/mobile/images/thumb_mysites_placeholder.png
diff --git a/src/mobile/images/thumb_overlayer.png b/src/mobile/images/thumb_overlayer.png
deleted file mode 100644
index d8ef479..0000000
--- a/src/mobile/images/thumb_overlayer.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_pin_overlayer.png b/src/mobile/images/thumb_pin_overlayer.png
deleted file mode 100644
index 8f5744c..0000000
--- a/src/mobile/images/thumb_pin_overlayer.png
+++ /dev/null
diff --git a/src/mobile/images/thumb_tabs_placeholder.png b/src/mobile/images/thumb_tabs_placeholder.png
new file mode 100644
index 0000000..5e14bf8
--- /dev/null
+++ b/src/mobile/images/thumb_tabs_placeholder.png
diff --git a/src/mobile/qml/NavigationPanel.qml b/src/mobile/qml/NavigationPanel.qml
index fba8a53..9c140c5 100644
--- a/src/mobile/qml/NavigationPanel.qml
+++ b/src/mobile/qml/NavigationPanel.qml
@@ -65,12 +65,22 @@ Item {
             width: UiConstants.PagedGridSizeTable[0]
             clip: true
 
-            Image {
-                source: "qrc:///mobile/grid/overlayer"
+            Text {
+                text: index + (tabsGrid.currentPage * 4) + 1
+                color: "#C1C2C3"
+                font.pixelSize: 30
+                font.family: "Nokia Pure Headline Light"
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
                 anchors {
+                    top: parent.top
                     bottom: parent.bottom
                     left: parent.left
                     right: parent.right
+                    topMargin: 108
+                    bottomMargin: 103
+                    leftMargin: 69
+                    rightMargin: 62
                 }
             }
 
@@ -89,27 +99,13 @@ Item {
                     leftMargin: 14
                     rightMargin: 14
                 }
-
             }
             Image {
                 id: urlFade
-                source: "qrc:///mobile/scrollbar/suggestions_overlayer"
+                source: "qrc:///mobile/grid/overlayer_tabs_url"
                 visible: displayedUrl.paintedWidth > displayedUrl.width
-                width: 30
                 anchors {
-                    verticalCenter: displayedUrl.verticalCenter
-                    right: parent.right
-                }
-            }
-
-            Image {
-                source: "qrc:///mobile/grid/mask" + Math.max(0, index)
-            }
-
-            Image {
-                source: "qrc:///mobile/grid/btn_close" + Math.max(0, index)
-                anchors {
-                    top: parent.top
+                    bottom: parent.bottom
                     right: parent.right
                 }
             }
diff --git a/src/mobile/qml/TopSitesPanel.qml b/src/mobile/qml/TopSitesPanel.qml
index 385d01d..25122a7 100644
--- a/src/mobile/qml/TopSitesPanel.qml
+++ b/src/mobile/qml/TopSitesPanel.qml
@@ -41,13 +41,32 @@ Item {
             property string url: model.url
             property bool fadeUrl: false
 
-            source: "qrc:///mobile/grid/pin_overlayer"
+            source: "qrc:///mobile/grid/thumb_mysites_placeholder"
             height: UiConstants.PagedGridSizeTable[1]
             fillMode: Image.Pad
             verticalAlignment: Image.AlignBottom
             clip: true
 
             Text {
+                text: index + (topSitesGrid.currentPage * 4) + 1
+                color: "#C1C2C3"
+                font.pixelSize: 30
+                font.family: "Nokia Pure Headline Light"
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                    left: parent.left
+                    right: parent.right
+                    topMargin: 69
+                    bottomMargin: 142
+                    leftMargin: 69
+                    rightMargin: 62
+                }
+            }
+
+            Text {
                 id: displayedUrl
                 text: url.replace(/(https?|file):\/\/\/?(www\.)?/, "").replace(/\/.*/, "");
                 color: "#515050"
@@ -67,11 +86,10 @@ Item {
             }
             Image {
                 id: urlFade
-                source: "qrc:///mobile/scrollbar/suggestions_overlayer"
+                source: "qrc:///mobile/grid/overlayer_mysites_url"
                 visible: fadeUrl
-                width: 30
                 anchors {
-                    verticalCenter: displayedUrl.verticalCenter
+                    bottom: parent.bottom
                     right: parent.right
                 }
             }
@@ -82,9 +100,6 @@ Item {
                 anchors.top: parent.top
                 anchors.topMargin: 186
             }
-            Image {
-                source: "qrc:///mobile/grid/mask" + Math.max(0, index)
-            }
         }
     }
 
diff --git a/src/mobile/snowshoe-mobile.qrc b/src/mobile/snowshoe-mobile.qrc
index d0602d3..e90014c 100644
--- a/src/mobile/snowshoe-mobile.qrc
+++ b/src/mobile/snowshoe-mobile.qrc
@@ -26,7 +26,6 @@
         <file alias="app/menu_disabled">images/view_menu_bg_disable.png</file>
         <file alias="app/tabs_pressed">images/view_menu_tabs_pressed.png</file>
         <file alias="app/mysites_pressed">images/view_menu_mysites_pressed.png</file>
-        <file alias="fav/icon03">images/fav_03.png</file>
         <file alias="indicator/page_active">images/pagination_active.png</file>
         <file alias="indicator/page_inactive">images/pagination_inactive.png</file>
         <file alias="indicator/page_slot">images/pagination_slot.png</file>
@@ -72,7 +71,7 @@
         <file alias="overlaybar/btn_plus_pressed">images/button_plus_pressed.png</file>
         <file alias="overlaybar/btn_pin_unpressed">images/button_pin_unpressed.png</file>
         <file alias="overlaybar/btn_pin_pressed">images/button_pin_pressed.png</file>
-	<file alias="overlaybar/btn_settings_unpressed">images/button_settings_unpressed.png</file>
+        <file alias="overlaybar/btn_settings_unpressed">images/button_settings_unpressed.png</file>
         <file alias="overlaybar/btn_settings_pressed">images/button_settings_pressed.png</file>
         <file alias="scrollbar/bg_image">images/scrollbar_base.png</file>
         <file alias="scrollbar/btn_google_search">images/button_google_search.png</file>
@@ -86,18 +85,12 @@
         <file alias="url/btn_erase_pressed">images/button_erase_pressed.png</file>
         <file alias="url/btn_cancel_unpressed">images/button_cancel_unpressed.png</file>
         <file alias="url/btn_cancel_pressed">images/button_cancel_pressed.png</file>
-        <file alias="grid/pin_overlayer">images/thumb_pin_overlayer.png</file>
-        <file alias="grid/overlayer">images/thumb_overlayer.png</file>
         <file alias="grid/btn_pin_pressed">images/thumb_pin_pressed.png</file>
         <file alias="grid/btn_pin_unpressed">images/thumb_pin_unpressed.png</file>
-        <file alias="grid/mask0">images/thumb_mask_01.png</file>
-        <file alias="grid/mask1">images/thumb_mask_02.png</file>
-        <file alias="grid/mask2">images/thumb_mask_03.png</file>
-        <file alias="grid/mask3">images/thumb_mask_04.png</file>
-        <file alias="grid/btn_close0">images/thumb_close_01.png</file>
-        <file alias="grid/btn_close1">images/thumb_close_02.png</file>
-        <file alias="grid/btn_close2">images/thumb_close_03.png</file>
-        <file alias="grid/btn_close3">images/thumb_close_04.png</file>
         <file alias="grid/thumb_empty_slot">images/thumb_slot.png</file>
+        <file alias="grid/thumb_tabs_placeholder">images/thumb_tabs_placeholder.png</file>
+        <file alias="grid/thumb_mysites_placeholder">images/thumb_mysites_placeholder.png</file>
+        <file alias="grid/overlayer_tabs_url">images/overlayer_label_tabs.png</file>
+        <file alias="grid/overlayer_mysites_url">images/overlayer_label_mysites.png</file>
     </qresource>
 </RCC>