← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sflphone/trusty

« back to all changes in this revision

Viewing changes to kde/src/widgets/videodock.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (4.3.4 sid)
  • Revision ID: package-import@ubuntu.com-20140128182336-jrsv0k9u6cawc068
Tags: 1.3.0-1
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/widgets/videodock.cpp
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2011-2013 by Savoir-Faire Linux                         *
 
2
 *   Copyright (C) 2011-2014 by Savoir-Faire Linux                         *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
19
19
 
20
20
#include <QtGui/QSpacerItem>
21
21
#include <QtGui/QGridLayout>
 
22
#include <QtGui/QWidgetItem>
 
23
#include <QtGui/QGraphicsView>
22
24
 
23
25
#include <KLocale>
24
26
 
25
 
#include "videowidget.h"
 
27
#include "videowidget3.h"
 
28
#include "videoscene.h"
 
29
 
 
30
class VideoWidgetItem : public QWidgetItem {
 
31
public:
 
32
   VideoWidgetItem(VideoWidget3* wdg) : QWidgetItem(wdg),m_pWdg(wdg){}
 
33
   virtual ~VideoWidgetItem(){}
 
34
   virtual bool hasHeightForWidth () const {
 
35
      return true;
 
36
   }
 
37
   virtual int heightForWidth ( int w ) const {
 
38
      return m_pWdg->heightForWidth(w);
 
39
   }
 
40
private:
 
41
   VideoWidget3* m_pWdg;
 
42
};
26
43
 
27
44
///Constructor
28
45
VideoDock::VideoDock(QWidget* parent) : QDockWidget(parent)
30
47
   setFloating(true);
31
48
   setWindowTitle(i18nc("Video conversation","Video"));
32
49
   QWidget* wdg = new QWidget(this);
33
 
   m_pVideoWidet = new VideoWidget(this);
 
50
 
 
51
   m_pVideoWidet = new VideoWidget3(wdg);
34
52
   auto l = new QGridLayout(wdg);
35
 
   l->addWidget(m_pVideoWidet,1,1);
36
 
   l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),0,0);
37
 
   l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),0,1);
38
 
   l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),2,0);
39
 
   l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),0,2);
 
53
//    l->addItem(new VideoWidgetItem(m_pVideoWidet),1,0);
 
54
   l->addWidget(m_pVideoWidet,1,0);
 
55
//    l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),0,0);
 
56
//    l->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding),2,0);
40
57
   setWidget(wdg);
 
58
   setMinimumSize(320,240);
41
59
}
42
60
 
43
61
///Set current renderer
44
 
void VideoDock::setRenderer(VideoRenderer* r)
 
62
void VideoDock::addRenderer(VideoRenderer* r)
45
63
{
46
 
   m_pVideoWidet->setRenderer(r);
 
64
   Q_UNUSED(r)
 
65
   m_pVideoWidet->addRenderer(r);
47
66
}