← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/setup/setupdcraw.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/setup/setupdcraw.cpp
56
56
 
57
57
 
58
58
    SetupDcrawPriv() :
59
 
        configGroupName("ImageViewer Settings"), 
 
59
        configGroupName("ImageViewer Settings"),
60
60
 
61
61
        dcrawSettings(0)
62
62
    {}
63
63
 
64
 
    const QString        configGroupName; 
 
64
    const QString        configGroupName;
65
65
 
66
66
    DcrawSettingsWidget* dcrawSettings;
67
67
};
68
68
 
69
69
SetupDcraw::SetupDcraw(QWidget* parent)
70
 
          : QScrollArea(parent), d(new SetupDcrawPriv)
 
70
    : QScrollArea(parent), d(new SetupDcrawPriv)
71
71
{
72
 
    QWidget *panel = new QWidget(viewport());
 
72
    QWidget* panel = new QWidget(viewport());
73
73
    setWidget(panel);
74
74
    setWidgetResizable(true);
75
75
 
76
 
    QGridLayout *layout = new QGridLayout(panel);
 
76
    QGridLayout* layout = new QGridLayout(panel);
77
77
    d->dcrawSettings    = new DcrawSettingsWidget(panel, DcrawSettingsWidget::SIXTEENBITS);
78
78
    d->dcrawSettings->setItemIcon(0, SmallIcon("kdcraw"));
79
79
    d->dcrawSettings->setItemIcon(1, SmallIcon("whitebalance"));