← Back to branch summary

~ubuntu-branches/ubuntu/maverick/digikam/maverick

« back to all changes in this revision

Viewing changes to utilities/imageeditor/editor/imagewindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2009-03-17 23:07:56 UTC
  • mfrom: (1.2.20 upstream) (3.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20090317230756-db5b8rqjwb2j35e5
Tags: 2:0.10.0-1ubuntu1
* Remaining changes to Debian (committed to Debian SVN):
  - Depends: kde-icons-oxygen dropped (included through kdelibs)
  - Recommends: kipi-plugins added (provides major functionality)
  - debian/digikamthemedesigner.manpage: add missing manpage
* Remaning change to Debian:
  - Section: devel for -dbg package (no debug in Jaunty)

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/imageeditor/editor/imagewindow.cpp
659
659
            QList<qlonglong> idList;
660
660
            idList << d->imageInfoCurrent.id();
661
661
 
662
 
            assignTagsMenu = new TagsPopupMenu(idList, TagsPopupMenu::ASSIGN);
663
 
            removeTagsMenu = new TagsPopupMenu(idList, TagsPopupMenu::REMOVE);
 
662
            assignTagsMenu = new TagsPopupMenu(idList, TagsPopupMenu::ASSIGN, this);
 
663
            removeTagsMenu = new TagsPopupMenu(idList, TagsPopupMenu::REMOVE, this);
664
664
            assignTagsMenu->menuAction()->setText(i18n("Assign Tag"));
665
665
            removeTagsMenu->menuAction()->setText(i18n("Remove Tag"));
666
666
 
1138
1138
        d->imageInfoList.removeAt(index);
1139
1139
    // Remember: index now points to the next item in the list
1140
1140
 
 
1141
    if (url != d->urlCurrent)
 
1142
        return true;
 
1143
 
1141
1144
    if (index < d->urlList.size())
1142
1145
    {
1143
1146
        // Try to get the next image in the current Album...
1175
1178
 
1176
1179
void ImageWindow::slotCollectionImageChange(const CollectionImageChangeset &changeset)
1177
1180
{
 
1181
    // ignore when closed
 
1182
    if (!isVisible())
 
1183
        return;
 
1184
 
1178
1185
    bool needLoadCurrent = false;
1179
1186
    switch(changeset.operation())
1180
1187
    {
1183
1190
            {
1184
1191
                if (changeset.containsImage(d->imageInfoList[i].id()))
1185
1192
                {
1186
 
                    if (removeItem(i))
1187
 
                        needLoadCurrent = true;
 
1193
                    if (d->imageInfoCurrent == d->imageInfoList[i])
 
1194
                    {
 
1195
                        if (removeItem(i))
 
1196
                            needLoadCurrent = true;
 
1197
                    }
 
1198
                    else
 
1199
                        removeItem(i);
1188
1200
                    i--;
1189
1201
                }
1190
1202
            }
1194
1206
            {
1195
1207
                if (changeset.containsAlbum(d->imageInfoList[i].albumId()))
1196
1208
                {
1197
 
                    if (removeItem(i))
1198
 
                        needLoadCurrent = true;
 
1209
                    if (d->imageInfoCurrent == d->imageInfoList[i])
 
1210
                    {
 
1211
                        if (removeItem(i))
 
1212
                            needLoadCurrent = true;
 
1213
                    }
 
1214
                    else
 
1215
                        removeItem(i);
1199
1216
                    i--;
1200
1217
                }
1201
1218
            }
1259
1276
            SlidePictureInfo pictInfo;
1260
1277
            meta.load((*it).path());
1261
1278
            pictInfo.comment   = meta.getImageComment();
1262
 
            pictInfo.photoInfo = meta.getPhotographInformations();
 
1279
            pictInfo.photoInfo = meta.getPhotographInformation();
1263
1280
            settings.pictInfoMap.insert(*it, pictInfo);
1264
1281
 
1265
1282
            m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));