← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/scribuscore.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/scribuscore.cpp
164
164
        prefsManager->setup();
165
165
        //CB #4428 Get fonts before prefs are set to default
166
166
        bool haveFonts=false;
167
 
#ifdef Q_OS_MAC
168
 
        haveFonts=ScCore->initFonts(true);
169
 
#else
 
167
//#ifdef Q_OS_MAC
 
168
//      haveFonts=ScCore->initFonts(true);
 
169
//#else
170
170
        haveFonts=ScCore->initFonts(showFontInfo);
171
 
#endif
 
171
//#endif
172
172
        if (!haveFonts)
173
173
                return 1;
174
174
        prefsManager->initDefaults();
332
332
        PrinterProfiles.clear();
333
333
        InputProfiles.clear();
334
334
        InputProfilesCMYK.clear();
335
 
        QString pfad = ScPaths::instance().libDir();
 
335
        QString pfad = ScPaths::instance().shareDir();
336
336
        pfad += "profiles/";
337
337
        profDirs = ScPaths::getSystemProfilesDirs();
338
338
        profDirs.prepend( prefsManager->appPrefs.ProfileDir );
456
456
                                defaultRGBProfile, Format_RGB_16, intent, Ctf_NullTransform);
457
457
        defaultRGBToScreenImageTrans  = ScColorMgmtEngine::createTransform(defaultRGBProfile, Format_RGBA_8,
458
458
                                defaultRGBProfile, Format_RGBA_8, intent, Ctf_NullTransform);
459
 
        defaultCMYKToScreenImageTrans = ScColorMgmtEngine::createTransform(defaultRGBProfile, Format_CMYK_8,
460
 
                                defaultCMYKProfile, Format_RGBA_8, intent, Ctf_NullTransform);
 
459
        defaultCMYKToScreenImageTrans = ScColorMgmtEngine::createTransform(defaultCMYKProfile, Format_CMYK_8,
 
460
                                defaultRGBProfile, Format_RGBA_8, intent, dcmsFlags);
461
461
        defaultRGBToCMYKTrans = ScColorMgmtEngine::createTransform(defaultRGBProfile, Format_RGB_16,
462
462
                                defaultCMYKProfile, Format_CMYK_16, intent, dcmsFlags);
463
463
        defaultCMYKToRGBTrans = ScColorMgmtEngine::createTransform(defaultCMYKProfile, Format_CMYK_16,
488
488
                ProfilesL::Iterator ip;
489
489
                if ((prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile)))
490
490
                {
491
 
                        ip = InputProfiles.begin();
 
491
                        ip = InputProfiles.find("sRGB IEC61966-2.1");
 
492
                        if (ip == InputProfiles.end())
 
493
                                ip = InputProfiles.begin();
492
494
                        prefsManager->appPrefs.DCMSset.DefaultImageRGBProfile = ip.key();
493
495
                }
494
496
                if ((prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile)))
495
497
                {
496
 
                        ip = InputProfilesCMYK.begin();
 
498
                        ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
 
499
                        if (ip == InputProfilesCMYK.end())
 
500
                                ip = InputProfilesCMYK.begin();
497
501
                        prefsManager->appPrefs.DCMSset.DefaultImageCMYKProfile = ip.key();
498
502
                }
499
503
                if ((prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile.isEmpty()) || (!InputProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile)))
500
504
                {
501
 
                        ip = InputProfiles.begin();
 
505
                        ip = InputProfiles.find("sRGB IEC61966-2.1");
 
506
                        if (ip == InputProfiles.end())
 
507
                                ip = InputProfiles.begin();
502
508
                        prefsManager->appPrefs.DCMSset.DefaultSolidColorRGBProfile = ip.key();
503
509
                }
504
510
                if ((prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile.isEmpty()) || (!InputProfilesCMYK.contains(prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile)))
505
511
                {
506
 
                        ip = InputProfilesCMYK.begin();
 
512
                        ip = InputProfilesCMYK.find("Fogra27L CMYK Coated Press");
 
513
                        if (ip == InputProfilesCMYK.end())
 
514
                                ip = InputProfilesCMYK.begin();
507
515
                        prefsManager->appPrefs.DCMSset.DefaultSolidColorCMYKProfile = ip.key();
508
516
                }
509
517
                if ((prefsManager->appPrefs.DCMSset.DefaultMonitorProfile.isEmpty()) || (!MonitorProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultMonitorProfile)))
510
518
                {
511
 
                        ip = MonitorProfiles.begin();
 
519
                        ip = MonitorProfiles.find("sRGB IEC61966-2.1");
 
520
                        if (ip == MonitorProfiles.end())
 
521
                                ip = MonitorProfiles.begin();
512
522
                        prefsManager->appPrefs.DCMSset.DefaultMonitorProfile = ip.key();
513
523
                }
514
524
                if ((prefsManager->appPrefs.DCMSset.DefaultPrinterProfile.isEmpty()) || (!PrinterProfiles.contains(prefsManager->appPrefs.DCMSset.DefaultPrinterProfile)))
515
525
                {
516
 
                        ip = PrinterProfiles.begin();
 
526
                        ip = PrinterProfiles.find("Fogra27L CMYK Coated Press");
 
527
                        if (ip == PrinterProfiles.end())
 
528
                                ip = PrinterProfiles.begin();
517
529
                        prefsManager->appPrefs.DCMSset.DefaultPrinterProfile = ip.key();
518
530
                }
519
531
                InitDefaultColorTransforms();