Commit ef9aeb29 authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Merge branch 'master' into krita-testing-wolthera

parents ceaafb00 58364da5
...@@ -311,7 +311,9 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name) ...@@ -311,7 +311,9 @@ ColorSettingsTab::ColorSettingsTab(QWidget *parent, const char *name)
// XXX: no color management integration on Windows or OSX yet // XXX: no color management integration on Windows or OSX yet
#ifndef HAVE_X11 #ifndef HAVE_X11
m_page->chkUseSystemMonitorProfile->setVisible(false); if (KisColorManager::instance()->devices() > 0) {
m_page->chkUseSystemMonitorProfile->setVisible(false);
}
#endif #endif
m_page->cmbWorkingColorSpace->setIDList(KoColorSpaceRegistry::instance()->listKeys()); m_page->cmbWorkingColorSpace->setIDList(KoColorSpaceRegistry::instance()->listKeys());
m_page->cmbWorkingColorSpace->setCurrent(cfg.workingColorSpace()); m_page->cmbWorkingColorSpace->setCurrent(cfg.workingColorSpace());
......
...@@ -409,7 +409,7 @@ const KoColorProfile *KisConfig::getScreenProfile(int screen) ...@@ -409,7 +409,7 @@ const KoColorProfile *KisConfig::getScreenProfile(int screen)
KisConfig cfg; KisConfig cfg;
QString monitorId; QString monitorId;
if (KisColorManager::instance()->devices().size() > screen && screen > 0) { if (KisColorManager::instance()->devices().size() > screen) {
monitorId = cfg.monitorForScreen(screen, KisColorManager::instance()->devices()[screen]); monitorId = cfg.monitorForScreen(screen, KisColorManager::instance()->devices()[screen]);
} }
//dbgKrita << "getScreenProfile(). Screen" << screen << "monitor id" << monitorId; //dbgKrita << "getScreenProfile(). Screen" << screen << "monitor id" << monitorId;
......
...@@ -154,12 +154,12 @@ KisImportExportFilter::ConversionStatus KisPNGExport::convert(const QByteArray& ...@@ -154,12 +154,12 @@ KisImportExportFilter::ConversionStatus KisPNGExport::convert(const QByteArray&
wdg->bnTransparencyFillColor->setEnabled(!wdg->alpha->isChecked()); wdg->bnTransparencyFillColor->setEnabled(!wdg->alpha->isChecked());
//This used to be 'setEnabled(sRGB)' but firefox and ColorD are incredibly awkward about sRGB management //This used to be 'cfg.getBool("saveSRGBProfile", true)' but firefox and ColorD are incredibly awkward about sRGB management
//on Linux devices, as indicated by the same distorted colours with using the sRGB chunk, meaning it's unrelated to the profile. //on Linux devices, as indicated by the same distorted colours with using the sRGB chunk, meaning it's unrelated to the profile.
//We can somewhat assume sRGB is the default color space for the web, but it's still a darn pity we cannot rely on firefox and colord //We can somewhat assume sRGB is the default color space for the web, but it's still a darn pity we cannot rely on firefox and colord
//to manage sRGB-marked images properly. //to manage sRGB-marked images properly.
wdg->chkSRGB->setEnabled(!sRGB); wdg->chkSRGB->setEnabled(sRGB);
wdg->chkSRGB->setChecked(cfg.getBool("saveSRGBProfile", true)); wdg->chkSRGB->setChecked(cfg.getBool("saveSRGBProfile", false));
wdg->chkForceSRGB->setEnabled(!sRGB); wdg->chkForceSRGB->setEnabled(!sRGB);
wdg->chkForceSRGB->setChecked(cfg.getBool("forceSRGB", false)); wdg->chkForceSRGB->setChecked(cfg.getBool("forceSRGB", false));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment