[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam
From:       Renchi Raju <renchi () pooh ! tam ! uiuc ! edu>
Date:       2005-07-28 16:50:48
Message-ID: 1122569448.235856.5272.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439685 by pahlibar:

tag usability 1.2: show tags which are already assigned as checked.
not a 100% perfect solution. make use of a custommenuitem and draw
the checkbox on the right. instead of doing custommenuitem for each
item (which will prevent having submenus), do it only for needed ones.
some of the code is copied from Sebastien Laout's custom popupmenu code.

screenshot: http://img41.imageshack.us/my.php?image=popupmenu9cv.png

CCMAIL: digikam-devel@kde.org


 M  +0 -7      TODO  
 M  +84 -2     digikam/tagspopupmenu.cpp  


--- trunk/extragear/graphics/digikam/TODO #439684:439685
@@ -1,10 +1,3 @@
-
-
-* Tina's Tag Usability Recommendations:
-(http://www.uni-koblenz.de/~trilliti/digikam_tagging/main.html). 
-Following items have been agreed on (rest are in dispute):
-1.2 Show which tags are already assigned
-
 * Fix PPC compatibility in image filters [GC]
 * Use threaded implementation in image filter when it's possible [GC]
 * Add doxygen comments in libs implementation [GC]
--- trunk/extragear/graphics/digikam/digikam/tagspopupmenu.cpp #439684:439685
@@ -26,6 +26,8 @@
 
 #include <qpixmap.h>
 #include <qstring.h>
+#include <qpainter.h>
+#include <qstyle.h>
 
 #include "albumiconview.h"
 #include "albumiconitem.h"
@@ -39,6 +41,61 @@
 
 #define ADDTAGID 10000
 
+class TagsPopupCheckedMenuItem : public QCustomMenuItem
+{
+public:
+
+    TagsPopupCheckedMenuItem(QPopupMenu* popup, const QString& txt, const QPixmap& pix)
+        : QCustomMenuItem(), m_popup(popup), m_txt(txt), m_pix(pix)
+    {
+    }
+
+    virtual QSize sizeHint()
+    {
+        QFont fn = m_popup->font();
+        QFontMetrics fm(fn);
+        int w = fm.width(m_txt) + 5 + kapp->style().pixelMetric(QStyle::PM_IndicatorWidth, 0);
+        int h = QMAX(fm.height(), m_pix.height());
+        return QSize( w, h );
+    }
+
+    virtual void paint(QPainter* p, const QColorGroup& cg, bool act, bool enabled,
+                       int x, int y, int w, int h )
+    {
+        p->save();
+        p->setPen(act ? cg.highlightedText() : cg.highlight());
+        p->drawText(x, y, w, h, Qt::AlignLeft|Qt::AlignVCenter, m_txt);
+        p->restore();
+
+        if (!m_pix.isNull())
+        {
+            QRect pixRect(x/2 - m_pix.width()/2, y, m_pix.width(), m_pix.height());
+            p->drawPixmap( pixRect.topLeft(), m_pix );
+        }
+
+        int checkWidth  = kapp->style().pixelMetric(QStyle::PM_IndicatorWidth,  0);
+        int checkHeight = kapp->style().pixelMetric(QStyle::PM_IndicatorHeight, 0);
+
+        QStyle::SFlags flags = QStyle::Style_Default;
+        flags |= QStyle::Style_On;
+        if (enabled)
+            flags |= QStyle::Style_Enabled;
+        if (act)
+            flags |= QStyle::Style_Active;
+        
+        QFont fn = m_popup->font();
+        QFontMetrics fm(fn);
+        QRect r(x + 5 + fm.width(m_txt), y, checkWidth, checkHeight);
+        kapp->style().drawPrimitive(QStyle::PE_Indicator, p, r, cg, flags);
+    }
+
+private:
+
+    QPopupMenu* m_popup;
+    QString     m_txt;
+    QPixmap     m_pix;
+};
+
 TagsPopupMenu::TagsPopupMenu(const QValueList<Q_LLONG>& selectedImageIDs,
                              int addToID,
                              Mode mode)
@@ -117,7 +174,17 @@
         }
         else
         {
-            popup->insertItem(pix, a->title(), m_addToID + a->id());
+            //popup->insertItem(pix, a->title(), m_addToID + a->id());
+            if ((m_mode == ASSIGN) && (m_assignedTags.contains(a->id())))
+            {
+                popup->insertItem(new TagsPopupCheckedMenuItem(popup, a->title(), pix),
+                                  m_addToID + a->id());
+            }
+            else
+            {
+
+                popup->insertItem(pix, a->title(), m_addToID + a->id());
+            }
         }
     }
 
@@ -163,6 +230,13 @@
             m_assignedTags.append(*it);
         }
     }
+    else if (m_mode == ASSIGN)
+    {
+        if (m_selectedImageIDs.count() == 1)
+        {
+            m_assignedTags = man->albumDB()->getItemCommonTagIDs(m_selectedImageIDs);
+        }
+    }
         
     TAlbum* album = man->findTAlbum(0);
     if (!album)
@@ -195,7 +269,15 @@
         }
         else
         {
-            insertItem(pix, a->title(), m_addToID + a->id());
+            if ((m_mode == ASSIGN) && (m_assignedTags.contains(a->id())))
+            {
+                insertItem(new TagsPopupCheckedMenuItem(this, a->title(), pix),
+                           m_addToID + a->id());
+            }
+            else
+            {
+                insertItem(pix, a->title(), m_addToID + a->id());
+            }
         }
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]