← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/setup/setupicc.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2010-02-04 07:46:57 UTC
  • mfrom: (3.2.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100204074657-hqzwjn4timlfw265
Tags: 2:1.1.0-1ubuntu1
https://launchpad.net/bugs/501135
https://launchpad.net/bugs/500581
https://launchpad.net/bugs/350280
https://launchpad.net/bugs/510346
* New upstream release:
  - Rename in BQM fails with multi dot names (LP: #501135)
  - Add collection with similar name fails (LP: #500581)
  - Add SMB folder error message (LP: #350280)
  - Zoom indicators indicate wrong magnification (LP: #510346)
* Merge with Debian, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Build-depend on libkipi7-dev, libkexiv2-8-dev and 
    libkdcraw8-dev (KDE 4.3 -> 4.4)
  - Build-depend on libmarble-dev (was disabled temporarily 
    in Debian due to 4.3.4 regression)

Show diffs side-by-side

added added

removed removed

Lines of Context:
utilities/setup/setupicc.cpp
278
278
                                            "and to which color space it shall be transformed for editing.</p>"));
279
279
 
280
280
    d->defaultSRGBMissing = new QRadioButton(i18n("Assume it is using the sRGB color space (Internet standard)"));
281
 
    //TODO d->defaultSRGBMissing->setWhatsThis( i18n("<p></p>"));
 
281
    /**
 
282
     * @todo d->defaultSRGBMissing->setWhatsThis( i18n("<p></p>"));
 
283
     */
282
284
 
283
285
    d->defaultSRGBConvert = new QCheckBox(i18n("and convert it to the working color space"));
284
 
    //TODO d->defaultSRGBConvert->setWhatsThis( i18n("<p></p>"));
 
286
    /**
 
287
     * @todo d->defaultSRGBConvert->setWhatsThis( i18n("<p></p>"));
 
288
     */
285
289
    d->defaultSRGBConvert->setChecked(true);
286
290
 
287
291
    QGridLayout *gridRgb = new QGridLayout;
290
294
    gridRgb->setColumnMinimumWidth(0, 10);
291
295
 
292
296
    d->defaultWSMissing  = new QRadioButton(i18n("Assume it is using the working color space"));
293
 
    //TODO d->defaultWSMissing->setWhatsThis( i18n("<p></p>"));
 
297
    /**
 
298
     * @todo d->defaultWSMissing->setWhatsThis( i18n("<p></p>"));
 
299
     */
294
300
 
295
301
    d->defaultInputMissing = new QRadioButton(i18n("Convert it from default input color space to working space"));
296
 
    //TODO d->defaultWSMissing->setWhatsThis( i18n("<p></p>"));
 
302
    /**
 
303
     * @todo d->defaultWSMissing->setWhatsThis( i18n("<p></p>"));
 
304
     */
297
305
 
298
306
    vlayMissing->addLayout(hboxMP);
299
307
    vlayMissing->addWidget(d->defaultAskMissing);
316
324
    hboxRF->addWidget(rawBehaviorLabel, 10);
317
325
 
318
326
    d->defaultAskRaw   = new QRadioButton(i18n("Ask for the input profile"));
319
 
    //TODO d->defaultAskRaw->setWhatsThis( i18n("<p></p>"));
 
327
    /**
 
328
    * @todo d->defaultAskRaw->setWhatsThis( i18n("<p></p>"));
 
329
    */
320
330
 
321
331
    d->defaultGuessRaw = new QRadioButton(i18n("Automatic color correction"));
322
 
    //TODO d->defaultGuessRaw->setWhatsThis( i18n("<p></p>"));
 
332
    /**
 
333
    * @todo d->defaultGuessRaw->setWhatsThis( i18n("<p></p>"));
 
334
    */
323
335
 
324
336
    d->defaultInputRaw = new QRadioButton(i18n("Convert it from the default input profile"));
325
 
    //TODO d->defaultSRGBMissing->setWhatsThis( i18n("<p></p>"));
 
337
    /**
 
338
    * @todo d->defaultSRGBMissing->setWhatsThis( i18n("<p></p>"));
 
339
    */
326
340
 
327
341
    d->defaultGuessRaw->setChecked(true);
328
342
 
369
383
 
370
384
    d->managedPreviews = new QCheckBox;
371
385
    d->managedPreviews->setText(i18n("Use color managed view for previews and thumbnails"));
372
 
    //TODO d->managedPreview->setWhatsThis( i18n("") );
 
386
    /**
 
387
    * @todo d->managedPreview->setWhatsThis( i18n("") );
 
388
    */
373
389
 
374
390
    gridView->addWidget(monitorIcon,            0, 0);
375
391
    gridView->addWidget(monitorProfiles,        0, 1, 1, 2);
775
791
 
776
792
void SetupICC::slotClickedMonitor()
777
793
{
778
 
    IccProfile profile = d->monitorProfilesKC->currentProfile();
 
794
    IccProfile profile;
 
795
    if (IccSettings::instance()->monitorProfileFromSystem())
 
796
        profile = IccSettings::instance()->monitorProfile();
 
797
    else
 
798
        profile = d->monitorProfilesKC->currentProfile();
779
799
    if (!profile.isNull())
780
800
       profileInfo(profile);
781
801
}