← Back to branch summary

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

« back to all changes in this revision

Viewing changes to core/utilities/setup/setuplighttable.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/setup/setuplighttable.cpp
6
6
 * Date        : 2007-05-11
7
7
 * Description : setup Light Table tab.
8
8
 *
9
 
 * Copyright (C) 2007-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
 
9
 * Copyright (C) 2007-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
41
41
namespace Digikam
42
42
{
43
43
 
44
 
class SetupLightTable::SetupLightTablePriv
 
44
class SetupLightTable::Private
45
45
{
46
46
public:
47
47
 
48
 
    SetupLightTablePriv() :
 
48
    Private() :
49
49
        hideToolBar(0),
50
50
        autoSyncPreview(0),
51
51
        autoLoadOnRightPanel(0),
67
67
    QCheckBox*           clearOnClose;
68
68
};
69
69
 
70
 
const QString SetupLightTable::SetupLightTablePriv::configGroupName("LightTable Settings");
71
 
const QString SetupLightTable::SetupLightTablePriv::configFullScreenHideToolBarEntry("FullScreen Hide ToolBar");
72
 
const QString SetupLightTable::SetupLightTablePriv::configAutoSyncPreviewEntry("Auto Sync Preview");
73
 
const QString SetupLightTable::SetupLightTablePriv::configAutoLoadRightPanelEntry("Auto Load Right Panel");
74
 
const QString SetupLightTable::SetupLightTablePriv::configLoadFullImagesizeEntry("Load Full Image size");
75
 
const QString SetupLightTable::SetupLightTablePriv::configClearOnCloseEntry("Clear On Close");
 
70
const QString SetupLightTable::Private::configGroupName("LightTable Settings");
 
71
const QString SetupLightTable::Private::configFullScreenHideToolBarEntry("FullScreen Hide ToolBar");
 
72
const QString SetupLightTable::Private::configAutoSyncPreviewEntry("Auto Sync Preview");
 
73
const QString SetupLightTable::Private::configAutoLoadRightPanelEntry("Auto Load Right Panel");
 
74
const QString SetupLightTable::Private::configLoadFullImagesizeEntry("Load Full Image size");
 
75
const QString SetupLightTable::Private::configClearOnCloseEntry("Clear On Close");
76
76
 
77
77
// --------------------------------------------------------
78
78
 
79
 
SetupLightTable::SetupLightTable(QWidget* parent)
80
 
    : QScrollArea(parent), d(new SetupLightTablePriv)
 
79
SetupLightTable::SetupLightTable(QWidget* const parent)
 
80
    : QScrollArea(parent), d(new Private)
81
81
{
82
82
    QWidget* panel = new QWidget(viewport());
83
83
    setWidget(panel);