← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/cameragui/capturedlg.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:
utilities/cameragui/capturedlg.cpp
45
45
{
46
46
public:
47
47
 
48
 
    CaptureDlgPriv()
 
48
    CaptureDlgPriv() :
 
49
        stopPreview(false),
 
50
        timer(0),
 
51
        controller(0),
 
52
        captureWidget(0)
49
53
    {
50
 
        stopPreview   = false;
51
 
        captureWidget = 0;
52
 
        controller    = 0;
53
 
        timer         = 0;
54
54
    }
55
55
 
56
56
    bool              stopPreview;
64
64
 
65
65
CaptureDlg::CaptureDlg(QWidget* parent, CameraController* controller,
66
66
                       const QString& cameraTitle)
67
 
          : KDialog(parent), d(new CaptureDlgPriv)
 
67
    : KDialog(parent), d(new CaptureDlgPriv)
68
68
{
69
69
    d->controller = controller;
70
70
    setCaption(i18n("Capture from %1", cameraTitle));
105
105
    delete d;
106
106
}
107
107
 
108
 
void CaptureDlg::closeEvent(QCloseEvent *e)
 
108
void CaptureDlg::closeEvent(QCloseEvent* e)
109
109
{
110
110
    d->stopPreview = true;
111
111
    d->timer->stop();
143
143
void CaptureDlg::slotPreviewDone(const QImage& preview)
144
144
{
145
145
    d->captureWidget->setPreview(preview);
 
146
 
146
147
    if (!d->stopPreview)
 
148
    {
147
149
        d->timer->start(0);
 
150
    }
148
151
}
149
152
 
150
153
}  // namespace Digikam