← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/advancedslideshow/widgets/slideshowgl.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/kipi-plugins/advancedslideshow/widgets/slideshowgl.cpp
50
50
 
51
51
// KDE includes
52
52
 
 
53
#include <kapplication.h>
53
54
#include <kconfiggroup.h>
54
55
#include <kconfig.h>
55
56
#include <kdebug.h>
62
63
 
63
64
#include <libkipi/imageinfo.h>
64
65
 
65
 
// local includes.
 
66
// local includes
66
67
 
67
68
#include "commoncontainer.h"
68
69
#include "playbackwidget.h"
77
78
           : QGLWidget(0, 0, Qt::WindowStaysOnTopHint | Qt::Popup | Qt::X11BypassWindowManagerHint)
78
79
{
79
80
    setAttribute(Qt::WA_DeleteOnClose);
80
 
    QRect deskRect = KGlobalSettings::desktopGeometry(this);
 
81
    QRect deskRect = KGlobalSettings::desktopGeometry( kapp->activeWindow() );
81
82
    m_deskX        = deskRect.x();
82
83
    m_deskY        = deskRect.y();
83
84
    m_deskWidth    = deskRect.width();