← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/utilities/kipiiface/kipiimagecollectionselector.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/utilities/kipiiface/kipiimagecollectionselector.cpp
50
50
namespace Digikam
51
51
{
52
52
 
53
 
class KipiImageCollectionSelector::KipiImageCollectionSelectorPriv
 
53
class KipiImageCollectionSelector::Private
54
54
{
55
55
public:
56
56
 
57
 
    KipiImageCollectionSelectorPriv() :
 
57
    Private() :
58
58
        tab(0),
59
59
        albumModel(0),
60
60
        albumTreeView(0),
121
121
 
122
122
KipiImageCollectionSelector::KipiImageCollectionSelector(KipiInterface* const iface, QWidget* const parent)
123
123
    : KIPI::ImageCollectionSelector(parent),
124
 
      d(new KipiImageCollectionSelectorPriv)
 
124
      d(new Private)
125
125
{
126
126
    KSharedConfigPtr config  = KGlobal::config();
127
127
    KConfigGroup configGroup = config->group("KipiImageCollectionSelector");
253
253
    return list;
254
254
}
255
255
 
 
256
void KipiImageCollectionSelector::enableVirtualCollections(bool flag)
 
257
{
 
258
    if (flag == false)
 
259
    {
 
260
        d->tab->setTabEnabled(1, false);
 
261
        d->tab->setTabEnabled(2, false);
 
262
    }
 
263
    
 
264
    else
 
265
    {
 
266
        d->tab->setTabEnabled(1, true);
 
267
        d->tab->setTabEnabled(2, true);
 
268
    }
 
269
}
 
270
 
256
271
}  // namespace Digikam