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

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2007-07-31 21:02:38
Message-ID: 1185915758.759271.1815.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 694827 by mwiesweg:

- Move "Add New Tag" to the bottom also in top-level. Wondering if it should be "Add New Tag Here".
- "Add this tag" is really "Assign This Tag"
- capitalization according to HIG; unsure about the demonstrative pronoun "This"


 M  +7 -9      tagspopupmenu.cpp  


--- trunk/extragear/graphics/digikam/digikam/tagspopupmenu.cpp #694826:694827
@@ -368,6 +368,8 @@
     d->addTagActions    = new QActionGroup(this);
     d->toggleTagActions = new QActionGroup(this);
 
+    setSeparatorsCollapsible(true);
+
     connect(d->addTagActions, SIGNAL(triggered(QAction*)),
             this, SLOT(slotAddTag(QAction*)));
 
@@ -435,19 +437,15 @@
     if (!album)
         return;
 
+    iterateAndBuildMenu(this, album);
+
     if (d->mode == ASSIGN)
     {
+        addSeparator();
         QAction *action = addAction(d->addTagPix, i18n("Add New Tag..."));
         action->setData(0); // root id
         d->addTagActions->addAction(action);
-
-        if (album->firstChild())
-        {
-            addSeparator();
-        }
     }
-
-    iterateAndBuildMenu(this, album);
 }
 
 // for qSort
@@ -513,14 +511,14 @@
     QPixmap pix = SyncJob::getTagThumbnail(album);
     if (d->mode == ASSIGN && !d->assignedTags.contains(album->id()))
     {
-        QAction *action = new KToggleAction(KIcon(pix), i18n("Add this tag"), d->toggleTagActions);
+        QAction *action = new KToggleAction(KIcon(pix), i18n("Assign This Tag"), d->toggleTagActions);
         action->setData(album->id());
         popup->addAction(action);
         popup->addSeparator();
     }
     else if (d->mode == REMOVE)
     {
-        QAction *action = new KToggleAction(KIcon(pix), i18n("Remove this tag"), d->toggleTagActions);
+        QAction *action = new KToggleAction(KIcon(pix), i18n("Remove This Tag"), d->toggleTagActions);
         action->setData(album->id());
         popup->addAction(action);
     }
[prev in list] [next in list] [prev in thread] [next in thread]