From 781a09af6bc5b47d7bed608a7d49d3117966b460 Mon Sep 17 00:00:00 2001
From: buliabyak <>
Date: Thu, 21 Jan 2010 19:50:15 -0400
Subject: [PATCH] disable softproofing if no get display id ONLY if source
profile is to be taken from display; add statusbar messages; string edit
---
src/widgets/desktop-widget.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 32d682904..ab440595f 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -532,8 +532,10 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
dtw->_tracker = ege_color_prof_tracker_new(GTK_WIDGET(dtw->layer_selector->gobj()));
#if ENABLE_LCMS
- {
+ bool fromDisplay = prefs->getBool( "/options/displayprofile/from_display");
+ if ( fromDisplay ) {
Glib::ustring id = Inkscape::colorprofile_get_display_id( 0, 0 );
+
bool enabled = false;
if ( dtw->canvas->cms_key ) {
*(dtw->canvas->cms_key) = id;
@@ -795,6 +797,11 @@ void cms_adjust_toggled( GtkWidget */*button*/, gpointer data )
dtw->requestCanvasUpdate();
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setBool("/options/displayprofile/enable", down);
+ if (down) {
+ dtw->setMessage (Inkscape::NORMAL_MESSAGE, _("Color-managed display is enabled in this window"));
+ } else {
+ dtw->setMessage (Inkscape::NORMAL_MESSAGE, _("Color-managed display is disabled in this window"));
+ }
}
#endif // ENABLE_LCMS
}
@@ -905,8 +912,8 @@ SPDesktopWidget::shutdown()
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
_("The file \"%s\" was saved with a format (%s) that may cause data loss!\n\n"
- "Do you want to save this file as an Inkscape SVG?"),
- SP_DOCUMENT_NAME(doc),
+ "Do you want to save this file as Inkscape SVG?"),
+ SP_DOCUMENT_NAME(doc)? SP_DOCUMENT_NAME(doc) : "Unnamed",
SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE);
// fix for bug 1767940:
GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label), GTK_CAN_FOCUS);
--
2.30.2