← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/digikam/intrepid

« back to all changes in this revision

Viewing changes to digikam/digikam/tagspopupmenu.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mark Purcell
  • Date: 2008-07-17 20:25:39 UTC
  • mfrom: (1.2.15 upstream) (3.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20080717202539-6n7dtirbkoo7qvhd
Tags: 2:0.9.4-1
http://bugs.debian.org/490144
* New upstream release
  - digiKam 0.9.4 Release Plan (KDE3) ~ 13 July 08 (Closes: #490144)
* DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
* Debhelper compatibility level V7
* Install pixmaps in debian/*.install
* Add debian/digikam.lintian-overrides

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/digikam/tagspopupmenu.cpp
8
8
 *               hierarchical view of digiKam tags.
9
9
 * 
10
10
 * Copyright (C) 2004 by Renchi Raju <renchi@pooh.tam.uiuc.edu>
11
 
 * Copyright (C) 2006-2007 by Gilles Caulier <caulier dot gilles at gmail dot com>
 
11
 * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
12
12
 *
13
13
 * This program is free software; you can redistribute it
14
14
 * and/or modify it under the terms of the GNU General
51
51
#include "albumdb.h"
52
52
#include "album.h"
53
53
#include "syncjob.h"
54
 
#include "tagcreatedlg.h"
 
54
#include "tageditdlg.h"
55
55
#include "tagspopupmenu.h"
56
56
#include "tagspopupmenu.moc"
57
57
 
346
346
        }
347
347
 
348
348
        QString title, icon;
349
 
        if (!TagCreateDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
350
 
            return;
351
 
 
352
 
        QString errMsg;
353
 
        TAlbum* newAlbum = man->createTAlbum(parent, title, icon, errMsg);
354
 
 
355
 
        if( !newAlbum )
356
 
        {
357
 
            KMessageBox::error(this, errMsg);
358
 
            return;
359
 
        }
360
 
 
361
 
        emit signalTagActivated(newAlbum->id());
 
349
        if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
 
350
            return;
 
351
 
 
352
        QMap<QString, QString> errMap;
 
353
        AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
 
354
        TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
 
355
 
 
356
        for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
 
357
            emit signalTagActivated((*it)->id());
362
358
    }
363
359
    else
364
360
    {