← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to digikam/albumwidgetstack.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/albumwidgetstack.cpp
83
83
    QTimer*           thumbbarTimer;
84
84
 
85
85
    DigikamImageView* imageIconView;
86
 
    ImageThumbnailBar*thumbBar;
 
86
    ImageThumbnailBar* thumbBar;
87
87
    ImagePreviewView* imagePreviewView;
88
88
    MediaPlayerView*  mediaPlayerView;
89
89
    ThumbBarDock*     thumbBarDock;
90
90
    WelcomePageView*  welcomePageView;
91
91
};
92
92
 
93
 
AlbumWidgetStack::AlbumWidgetStack(QWidget *parent)
94
 
                : QStackedWidget(parent), d(new AlbumWidgetStackPriv)
 
93
AlbumWidgetStack::AlbumWidgetStack(QWidget* parent)
 
94
    : QStackedWidget(parent), d(new AlbumWidgetStackPriv)
95
95
{
96
96
    d->imageIconView    = new DigikamImageView(this);
97
97
    d->imagePreviewView = new ImagePreviewView(this);
204
204
 
205
205
void AlbumWidgetStack::readSettings()
206
206
{
207
 
    AlbumSettings *settings = AlbumSettings::instance();
 
207
    AlbumSettings* settings = AlbumSettings::instance();
208
208
    bool showThumbbar       = settings->getShowThumbbar();
209
209
    d->thumbBarDock->setShouldBeVisible(showThumbbar);
210
210
}
226
226
void AlbumWidgetStack::slotEscapePreview()
227
227
{
228
228
    if (previewMode() == MediaPlayerMode)
 
229
    {
229
230
        d->mediaPlayerView->escapePreview();
 
231
    }
230
232
}
231
233
 
232
234
DigikamImageView* AlbumWidgetStack::imageIconView()
261
263
    }
262
264
    else
263
265
    {
264
 
        AlbumSettings *settings      = AlbumSettings::instance();
 
266
        AlbumSettings* settings      = AlbumSettings::instance();
265
267
        QString currentFileExtension = QFileInfo(info.fileUrl().toLocalFile()).suffix();
266
268
        QString mediaplayerfilter    = settings->getMovieFileFilter().toLower() +
267
269
                                       settings->getMovieFileFilter().toUpper() +
268
270
                                       settings->getAudioFileFilter().toLower() +
269
271
                                       settings->getAudioFileFilter().toUpper();
 
272
 
270
273
        if (mediaplayerfilter.contains(currentFileExtension) )
271
274
        {
272
275
            setPreviewMode(MediaPlayerMode);
276
279
        {
277
280
            // Stop media player if running...
278
281
            if (previewMode() == MediaPlayerMode)
 
282
            {
279
283
                setPreviewItem();
 
284
            }
280
285
 
281
286
            /*
282
287
            if (previewMode() != PreviewImageMode)
303
308
{
304
309
    if (mode != PreviewAlbumMode && mode != PreviewImageMode &&
305
310
        mode != WelcomePageMode  && mode != MediaPlayerMode)
 
311
    {
306
312
        return;
 
313
    }
307
314
 
308
315
    if (mode == PreviewImageMode)
309
316
    {
324
331
    {
325
332
        setCurrentIndex(mode);
326
333
    }
 
334
 
327
335
    d->imageIconView->setFocus();
328
336
}
329
337
 
330
338
void AlbumWidgetStack::previewLoaded()
331
339
{
332
 
     emit signalToggledToPreviewMode(true);
 
340
    emit signalToggledToPreviewMode(true);
333
341
}
334
342
 
335
343
void AlbumWidgetStack::slotZoomFactorChanged(double z)
336
344
{
337
345
    if (previewMode() == PreviewImageMode)
 
346
    {
338
347
        emit signalZoomFactorChanged(z);
 
348
    }
339
349
}
340
350
 
341
 
void AlbumWidgetStack::slotFileChanged(const QString &path)
 
351
void AlbumWidgetStack::slotFileChanged(const QString& path)
342
352
{
343
353
    // If item are updated from Icon View, and if we are in Preview Mode,
344
354
    // We will check if the current item preview need to be reloaded.
346
356
    if (previewMode() == PreviewAlbumMode ||
347
357
        previewMode() == WelcomePageMode  ||
348
358
        previewMode() == MediaPlayerMode)    // What we can do with media player ?
 
359
    {
349
360
        return;
 
361
    }
350
362
 
351
363
    if (path == imagePreviewView()->getImageInfo().filePath())
 
364
    {
352
365
        d->imagePreviewView->reload();
 
366
    }
353
367
}
354
368
 
355
369
/*
454
468
 
455
469
void AlbumWidgetStack::applySettings()
456
470
{
457
 
    AlbumSettings *settings = AlbumSettings::instance();
 
471
    AlbumSettings* settings = AlbumSettings::instance();
458
472
    d->imagePreviewView->setLoadFullImageSize(settings->getPreviewLoadFullImageSize());
459
473
}
460
474