Ticket #4295: image_grid_with_folder_icons.patch

libs/libmyth/xmlparse.cpp

@@ -946 +946 @@
     QString normalImage = "";
     QString selectedImage = "";
     QString highlightedImage = "";
+    QString folderNormalImage = "";
+    QString folderHighlightImage = "";
 
     QString name = element.attribute("name", "");
     if (name.isNull() || name.isEmpty())
@@ -1071 +1073 @@
                 {
                     highlightedImage = file;
                 }
+                
+                if (imgname.lower() == "folderhighlighted")
+                {
+                        folderHighlightImage = file;
+                }
+                
+                if (imgname.lower() == "foldernormal")
+                {
+                        folderNormalImage = file;
+                }
 
                 if (imgname.lower() == "default")
                 {
@@ -1124 +1136 @@
     grid->setNormalImage(normalImage);
     grid->setSelectedImage(selectedImage);
     grid->setHighlightedImage(highlightedImage);
+    grid->setFolderNormalImage(folderNormalImage);
+    grid->setFolderHighlightImage(folderHighlightImage);
 
     int jst = Qt::AlignLeft | Qt::AlignTop;
     if (multiline == true)

libs/libmyth/uitypes.cpp

@@ -2011 +2011 @@
 {
     allData->append(item);
     itemCount = allData->count();
+    lastRow = QMAX((int) ceilf((float) itemCount/columnCount) - 1, 0);
 }
 
 void UIImageGridType::updateItem(ImageGridItem *item)
@@ -2246 +2247 @@
 {
     QRect r(xpos, ypos, cellWidth, cellHeight);
 
-    if (curPos == currentItem)
+    ImageGridItem* currentImageItem = this->getItemAt(curPos);
+    if(currentImageItem->folder && curPos == currentItem){
+        /// highlighted
+        if (m_debug == true)
+                p->setPen(Qt::yellow);
+        if (folderHighlightPixmap)
+                p->drawPixmap(xpos, ypos, *folderHighlightPixmap);
+    }else if(currentImageItem->folder && curPos != currentItem){
+        if (m_debug == true)
+                p->setPen(Qt::green);
+        if (folderNormalPixmap)
+                p->drawPixmap(xpos, ypos, *folderNormalPixmap);
+    }
+    else if (curPos == currentItem)
     {
-        // highlighted
-        if (m_debug == true)
-            p->setPen(Qt::yellow);
-        if (highlightedPixmap)
-            p->drawPixmap(xpos, ypos, *highlightedPixmap);
+        // highlighted
+        if (m_debug == true)
+                p->setPen(Qt::yellow);
+        if (highlightedPixmap)
+                p->drawPixmap(xpos, ypos, *highlightedPixmap);
     }
     else
     {
-        if (m_debug == true)
-            p->setPen(Qt::green);
-        if (normalPixmap)
-            p->drawPixmap(xpos, ypos, *normalPixmap);
+        if (m_debug == true)
+                p->setPen(Qt::green);
+        if (normalPixmap)
+                p->drawPixmap(xpos, ypos, *normalPixmap);
     }
 
     // draw item image
@@ -2439 +2453 @@
     defaultPixmap = createScaledPixmap(defaultImage, imgWidth - 2 * sw,
                                        imgHeight - 2 * sh,
                                        QImage::ScaleMin);
+    folderNormalPixmap = createScaledPixmap(folderNormalImage, imgWidth, imgHeight,
+                                                                                        QImage::ScaleFree);
+    folderHighlightPixmap =     createScaledPixmap(folderHighlightImage, imgWidth, imgHeight,
+                                                QImage::ScaleFree);
 }
 
 void UIImageGridType::calculateScreenArea(void)

libs/libmyth/uitypes.h

@@ -342 +342 @@
 class ImageGridItem
 {
     public:
-        ImageGridItem(const QString &text, QPixmap *pixmap, bool selected, void *data)
+        ImageGridItem(const QString &text, QPixmap *pixmap, bool selected, void *data, bool folder=false)
         {
             this->text = text;
             this->pixmap = pixmap;
             this->selected = selected;
             this->data = data;
+            this->folder = folder;
         }
 
         ImageGridItem(const ImageGridItem &o)
@@ -380 +381 @@
         QPixmap *pixmap;
         bool selected;
         void *data;
+        bool folder;
 };
 
 class MPUBLIC UIImageGridType : public UIType
@@ -413 +415 @@
         void setSelectedImage(QString filename) { selectedImage = filename; }
         void setHighlightedImage(QString filename) { highlightedImage = filename; }
         void setDefaultImage(QString filename) { defaultImage = filename; }
+        void setFolderNormalImage(QString filename){folderNormalImage = filename;}
+        void setFolderHighlightImage(QString filename){folderHighlightImage = filename;}
         void setShowChecks(bool value) { showCheck = value; }
         void setShowScrollArrows(bool value) { showScrollArrows = value; }
         void setShowSelected(bool value) { showSelected = value; }
@@ -489 +493 @@
         QString highlightedImage;
         QString selectedImage;
         QString defaultImage;
+        QString folderNormalImage;
+        QString folderHighlightImage;
 
         QPixmap *normalPixmap;
         QPixmap *highlightedPixmap;
         QPixmap *selectedPixmap;
         QPixmap *defaultPixmap;
+        QPixmap *folderNormalPixmap;
+        QPixmap *folderHighlightPixmap;
 
         QPixmap *checkNonPixmap;
         QPixmap *checkHalfPixmap;