← Back to branch summary

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

« back to all changes in this revision

Viewing changes to digikam/mediaplayerview.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/mediaplayerview.cpp
52
52
{
53
53
 
54
54
MediaPlayerMouseClickFilter::MediaPlayerMouseClickFilter(QObject* parent)
55
 
               : QObject(parent), m_parent(parent)
 
55
    : QObject(parent), m_parent(parent)
56
56
{
57
57
}
58
58
 
59
 
bool MediaPlayerMouseClickFilter::eventFilter(QObject *obj, QEvent *event)
 
59
bool MediaPlayerMouseClickFilter::eventFilter(QObject* obj, QEvent* event)
60
60
{
61
61
    if (event->type() == QEvent::MouseButtonPress)
62
62
    {
63
 
        QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
 
63
        QMouseEvent* mouseEvent = dynamic_cast<QMouseEvent*>(event);
 
64
 
64
65
        if (mouseEvent && mouseEvent->button() == Qt::LeftButton)
65
66
        {
66
67
            if (m_parent)
67
68
            {
68
69
                MediaPlayerView* mplayer = dynamic_cast<MediaPlayerView*>(m_parent);
 
70
 
69
71
                if (mplayer)
70
72
                {
71
73
                    mplayer->slotEscapePressed();
72
74
                }
73
75
            }
 
76
 
74
77
            return true;
75
78
        }
76
79
        else
128
131
};
129
132
 
130
133
MediaPlayerView::MediaPlayerView(AlbumWidgetStack* parent)
131
 
               : QStackedWidget(parent), d(new MediaPlayerViewPriv)
 
134
    : QStackedWidget(parent), d(new MediaPlayerViewPriv)
132
135
{
133
136
    setAttribute(Qt::WA_DeleteOnClose);
134
137
 
137
140
    d->nextAction       = new QAction(SmallIcon("go-next"),      i18nc("go to next image", "Forward"),  this);
138
141
 
139
142
    d->errorView        = new QFrame(this);
140
 
    QLabel *errorMsg    = new QLabel(i18n("An error has occurred with the media player...."), this);
 
143
    QLabel* errorMsg    = new QLabel(i18n("An error has occurred with the media player...."), this);
141
144
 
142
145
    errorMsg->setAlignment(Qt::AlignCenter);
143
146
    d->errorView->setFrameStyle(QFrame::GroupBoxPanel|QFrame::Plain);
144
147
    d->errorView->setLineWidth(1);
145
148
 
146
 
    QGridLayout *grid = new QGridLayout;
 
149
    QGridLayout* grid = new QGridLayout;
147
150
    grid->addWidget(errorMsg, 1, 0, 1, 3 );
148
151
    grid->setColumnStretch(0, 10),
149
 
    grid->setColumnStretch(2, 10),
150
 
    grid->setRowStretch(0, 10),
151
 
    grid->setRowStretch(2, 10),
152
 
    grid->setMargin(KDialog::spacingHint());
 
152
         grid->setColumnStretch(2, 10),
 
153
         grid->setRowStretch(0, 10),
 
154
         grid->setRowStretch(2, 10),
 
155
         grid->setMargin(KDialog::spacingHint());
153
156
    grid->setSpacing(KDialog::spacingHint());
154
157
    d->errorView->setLayout(grid);
155
158
 
171
174
    d->grid->addWidget(d->player->videoWidget(), 0, 0, 1, 3);
172
175
    d->grid->addWidget(d->slider,                1, 0, 1, 3);
173
176
    d->grid->setColumnStretch(0, 10),
174
 
    d->grid->setColumnStretch(2, 10),
175
 
    d->grid->setRowStretch(0, 10),
176
 
    d->grid->setMargin(KDialog::spacingHint());
 
177
      d->grid->setColumnStretch(2, 10),
 
178
      d->grid->setRowStretch(0, 10),
 
179
      d->grid->setMargin(KDialog::spacingHint());
177
180
    d->grid->setSpacing(KDialog::spacingHint());
178
181
    d->mediaPlayerView->setLayout(d->grid);
179
182
 
237
240
void MediaPlayerView::slotPlayerFinished()
238
241
{
239
242
    if (d->player->mediaObject()->errorType() == Phonon::FatalError)
 
243
    {
240
244
        setPreviewMode(MediaPlayerViewPriv::ErrorView);
 
245
    }
241
246
}
242
247
 
243
248
void MediaPlayerView::slotPlayerstateChanged(Phonon::State newState, Phonon::State /*oldState*/)
244
249
{
245
250
    if (newState == Phonon::ErrorState)
 
251
    {
246
252
        setPreviewMode(MediaPlayerViewPriv::ErrorView);
 
253
    }
247
254
}
248
255
 
249
256
void MediaPlayerView::escapePreview()
276
283
void MediaPlayerView::setPreviewMode(int mode)
277
284
{
278
285
    if (mode != MediaPlayerViewPriv::ErrorView && mode != MediaPlayerViewPriv::PlayerView)
 
286
    {
279
287
        return;
 
288
    }
280
289
 
281
290
    setCurrentIndex(mode);
282
291
    d->toolBar->raise();