![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 1494d3c2401542a043fadd76921833b30df71b6a..5396ecc24f6ba9155486811648ddad9d21e2fc3c 100644 (file)
#include "conn-avoid-ref.h"
#include "ege-select-one-action.h"
#include "ege-color-prof-tracker.h"
-#include "dom/util/digest.h"
+#include "color-profile-fns.h"
#include "xml/node-observer.h"
#if defined (SOLARIS_2_8)
static void sp_dtw_color_profile_event(EgeColorProfTracker *widget, SPDesktopWidget *dtw);
static void cms_adjust_toggled( GtkWidget *button, gpointer data );
+static void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled );
static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw);
static void sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidget *dtw);
class PrefWatcher : public Inkscape::XML::NodeObserver {
public:
- PrefWatcher() :
- NodeObserver(),
- dtws()
- {
- }
-
+ PrefWatcher();
virtual ~PrefWatcher();
void remove( SPDesktopWidget* dtw );
private:
+ static void hook(EgeColorProfTracker *tracker, gint a, gint b, PrefWatcher *watcher);
+
std::list<SPDesktopWidget*> dtws;
+ EgeColorProfTracker *_tracker;
};
+PrefWatcher::PrefWatcher() :
+ NodeObserver(),
+ dtws(),
+ _tracker(0)
+{
+ _tracker = ege_color_prof_tracker_new(0);
+ g_signal_connect( G_OBJECT(_tracker), "modified", G_CALLBACK(hook), this );
+}
+
PrefWatcher::~PrefWatcher()
{
}
+void PrefWatcher::hook(EgeColorProfTracker */*tracker*/, gint screen, gint monitor, PrefWatcher */*watcher*/)
+{
+ unsigned char* buf = 0;
+ guint len = 0;
+
+ ege_color_prof_tracker_get_profile_for( screen, monitor, reinterpret_cast<gpointer*>(&buf), &len );
+ Glib::ustring id = Inkscape::colorprofile_set_display_per( buf, len, screen, monitor );
+}
+
void PrefWatcher::add( SPDesktopWidget* dtw )
{
dtws.push_back(dtw);
for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
SPDesktopWidget* dtw = *it;
if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) != enabled ) {
- gtk_widget_set_sensitive( dtw->cms_adjust, enabled );
+ cms_adjust_set_sensitive( dtw, enabled );
}
}
refresh = true;
gdk_window_process_updates(GTK_WIDGET(sb)->window, TRUE);
}
- // FIXME: TODO: remove <b></b> before displaying as tooltip
- gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, message ? message : "", NULL);
+ gtk_tooltips_set_tip (this->tt, this->select_status_eventbox, gtk_label_get_text (sb) , NULL);
}
NR::Point
gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->vscrollbar, TRUE, TRUE, 0);
gtk_table_attach (GTK_TABLE (canvas_tbl), dtw->vscrollbar_box, 2, 3, 0, 2, (GtkAttachOptions)(GTK_SHRINK), (GtkAttachOptions)(GTK_FILL), 0, 0);
+
+ gchar const* tip = "";
+ Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE );
+ if ( verb ) {
+ SPAction *act = verb->get_action( dtw->viewwidget.view );
+ if ( act && act->tip ) {
+ tip = act->tip;
+ }
+ }
dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
SP_BUTTON_TYPE_TOGGLE,
NULL,
- "swatches",
- _("Adjust the display"),
+ "color_management",
+ tip,
dtw->tt );
#if ENABLE_LCMS
{
Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
bool enabled = current.length() > 0;
- gtk_widget_set_sensitive( dtw->cms_adjust, enabled );
+ cms_adjust_set_sensitive( dtw, enabled );
if ( enabled ) {
long long int active = prefs_get_int_attribute_limited( "options.displayprofile", "enable", 0, 0, 1 );
if ( active ) {
}
g_signal_connect_after( G_OBJECT(dtw->cms_adjust), "clicked", G_CALLBACK(cms_adjust_toggled), dtw );
#else
- gtk_widget_set_sensitive(dtw->cms_adjust, FALSE);
+ cms_adjust_set_sensitive(dtw, FALSE);
#endif // ENABLE_LCMS
gtk_table_attach( GTK_TABLE(canvas_tbl), dtw->cms_adjust, 2, 3, 2, 3, (GtkAttachOptions)(GTK_SHRINK), (GtkAttachOptions)(GTK_SHRINK), 0, 0);
{
prefs_get_int_attribute_limited ("options.dialogtype", "value", Inkscape::UI::Dialog::FLOATING, 0, 1) ==
Inkscape::UI::Dialog::DOCK;
- if (create_dock)
- {
+ if (create_dock) {
dtw->dock = new Inkscape::UI::Widget::Dock();
Gtk::HPaned *paned = new Gtk::HPaned();
gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1);
dtw->_tracker = ege_color_prof_tracker_new(GTK_WIDGET(dtw->layer_selector->gobj()));
+ {
+ Glib::ustring id = Inkscape::colorprofile_get_display_id( 0, 0 );
+ bool enabled = false;
+ if ( dtw->canvas->cms_key ) {
+ *(dtw->canvas->cms_key) = id;
+ enabled = !dtw->canvas->cms_key->empty();
+ }
+ cms_adjust_set_sensitive( dtw, enabled );
+ }
g_signal_connect( G_OBJECT(dtw->_tracker), "changed", G_CALLBACK(sp_dtw_color_profile_event), dtw );
dtw->select_status_eventbox = gtk_event_box_new ();
@@ -708,18 +741,20 @@ sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dt
return FALSE;
}
-void sp_dtw_color_profile_event(EgeColorProfTracker *tracker, SPDesktopWidget */*dtw*/)
+void sp_dtw_color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktopWidget *dtw)
{
// Handle profile changes
- Md5Digest digest;
- unsigned char* buf = 0;
- guint len = 0;
- ege_color_prof_tracker_get_profile( tracker, reinterpret_cast<gpointer*>(&buf), &len );
- if ( buf && len ) {
- digest.append(buf, len);
+ GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(dtw));
+ gint screenNum = gdk_screen_get_number(screen);
+ gint monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_toplevel(GTK_WIDGET(dtw))->window);
+ Glib::ustring id = Inkscape::colorprofile_get_display_id( screenNum, monitor );
+ bool enabled = false;
+ if ( dtw->canvas->cms_key ) {
+ *(dtw->canvas->cms_key) = id;
+ dtw->requestCanvasUpdate();
+ enabled = !dtw->canvas->cms_key->empty();
}
- std::string hash = digest.finishHex();
- //g_message("ICC profile %d bytes at %p is [%s]", len, buf, hash.c_str() );
+ cms_adjust_set_sensitive( dtw, enabled );
}
void cms_adjust_toggled( GtkWidget */*button*/, gpointer data )
}
}
+void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled )
+{
+ Inkscape::Verb* verb = Inkscape::Verb::get( SP_VERB_VIEW_CMS_TOGGLE );
+ if ( verb ) {
+ SPAction *act = verb->get_action( dtw->viewwidget.view );
+ if ( act ) {
+ sp_action_set_sensitive( act, enabled );
+ }
+ }
+ gtk_widget_set_sensitive( dtw->cms_adjust, enabled );
+}
+
void
sp_dtw_desktop_activate (SPDesktopWidget */*dtw*/)
{
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
_("<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a format (%s) that may cause data loss!</span>\n\n"
- "Do you want to save this file in another format?"),
+ "Do you want to save this file as an Inkscape SVG?"),
SP_DOCUMENT_NAME(doc),
Inkscape::Extension::db.get(sp_document_repr_root(doc)->attribute("inkscape:output_extension"))->get_name());
// fix for bug 1767940:
GtkWidget *close_button;
close_button = gtk_button_new_with_mnemonic(_("Close _without saving"));
gtk_widget_show(close_button);
+ GtkWidget *save_button;
+ save_button = gtk_button_new_with_mnemonic(_("_Save as SVG"));
+ gtk_widget_show(save_button);
gtk_dialog_add_action_widget(GTK_DIALOG(dialog), close_button, GTK_RESPONSE_NO);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_SAVE, GTK_RESPONSE_YES);
+ gtk_dialog_add_action_widget(GTK_DIALOG(dialog), save_button, GTK_RESPONSE_YES);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
gint response;
}
}
+void sp_desktop_widget_toggle_color_prof_adj( SPDesktopWidget *dtw )
+{
+
+ if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) ) {
+ if ( SP_BUTTON_IS_DOWN(dtw->cms_adjust) ) {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), FALSE );
+ } else {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), TRUE );
+ }
+ }
+}
+
/* Unused
void
sp_spw_toggle_menubar (SPDesktopWidget *dtw, bool is_fullscreen)