← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to core/utilities/imageeditor/editor/editorstackview.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/utilities/imageeditor/editor/editorstackview.cpp
6
6
 * Date        : 2008-08-20
7
7
 * Description : A widget stack to embed editor view.
8
8
 *
9
 
 * Copyright (C) 2008-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
 
9
 * Copyright (C) 2008-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
10
10
 *
11
11
 * This program is free software; you can redistribute it
12
12
 * and/or modify it under the terms of the GNU General
35
35
namespace Digikam
36
36
{
37
37
 
38
 
class EditorStackView::EditorStackViewPriv
 
38
class EditorStackView::Private
39
39
{
40
40
 
41
41
public:
42
42
 
43
 
    EditorStackViewPriv() :
 
43
    Private() :
44
44
        toolView(0),
45
45
        canvas(0)
46
46
    {
50
50
    Canvas*  canvas;
51
51
};
52
52
 
53
 
EditorStackView::EditorStackView(QWidget* parent)
54
 
    : QStackedWidget(parent), d(new EditorStackViewPriv)
 
53
EditorStackView::EditorStackView(QWidget* const parent)
 
54
    : QStackedWidget(parent), d(new Private)
55
55
{
56
56
}
57
57
 
60
60
    delete d;
61
61
}
62
62
 
63
 
void EditorStackView::setCanvas(Canvas* canvas)
 
63
void EditorStackView::setCanvas(Canvas* const canvas)
64
64
{
65
65
    if (d->canvas)
66
66
    {
82
82
    return d->canvas;
83
83
}
84
84
 
85
 
void EditorStackView::setToolView(QWidget* view)
 
85
void EditorStackView::setToolView(QWidget* const view)
86
86
{
87
87
    if (d->toolView)
88
88
    {
97
97
    }
98
98
 
99
99
    // TODO: to remove when PreviewWidget will be unused...
100
 
    PreviewWidget* old_preview = previewWidget_old();
 
100
    PreviewWidget* const old_preview = previewWidget_old();
101
101
 
102
102
    if (old_preview)
103
103
    {
110
110
        return;
111
111
    }
112
112
 
113
 
    GraphicsDImgView* preview = previewWidget();
 
113
    GraphicsDImgView* const preview = previewWidget();
114
114
 
115
115
    if (preview)
116
116
    {
150
150
    }
151
151
    else
152
152
    {
153
 
        PreviewWidget* old_preview = previewWidget_old();
 
153
        PreviewWidget* const old_preview = previewWidget_old();
154
154
 
155
155
        if (old_preview)
156
156
        {
158
158
            return;
159
159
        }
160
160
 
161
 
        GraphicsDImgView* preview = previewWidget();
 
161
        GraphicsDImgView* const preview = previewWidget();
162
162
 
163
163
        if (preview)
164
164
        {
175
175
    }
176
176
    else
177
177
    {
178
 
        PreviewWidget* old_preview = previewWidget_old();
 
178
        PreviewWidget* const old_preview = previewWidget_old();
179
179
 
180
180
        if (old_preview)
181
181
        {
183
183
            return;
184
184
        }
185
185
 
186
 
        GraphicsDImgView* preview = previewWidget();
 
186
        GraphicsDImgView* const preview = previewWidget();
187
187
 
188
188
        if (preview)
189
189
        {
199
199
    // Both are toggle at the same time.
200
200
    d->canvas->toggleFitToWindow();
201
201
 
202
 
    PreviewWidget* old_preview = previewWidget_old();
 
202
    PreviewWidget* const old_preview = previewWidget_old();
203
203
 
204
204
    if (old_preview)
205
205
    {
207
207
        return;
208
208
    }
209
209
 
210
 
    GraphicsDImgView* preview = previewWidget();
 
210
    GraphicsDImgView* const preview = previewWidget();
211
211
 
212
212
    if (preview)
213
213
    {
231
231
    }
232
232
    else
233
233
    {
234
 
        PreviewWidget* old_preview = previewWidget_old();
 
234
        PreviewWidget* const old_preview = previewWidget_old();
235
235
 
236
236
        if (old_preview)
237
237
        {
239
239
            return;
240
240
        }
241
241
 
242
 
        GraphicsDImgView* preview = previewWidget();
 
242
        GraphicsDImgView* const preview = previewWidget();
243
243
 
244
244
        if (preview)
245
245
        {
256
256
    }
257
257
    else
258
258
    {
259
 
        PreviewWidget* old_preview = previewWidget_old();
 
259
        PreviewWidget* const old_preview = previewWidget_old();
260
260
 
261
261
        if (old_preview)
262
262
        {
264
264
            return;
265
265
        }
266
266
 
267
 
        GraphicsDImgView* preview = previewWidget();
 
267
        GraphicsDImgView* const preview = previewWidget();
268
268
 
269
269
        if (preview)
270
270
        {
281
281
    }
282
282
    else
283
283
    {
284
 
        GraphicsDImgView* preview  = previewWidget();
285
 
        PreviewWidget* old_preview = previewWidget_old();
 
284
        GraphicsDImgView* const preview  = previewWidget();
 
285
        PreviewWidget* const old_preview = previewWidget_old();
286
286
 
287
287
        if (old_preview)
288
288
        {
307
307
    }
308
308
    else
309
309
    {
310
 
        GraphicsDImgView* preview  = previewWidget();
311
 
        PreviewWidget* old_preview = previewWidget_old();
 
310
        GraphicsDImgView* const preview  = previewWidget();
 
311
        PreviewWidget* const old_preview = previewWidget_old();
312
312
 
313
313
        if (old_preview)
314
314
        {
340
340
    }
341
341
    else
342
342
    {
343
 
        PreviewWidget* old_preview = previewWidget_old();
 
343
        PreviewWidget* const old_preview = previewWidget_old();
344
344
 
345
345
        if (old_preview)
346
346
        {
348
348
            return;
349
349
        }
350
350
 
351
 
        GraphicsDImgView* preview = previewWidget();
 
351
        GraphicsDImgView* const preview = previewWidget();
352
352
 
353
353
        if (preview)
354
354
        {
369
369
    }
370
370
    else
371
371
    {
372
 
        PreviewWidget* old_preview = previewWidget_old();
 
372
        PreviewWidget* const old_preview = previewWidget_old();
373
373
 
374
374
        if (old_preview)
375
375
        {
379
379
            return;
380
380
        }
381
381
 
382
 
        GraphicsDImgView* preview = previewWidget();
 
382
        GraphicsDImgView* const preview = previewWidget();
383
383
 
384
384
        if (preview)
385
385
        {
400
400
 
401
401
GraphicsDImgView* EditorStackView::previewWidget() const
402
402
{
403
 
    GraphicsDImgView* preview = dynamic_cast<GraphicsDImgView*>(d->toolView);
 
403
    GraphicsDImgView* const preview = dynamic_cast<GraphicsDImgView*>(d->toolView);
404
404
 
405
405
    if (preview)
406
406
    {
412
412
 
413
413
PreviewWidget* EditorStackView::previewWidget_old() const
414
414
{
415
 
    PreviewWidget* preview = dynamic_cast<PreviewWidget*>(d->toolView);
 
415
    PreviewWidget* const preview = dynamic_cast<PreviewWidget*>(d->toolView);
416
416
 
417
417
    if (preview)
418
418
    {