![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 3562e7b2a8a63307f55c5dc03ef0d62f28e5d124..5396ecc24f6ba9155486811648ddad9d21e2fc3c 100644 (file)
#include "interface.h"
#include "toolbox.h"
#include "prefs-utils.h"
+#include "preferences.h"
#include "file.h"
#include "display/canvas-arena.h"
#include "display/nr-arena.h"
#include "dialogs/swatches.h"
#include "conn-avoid-ref.h"
#include "ege-select-one-action.h"
+#include "ege-color-prof-tracker.h"
+#include "color-profile-fns.h"
+#include "xml/node-observer.h"
#if defined (SOLARIS_2_8)
#include "round.h"
static gint sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw);
+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);
SPViewWidgetClass *dtw_parent_class;
+using Inkscape::XML::Node;
+
+class PrefWatcher : public Inkscape::XML::NodeObserver {
+public:
+ PrefWatcher();
+ virtual ~PrefWatcher();
+
+
+ virtual void notifyChildAdded( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+ virtual void notifyChildRemoved( Node &/*node*/, Node &/*child*/, Node */*prev*/ ) {}
+ virtual void notifyChildOrderChanged( Node &/*node*/, Node &/*child*/,
+ Node */*old_prev*/, Node */*new_prev*/ ) {}
+ virtual void notifyContentChanged( Node &/*node*/,
+ Inkscape::Util::ptr_shared<char> /*old_content*/,
+ Inkscape::Util::ptr_shared<char> /*new_content*/ ) {}
+ virtual void notifyAttributeChanged( Node &node, GQuark name,
+ Inkscape::Util::ptr_shared<char> old_value,
+ Inkscape::Util::ptr_shared<char> new_value );
+ void add( SPDesktopWidget* dtw );
+ 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);
+}
+
+void PrefWatcher::remove( SPDesktopWidget* dtw )
+{
+ dtws.remove(dtw);
+}
+
+void PrefWatcher::notifyAttributeChanged( Node &node, GQuark name,
+ Inkscape::Util::ptr_shared<char> /*old_value*/,
+ Inkscape::Util::ptr_shared<char> /*new_value*/ )
+{
+#if ENABLE_LCMS
+ (void)name;
+ if ( strcmp("group", node.name()) == 0 ) {
+ gchar const* id = node.attribute("id");
+ bool refresh = false;
+ if ( !id ) {
+ // bad
+ } else if (strcmp("displayprofile", id) == 0) {
+ Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
+ bool enabled = current.length() > 0;
+
+ for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
+ SPDesktopWidget* dtw = *it;
+ if ( GTK_WIDGET_SENSITIVE( dtw->cms_adjust ) != enabled ) {
+ cms_adjust_set_sensitive( dtw, enabled );
+ }
+ }
+ refresh = true;
+ } else if (strcmp("softproof", id) == 0) {
+ refresh = true;
+ }
+
+ if ( refresh ) {
+ for ( std::list<SPDesktopWidget*>::iterator it = dtws.begin(); it != dtws.end(); ++it ) {
+ (*it)->requestCanvasUpdate();
+ }
+ }
+#else
+ (void)node;
+ (void)name;
+ (void)new_value;
+#endif // ENABLE_LCMS
+ }
+}
+
+static PrefWatcher* watcher = 0;
+
void
SPDesktopWidget::setMessage (Inkscape::MessageType type, const gchar *message)
{
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
dtw->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (dtw->vadj));
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,
+ "color_management",
+ tip,
+ dtw->tt );
+#if ENABLE_LCMS
+ {
+ Glib::ustring current = prefs_get_string_attribute( "options.displayprofile", "uri" );
+ bool enabled = current.length() > 0;
+ 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 ) {
+ sp_button_toggle_set_down( SP_BUTTON(dtw->cms_adjust), TRUE );
+ }
+ }
+ }
+ g_signal_connect_after( G_OBJECT(dtw->cms_adjust), "clicked", G_CALLBACK(cms_adjust_toggled), dtw );
+#else
+ 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);
+ {
+ Inkscape::XML::Node* prefs = Inkscape::Preferences::get();
+ if ( prefs ) {
+ if (!watcher) {
+ watcher = new PrefWatcher();
+ prefs->addSubtreeObserver( *watcher );
+ }
+ watcher->add(dtw);
+ } else {
+ g_warning("NULL preferences instance encountered");
+ }
+ }
+
/* Canvas */
dtw->canvas = SP_CANVAS (sp_canvas_new_aa ());
+#if ENABLE_LCMS
+ dtw->canvas->enable_cms_display_adj = prefs_get_int_attribute_limited( "options.displayprofile", "enable", 0, 0, 1 ) != 0;
+#endif // ENABLE_LCMS
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (dtw->canvas), GTK_CAN_FOCUS);
style = gtk_style_copy (GTK_WIDGET (dtw->canvas)->style);
style->bg[GTK_STATE_NORMAL] = style->white;
gtk_table_attach (GTK_TABLE (canvas_tbl), GTK_WIDGET(dtw->canvas), 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
/* Dock */
- bool create_dock =
- prefs_get_int_attribute_limited ("options.dialogtype", "value", Inkscape::UI::Dialog::FLOATING, 0, 1) ==
+ bool create_dock =
+ 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();
paned->pack1(*Glib::wrap(canvas_tbl));
paned->pack2(dtw->dock->getWidget(), Gtk::FILL);
- /* Prevent the paned from catching F6 and F8 by unsetting the default callbacks */
+ /* Prevent the paned from catching F6 and F8 by unsetting the default callbacks */
if (GtkPanedClass *paned_class = GTK_PANED_CLASS (G_OBJECT_GET_CLASS (paned->gobj()))) {
paned_class->cycle_child_focus = NULL;
paned_class->cycle_handle_focus = NULL;
}
- gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
+ gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (paned->gobj()), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
} else {
- gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
+ gtk_table_attach (GTK_TABLE (tbl), GTK_WIDGET (canvas_tbl), 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0);
}
//dtw->layer_selector->set_size_request(-1, SP_ICON_SIZE_BUTTON);
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 ();
dtw->select_status = gtk_label_new (NULL);
#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 6
SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (object);
if (dtw->desktop) {
+ if ( watcher ) {
+ watcher->remove(dtw);
+ }
g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK(sp_dtw_zoom_input), dtw);
g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK(sp_dtw_zoom_output), dtw);
gtk_signal_disconnect_by_data (GTK_OBJECT (dtw->zoom_status), dtw->zoom_status);
void
SPDesktopWidget::updateTitle(gchar const* uri)
{
- Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
if (window) {
gchar const *fname = ( TRUE
@@ -572,14 +741,54 @@ sp_desktop_widget_event (GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dt
return FALSE;
}
+void sp_dtw_color_profile_event(EgeColorProfTracker */*tracker*/, SPDesktopWidget *dtw)
+{
+ // Handle profile changes
+ 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();
+ }
+ cms_adjust_set_sensitive( dtw, enabled );
+}
+
+void cms_adjust_toggled( GtkWidget */*button*/, gpointer data )
+{
+ SPDesktopWidget *dtw = SP_DESKTOP_WIDGET(data);
+
+ bool down = SP_BUTTON_IS_DOWN(dtw->cms_adjust);
+ if ( down != dtw->canvas->enable_cms_display_adj ) {
+ dtw->canvas->enable_cms_display_adj = down;
+ dtw->requestCanvasUpdate();
+ prefs_set_int_attribute( "options.displayprofile", "enable", down ? 1 : 0 );
+ }
+}
+
+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)
+sp_dtw_desktop_activate (SPDesktopWidget */*dtw*/)
{
/* update active desktop indicator */
}
void
-sp_dtw_desktop_deactivate (SPDesktopWidget *dtw)
+sp_dtw_desktop_deactivate (SPDesktopWidget */*dtw*/)
{
/* update inactive desktop indicator */
}
_("<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before closing?</span>\n\n"
"If you close without saving, your changes will be discarded."),
SP_DOCUMENT_NAME(doc));
- // fix for bug 1767940:
+ // fix for bug 1767940:
GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label), GTK_CAN_FOCUS);
GtkWidget *close_button;
switch (response) {
case GTK_RESPONSE_YES:
{
- Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
-
- sp_document_ref(doc);
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+
+ sp_document_ref(doc);
if (sp_file_save_document(*window, doc)) {
sp_document_unref(doc);
} else { // save dialog cancelled or save failed
sp_document_unref(doc);
return TRUE;
}
-
+
break;
}
case GTK_RESPONSE_NO:
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:
+ // fix for bug 1767940:
GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(GTK_MESSAGE_DIALOG(dialog)->label), GTK_CAN_FOCUS);
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;
switch (response) {
case GTK_RESPONSE_YES:
{
- sp_document_ref(doc);
-
- Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
-
+ sp_document_ref(doc);
+
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+
if (sp_file_save_dialog(*window, doc)) {
sp_document_unref(doc);
} else { // save dialog cancelled or save failed
sp_document_unref(doc);
return TRUE;
}
-
+
break;
}
case GTK_RESPONSE_NO:
prefs_set_int_attribute("desktop.geometry", "maximized", maxed);
gint w, h, x, y;
desktop->getWindowGeometry(x, y, w, h);
- // Don't save geom for maximized windows. It
+ // Don't save geom for maximized windows. It
// just tells you the current maximized size, which is not
// as useful as whatever value it had previously.
if (!maxed && !full) {
SPDesktopWidget::getWindowGeometry (gint &x, gint &y, gint &w, gint &h)
{
gboolean vis = GTK_WIDGET_VISIBLE (this);
+ (void)vis; // TODO figure out why it is here but not used.
Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
-
+
if (window)
{
window->get_size (w, h);
void
SPDesktopWidget::setWindowPosition (NR::Point p)
{
- Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
-
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+
if (window)
{
window->move (gint(round(p[NR::X])), gint(round(p[NR::Y])));
void
SPDesktopWidget::setWindowSize (gint w, gint h)
{
- Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
-
+ Gtk::Window *window = (Gtk::Window*)gtk_object_get_data (GTK_OBJECT(this), "window");
+
if (window)
{
window->set_default_size (w, h);
if (dtw->desktop->is_maximized()) {
gtk_window_unmaximize(topw);
} else {
- // Save geometry to prefs before maximizing so that
+ // Save geometry to prefs before maximizing so that
// something useful is stored there, because GTK doesn't maintain
// a separate non-maximized size.
- if (!dtw->desktop->is_iconified() && !dtw->desktop->is_fullscreen())
+ if (!dtw->desktop->is_iconified() && !dtw->desktop->is_fullscreen())
{
gint w, h, x, y;
dtw->getWindowGeometry(x, y, w, h);
gtk_window_unfullscreen(topw);
// widget layout is triggered by the resulting window_state_event
} else {
- // Save geometry to prefs before maximizing so that
+ // Save geometry to prefs before maximizing so that
// something useful is stored there, because GTK doesn't maintain
// a separate non-maximized size.
- if (!dtw->desktop->is_iconified() && !dtw->desktop->is_maximized())
+ if (!dtw->desktop->is_iconified() && !dtw->desktop->is_maximized())
{
gint w, h, x, y;
dtw->getWindowGeometry(x, y, w, h);
if (prefs_get_int_attribute (fullscreen ? "fullscreen.scrollbars" : "window.scrollbars", "state", 1) == 0) {
gtk_widget_hide_all (dtw->hscrollbar);
gtk_widget_hide_all (dtw->vscrollbar_box);
+ gtk_widget_hide_all( dtw->cms_adjust );
} else {
gtk_widget_show_all (dtw->hscrollbar);
gtk_widget_show_all (dtw->vscrollbar_box);
+ gtk_widget_show_all( dtw->cms_adjust );
}
if (prefs_get_int_attribute (fullscreen ? "fullscreen.rulers" : "window.rulers", "state", 1) == 0) {
@@ -1156,7 +1371,7 @@ sp_desktop_widget_namedview_modified (SPObject *obj, guint flags, SPDesktopWidge
}
static void
-sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw)
+sp_desktop_widget_adjustment_value_changed (GtkAdjustment */*adj*/, SPDesktopWidget *dtw)
{
if (dtw->update)
return;
@@ -1173,14 +1388,14 @@ sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget
bool SPDesktopWidget::onFocusInEvent(GdkEventFocus*)
{
inkscape_activate_desktop (desktop);
-
+
return false;
}
static gdouble
sp_dtw_zoom_value_to_display (gdouble value)
{
- return floor (pow (2, value) * 100.0 + 0.5);
+ return floor (10 * (pow (2, value) * 100.0 + 0.05)) / 10;
}
static gdouble
}
static gint
-sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data)
+sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer /*data*/)
{
gdouble new_scrolled = gtk_spin_button_get_value (spin);
const gchar *b = gtk_entry_get_text (GTK_ENTRY (spin));
}
static bool
-sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data)
+sp_dtw_zoom_output (GtkSpinButton *spin, gpointer /*data*/)
{
gchar b[64];
- g_snprintf (b, 64, "%4.0f%%", sp_dtw_zoom_value_to_display (gtk_spin_button_get_value (spin)));
+ double val = sp_dtw_zoom_value_to_display (gtk_spin_button_get_value (spin));
+ if (val < 10) {
+ g_snprintf (b, 64, "%4.1f%%", val);
+ } else {
+ g_snprintf (b, 64, "%4.0f%%", val);
+ }
gtk_entry_set_text (GTK_ENTRY (spin), b);
return TRUE;
}
}
static void
-sp_dtw_zoom_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data)
+sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
{
GList *children, *iter;
GtkWidget *item;
}
static void
-sp_dtw_zoom_50 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_50 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 0.5);
}
static void
-sp_dtw_zoom_100 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_100 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 1.0);
}
static void
-sp_dtw_zoom_200 (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_200 (GtkMenuItem */*item*/, gpointer data)
{
sp_dtw_zoom_menu_handler (static_cast<SPDesktop*>(data), 2.0);
}
static void
-sp_dtw_zoom_page (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_page (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_page();
}
static void
-sp_dtw_zoom_drawing (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_drawing (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_drawing();
}
static void
-sp_dtw_zoom_selection (GtkMenuItem *item, gpointer data)
+sp_dtw_zoom_selection (GtkMenuItem */*item*/, gpointer data)
{
static_cast<SPDesktop*>(data)->zoom_selection();
}
if (GTK_WIDGET_VISIBLE (dtw->hscrollbar)) {
gtk_widget_hide_all (dtw->hscrollbar);
gtk_widget_hide_all (dtw->vscrollbar_box);
+ gtk_widget_hide_all( dtw->cms_adjust );
prefs_set_int_attribute (dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", 0);
} else {
gtk_widget_show_all (dtw->hscrollbar);
gtk_widget_show_all (dtw->vscrollbar_box);
+ gtk_widget_show_all( dtw->cms_adjust );
prefs_set_int_attribute (dtw->desktop->is_fullscreen() ? "fullscreen.scrollbars" : "window.scrollbars", "state", 1);
}
}
+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)